From a2ef4bb471a6b94bdafc7fd9dc4b85bacf3172a6 Mon Sep 17 00:00:00 2001 From: Yuri Kovsher Date: Tue, 16 Feb 2016 12:24:04 +0200 Subject: [PATCH 01/44] MAGETWO-49825: Change order of ArrayManager::get() method parameters --- .../Magento/Framework/Stdlib/ArrayManager.php | 19 ++++++++-- .../Stdlib/Test/Unit/ArrayManagerTest.php | 35 +++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Stdlib/ArrayManager.php b/lib/internal/Magento/Framework/Stdlib/ArrayManager.php index d759d2a42c778..78328ad8fd3b2 100644 --- a/lib/internal/Magento/Framework/Stdlib/ArrayManager.php +++ b/lib/internal/Magento/Framework/Stdlib/ArrayManager.php @@ -43,11 +43,11 @@ public function exists($path, array $data, $delimiter = self::DEFAULT_PATH_DELIM * * @param string $path * @param array $data - * @param string $delimiter * @param null $defaultValue + * @param string $delimiter * @return mixed|null */ - public function get($path, array $data, $delimiter = self::DEFAULT_PATH_DELIMITER, $defaultValue = null) + public function get($path, array $data, $defaultValue = null, $delimiter = self::DEFAULT_PATH_DELIMITER) { return $this->find($path, $data, $delimiter) ? $this->parentNode[$this->nodeIndex] : $defaultValue; } @@ -109,6 +109,21 @@ public function merge($path, array $data, array $value, $delimiter = self::DEFAU return $data; } + /** + * Populate nested array if possible and needed + * + * @param string $path + * @param array $data + * @param string $delimiter + * @return array + */ + public function populate($path, array $data, $delimiter = self::DEFAULT_PATH_DELIMITER) + { + $this->find($path, $data, $delimiter, true); + + return $data; + } + /** * Remove node and return modified data * diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php index 40a3bdacc0e9e..11b1e39e8686a 100644 --- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php +++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php @@ -221,6 +221,41 @@ public function mergeDataProvider() ]; } + /** + * @param string $path + * @param array $data + * @param array $result + * @dataProvider populateDataProvider + */ + public function testPopulate($path, $data, $result) + { + $this->assertSame($result, $this->arrayManager->populate($path, $data)); + } + + /** + * @return array + */ + public function populateDataProvider() + { + return [ + 0 => [ + 'path' => 'some/is/not/array', + 'data' => ['some' => true], + 'result' => ['some' => true] + ], + 1 => [ + 'path' => 0, + 'data' => [], + 'result' => [[]] + ], + 2 => [ + 'path' => 'nested/1/array', + 'data' => ['nested' => [true]], + 'result' => ['nested' => [true, ['array' => []]]] + ] + ]; + } + /** * @param string $path * @param array $data From 407cd4c6b3cd532456d0cd5f4be01b66be794fcb Mon Sep 17 00:00:00 2001 From: Yuri Kovsher Date: Mon, 29 Feb 2016 13:06:37 +0200 Subject: [PATCH 02/44] MAGETWO-49825: Change order of ArrayManager::get() method parameters --- .../Magento/Framework/Stdlib/ArrayManager.php | 27 ++++++++++ .../Stdlib/Test/Unit/ArrayManagerTest.php | 50 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/lib/internal/Magento/Framework/Stdlib/ArrayManager.php b/lib/internal/Magento/Framework/Stdlib/ArrayManager.php index 78328ad8fd3b2..51897c0edfcf9 100644 --- a/lib/internal/Magento/Framework/Stdlib/ArrayManager.php +++ b/lib/internal/Magento/Framework/Stdlib/ArrayManager.php @@ -88,6 +88,33 @@ public function replace($path, array $data, $value, $delimiter = self::DEFAULT_P return $data; } + /** + * Move value from one location to another + * + * @param string $path + * @param string $targetPath + * @param array $data + * @param bool $overwrite + * @param string $delimiter + * @return array + */ + public function move($path, $targetPath, array $data, $overwrite = false, $delimiter = self::DEFAULT_PATH_DELIMITER) + { + if ($this->find($path, $data, $delimiter)) { + $parentNode = &$this->parentNode; + $nodeIndex = &$this->nodeIndex; + + if ((!$this->find($targetPath, $data, $delimiter) || $overwrite) + && $this->find($targetPath, $data, $delimiter, true) + ) { + $this->parentNode[$this->nodeIndex] = $parentNode[$nodeIndex]; + unset($parentNode[$nodeIndex]); + } + } + + return $data; + } + /** * Merge value with node and return modified data * diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php index 11b1e39e8686a..8967a6f488b85 100644 --- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php +++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php @@ -182,6 +182,56 @@ public function setReplaceProvider() ]; } + /** + * @param string $path + * @param string $targetPath + * @param array $data + * @param bool $overwrite + * @param array $result + * @dataProvider moveDataProvider + */ + public function testMove($path, $targetPath, array $data, $overwrite, array $result) + { + $this->assertSame($result, $this->arrayManager->move($path, $targetPath, $data, $overwrite)); + } + + /** + * @return array + */ + public function moveDataProvider() + { + return [ + 0 => [ + 'path' => 'not/valid/path', + 'targetPath' => 'target/path', + 'data' => ['valid' => ['path' => 'value']], + 'overwrite' => false, + 'result' => ['valid' => ['path' => 'value']] + ], + 1 => [ + 'path' => 'valid/path', + 'targetPath' => 'target/path', + 'data' => ['valid' => ['path' => 'value']], + 'overwrite' => false, + 'result' => ['valid' => [], 'target' => ['path' => 'value']] + ], + 2 => [ + 'path' => 'valid/path', + 'targetPath' => 'target/path', + 'data' => ['valid' => ['path' => 'value'], 'target' => ['path' => 'exists']], + 'overwrite' => false, + 'result' => ['valid' => ['path' => 'value'], 'target' => ['path' => 'exists']] + ], + 3 => [ + 'path' => 'valid/path', + 'targetPath' => 'target/path', + 'data' => ['valid' => ['path' => 'value'], 'target' => ['path' => 'exists']], + 'overwrite' => true, + 'result' => ['valid' => [], 'target' => ['path' => 'value']] + ] + ]; + } + /** * @param string $path * @param array $data From f69268b3ce9d90b442085a082a8eefa14fe1c881 Mon Sep 17 00:00:00 2001 From: Yuri Kovsher Date: Tue, 1 Mar 2016 16:11:56 +0200 Subject: [PATCH 03/44] MAGETWO-49825: Change order of ArrayManager::get() method parameters --- .../DataProvider/Product/Form/Modifier/AbstractModifierTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php index 83286105a0ab6..9dd57d661c7c5 100644 --- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php @@ -86,7 +86,7 @@ protected function setUp() ->willReturnArgument(1); $this->arrayManagerMock->expects($this->any()) ->method('get') - ->willReturnArgument(3); + ->willReturnArgument(2); $this->arrayManagerMock->expects($this->any()) ->method('set') ->willReturnArgument(1); From e92874f643a1d160918e3fe644f449533dc5ac79 Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Fri, 4 Mar 2016 21:54:09 +0200 Subject: [PATCH 04/44] MAGETWO-49953: language.xml syntax error causes stack trace without listing filename - \Magento\Framework\Config\Dom\ValidationException is thrown in case of error in \DOMDocument::loadXML() while reading xml files in Magento\Framework\Config\Dom - Magento\Framework\App\Language::getDictionary throws \Magento\Framework\Exception\LocalizedException in case of error while reading language.xml - An error message is shown in AdminUi in case of incorrect language.xml --- .../Framework/App/Action/Plugin/Design.php | 29 ++++++++++++-- .../Framework/App/Language/Dictionary.php | 13 +++++- lib/internal/Magento/Framework/Config/Dom.php | 40 ++++++++++++++----- 3 files changed, 67 insertions(+), 15 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Action/Plugin/Design.php b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php index 6bd2ee59c477e..eac53cf853aba 100644 --- a/lib/internal/Magento/Framework/App/Action/Plugin/Design.php +++ b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php @@ -5,6 +5,8 @@ */ namespace Magento\Framework\App\Action\Plugin; +use Magento\Framework\Message\MessageInterface; + class Design { /** @@ -12,12 +14,21 @@ class Design */ protected $_designLoader; + /** + * @var \Magento\Framework\Message\ManagerInterface + */ + protected $messageManager; + /** * @param \Magento\Framework\View\DesignLoader $designLoader + * @param \Magento\Framework\Message\ManagerInterface $messageManager */ - public function __construct(\Magento\Framework\View\DesignLoader $designLoader) - { + public function __construct( + \Magento\Framework\View\DesignLoader $designLoader, + \Magento\Framework\Message\ManagerInterface $messageManager + ) { $this->_designLoader = $designLoader; + $this->messageManager = $messageManager; } /** @@ -26,13 +37,23 @@ public function __construct(\Magento\Framework\View\DesignLoader $designLoader) * @param \Magento\Framework\App\ActionInterface $subject * @param \Magento\Framework\App\RequestInterface $request * - * @return mixed + * @return void * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function beforeDispatch( \Magento\Framework\App\ActionInterface $subject, \Magento\Framework\App\RequestInterface $request ) { - $this->_designLoader->load(); + try { + $this->_designLoader->load(); + } catch (\Magento\Framework\Exception\LocalizedException $e) { + if ($e->getPrevious() instanceof \Magento\Framework\Config\Dom\ValidationException) { + /** @var MessageInterface $message */ + $message = $this->messageManager + ->createMessage(MessageInterface::TYPE_ERROR) + ->setText($e->getMessage()); + $this->messageManager->addUniqueMessages([$message]); + } + } } } diff --git a/lib/internal/Magento/Framework/App/Language/Dictionary.php b/lib/internal/Magento/Framework/App/Language/Dictionary.php index 7327b46b59116..81bcbbad9ac7a 100644 --- a/lib/internal/Magento/Framework/App/Language/Dictionary.php +++ b/lib/internal/Magento/Framework/App/Language/Dictionary.php @@ -68,6 +68,7 @@ public function __construct( * * @param string $languageCode * @return array + * @throws \Magento\Framework\Exception\LocalizedException */ public function getDictionary($languageCode) { @@ -77,7 +78,17 @@ public function getDictionary($languageCode) $directoryRead = $this->directoryReadFactory->create($path); if ($directoryRead->isExist('language.xml')) { $xmlSource = $directoryRead->readFile('language.xml'); - $languageConfig = $this->configFactory->create(['source' => $xmlSource]); + try { + $languageConfig = $this->configFactory->create(['source' => $xmlSource]); + } catch (\Magento\Framework\Config\Dom\ValidationException $e) { + throw new \Magento\Framework\Exception\LocalizedException( + new \Magento\Framework\Phrase( + "Invalid XML in file %1:\n%2", + [$path . '/language.xml', $e->getMessage()] + ), + $e + ); + } $this->packList[$languageConfig->getVendor()][$languageConfig->getPackage()] = $languageConfig; if ($languageConfig->getCode() === $languageCode) { $languages[] = $languageConfig; diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php index 508a3255fd1ce..354baba0a3d14 100644 --- a/lib/internal/Magento/Framework/Config/Dom.php +++ b/lib/internal/Magento/Framework/Config/Dom.php @@ -110,6 +110,26 @@ public function __construct( $this->rootNamespace = $this->dom->lookupNamespaceUri($this->dom->namespaceURI); } + /** + * Retrieve array of xml errors + * + * @param $errorFormat + * @return string[] + */ + private static function getXmlErrors($errorFormat) + { + $errors = []; + $validationErrors = libxml_get_errors(); + if (count($validationErrors)) { + foreach ($validationErrors as $error) { + $errors[] = self::_renderErrorMessage($error, $errorFormat); + } + } else { + $errors[] = 'Unknown validation error'; + } + return $errors; + } + /** * Merge $xml into DOM document * @@ -286,18 +306,11 @@ public static function validateDomDocument( $schema = self::$urnResolver->getRealPath($schema); libxml_use_internal_errors(true); libxml_set_external_entity_loader([self::$urnResolver, 'registerEntityLoader']); + $errors = []; try { $result = $dom->schemaValidate($schema); - $errors = []; if (!$result) { - $validationErrors = libxml_get_errors(); - if (count($validationErrors)) { - foreach ($validationErrors as $error) { - $errors[] = self::_renderErrorMessage($error, $errorFormat); - } - } else { - $errors[] = 'Unknown validation error'; - } + $errors = self::getXmlErrors($errorFormat); } } catch (\Exception $exception) { libxml_use_internal_errors(false); @@ -362,7 +375,14 @@ public function getDom() protected function _initDom($xml) { $dom = new \DOMDocument(); - $dom->loadXML($xml); + $useErrors = libxml_use_internal_errors(true); + $res = $dom->loadXML($xml); + if (!$res) { + $errors = self::getXmlErrors($this->errorFormat); + libxml_use_internal_errors($useErrors); + throw new \Magento\Framework\Config\Dom\ValidationException(implode("\n", $errors)); + } + libxml_use_internal_errors($useErrors); if ($this->validationState->isValidationRequired() && $this->schema) { $errors = $this->validateDomDocument($dom, $this->schema, $this->errorFormat); if (count($errors)) { From 3318a2c2b511d961f006959849bb3d9f7d9f690c Mon Sep 17 00:00:00 2001 From: Alexander Paliarush Date: Fri, 4 Mar 2016 16:52:27 -0600 Subject: [PATCH 05/44] MAGETWO-49109: Password length restriction based denial of service --- .../Api/AccountManagementInterface.php | 1 + .../Customer/Model/AccountManagement.php | 10 +++++- .../Test/Unit/Model/AccountManagementTest.php | 31 ++++++++++++++----- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Customer/Api/AccountManagementInterface.php b/app/code/Magento/Customer/Api/AccountManagementInterface.php index afd19537fd4c3..517bee453cd5a 100644 --- a/app/code/Magento/Customer/Api/AccountManagementInterface.php +++ b/app/code/Magento/Customer/Api/AccountManagementInterface.php @@ -18,6 +18,7 @@ interface AccountManagementInterface const ACCOUNT_CONFIRMED = 'account_confirmed'; const ACCOUNT_CONFIRMATION_REQUIRED = 'account_confirmation_required'; const ACCOUNT_CONFIRMATION_NOT_REQUIRED = 'account_confirmation_not_required'; + const MAX_PASSWORD_LENGTH = 256; /**#@-*/ /** diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php index 969adcfd811a8..13bb10058b998 100644 --- a/app/code/Magento/Customer/Model/AccountManagement.php +++ b/app/code/Magento/Customer/Model/AccountManagement.php @@ -509,8 +509,16 @@ public function resetPassword($email, $resetToken, $newPassword) */ protected function checkPasswordStrength($password) { - $configMinPasswordLength = $this->getMinPasswordLength(); $length = $this->stringHelper->strlen($password); + if ($length > self::MAX_PASSWORD_LENGTH) { + throw new InputException( + __( + 'Please enter a password with at most %1 characters.', + self::MAX_PASSWORD_LENGTH + ) + ); + } + $configMinPasswordLength = $this->getMinPasswordLength(); if ($length < $configMinPasswordLength) { throw new InputException( __( diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php index 3bc8dd1a5d0ce..cb01b32390986 100644 --- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php +++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php @@ -745,18 +745,15 @@ public function testCreateAccountWithPasswordInputException( if ($testNumber == 1) { $this->setExpectedException( '\Magento\Framework\Exception\InputException', - __('Please enter a password with at least %1 characters.', $minPasswordLength) + 'Please enter a password with at least ' . $minPasswordLength . ' characters.' ); } if ($testNumber == 2) { $this->setExpectedException( '\Magento\Framework\Exception\InputException', - __( - 'Minimum different classes of characters in password are %1.' . - ' Classes of characters: Lower Case, Upper Case, Digits, Special Characters.', - $minCharacterSetsNum - ) + 'Minimum of different classes of characters in password is ' . $minCharacterSetsNum . + '. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.' ); } @@ -764,6 +761,26 @@ public function testCreateAccountWithPasswordInputException( $this->accountManagement->createAccount($customer, $password); } + public function testCreateAccountInputExceptionExtraLongPassword() + { + $password = '257*chars*************************************************************************************' + . '****************************************************************************************************' + . '***************************************************************'; + + $this->string->expects($this->any()) + ->method('strlen') + ->with($password) + ->willReturn(iconv_strlen($password, 'UTF-8')); + + $this->setExpectedException( + '\Magento\Framework\Exception\InputException', + 'Please enter a password with at most 256 characters.' + ); + + $customer = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')->getMock(); + $this->accountManagement->createAccount($customer, $password); + } + /** * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ @@ -1442,7 +1459,7 @@ public function testChangePasswordException() $this->setExpectedException( '\Magento\Framework\Exception\InvalidEmailOrPasswordException', - __('Invalid login or password.') + 'Invalid login or password.' ); $this->accountManagement->changePassword($email, $currentPassword, $newPassword); From b322e910348bd1d0c902f9d886f03a417bdfcc38 Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Mon, 7 Mar 2016 15:20:10 +0200 Subject: [PATCH 06/44] MAGETWO-50030: ObjectManager/Runtime unit test fails on running single - updated unit test --- .../ObjectManager/Test/Unit/Relations/RuntimeTest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php index 2485e8e156228..bb5e77e56f528 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php @@ -42,12 +42,11 @@ public function getParentsDataProvider() /** * @param $entity - * @expectedException \Magento\Framework\Exception\LocalizedException * @dataProvider nonExistentGeneratorsDataProvider */ public function testHasIfNonExists($entity) { - $this->_model->has($entity); + $this->assertFalse($this->_model->has($entity)); } public function nonExistentGeneratorsDataProvider() From b392ca256881212393eca16ae42c1c75d09c27cd Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Mon, 7 Mar 2016 18:04:25 +0200 Subject: [PATCH 07/44] MAGETWO-50030: ObjectManager/Runtime unit test fails on running single - removed test, that cover ignored code and is innapropriate test for unit tests --- .../App/Test/Unit/Response/HttpTest.php | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php index 639250043cf99..609b8ddbc3bfb 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php @@ -72,9 +72,6 @@ protected function setUp() protected function tearDown() { unset($this->model); - $magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER); - $objectManager = $magentoObjectManagerFactory->create($_SERVER); - \Magento\Framework\App\ObjectManager::setInstance($objectManager); } public function testSendVary() @@ -270,27 +267,6 @@ public function testWakeUpWithException() $this->assertNull($this->cookieManagerMock); } - /** - * Test for the magic method __wakeup - * - * @covers \Magento\Framework\App\Response\Http::__wakeup - */ - public function testWakeUpWith() - { - $objectManagerMock = $this->getMock('Magento\Framework\App\ObjectManager', [], [], '', false); - $objectManagerMock->expects($this->once()) - ->method('create') - ->with('Magento\Framework\Stdlib\CookieManagerInterface') - ->will($this->returnValue($this->cookieManagerMock)); - $objectManagerMock->expects($this->at(1)) - ->method('get') - ->with('Magento\Framework\Stdlib\Cookie\CookieMetadataFactory') - ->will($this->returnValue($this->cookieMetadataFactoryMock)); - - \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock); - $this->model->__wakeup(); - } - public function testSetXFrameOptions() { $value = 'DENY'; From 642fc45f3dca855942147c6a4dd0c4ab7ae79977 Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Mon, 7 Mar 2016 18:56:34 +0200 Subject: [PATCH 08/44] MAGETWO-50030: ObjectManager/Runtime unit test fails on running single - fixed tests, that use static method \Magento\Framework\App\ObjectManager::setInstance --- .../Test/Unit/Model/BackendTemplateTest.php | 12 ++++----- .../App/Test/Unit/Response/HttpTest.php | 25 +++++++++++++++++++ .../Db/Collection/AbstractCollectionTest.php | 11 +++----- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php index e4e874ff1b432..79e04dd1e0c6d 100644 --- a/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php @@ -12,6 +12,7 @@ namespace Magento\Email\Test\Unit\Model; use Magento\Email\Model\BackendTemplate; +use Magento\Framework\ObjectManagerInterface; class BackendTemplateTest extends \PHPUnit_Framework_TestCase { @@ -54,18 +55,13 @@ protected function setUp() $this->resourceModelMock = $this->getMock('Magento\Email\Model\ResourceModel\Template', [], [], '', false); $this->resourceModelMock->expects($this->any())->method('getSystemConfigByPathsAndTemplateId')->willReturn(['test_config' => 2015]); + /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManagerMock*/ $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface'); $objectManagerMock->expects($this->any()) ->method('get') ->with('Magento\Email\Model\ResourceModel\Template') ->will($this->returnValue($this->resourceModelMock)); - try { - $this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance(); - } catch (\RuntimeException $e) { - $this->objectManagerBackup = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER) - ->create($_SERVER); - } \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock); $this->model = $helper->getObject( @@ -77,7 +73,9 @@ protected function setUp() protected function tearDown() { parent::tearDown(); - \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerBackup); + /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManagerMock*/ + $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface'); + \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock); } public function testGetSystemConfigPathsWhereCurrentlyUsedNoId() diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php index 609b8ddbc3bfb..890d926820337 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php @@ -9,6 +9,7 @@ namespace Magento\Framework\App\Test\Unit\Response; use \Magento\Framework\App\Response\Http; +use Magento\Framework\ObjectManagerInterface; class HttpTest extends \PHPUnit_Framework_TestCase { @@ -72,6 +73,9 @@ protected function setUp() protected function tearDown() { unset($this->model); + /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManagerMock*/ + $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface'); + \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock); } public function testSendVary() @@ -267,6 +271,27 @@ public function testWakeUpWithException() $this->assertNull($this->cookieManagerMock); } + /** + * Test for the magic method __wakeup + * + * @covers \Magento\Framework\App\Response\Http::__wakeup + */ + public function testWakeUpWith() + { + $objectManagerMock = $this->getMock('Magento\Framework\App\ObjectManager', [], [], '', false); + $objectManagerMock->expects($this->once()) + ->method('create') + ->with('Magento\Framework\Stdlib\CookieManagerInterface') + ->will($this->returnValue($this->cookieManagerMock)); + $objectManagerMock->expects($this->at(1)) + ->method('get') + ->with('Magento\Framework\Stdlib\Cookie\CookieMetadataFactory') + ->will($this->returnValue($this->cookieMetadataFactoryMock)); + + \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock); + $this->model->__wakeup(); + } + public function testSetXFrameOptions() { $value = 'DENY'; diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php index 5f17926c7ee4f..00aa03dcc1717 100644 --- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php +++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php @@ -12,6 +12,7 @@ use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection; use Magento\Framework\DataObject as MagentoObject; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use Magento\Framework\ObjectManagerInterface; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -83,12 +84,6 @@ protected function setUp() $this->objectManagerMock = $this->getMock('Magento\Framework\App\ObjectManager', [], [], '', false); - try { - $this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance(); - } catch (\RuntimeException $e) { - $this->objectManagerBackup = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER) - ->create($_SERVER); - } \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerMock); $this->objectManagerHelper = new ObjectManagerHelper($this); @@ -98,7 +93,9 @@ protected function setUp() protected function tearDown() { parent::tearDown(); - \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerBackup); + /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManagerMock*/ + $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface'); + \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock); } protected function getUut() From 7d1f93174a50589cac5236c81d4e56b7bfb28f9a Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Mon, 7 Mar 2016 10:57:12 -0600 Subject: [PATCH 09/44] MAGETWO-47595: [Github] Translation files are inconsistent with the code - Updated en_US translation files. --- .../Magento/AdminNotification/i18n/en_US.csv | 26 +- .../i18n/en_US.csv | 4 + app/code/Magento/Authorization/i18n/en_US.csv | 2 + app/code/Magento/Authorizenet/i18n/en_US.csv | 106 +-- app/code/Magento/Backend/i18n/en_US.csv | 504 ++++-------- app/code/Magento/Backup/i18n/en_US.csv | 86 +- app/code/Magento/Braintree/i18n/en_US.csv | 356 +++------ app/code/Magento/BraintreeTwo/i18n/en_US.csv | 118 ++- app/code/Magento/Bundle/i18n/en_US.csv | 100 ++- app/code/Magento/Captcha/i18n/en_US.csv | 10 +- app/code/Magento/Catalog/i18n/en_US.csv | 734 +++++++++--------- .../CatalogImportExport/i18n/en_US.csv | 31 +- .../Magento/CatalogInventory/i18n/en_US.csv | 65 +- app/code/Magento/CatalogRule/i18n/en_US.csv | 114 ++- app/code/Magento/CatalogSearch/i18n/en_US.csv | 51 +- .../Magento/CatalogUrlRewrite/i18n/en_US.csv | 6 + app/code/Magento/CatalogWidget/i18n/en_US.csv | 20 + app/code/Magento/Checkout/i18n/en_US.csv | 257 +++--- .../Magento/CheckoutAgreements/i18n/en_US.csv | 38 +- app/code/Magento/Cms/i18n/en_US.csv | 161 ++-- app/code/Magento/Config/i18n/en_US.csv | 103 +++ .../ConfigurableProduct/i18n/en_US.csv | 161 +++- app/code/Magento/Contact/i18n/en_US.csv | 24 +- app/code/Magento/Cookie/i18n/en_US.csv | 13 + app/code/Magento/Cron/i18n/en_US.csv | 6 +- .../Magento/CurrencySymbol/i18n/en_US.csv | 18 +- app/code/Magento/Customer/i18n/en_US.csv | 595 +++++++------- .../CustomerImportExport/i18n/en_US.csv | 24 +- app/code/Magento/Developer/i18n/en_US.csv | 39 +- app/code/Magento/Dhl/i18n/en_US.csv | 27 +- app/code/Magento/Directory/i18n/en_US.csv | 27 +- app/code/Magento/Downloadable/i18n/en_US.csv | 131 ++-- .../DownloadableImportExport/i18n/en_US.csv | 3 + app/code/Magento/Eav/i18n/en_US.csv | 126 +-- app/code/Magento/Email/i18n/en_US.csv | 79 +- app/code/Magento/EncryptionKey/i18n/en_US.csv | 16 +- app/code/Magento/Fedex/i18n/en_US.csv | 44 +- app/code/Magento/GiftMessage/i18n/en_US.csv | 44 +- app/code/Magento/GoogleAdwords/i18n/en_US.csv | 2 +- .../Magento/GoogleAnalytics/i18n/en_US.csv | 4 +- .../Magento/GoogleOptimizer/i18n/en_US.csv | 4 +- .../Magento/GroupedProduct/i18n/en_US.csv | 42 +- app/code/Magento/ImportExport/i18n/en_US.csv | 132 ++-- app/code/Magento/Indexer/i18n/en_US.csv | 24 +- app/code/Magento/Integration/i18n/en_US.csv | 106 ++- .../Magento/LayeredNavigation/i18n/en_US.csv | 27 +- app/code/Magento/Marketplace/i18n/en_US.csv | 6 +- app/code/Magento/MediaStorage/i18n/en_US.csv | 17 +- app/code/Magento/Msrp/i18n/en_US.csv | 20 +- app/code/Magento/Multishipping/i18n/en_US.csv | 95 ++- app/code/Magento/Newsletter/i18n/en_US.csv | 131 ++-- .../Magento/OfflinePayments/i18n/en_US.csv | 12 +- .../Magento/OfflineShipping/i18n/en_US.csv | 39 +- app/code/Magento/PageCache/i18n/en_US.csv | 8 +- app/code/Magento/Payment/i18n/en_US.csv | 55 +- app/code/Magento/Paypal/i18n/en_US.csv | 118 +-- app/code/Magento/Persistent/i18n/en_US.csv | 14 +- app/code/Magento/ProductAlert/i18n/en_US.csv | 34 +- app/code/Magento/ProductVideo/i18n/en_US.csv | 47 +- app/code/Magento/Quote/i18n/en_US.csv | 54 +- app/code/Magento/Reports/i18n/en_US.csv | 225 +++--- app/code/Magento/Review/i18n/en_US.csv | 139 ++-- app/code/Magento/Rss/i18n/en_US.csv | 54 +- app/code/Magento/Rule/i18n/en_US.csv | 39 +- app/code/Magento/Sales/i18n/en_US.csv | 710 +++++++++-------- app/code/Magento/SalesRule/i18n/en_US.csv | 216 +++--- app/code/Magento/SalesSequence/i18n/en_US.csv | 2 + app/code/Magento/Search/i18n/en_US.csv | 28 +- app/code/Magento/Security/i18n/en_US.csv | 33 +- app/code/Magento/SendFriend/i18n/en_US.csv | 57 +- app/code/Magento/Shipping/i18n/en_US.csv | 223 +++--- app/code/Magento/Sitemap/i18n/en_US.csv | 59 +- app/code/Magento/Store/i18n/en_US.csv | 42 +- app/code/Magento/Swatches/i18n/en_US.csv | 35 +- app/code/Magento/Tax/i18n/en_US.csv | 142 ++-- .../Magento/TaxImportExport/i18n/en_US.csv | 19 + app/code/Magento/Theme/i18n/en_US.csv | 195 +++-- app/code/Magento/Translation/i18n/en_US.csv | 149 +--- app/code/Magento/Ui/i18n/en_US.csv | 111 ++- app/code/Magento/Ups/i18n/en_US.csv | 65 +- app/code/Magento/UrlRewrite/i18n/en_US.csv | 72 +- app/code/Magento/User/i18n/en_US.csv | 137 ++-- app/code/Magento/Usps/i18n/en_US.csv | 68 +- app/code/Magento/Variable/i18n/en_US.csv | 17 + app/code/Magento/Webapi/i18n/en_US.csv | 35 +- app/code/Magento/Weee/i18n/en_US.csv | 17 +- app/code/Magento/Widget/i18n/en_US.csv | 65 +- app/code/Magento/Wishlist/i18n/en_US.csv | 167 ++-- .../frontend/Magento/blank/i18n/en_US.csv | 6 + .../frontend/Magento/luma/i18n/en_US.csv | 65 +- dev/tests/integration/phpunit.xml.dist | 2 +- lib/web/i18n/en_US.csv | 20 +- 92 files changed, 4533 insertions(+), 3941 deletions(-) diff --git a/app/code/Magento/AdminNotification/i18n/en_US.csv b/app/code/Magento/AdminNotification/i18n/en_US.csv index 2c1704702417d..7b55e96976cad 100644 --- a/app/code/Magento/AdminNotification/i18n/en_US.csv +++ b/app/code/Magento/AdminNotification/i18n/en_US.csv @@ -7,15 +7,14 @@ Remove,Remove "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." "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." -"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." +"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error." +"The message has been removed.","The message has been removed." "1 Hour","1 Hour" "2 Hours","2 Hours" "6 Hours","6 Hours" @@ -26,26 +25,27 @@ 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 configuration.","{{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 configuration." +"Wrong notification ID specified.","Wrong notification ID specified." +"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento configuration.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento configuration." "One or more of the Cache Types are invalidated: %1. ","One or more of the Cache Types are invalidated: %1. " "Please go to Cache Management and refresh cache types.","Please go to Cache Management 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." +"We were unable to synchronize one or more media files. Please refer to the log file for details.","We were unable to synchronize one or more media files. Please 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 take our survey and tell us about features you'd like to see in Magento.","We appreciate our merchants' feedback. Please take our survey and tell us about features you'd like to see in Magento." +"Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider.","Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider." "Close popup","Close popup" Close,Close +"System Messages:","System Messages:" "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 +"See All (","See All (" +" unread)"," unread)" +"Show Toolbar","Show Toolbar" +"Show List","Show List" "Use HTTPS to Get Feed","Use HTTPS to Get Feed" "Update Frequency","Update Frequency" "Last Update","Last Update" Severity,Severity "Date Added","Date Added" +Message,Message +Actions,Actions diff --git a/app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv b/app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv index e69de29bb2d1d..56b3d249c4123 100644 --- a/app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv +++ b/app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv @@ -0,0 +1,4 @@ +"Please correct the data sent.","Please correct the data sent." +"Entity type model \'%1\' is not found","Entity type model \'%1\' is not found" +"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" diff --git a/app/code/Magento/Authorization/i18n/en_US.csv b/app/code/Magento/Authorization/i18n/en_US.csv index e69de29bb2d1d..2bb5f767fa5f9 100644 --- a/app/code/Magento/Authorization/i18n/en_US.csv +++ b/app/code/Magento/Authorization/i18n/en_US.csv @@ -0,0 +1,2 @@ +"We can\'t find the role for the user you wanted.","We can\'t find the role for the user you wanted." +"Something went wrong while compiling a list of allowed resources. You can find out more in the exceptions log.","Something went wrong while compiling a list of allowed resources. You can find out more in the exceptions log." diff --git a/app/code/Magento/Authorizenet/i18n/en_US.csv b/app/code/Magento/Authorizenet/i18n/en_US.csv index 7bbbbaf286d5a..24d408e98a31a 100644 --- a/app/code/Magento/Authorizenet/i18n/en_US.csv +++ b/app/code/Magento/Authorizenet/i18n/en_US.csv @@ -1,48 +1,20 @@ -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" +"You created the order.","You created the order." "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 +"We can\'t process your order right now. Please try again later.","We can\'t process your order right now. Please try again later." +"Cannot place order.","Cannot place order." "Credit Card: xxxx-%1","Credit Card: xxxx-%1" -"Authorize.Net Transaction ID %1","Authorize.Net Transaction ID %1" +"amount %1","amount %1" +failed.,failed. +successful.,successful. +"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" +"Something went wrong in the payment gateway.","Something went wrong in the payment gateway." "Invalid amount for capture.","Invalid amount for capture." "Payment capturing error.","Payment capturing error." "Invalid transaction ID.","Invalid transaction ID." @@ -50,51 +22,45 @@ void,void "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." +"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." +"Please enter a transaction ID to authorize this payment.","Please enter a transaction ID to authorize this payment." +"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." +"Transaction %1 has been approved. Amount %2. Transaction status is ""%3""","Transaction %1 has been approved. Amount %2. Transaction status is ""%3""" +"Transaction %1 has been voided/declined. Transaction status is ""%2"". Amount %3.","Transaction %1 has been voided/declined. Transaction status is ""%2"". Amount %3." +"Authorize Only","Authorize Only" +"Authorize and Capture","Authorize and Capture" +"Unable to get transaction details. Try again later.","Unable to get transaction details. Try again later." "Credit Card Type","Credit Card Type" "Credit Card Number","Credit Card Number" "Expiration Date","Expiration Date" "Card Verification Number","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","Credit Card Information" -"--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... +"Fraud Detection ","Fraud Detection " +"FDS Filter Action","FDS Filter Action" +"AVS Response","AVS Response" +"Card Code Response","Card Code Response" +"CAVV Response","CAVV Response" +"Fraud Filters","Fraud Filters" +"Place Order","Place Order" +"Authorize.net Direct Post","Authorize.net Direct Post" Enabled,Enabled -"Sort Order","Sort Order" +"Payment Action","Payment Action" 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" +"Merchant MD5","Merchant MD5" +"New Order Status","New Order Status" +"Test Mode","Test Mode" +"Gateway URL","Gateway URL" +"Transaction Details URL","Transaction Details URL" "Accepted Currency","Accepted Currency" +Debug,Debug +"Email Customer","Email Customer" +"Merchant's Email","Merchant's Email" +"Credit Card Types","Credit Card Types" +"Credit Card Verification","Credit Card Verification" "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" -"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" +"Sort Order","Sort Order" diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv index 0c5586948801f..3dcc793ac28e5 100644 --- a/app/code/Magento/Backend/i18n/en_US.csv +++ b/app/code/Magento/Backend/i18n/en_US.csv @@ -1,30 +1,8 @@ -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?" +"The cache storage may contain additional data. Are you sure that you want to flush it?","The cache storage may contain additional data. Are you sure that you want to flush it?" "Flush Cache Storage","Flush Cache Storage" Invalidated,Invalidated Orders,Orders @@ -32,17 +10,17 @@ Amounts,Amounts Bestsellers,Bestsellers "Most Viewed Products","Most Viewed Products" "New Customers","New Customers" +Customers,Customers Customer,Customer Guest,Guest Items,Items -"Grand Total","Grand Total" +Total,Total "Lifetime Sales","Lifetime Sales" -"Average Orders","Average Orders" -"Search Term","Search Term" -Results,Results -Uses,Uses +"Average Order","Average Order" Average,Average -"Order Quantity","Order Quantity" +Product,Product +Price,Price +Quantity,Quantity Views,Views Revenue,Revenue Tax,Tax @@ -50,9 +28,9 @@ 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" +"What is this?","What is this?" "Save Account","Save Account" "My Account","My Account" "Account Information","Account Information" @@ -64,6 +42,8 @@ Email,Email "New Password","New Password" "Password Confirmation","Password Confirmation" "Interface Locale","Interface Locale" +"Current User Identity Verification","Current User Identity Verification" +"Your Password","Your Password" "Save Cache Settings","Save Cache Settings" "Catalog Rewrites","Catalog Rewrites" Refresh,Refresh @@ -80,23 +60,10 @@ Rebuild,Rebuild "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" +Back,Back Delete,Delete +"Are you sure?","Are you sure?" Save,Save "Edit Design Change","Edit Design Change" "New Store Design Change","New Store Design Change" @@ -108,12 +75,14 @@ Store,Store "Date To","Date To" "Design Change","Design Change" General,General +Cancel,Cancel "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 +No,No "Delete Store","Delete Store" "Delete Web Site","Delete Web Site" "Save Web Site","Save Web Site" @@ -144,53 +113,11 @@ 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 +Reset,Reset +"Are you sure you want to do this?","Are you sure you want to do this?" "Add New Image","Add New Image" +"Export block for grid %1 is not defined","Export block for grid %1 is not defined" "Reset Filter","Reset Filter" Search,Search Any,Any @@ -201,173 +128,116 @@ To,To "[ deleted ]","[ deleted ]" "Select All","Select All" " [deleted]"," [deleted]" -"We couldn't find any records.","We couldn't find any records." +"We couldn\'t find any records.","We couldn\'t find any records." "Add New","Add New" +"Invalid export type supplied for grid export block","Invalid export type supplied for grid export block" 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 +"Unknown block type","Unknown block type" +"Please correct the tab configuration and try again. Tab Id should be not empty","Please correct the tab configuration and try again. Tab Id should be not empty" "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" +"Specified cache type(s) don\'t exist: %1","Specified cache type(s) don\'t exist: %1" +"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." +"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 static files cache has been cleaned.","The static files cache has been cleaned." "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." +"Cache Management","Cache Management" "%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) enabled.","%1 cache type(s) enabled." +"An error occurred while enabling cache.","An error occurred while enabling 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 +"We updated lifetime statistic.","We updated lifetime statistic." +"We can\'t refresh lifetime statistics.","We can\'t refresh lifetime statistics." "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" +"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." +"You saved the account.","You saved the account." "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." +"You deleted the design change.","You deleted the design change." +"You can't delete the design change.","You can't delete the design change." "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." +System,System "Manage Stores","Manage Stores" +"The database was backed up.","The database was backed up." +"We can\'t create a backup right now. Please try again later.","We can\'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." +"Something went wrong. Please try again.","Something went wrong. Please try again." +"This store cannot be deleted.","This store cannot be deleted." +"You deleted the store.","You deleted the store." +"Unable to delete the store. Please try again later.","Unable to delete the store. Please try again later." +"This store view cannot be deleted.","This store view cannot be deleted." +"Store View","Store View" +"You deleted the store view.","You deleted the store view." +"Unable to delete the store view. Please try again later.","Unable to delete the store view. Please try again later." +"This website cannot be deleted.","This website cannot be deleted." +"You deleted the website.","You deleted the website." +"Unable to delete the website. Please try again later.","Unable to delete the website. Please try again later." "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." +"Before modifying the website code please make sure it is not used in index.php.","Before modifying the website code please make sure 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." +"Before modifying the store view code please make sure it is not used in index.php.","Before modifying the store view code please make sure 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 custom variable.","You deleted the custom variable." -"URL Rewrites","URL Rewrites" -"[New/Edit] URL Rewrite","[New/Edit] URL Rewrite" -"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." +"You saved the website.","You saved the website." +"You saved the store.","You saved the store." +"You saved the store view.","You saved the store view." +"Something went wrong while saving. Please review the error log.","Something went wrong while saving. Please review the error log." "Last 24 Hours","Last 24 Hours" "Last 7 Days","Last 7 Days" "Current Month","Current Month" YTD,YTD 2YTD,2YTD +"Authentication storage is incorrect.","Authentication storage is incorrect." "You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled." "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: %1","The specified image adapter cannot be used because of: %1" -"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." +"Please try to sign out and sign in again.","Please try to sign 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:" +"You need more permissions to access this.","You need more permissions to access this." +"Welcome, please sign in","Welcome, please sign in" +Username,Username "user name","user name" -Password:,Password: +Password,Password password,password -"Log in","Log in" -"Please wait...","Please wait..." +"Sign in","Sign in" "Select Range:","Select Range:" "No Data Found","No Data Found" "Chart is disabled. To enable the chart, click here.","Chart is disabled. To enable the chart, click here." -"Last 5 Orders","Last 5 Orders" -"Last 5 Search Terms","Last 5 Search Terms" -"Top 5 Search Terms","Top 5 Search Terms" +"Last Orders","Last Orders" +"Last Search Terms","Last Search Terms" +"Top Search Terms","Top 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" +"Reload Data","Reload Data" "Browse Files...","Browse Files..." +Magento,Magento "Copyright© %1 Magento Commerce Inc. All rights reserved.","Copyright© %1 Magento Commerce 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" +"ver. %1","ver. %1" +"Magento Admin Panel","Magento Admin Panel" "Account Setting","Account Setting" "Customer View","Customer View" "Sign Out","Sign Out" "About the calendar","About the calendar" +Close,Close "Go Today","Go Today" Previous,Previous Next,Next @@ -375,61 +245,31 @@ 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: +"Report Bugs","Report Bugs" +"Store View:","Store View:" "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." +"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." -"Flush Static Files Cache", "Flush Static Files Cache" -"Preprocessed view files and static files", "Preprocessed view files and static files" +"Themes JavaScript and CSS files combined to one file","Themes JavaScript and CSS files combined to one file" +"Flush Static Files Cache","Flush Static Files Cache" +"Preprocessed view files and static files","Preprocessed view files and static files" 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 +"records found","records found" +selected,selected "per page","per page" -Page,Page "Previous page","Previous page" "of %1","of %1" "Next page","Next page" @@ -439,80 +279,66 @@ Actions,Actions "Unselect All","Unselect All" "Select Visible","Select Visible" "Unselect Visible","Unselect Visible" -"items selected","items selected" +"Changes have been made to this section that have not been saved.","Changes have been made to this section that have not been saved." +"This tab contains invalid data. Please resolve this before saving.","This tab contains invalid data. Please resolve this before saving." "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" +"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." +"Allow everything","Allow everything" +"Magento Admin","Magento Admin" +"Global Search","Global Search" +Marketing,Marketing +"SEO & Search","SEO & Search" +"User Content","User Content" +Content,Content +Elements,Elements 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)." +Schedule,Schedule +Settings,Settings +"All Stores","All Stores" +Attributes,Attributes +"Other Settings","Other Settings" +"Data Transfer","Data Transfer" +"Magento Connect","Magento Connect" +"Connect Manager","Connect Manager" +"Package Extensions","Package Extensions" +Tools,Tools +"Web Setup Wizard","Web Setup Wizard" +Currency,Currency +Communications,Communications Services,Services +Advanced,Advanced "Disable Modules Output","Disable Modules Output" "Store Email Addresses","Store Email Addresses" "Custom Email 1","Custom Email 1" +"Sender Email","Sender Email" +"Sender Name","Sender Name" "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:
Firefox
/^mozilla/i - "," - Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:
Firefox
/^mozilla/i - " -"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" +Debug,Debug +"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront" +"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin" "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." +"Minify Html","Minify Html" +"Minification is not applied in developer mode.","Minification is not applied in developer mode." "Translate Inline","Translate Inline" -"Enabled for Frontend","Enabled for Frontend" +"Enabled for Storefront","Enabled for Storefront" "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 \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log","Logging from \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log" -"Exceptions Log File Name","Exceptions Log File Name" +"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.","Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations." "JavaScript Settings","JavaScript Settings" "Merge JavaScript Files","Merge JavaScript Files" +"Enable JavaScript Bundling","Enable JavaScript Bundling" "Minify JavaScript Files","Minify JavaScript Files" "CSS Settings","CSS Settings" "Merge CSS Files","Merge CSS Files" +"Minify CSS Files","Minify CSS Files" "Image Processing Settings","Image Processing Settings" "Image Adapter","Image Adapter" "Static Files Settings","Static Files Settings" @@ -521,29 +347,36 @@ Developer,Developer "Allow Countries","Allow Countries" "Default Country","Default Country" "European Union Countries","European Union Countries" +"Top destinations","Top destinations" "Locale Options","Locale Options" Timezone,Timezone +Locale,Locale "First Day of Week","First Day of Week" "Weekend Days","Weekend Days" +"Store Name","Store Name" +"Store Phone Number","Store Phone Number" +"Store Hours of Operation","Store Hours of Operation" +Country,Country +Region/State,Region/State "ZIP/Postal Code","ZIP/Postal Code" +City,City +"Street Address","Street Address" "Street Address Line 2","Street Address Line 2" +"VAT Number","VAT Number" "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" +Host,Host "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,Admin "Admin User Emails","Admin User Emails" "Forgot Password Email Template","Forgot Password Email Template" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." "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" @@ -551,12 +384,15 @@ Timezone,Timezone "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." +"You will have to sign in after you save your custom admin path.","You will have to sign in after you save your custom admin path." Security,Security +"Recovery Link Expiration Period (hours)","Recovery Link Expiration Period (hours)" +"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field." "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." +"Enable Charts","Enable Charts" Web,Web "Url Options","Url Options" "Add Store Code to Urls","Add Store Code to Urls" @@ -569,78 +405,52 @@ Web,Web "Search Engine Optimization","Search Engine Optimization" "Use Web Server Rewrites","Use Web Server Rewrites" "Base URLs","Base URLs" +"Base URL","Base URL" "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)" +"Secure Base URL","Secure Base URL" "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 on Storefront","Use Secure URLs on Storefront" "Use Secure URLs in Admin","Use Secure URLs in Admin" +"Enable HTTP Strict Transport Security (HSTS)","Enable HTTP Strict Transport Security (HSTS)" +"Upgrade Insecure Requests","Upgrade Insecure Requests" "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" +"Use SID on Storefront","Use SID on Storefront" "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" +Description,Description Tags,Tags "

404 Error

Page not found.

","

404 Error

Page not found.

" -"Variable ID","Variable ID" -Options,Options -"Magento Admin","Magento Admin" "Community Edition","Community Edition" -"Last Orders","Last Orders" -"Last Search Terms","Last Search Terms" -"Top Search Terms","Top Search Terms" -"Your Password","Your Password" -"You saved the account.","You saved the account." -"Current User Identity Verification","Current User Identity Verification" -Marketing,Marketing -Communications,Communications -"SEO & Search","SEO & Search" -"User Content","User Content" -"Data Transfer","Data Transfer" -"Import History","Import History" -Extensions,Extensions -"Web Setup Wizard","Web Setup Wizard" -"VAT number","VAT number" -"Top destinations","Top destinations" -"Store Hours of Operation","Store Hours of Operation" -"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/" -"Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/","Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/" -"Use Secure URLs on Storefront","Use Secure URLs on Storefront" -"Use SID on Storefront","Use SID on Storefront" -"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." -"For Windows server only.","For Windows server only." -"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront" -"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin" -"Minify Html","Minify Html" -"Enabled for Storefront","Enabled for Storefront" -"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.", "Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations." -"Enable Javascript Bundling","Enable Javascript Bundling" -"Minify CSS Files","Minify CSS Files" -"When the adapter was changed, please, flush Catalog Images Cache.","When the adapter was changed, please, flush Catalog Images Cache." -"Average Order","Average Order" -"Last Orders","Last Orders" -"Last Search Terms","Last Search Terms" -"Top Search Terms","Top Search Terms" -"Reload Data","Reload Data" -"Welcome, please sign in","Welcome, please sign in" -"Sign in","Sign in" +"Default Theme","Default Theme" +"Applied Theme","Applied Theme" +"If no value is specified, the system default is used. The system default may be modified by third party extensions.","If no value is specified, the system default is used. The system default may be modified by third party extensions." +"Design Rule","Design Rule" +"User Agent Rules","User Agent Rules" +Magento_Ui/js/dynamic-rows/record,Magento_Ui/js/dynamic-rows/record +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 current frame position does not cover utmost pages, it renders the link to current position plus/minus this value.","If current frame position does not cover utmost pages, it renders the link to current position plus/minus this value." +"Anchor Text for Previous","Anchor Text for Previous" +"Alternative text for the previous pages link in the pagination menu. If empty, the default arrow image is used.","Alternative text for the previous pages link in the pagination menu. If empty, the default arrow image is used." +"Anchor Text for Next","Anchor Text for Next" +"Alternative text for the next pages link in the pagination menu. If empty, default arrow image is used.","Alternative text for the next pages link in the pagination menu. If empty, default arrow image is used." +"Theme Name","Theme Name" diff --git a/app/code/Magento/Backup/i18n/en_US.csv b/app/code/Magento/Backup/i18n/en_US.csv index 03be8da7ef6a8..9aee00c33c393 100644 --- a/app/code/Magento/Backup/i18n/en_US.csv +++ b/app/code/Magento/Backup/i18n/en_US.csv @@ -1,67 +1,59 @@ -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 Backup","Database Backup" "The archive can be uncompressed with %2 on Windows systems.","The archive can be uncompressed with %2 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." +"To create the backup, please deselect ""Put store into maintenance mode"" or update your permissions.","To create the backup, please deselect ""Put store into maintenance mode"" or update your permissions." +"Something went wrong while putting your store into maintenance mode.","Something went wrong while 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." +"We can\'t create the backup right now.","We can\'t create the backup right now." +Backups,Backups +System,System +Tools,Tools +Backup,Backup +"We can\'t delete one or more backups.","We can\'t delete one or more backups." +failed,failed +successful,successful +"You deleted the selected backup(s).","You deleted the selected backup(s)." +"Can\'t load snapshot archive","Can\'t load snapshot archive" "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" -"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." +"To complete the rollback, please deselect ""Put store into maintenance mode"" or update your permissions.","To complete the rollback, please deselect ""Put store into maintenance mode"" or update your permissions." +"We can\'t find the backup file.","We can\'t find the backup file." +"We can\'t connect to the FTP right now.","We can\'t connect to the FTP right now." +"Failed to validate FTP.","Failed to validate FTP." +"You need more permissions to perform a rollback.","You need more permissions to perform a rollback." +"Failed to rollback.","Failed to rollback." +Database,Database "Database and Media","Database and Media" "System (excluding Media)","System (excluding Media)" -"The system backup has been created.","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 and media backup has been created." -"The database backup has been created.","The database backup has been created." +"You created the system backup.","You created the system backup." +"You created the system backup (excluding media).","You created the system backup (excluding media)." +"You created the database and media backup.","You created the database and media backup." +"You created the database backup.","You created the database backup." "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." +"Something went wrong while writing to the backup file ""%1"".","Something went wrong while writing to the backup file ""%1""." +"We can\'t save the Cron expression.","We can\'t save the Cron expression." +"You will lose any data created since the backup was made, including admin users, customers and orders.","You will lose any data created since the backup was made, including admin users, customers and orders." "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." +"This may take a few moments.","This may take a few moments." +"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup." "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." +"Maintenance mode","Maintenance mode" "Please put your store into maintenance mode during backup.","Please put your store into maintenance mode during backup." +Exclude,Exclude "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." +FTP,FTP "Use FTP Connection","Use FTP Connection" "FTP credentials","FTP credentials" "FTP Host","FTP Host" @@ -69,16 +61,18 @@ OK,OK "FTP Password","FTP Password" "Magento root directory","Magento root directory" "Create Backup","Create Backup" -Download,Download -"Start Time","Start Time" -Frequency,Frequency +Rollback,Rollback "Scheduled Backup Settings","Scheduled Backup Settings" "Enable Scheduled Backup","Enable Scheduled Backup" "Backup Type","Backup Type" +"Start Time","Start Time" +Frequency,Frequency "Maintenance Mode","Maintenance Mode" +Delete,Delete "Are you sure you want to delete the selected backup(s)?","Are you sure you want to delete the selected backup(s)?" +Time,Time +Name,Name Size(bytes),Size(bytes) -Rollback,Rollback -"Maintenance mode","Maintenance mode" -"This may take a few moments.","This may take a few moments." -"Be sure your store is in maintenance mode during backup.","Be sure your store is in maintenance mode during backup." +Type,Type +Download,Download +Action,Action diff --git a/app/code/Magento/Braintree/i18n/en_US.csv b/app/code/Magento/Braintree/i18n/en_US.csv index 72919239a5585..0b1a5aa170f32 100644 --- a/app/code/Magento/Braintree/i18n/en_US.csv +++ b/app/code/Magento/Braintree/i18n/en_US.csv @@ -1,288 +1,130 @@ -"Country","Country" +Country,Country "Allowed Credit Card Types","Allowed Credit Card Types" "Add Rule","Add Rule" -"Edit Credit Card","Edit Credit Card" -"Add Credit Card","Add Credit Card" +Month,Month +Year,Year "Stored Card","Stored Card" "Credit Card Type","Credit Card Type" "Credit Card Number","Credit Card Number" -"Selected payment type is not allowed for billing country.","Selected payment type is not allowed for billing country." -"Credit card type is not allowed for this payment method.","Credit card type is not allowed for this payment method." -"Credit card type is not allowed for your country.","Credit card type is not allowed for your country." -"Please try again later","Please try again later" -"Contact your bank or try another card","Contact your bank or try another card" -"Check card details or try another card","Check card details or try another card" -"Try another card","Try another card" -"Voice Authorization Required","Voice Authorization Required" -"Duplicate transaction","Duplicate transaction" -"Try again later","Try again later" -"Processor decline","Processor decline" -"Processor network error","Processor network error" +"Credit card successfully added","Credit card successfully added" +"Something went wrong while saving the card.","Something went wrong while saving the card." +"Credit card does not exist","Credit card does not exist" +"Delete Credit Card","Delete Credit Card" +"There was error deleting the credit card","There was error deleting the credit card" +"Credit card successfully deleted","Credit card successfully deleted" +"Edit Credit Card","Edit Credit Card" +"My Credit Cards","My Credit Cards" +"New Credit Card","New Credit Card" +"There was error during saving card data","There was error during saving card data" +"We can\'t initialize checkout.","We can\'t initialize checkout." +"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order." +"We can\'t place the order.","We can\'t place the order." +"Incorrect payment method.","Incorrect payment method." +"We can\'t initialize checkout review.","We can\'t initialize checkout review." +"We can\'t update shipping method.","We can\'t update shipping method." +"The processor declined your transaction, please re-enter your payment information","The processor declined your transaction, please re-enter your payment information" "Transaction declined by gateway: Check card details or try another card","Transaction declined by gateway: Check card details or try another card" "Transaction declined: ","Transaction declined: " -"There was an error capturing the transaction.","There was an error capturing the transaction." -"There was an error refunding the transaction.","There was an error refunding the transaction." -"There was an error voiding the transaction.","There was an error voiding the transaction." -"This refund is for a partial amount but the Transaction has not settled. ","This refund is for a partial amount but the Transaction has not settled. " +.,. +"The processor responded with an unknown error","The processor responded with an unknown error" +"Credit card type is not allowed for your country.","Credit card type is not allowed for your country." +"Credit card type is not allowed for this payment method.","Credit card type is not allowed for this payment method." +"Selected payment type is not allowed for billing country.","Selected payment type is not allowed for billing country." +"Incomplete payment information.","Incomplete payment information." +"Please try again later","Please try again later" +"Can not find original authorization transaction for partial capture","Can not find original authorization transaction for partial capture" +"There was an error capturing the transaction: %1.","There was an error capturing the transaction: %1." +"This refund is for a partial amount but the Transaction has not settled.","This refund is for a partial amount but the Transaction has not settled." "Please wait 24 hours before trying to issue a partial refund.","Please wait 24 hours before trying to issue a partial refund." -"The Transaction has not settled. ","The Transaction has not settled. " -"Please wait 24 hours before trying to issue a refund or use Void option.","Please wait 24 hours before trying to issue a refund or use Void option." +"There was an error refunding the transaction: %1.","There was an error refunding the transaction: %1." +"Some transactions are already settled or voided and cannot be voided.","Some transactions are already settled or voided and cannot be voided." +"Voided capture.","Voided capture." +"There was an error voiding the transaction: %1.","There was an error voiding the transaction: %1." +Invoice,Invoice +Shipment,Shipment +Authorize,Authorize +"Authorize and Capture","Authorize and Capture" +"--Please Select--","--Please Select--" "Invalid Customer ID provided","Invalid Customer ID provided" -"Invalid Credit Card Data provided","Invalid Credit Card Data provided" -"Invalid Address Data provided","Invalid Address Data provided" -"Credit card successfully added","Credit card successfully added" -"Credit card successfully updated","Credit card successfully updated" -"Credit card successfully deleted","Credit card successfully deleted" -"There was error during saving card data","There was error during saving card data" -"My Credit Cards","My Credit Cards" +"some error","some error" +"a,b,c","a,b,c" +"Something went wrong while processing.","Something went wrong while processing." +error,error +exception,exception +"Payment Information","Payment Information" +"Add new card","Add new card" "Please Select","Please Select" -"Credit Cards","Credit Cards" "Expiration Date","Expiration Date" "Card Verification Number","Card Verification Number" -"What is this?","What is this?" -"Delete Credit Card","Delete Credit Card" +"Save this card for future use","Save this card for future use" +or,or "Please confirm that you want to delete this credit card","Please confirm that you want to delete this credit card" "Cardholder Name","Cardholder Name" -"Delete","Delete" -"Back","Back" -"CVV","CVV" +Delete,Delete +Back,Back +"* Required Fields","* Required Fields" +"Credit Card","Credit Card" +CVV,CVV +"Card Verification Number Visual Reference","Card Verification Number Visual Reference" +"What is this?","What is this?" "Make Default","Make Default" "Billing Address","Billing Address" "First Name","First Name" "Last Name","Last Name" -"Company","Company" -"Street Address","Street Address" -"Extended Address","Extended Address" -"City","City" -"State/Province","State/Province" +Company,Company +Address,Address +City,City +State/Province,State/Province "Please select region, state or province","Please select region, state or province" -"Postal Code","Postal Code" -"Country","Country" -"* Required Fields","* Required Fields" -"Submit","Submit" -"Type","Type" +"Zip/Postal Code","Zip/Postal Code" +Submit,Submit +"Add Credit Card","Add Credit Card" +Type,Type +"Card Number","Card Number" "Is Default","Is Default" -"Actions","Actions" -"Yes","Yes" -"No","No" -"Edit","Edit" -"Delete","Delete" -"Payment Information","Payment Information" -"Add new card","Add new card" -"Switch/Solo/Maestro Only","Switch/Solo/Maestro Only" -"Issue Number","Issue Number" -"Start Date","Start Date" -"Save this card for future use","Save this card for future use" -"Please try again later","Please try again later" -"Braintree","Braintree" -"Enabled","Enabled" -"Payment action","Payment action" -"Capture action","Capture action" -"New order status","New order status" -"Environment","Environment" -"Title","Title" -"Merchant ID","Merchant ID" +Actions,Actions +Yes,Yes +No,No +Edit,Edit +"Place Order","Place Order" +"Credit Card Information","Credit Card Information" +"An error occured with payment processing.","An error occured with payment processing." +"Can not initialize PayPal (Braintree)","Can not initialize PayPal (Braintree)" +"Please try again with another form of payment.","Please try again with another form of payment." +Braintree,Braintree + ,  +"Enable this Solution","Enable this Solution" +"Enable PayPal through Braintree","Enable PayPal through Braintree" +"Basic Braintree Settings","Basic Braintree Settings" +Title,Title +Environment,Environment +"Payment Action","Payment Action" "Merchant Account ID","Merchant Account ID" +"Merchant ID","Merchant ID" "Public Key","Public Key" "Private Key","Private Key" -"Client Side Encryption Key","Client Side Encryption Key" -"Credit Card Types","Credit Card Types" +"Advanced Braintree Settings","Advanced Braintree Settings" +Debug,Debug +"Capture Action","Capture Action" +"New Order Status","New Order Status" "Use Vault","Use Vault" "Allow Duplicate Cards","Allow Duplicate Cards" "CVV Verification","CVV Verification" -"Payment from Applicable Countries","Payment from Applicable Countries" -"Payment from Specific Countries","Payment from Specific Countries" -"Country Specific Credit Card Types","Country Specific Credit Card Types" +"Credit Card Types","Credit Card Types" +"Enable Credit Card auto-detection on Storefront","Enable Credit Card auto-detection on Storefront" "Advanced Fraud Protection","Advanced Fraud Protection" -"Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section","Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section" -"Used for direct fraud tool integration. Make sure you also contact accounts@braintreepayments.com to setup your Kount account.","Used for direct fraud tool integration. Make sure you also contact accounts@braintreepayments.com to setup your Kount account." -"Click here to login to your existing Braintree account. Or to setup a new account and accept payments on your website, click here to signup for a Braintree account.","Click here to login to your existing Braintree account. Or to setup a new account and accept payments on your website, click here to signup for a Braintree account." -"Enable Credit Card auto-detection on front-end","Enable Credit Card auto-detection on front-end" -"Typing in a credit card number will automatically select the credit card type","Typing in a credit card number will automatically select the credit card type" "Your Kount ID","Your Kount ID" -"Debug","Debug" -"Some of results will be cached to improve performance. Magento cache have to be enabled","Some of results will be cached to improve performance. Magento cache have to be enabled" "Use Cache","Use Cache" -"Avs Postal Code Response Code","Avs Postal Code Response Code" -"Avs Street Address Response Code","Avs Street Address Response Code" -"Cvv Response Code","Cvv Response Code" -"Processor Authorization Code","Processor Authorization Code" -"Processor Response Code","Processor Response Code" -"Processor Response Text","Processor Response Text" -"This invoice can be processed only offline","This invoice can be processed only offline" -"Some transactions are already settled or voided and cannot be voided.","Some transactions are already settled or voided and cannot be voided." -"Duplicate card exists in the vault.","The credit card already exists in records, please verify that you entered the correct credit card number." -"Amount cannot be negative.","Amount cannot be negative." -"Amount is required.","Amount is required." -"Amount is an invalid format.","Amount is an invalid format." -"Amount is too large.","Amount is too large." -"Credit card type is not accepted by this merchant account.","Credit card type is not accepted by this merchant account." -"Custom field is too long.","Custom field is too long." -"Order ID is too long.","Order ID is too long." -"Cannot provide a billing address unless also providing a credit card.","Cannot provide a billing address unless also providing a credit card." -"Transaction can only be voided if status is authorized or submitted_for_settlement.","Transaction can only be voided if status is authorized or submitted_for_settlement." -"Cannot refund credit","Cannot refund credit" -"Cannot refund a transaction unless it is settled.","Cannot refund a transaction unless it is settled." -"Cannot submit for settlement unless status is authorized.","Cannot submit for settlement unless status is authorized." -"Need a customer_id, payment_method_token, credit_card, or subscription_id.","Need a customer_id, payment_method_token, credit_card, or subscription_id." -"Custom field is invalid","Custom field is invalid" -"Customer ID is invalid.","Customer ID is invalid." -"Customer does not have any credit cards.","Customer does not have any credit cards." -"Transaction has already been refunded.","Transaction has already been refunded." -"Merchant account ID is invalid.","Merchant account ID is invalid." -"Merchant account is suspended.","Merchant account is suspended." -"Cannot provide both payment_method_token and credit_card attributes.","Cannot provide both payment_method_token and credit_card attributes." -"Cannot provide both payment_method_token and customer_id unless the payment_method belongs to the customer.","Cannot provide both payment_method_token and customer_id unless the payment_method belongs to the customer." -"Cannot provide both payment_method_token and subscription_id unless the payment method belongs to the subscription.","Cannot provide both payment_method_token and subscription_id unless the payment method belongs to the subscription." -"Payment method token is invalid.","Payment method token is invalid." -"Processor authorization code cannot be set unless for a voice authorization.","Processor authorization code cannot be set unless for a voice authorization." -"Refund amount cannot be more than the authorized amount.","Refund amount cannot be more than the authorized amount." -"Cannot refund transaction with suspended merchant account.","Cannot refund transaction with suspended merchant account." -"Settlement amount cannot be more than the authorized amount.","Settlement amount cannot be more than the authorized amount." -"Cannot provide both subscription_id and customer_id unless the subscription belongs to the customer.","Cannot provide both subscription_id and customer_id unless the subscription belongs to the customer." -"Subscription ID is invalid.","Subscription ID is invalid." -"Transaction type is invalid.","Transaction type is invalid." -"Transaction type is required.","Transaction type is required." -"Vault is disabled.","Vault is disabled." -"Subscription status must be past due","Subscription status must be past due" -"Merchant account does not support refunds","Merchant account does not support refunds" -"Amount must be greater than zero","Amount must be greater than zero" -"Tax amount cannot be negative.","Tax amount cannot be negative." -"Tax amount is an invalid format.","Tax amount is an invalid format." -"Tax amount is too large.","Tax amount is too large." -"Purchase order number is too long.","Purchase order number is too long." -"Voice Authorization is not allowed for this card type","Voice Authorization is not allowed for this card type" -"Transaction cannot be cloned if payment method is stored in Vault","Transaction cannot be cloned if payment method is stored in Vault" -"Cannot clone voice authorization transactions","Cannot clone voice authorization transactions" -"Unsuccessful transaction cannot be cloned.","Unsuccessful transaction cannot be cloned." -"Credits cannot be cloned.","Credits cannot be cloned." -"Cannot clone transaction without submit_for_settlement flag.","Cannot clone transaction without submit_for_settlement flag." -"Voice Authorizations are not supported for this processor","Voice Authorizations are not supported for this processor" -"Credits are not supported by this processor","Credits are not supported by this processor" -"Purchase order number is invalid","Purchase order number is invalid" -"Processor authorization code is invalid","Processor authorization code is invalid" -"Payment method conflict with venmo sdk","Payment method conflict with venmo sdk" -"Channel is too long","Channel is too long" -"Settlement amount is less than service fee amount","Settlement amount is less than service fee amount" -"Service fee is not allowed on credits","Service fee is not allowed on credits" -"Sub merchant account requires service fee amount","Sub merchant account requires service fee amount" -"Service fee amount cannot be negative","Service fee amount cannot be negative" -"Service fee amount format is invalid","Service fee amount format is invalid" -"Service fee amount is too large","Service fee amount is too large" -"Service fee amount not allowed on master merchant account","Service fee amount not allowed on master merchant account" -"Merchant account does not support MOTO","Merchant account does not support MOTO" -"Cannot refund with pending merchant account","Cannot refund with pending merchant account" -"Cannot hold in escrow","Cannot hold in escrow" -"Cannot release from escrow","Cannot release from escrow" -"Cannot cancel release","Cannot cancel release" -"Cannot partially refund escrowed transaction","Cannot partially refund escrowed transaction" -"Cannot provide both a billing address and a billing address ID.","Cannot provide both a billing address and a billing address ID." -"Billing address ID is invalid.","Billing address ID is invalid." -"Customer ID is required.","Customer ID is required." -"Customer ID is invalid.","Customer ID is invalid." -"Cannot provide expiration_date if you are also providing expiration_month and expiration_year.","Cannot provide expiration_date if you are also providing expiration_month and expiration_year." -"Token is invalid.","Token is invalid." -"Credit card token is taken.","Credit card token is taken." -"Credit card token is too long.","Credit card token is too long." -"Token is not an allowed token.","Token is not an allowed token." -"Payment method token is required.","Payment method token is required." -"Cardholder name is too long.","Cardholder name is too long." -"Credit card number cannot be updated to an unsupported card type when it is associated to subscriptions.","Credit card number cannot be updated to an unsupported card type when it is associated to subscriptions." -"CVV is required.","CVV is required." -"CVV must be 3 or 4 digits.","CVV must be 3 or 4 digits." -"Expiration date is required.","Expiration date is required." -"Expiration date is invalid.","Expiration date is invalid." -"Expiration date year is invalid.","Expiration date year is invalid." -"Expiration month is invalid.","Expiration month is invalid." -"Expiration year is invalid.","Expiration year is invalid." -"Credit card number is required.","Credit card number is required." -"Credit card number is invalid.","Credit card number is invalid." -"Credit card number must be 12-19 digits.","Credit card number must be 12-19 digits." -"Credit card number is not an accepted test number.","Credit card number is not an accepted test number." -"Update Existing Token is invalid.","Update Existing Token is invalid." -"Duplicate card exists","Duplicate card exists" -"Payment method conflict","Payment method conflict" -"Venmo sdk payment method code card type is not accepted","Venmo sdk payment method code card type is not accepted" -"Invalid venmo sdk payment method code","Invalid venmo sdk payment method code" -"Invalid verification merchant account ID","Invalid verification merchant account ID" -"Verification not supported on this merchant account","Verification not supported on this merchant account" -"Custom field is invalid.","Custom field is invalid." -"Customer ID has already been taken.","Customer ID has already been taken." -"Customer ID is invalid.","Customer ID is invalid." -"Customer ID is not an allowed ID.","Customer ID is not an allowed ID." -"Customer ID is too long.","Customer ID is too long." -"Id is required","Id is required" -"Company is too long.","Company is too long." -"Custom field is too long.","Custom field is too long." -"Email is an invalid format.","Email is an invalid format." -"Email is too long.","Email is too long." -"Email is required if sending a receipt.","Email is required if sending a receipt." -"Fax is too long.","Fax is too long." -"First name is too long.","First name is too long." -"Last name is too long.","Last name is too long." -"Phone is too long.","Phone is too long." -"Website is too long.","Website is too long." -"Website is an invalid format.","Website is an invalid format." -"Address must have at least one field fill in.","Address must have at least one field fill in." -"Company is too long.","Company is too long." -"Extended address is too long.","Extended address is too long." -"First name is too long.","First name is too long." -"Last name is too long.","Last name is too long." -"Locality is too long.","Locality is too long." -"Postal code can only contain letters, numbers, spaces, and hyphens.","Postal code can only contain letters, numbers, spaces, and hyphens." -"Postal code is required.","Postal code is required." -"Postal code may contain no more than 9 letter or number characters.","Postal code may contain no more than 9 letter or number characters." -"Region is too long.","Region is too long." -"Street address is required.","Street address is required." -"Street address is too long.","Street address is too long." -"Country name is not an accepted country.","Country name is not an accepted country." -"Inconsistent country","Inconsistent country" -"Country code alpha-3 is not accepted","Country code alpha-3 is not accepted" -"Country code numeric is not accepted","Country code numeric is not accepted" -"Country code alpha-2 is not accepted","Country code alpha-2 is not accepted" -"Too many addresses per customer","Too many addresses per customer" -"First name is invalid","First name is invalid" -"Last name is invalid","Last name is invalid" -"Company is invalid","Company is invalid" -"Street address is invalid","Street address is invalid" -"Extended address is invalid","Extended address is invalid" -"Locality is invalid","Locality is invalid" -"Region is invalid","Region is invalid" -"Postal code is invalid","Postal code is invalid" -"Cannot edit a canceled subscription.","Cannot edit a canceled subscription." -"ID has already been taken.","ID has already been taken." -"Price cannot be blank.","Price cannot be blank." -"Price is an invalid format.","Price is an invalid format." -"Subscription has already been canceled.","Subscription has already been canceled." -"ID is invalid.","ID is invalid." -"Trial duration is an invalid format.","Trial duration is an invalid format." -"Trial duration is required.","Trial duration is required." -"Trial duration unit is invalid.","Trial duration unit is invalid." -"Cannot edit expired subscription","Cannot edit expired subscription" -"Price is too large","Price is too large" -"Merchant account ID is invalid.","Merchant account ID is invalid." -"Payment method token card type is not accepted by this merchant account.","Payment method token card type is not accepted by this merchant account." -"Payment method token is invalid.","Payment method token is invalid." -"Plan ID is invalid.","Plan ID is invalid." -"Payment method token does not belong to the subscription’s customer.","Payment method token does not belong to the subscription’s customer." -"Number of billing cycles must be numeric","Number of billing cycles must be numeric" -"Number of billing cycles must be greater than zero","Number of billing cycles must be greater than zero" -"Inconsistent number of billing cycles","Inconsistent number of billing cycles" -"Number of billing cycles is too small","Number of billing cycles is too small" -"Cannot add duplicate addon or discount","Cannot add duplicate addon or discount" -"Number of billing cycles cannot be blank","Number of billing cycles cannot be blank" -"Billing day of month must be numeric","Billing day of month must be numeric" -"Billing day of month is invalid","Billing day of month is invalid" -"First billing date is invalid","First billing date is invalid" -"First billing date cannot be in the past","First billing date cannot be in the past" -"Inconsistent start date","Inconsistent start date" -"Billing day of month cannot be updated","Billing day of month cannot be updated" -"First billing date cannot be updated","First billing date cannot be updated" -"Cannot edit price changing fields on past due subscription","Cannot edit price changing fields on past due subscription" -"Invalid request format","Invalid request format" -"Cannot update subscription to a plan with a different billing frequency.","Cannot update subscription to a plan with a different billing frequency." -"Mismatch currency iso code","Mismatch currency iso code" -"Enable this Solution","Enable this Solution" -"Enable PayPal through Braintree","Enable PayPal through Braintree" +"Sort Order","Sort Order" +"Country Specific Settings","Country Specific Settings" +"Payment from Applicable Countries","Payment from Applicable Countries" +"Payment from Specific Countries","Payment from Specific Countries" +"Country Specific Credit Card Types","Country Specific Credit Card Types" +"PayPal through Braintree","PayPal through Braintree" +"Override Merchant Name","Override Merchant Name" +"Display on Shopping Cart","Display on Shopping Cart" +"Require Customer's Billing Address","Require Customer's Billing Address" +"Allow to Edit Shipping Address Entered During Checkout on PayPal Side","Allow to Edit Shipping Address Entered During Checkout on PayPal Side" "3D Secure Verification Settings","3D Secure Verification Settings" "3D Secure Verification","3D Secure Verification" +"Edit My Credit Cards","Edit My Credit Cards" diff --git a/app/code/Magento/BraintreeTwo/i18n/en_US.csv b/app/code/Magento/BraintreeTwo/i18n/en_US.csv index 5feecc352a20d..8e86f7911c880 100644 --- a/app/code/Magento/BraintreeTwo/i18n/en_US.csv +++ b/app/code/Magento/BraintreeTwo/i18n/en_US.csv @@ -1,15 +1,103 @@ -"cc_type","Credit Card Type" -"cc_number","Credit Card Number" -"avsPostalCodeResponseCode","AVS Postal Code Response Code" -"avsStreetAddressResponseCode","AVS Street Address Response Code" -"cvvResponseCode","CVV Response Code" -"processorAuthorizationCode","Processor Authorization Code" -"processorResponseCode","Processor Response Code" -"processorResponseText","Processor Response Text" -"braintreetwo", "Braintree" -"liabilityShifted", "Liability Shifted" -"liabilityShiftPossible", "Liability Shift Possible" -"riskDataId", "Risk ID" -"riskDataDecision", "Risk Decision", -"paymentId", "Payment Id", -"payerEmail", "Payer Email", +Country,Country +"Allowed Credit Card Types","Allowed Credit Card Types" +"Add Rule","Add Rule" +"Braintree Settlement Report","Braintree Settlement Report" +"Sorry, but something went wrong","Sorry, but something went wrong" +"We can\'t initialize checkout.","We can\'t initialize checkout." +"No authorization transaction to proceed capture.","No authorization transaction to proceed capture." +"Braintree error response.","Braintree error response." +"Payment method nonce can\'t be retrieved.","Payment method nonce can\'t be retrieved." +"Wrong transaction status","Wrong transaction status" +Authorize,Authorize +"Authorize and Capture","Authorize and Capture" +"--Please Select--","--Please Select--" +"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order." +"Paypal account","Paypal account" +"Coinbase account","Coinbase account" +"Europe bank account","Europe bank account" +"Credit card","Credit card" +"Apple pay card","Apple pay card" +"Android pay card","Android pay card" +"Authorization expired","Authorization expired" +Authorizing,Authorizing +Authorized,Authorized +"Gateway rejected","Gateway rejected" +Failed,Failed +"Processor declined","Processor declined" +Settled,Settled +Settling,Settling +"Submitted for settlement","Submitted for settlement" +Voided,Voided +Unrecognized,Unrecognized +"Settlement declined","Settlement declined" +"Settlement pending","Settlement pending" +"Settlement confirmed","Settlement confirmed" +Sale,Sale +Credit,Credit +"Credit Card Type","Credit Card Type" +"Credit Card Number","Credit Card Number" +"Please, enter valid Credit Card Number","Please, enter valid Credit Card Number" +"Expiration Date","Expiration Date" +"Please, enter valid Expiration Date","Please, enter valid Expiration Date" +"Card Verification Number","Card Verification Number" +"Please, enter valid Card Verification Number","Please, enter valid Card Verification Number" +ending,ending +expires,expires +"Credit Card Information","Credit Card Information" +"What is this?","What is this?" +"Save for later use.","Save for later use." +"Place Order","Place Order" +"This payment is not available","This payment is not available" +MM,MM +YY,YY +"Please try again with another form of payment.","Please try again with another form of payment." +"Sorry, but something went wrong.","Sorry, but something went wrong." +BraintreeTwo,BraintreeTwo + ,  +"Enable this Solution","Enable this Solution" +"Enable PayPal through Braintree","Enable PayPal through Braintree" +"Basic BraintreeTwo Settings","Basic BraintreeTwo Settings" +Title,Title +Environment,Environment +"Payment Action","Payment Action" +"Merchant ID","Merchant ID" +"Public Key","Public Key" +"Private Key","Private Key" +"Advanced Braintree Settings","Advanced Braintree Settings" +"Merchant Account ID","Merchant Account ID" +"Advanced Fraud Protection","Advanced Fraud Protection" +"Kount Merchant ID","Kount Merchant ID" +Debug,Debug +"CVV Verification","CVV Verification" +"Credit Card Types","Credit Card Types" +"Sort Order","Sort Order" +"Country Specific Settings","Country Specific Settings" +"Payment from Applicable Countries","Payment from Applicable Countries" +"Payment from Specific Countries","Payment from Specific Countries" +"Country Specific Credit Card Types","Country Specific Credit Card Types" +"PayPal through Braintree","PayPal through Braintree" +"Override Merchant Name","Override Merchant Name" +"Require Customer's Billing Address","Require Customer's Billing Address" +"Allow to Edit Shipping Address Entered During Checkout on PayPal Side","Allow to Edit Shipping Address Entered During Checkout on PayPal Side" +"Display on Shopping Cart","Display on Shopping Cart" +"3D Secure Verification Settings","3D Secure Verification Settings" +"3D Secure Verification","3D Secure Verification" +"Threshold Amount","Threshold Amount" +"Verify for Applicable Countries","Verify for Applicable Countries" +"Verify for Specific Countries","Verify for Specific Countries" +"Apply filters in order to get results. Only first 100 records will be displayed in the grid, you will be able to download full version of the report in .csv format.","Apply filters in order to get results. Only first 100 records will be displayed in the grid, you will be able to download full version of the report in .csv format." +Select...,Select... +Status,Status +"Transaction Type","Transaction Type" +"PayPal Payment ID","PayPal Payment ID" +"Transaction ID","Transaction ID" +"Order ID","Order ID" +"Payment Type","Payment Type" +Type,Type +"Created At","Created At" +Amount,Amount +"Settlement Code","Settlement Code" +"Settlement Response Text","Settlement Response Text" +"Refund Ids","Refund Ids" +"Settlement Batch ID","Settlement Batch ID" +Currency,Currency diff --git a/app/code/Magento/Bundle/i18n/en_US.csv b/app/code/Magento/Bundle/i18n/en_US.csv index 3af5498737efa..e6ecf7d43df4a 100644 --- a/app/code/Magento/Bundle/i18n/en_US.csv +++ b/app/code/Magento/Bundle/i18n/en_US.csv @@ -1,21 +1,3 @@ -None,None -Close,Close -Cancel,Cancel -Product,Product -Price,Price -ID,ID -SKU,SKU -Qty,Qty -"Excl. Tax","Excl. Tax" -Total,Total -"Incl. Tax","Incl. Tax" -"Total incl. tax","Total incl. tax" -Delete,Delete -Name,Name -From,From -To,To -Required,Required -Position,Position "Percent Discount","Percent Discount" "-- Select --","-- Select --" Dynamic,Dynamic @@ -23,40 +5,77 @@ Fixed,Fixed "Create New Option","Create New Option" "Bundle Items","Bundle Items" "Add Products to Option","Add Products to Option" +Close,Close "Delete Option","Delete Option" -"Please enter search conditions to view products.","Please enter search conditions to view products." +"What are you looking for?","What are you looking for?" +ID,ID +Product,Product +SKU,SKU +Price,Price +Delete,Delete "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" +"Only implemented for bundle product","Only implemented for bundle product" +"Product with specified sku: ""%1"" is not a bundle product","Product with specified sku: ""%1"" is not a bundle product" +"Bundle product could not contain another composite product","Bundle product could not contain another composite product" +"Id field of product link is required","Id field of product link is required" +"Can not find product link with id ""%1""","Can not find product link with id ""%1""" +"Could not save child: ""%1""","Could not save child: ""%1""" +"Product with specified sku: ""%1"" does not contain option: ""%2""","Product with specified sku: ""%1"" does not contain option: ""%2""" +"Child with specified sku: ""%1"" already assigned to product: ""%2""","Child with specified sku: ""%1"" already assigned to product: ""%2""" +"Product with specified sku: %1 is not a bundle product","Product with specified sku: %1 is not a bundle product" +"Requested bundle option product doesn\'t exist","Requested bundle option product doesn\'t exist" +"Requested option doesn\'t exist","Requested option doesn\'t exist" +"Cannot delete option with id %1","Cannot delete option with id %1" +"Could not save option","Could not save option" "Price Range","Price Range" +"As Low as","As Low as" +Together,Together +Separately,Separately "Please specify product option(s).","Please specify product option(s)." -"Please select all required options.","Please select all required options." +"The options you selected are not available.","The options you selected are not available." "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." +"Please select all required options.","Please select all required options." +"We can\'t add this item to your shopping cart right now.","We can\'t add this item to your shopping cart right now." N/A,N/A Percent,Percent -Qty:,Qty: -"Choose a selection...","Choose a selection..." "Ship Bundle Items","Ship Bundle Items" -Separately,Separately -Together,Together +"We can\'t save custom-defined options for bundles with dynamic pricing.","We can\'t save custom-defined options for bundles with dynamic pricing." +Cancel,Cancel +"Add Selected Products","Add Selected Products" +[GLOBAL],[GLOBAL] +"Add Option","Add Option" +"New Option","New Option" "Option Title","Option Title" -"Store View Title","Store View Title" "Input Type","Input Type" -"There are no products in this option.","There are no products in this option." -"New Option","New Option" +Drop-down,Drop-down +"Radio Buttons","Radio Buttons" +Checkbox,Checkbox +"Multiple Select","Multiple Select" +Required,Required Default,Default -"Price Type","Price Type" +Name,Name "Default Quantity","Default Quantity" "User Defined","User Defined" +"Price Type","Price Type" +"Dynamic Price","Dynamic Price" +"Dynamic SKU","Dynamic SKU" +"Dynamic Weight","Dynamic Weight" +None,None +Quantity:,Quantity: +"Choose a selection...","Choose a selection..." +"Store View Title","Store View Title" +Position,Position +"There are no products in this option.","There are no products in this option." Ordered,Ordered Invoiced,Invoiced Shipped,Shipped Refunded,Refunded Canceled,Canceled "As low as","As low as" -From:,From: -To:,To: +"Regular Price","Regular Price" +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" @@ -68,13 +87,22 @@ Availability,Availability Summary,Summary "%1 x %2","%1 x %2" Availability:,Availability: +Quantity,Quantity "Customize %1","Customize %1" "No options of this product are available.","No options of this product are available." "Gift Message","Gift Message" +From:,From: +To:,To: Message:,Message: -"Excl. Tax:","Excl. Tax:" -"Incl. Tax:","Incl. Tax:" -"Total Incl. Tax","Total Incl. Tax" +"Product Name","Product Name" +Subtotal,Subtotal +"Discount Amount","Discount Amount" +"Row Total","Row Total" +"Qty Invoiced","Qty Invoiced" +"Qty Shipped","Qty Shipped" "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...,Select... +Status,Status +Thumbnail,Thumbnail +Type,Type diff --git a/app/code/Magento/Captcha/i18n/en_US.csv b/app/code/Magento/Captcha/i18n/en_US.csv index 949b840055a4e..2de4ab5345c88 100644 --- a/app/code/Magento/Captcha/i18n/en_US.csv +++ b/app/code/Magento/Captcha/i18n/en_US.csv @@ -1,11 +1,14 @@ Always,Always "After number of attempts to login","After number of attempts to login" +"Provided form does not exist","Provided form does not exist" "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" +"The account is locked. Please wait and try again or contact %1.","The account is locked. Please wait and try again or contact %1." +"Please enter the letters from the image","Please enter the letters from the image" "Attention: Captcha is case sensitive.","Attention: Captcha is case sensitive." +"Reload captcha","Reload captcha" "Please type the letters below","Please type the letters below" +"Attention: Captcha is case sensitive.","Attention: Captcha is case sensitive." CAPTCHA,CAPTCHA "Enable CAPTCHA in Admin","Enable CAPTCHA in Admin" Font,Font @@ -23,6 +26,5 @@ Forms,Forms Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.
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." "Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront" +"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/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv index 8580eb33942b2..39f2b9bdc28a8 100644 --- a/app/code/Magento/Catalog/i18n/en_US.csv +++ b/app/code/Magento/Catalog/i18n/en_US.csv @@ -1,100 +1,23 @@ -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" +Root,Root Delete,Delete Save,Save -Store,Store -"-- Please Select --","-- Please Select --" -"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" -"Please select items.","Please select items." -Required,Required -Website,Website -"All Websites","All Websites" -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 Products","Category Products" +ID,ID +Name,Name +SKU,SKU +Price,Price +Position,Position "Add Subcategory","Add Subcategory" "Add Root Category","Add Root Category" -"Create Permanent Redirect for old URL","Create Permanent Redirect for old URL" Day,Day Month,Month Year,Year "","" "","" +[GLOBAL],[GLOBAL] +[WEBSITE],[WEBSITE] +"[STORE VIEW]","[STORE VIEW]" "WYSIWYG Editor","WYSIWYG Editor" "Add Product","Add Product" label,label @@ -102,35 +25,44 @@ label,label "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 and Continue Edit","Save and Continue Edit" "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" +"This is used internally. Make sure you don\'t use spaces or more than %1 symbols.","This is used internally. Make sure you don\'t use spaces or more 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" +"Not shared with other products.","Not shared with other products." "Input Validation for Store Owner","Input Validation for Store Owner" +"Add to Column Options","Add to Column Options" +"Select ""Yes"" to add this attribute to the list of column options in the product grid.","Select ""Yes"" to add this attribute to the list of column options in the product grid." +"Use in Filter Options","Use in Filter Options" +"Select ""Yes"" to add this attribute to the list of filter options in the product grid.","Select ""Yes"" to add this attribute to the list of filter options in the product grid." +"Store View","Store View" +Website,Website 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" +"Declare attribute value saving scope.","Declare attribute value saving scope." +"Storefront Properties","Storefront Properties" +"Use in Search","Use in Search" +"Visible in Advanced Search","Visible in Advanced Search" +"Comparable on Storefront","Comparable on Storefront" "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" +"Allow HTML Tags on Storefront","Allow HTML Tags on Storefront" +"Visible on Catalog Pages on Storefront","Visible on Catalog Pages on Storefront" "Used in Product Listing","Used in Product Listing" -"Depends on design theme","Depends on design theme" +"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" +No,No +Yes,Yes "Data Type for Saving in Database","Data Type for Saving in Database" Text,Text Varchar,Varchar @@ -143,26 +75,26 @@ Integer,Integer Properties,Properties "Manage Labels","Manage Labels" Visible,Visible +"Web Site","Web Site" 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" +"Add New","Add New" +Back,Back +Reset,Reset +"You are about to delete all products in this attribute set. Are you sure you want to do that?","You are about to delete all products in this attribute set. Are you sure you want to do that?" "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" +"Edit Attribute Set Name","Edit Attribute 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" +"Add Attribute Set","Add Attribute Set" "Attribute Sets","Attribute Sets" -"Product Templates","Product Templates" -"Product Template","Product Template" "Close Window","Close Window" "New Product","New Product" "Save & Edit","Save & Edit" @@ -174,27 +106,35 @@ Change,Change "Advanced Inventory","Advanced Inventory" Websites,Websites "Products Information","Products Information" +"Create Category","Create Category" "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 ' 'Products > Categories.","If there are no custom parent categories, please use the default parent category. ' 'You can reassign the category at any time in ' 'Products > Categories." -"We saved the price alert subscription.","We saved the price alert subscription." -"We saved the stock notification.","We saved the stock notification." +"If there are no custom parent categories, please use the default parent category. You can reassign the category at any time in Products > Categories.","If there are no custom parent categories, please use the default parent category. You can reassign the category at any time in Products > Categories." +"Price Alert Subscriptions","Price Alert Subscriptions" +"Stock Alert Subscriptions","Stock Alert Subscriptions" "There are no customers for this alert.","There are no customers for this alert." +"First Name","First Name" +"Last Name","Last Name" +Email,Email "Subscribe Date","Subscribe Date" "Last Notified","Last Notified" "Send Count","Send Count" "New Attribute","New Attribute" +Type,Type "Attribute Set","Attribute Set" +Status,Status +Visibility,Visibility "Add New Option","Add New Option" "Import Options","Import Options" +"Use Default","Use Default" Import,Import "Add New Row","Add New Row" "Delete Row","Delete Row" "Tier Pricing","Tier Pricing" "Default Price","Default Price" -"Add Group Price","Add Group Price" +"All Websites","All Websites" "ALL GROUPS","ALL GROUPS" -"Add Tier","Add Tier" +"Add Price","Add Price" "Default Values","Default Values" "Related Products","Related Products" Up-sells,Up-sells @@ -203,113 +143,108 @@ Cross-sells,Cross-sells "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" +Quantity,Quantity +Edit,Edit +"Are you sure?","Are you sure?" +"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" +"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)" "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" -"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." -"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" +"Does this have a weight?","Does this have a weight?" +Product,Product +"Notify Low Stock RSS","Notify Low Stock RSS" +"Low Stock Products","Low Stock Products" +"%1 has reached a quantity of %2.","%1 has reached a quantity of %2." +Home,Home "Go to Home Page","Go to Home Page" -"%1 RSS Feed","%1 RSS Feed" +"Subscribe to RSS Feed","Subscribe to RSS Feed" "Products Comparison List","Products Comparison List" +N/A,N/A AM,AM PM,PM +"-- Please Select --","-- Please Select --" +None,None +"New Products from %1","New Products from %1" +"New Products","New Products" +"%1 - Special Products","%1 - Special Products" +"Click for price","Click for price" +"Special Expires On: %1","Special Expires On: %1" +"Price: %1","Price: %1" +"Special Price: %1","Special Price: %1" +"Special Products","Special Products" +"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." Categories,Categories "Manage Catalog Categories","Manage Catalog Categories" "Manage Categories","Manage Categories" +"Category is not available for requested store.","Category is not available for requested store." +"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 moved the category","You moved the category" "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." +"Something went wrong while saving the category.","Something went wrong while saving the category." +"Please select products for attributes update.","Please select products for attributes update." "Please make sure to define SKU values for all processed products.","Please make sure to define SKU values for all processed products." "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." +"Please, specify attributes","Please, specify attributes" +Catalog,Catalog "Manage Product Attributes","Manage Product Attributes" +"We can\'t delete the attribute.","We can\'t delete the attribute." +"You deleted the product attribute.","You deleted the product attribute." +"We can\'t find an attribute to delete.","We can\'t find an attribute to delete." "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." +"An attribute set named \'%1\' already exists.","An attribute set named \'%1\' already exists." +"Something went wrong while saving the attribute.","Something went wrong while 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." +"We can\'t update the attribute.","We can\'t update the 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." +"An attribute with this code already exists.","An attribute with this code already exists." +"An attribute with the same code (%1) already exists.","An attribute with the same code (%1) already exists." +"You duplicated the product.","You duplicated the product." +"This product no longer exists.","This product no longer exists." +Products,Products "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" +"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." +"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." +"The image cannot be removed as it has been assigned to the other image role","The image cannot be removed as it has been assigned to the other image role" +"New Attribute Set","New Attribute Set" +"The attribute set has been removed.","The attribute set has been removed." +"We can\'t delete this set right now.","We can\'t delete this set right now." "New Set","New Set" "Manage Product Sets","Manage Product Sets" +"Manage Attribute Sets","Manage Attribute Sets" "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 Attribute Set","New 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" +"Something went wrong while saving the attribute set.","Something went wrong while saving the attribute set." "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." +"You removed product %1 from the comparison list.","You removed product %1 from the comparison list." +"1 item","1 item" +"%1 items","%1 items" "Invalid attribute %1","Invalid attribute %1" Grid,Grid List,List -"Product is not loaded","Product is not loaded" +All,All "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." +"Product is not loaded","Product is not loaded" +"Make sure the To Date is later than or the same as the From Date.","Make sure the To Date is later than or the same as the From Date." +"Sorry, but we can\'t find the new parent category you selected.","Sorry, but we can\'t find the new parent category you selected." +"Sorry, but we can\'t find the new category you selected.","Sorry, but we can\'t find the new category you selected." +"We can\'t move the category because the parent category name matches the child category name.","We can\'t move the category because the parent category name matches the child category name." +"Can\'t delete root category.","Can\'t delete root 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" @@ -318,6 +253,13 @@ List,List "Static block and products","Static block and products" "Please select a static block.","Please select a static block." frontend_label,frontend_label +"Could not save product ""%1"" with position %2 to category %3","Could not save product ""%1"" with position %2 to category %3" +"Category does not contain specified product","Category does not contain specified product" +"Could not save product ""%product"" with position %position to category %category","Could not save product ""%product"" with position %position to category %category" +"Operation do not allow to move a parent category to any of children category","Operation do not allow to move a parent category to any of children category" +"Could not move category","Could not move category" +"Could not save category: %1","Could not save category: %1" +"Cannot delete category with id %1","Cannot delete category with id %1" "-- Please Select a Category --","-- Please Select a Category --" "Grid Only","Grid Only" "List Only","List Only" @@ -326,6 +268,8 @@ frontend_label,frontend_label "Automatic (equalize price ranges)","Automatic (equalize price ranges)" "Automatic (equalize product counts)","Automatic (equalize product counts)" Manual,Manual +Fixed,Fixed +Percent,Percent "-- Please select --","-- Please select --" "Product Thumbnail Itself","Product Thumbnail Itself" "Parent Product Thumbnail","Parent Product Thumbnail" @@ -338,106 +282,205 @@ 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" +"%1 doesn\'t extends \Magento\Framework\Model\AbstractModel","%1 doesn\'t extends \Magento\Framework\Model\AbstractModel" +"Something went wrong while saving the file(s).","Something went wrong while saving the file(s)." +"File can not be saved to the destination folder.","File can not be saved to the destination folder." +"Unknown EAV indexer type ""%1"".","Unknown EAV indexer type ""%1""." +"We can\'t rebuild the index for an undefined product.","We can\'t rebuild the index for an 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" +"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""." -"Index product and categories URL Rewrites","Index product and categories URL Rewrites" -"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." +"Must be category model instance or its id.","Must be category model instance or its id." "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" +"%1 was not found in algorithms","%1 was not found in algorithms" +"%1 doesn\'t extend \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmInterface","%1 doesn\'t extend \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmInterface" +"%1 doesn\'t extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter","%1 doesn\'t extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter" +"The filter must be an object. Please set the correct filter.","The filter must be an object. Please set the correct filter." "Clear Price","Clear Price" +"%1 and above","%1 and above" "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." +"Media Gallery converter should be an instance of EntryConverterInterface.","Media Gallery converter should be an instance of EntryConverterInterface." +"There is no MediaGalleryEntryConverter for given type","There is no MediaGalleryEntryConverter for given type" "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." +"Please enter a valid number in this field.","Please enter a valid number in this field." "We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity." +"Invalid option id %1","Invalid option id %1" +"Can not create attribute set based on non product attribute set.","Can not create attribute set based on non product attribute set." +"Can not create attribute set based on not existing attribute set","Can not create attribute set based on not existing attribute set" +"Provided Attribute set non product Attribute set.","Provided Attribute set non product Attribute set." "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" +Enabled,Enabled +Disabled,Disabled +"Attribute Set already exists.","Attribute Set already exists." +"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." +"The image content is not valid.","The image content is not valid." +"Cannot save product.","Cannot save product." +"Failed to save new media gallery entry.","Failed to save new media gallery entry." +"There is no image with provided ID.","There is no image with provided ID." +"Such product doesn\'t exist","Such product doesn\'t exist" +"Such image doesn\'t exist","Such image doesn\'t exist" +"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 can\'t find the image file.","We can\'t find the image file." "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." +"Could not remove custom option","Could not remove custom option" "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)." +"Please specify product\'s required option(s).","Please specify 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" +"We can\'t add the product to the cart because of an option validation issue.","We can\'t add the product to the cart because of an option validation issue." +"%1 doesn\'t extends \Magento\Catalog\Model\Product\Option\Type\DefaultType","%1 doesn\'t extends \Magento\Catalog\Model\Product\Option\Type\DefaultType" +"The file options format is not valid.","The file options format is not valid." +px.,px. "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 maximum allowed image size for '%1' is %2x%3 px.","The 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." +"The file '%1' is empty. Please choose another one","The file '%1' is empty. Please choose another one" +"The file '%1' is invalid. Please choose another one","The file '%1' is invalid. Please choose another one" +"File \'%1\' is not an image.","File \'%1\' is not an image." +"Validation failed. Required options were not filled or the file was not uploaded.","Validation failed. Required options were not filled or the file was not uploaded." +"The file you uploaded is larger than %1 Megabytes allowed by server","The file you uploaded is larger than %1 Megabytes allowed by server" +"Option required.","Option required." +"The file is empty. Please choose another one","The file is empty. Please choose another one" "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""." +"This product doesn\'t have tier price","This product doesn\'t have tier price" +"Product hasn\'t group price with such data: customerGroupId = \'%1\', website = %2, qty = %3","Product hasn\'t group price with such data: customerGroupId = \'%1\', website = %2, qty = %3" +"Invalid data provided for tier_price","Invalid data provided for tier_price" +"Please provide valid data","Please provide valid data" +"Values of following attributes are invalid: %1","Values of following attributes are invalid: %1" +"Could not save group price","Could not save group price" +"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." +"%1 doesn\'t extends \Magento\Catalog\Model\Product\Type\AbstractType","%1 doesn\'t extends \Magento\Catalog\Model\Product\Type\AbstractType" +"%1 doesn\'t extends \Magento\Catalog\Model\Product\Type\Price","%1 doesn\'t extends \Magento\Catalog\Model\Product\Type\Price" "Not Visible Individually","Not Visible Individually" +Search,Search "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""." +"Something went wrong while removing products from the websites.","Something went wrong while removing products from the websites." +"Something went wrong while adding products to websites.","Something went wrong while adding products to websites." +"Group with id ""%1"" does not exist.","Group with id ""%1"" does not exist." +"Attribute group that contains system attributes can not be deleted","Attribute group that contains system attributes can not be deleted" +"Collection provider is not registered","Collection provider is not registered" +"Unknown link type: %1","Unknown link type: %1" +"Provided link type ""%1"" does not exist","Provided link type ""%1"" does not exist" +"Invalid data provided for linked products","Invalid data provided for linked products" +"Product with SKU %1 is not linked to product with SKU %2","Product with SKU %1 is not linked to product with SKU %2" +"Product %1 doesn\'t have linked %2 as %3","Product %1 doesn\'t have linked %2 as %3" +"Requested product doesn\'t exist","Requested product doesn\'t exist" +"Requested product does not support images.","Requested product does not support images." +"Product with SKU ""%1"" does not exist","Product with SKU ""%1"" does not exist" +"Invalid product data: %1","Invalid product data: %1" +"Unable to remove product %1","Unable to remove product %1" +"There are not websites for assign to product","There are not websites for assign to product" +"Could not assign product ""%1"" to websites ""%2""","Could not assign product ""%1"" to websites ""%2""" +"Could not save product ""%1"" with websites %2","Could not save product ""%1"" with websites %2" +"We cannot determine the field name.","We cannot determine the field name." +"Attribute \'%1\' is locked. %2","Attribute \'%1\' is locked. %2" +"Do not change the scope. %1","Do not change the scope. %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." +"%1 doesn\'t extend \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice","%1 doesn\'t extend \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice" "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 configuration.","Set root category for this store in the configuration." +"%1 doesn\'t extend \Magento\Framework\Filter\Template","%1 doesn\'t extend \Magento\Framework\Filter\Template" +"As low as","As low as" +message,message +fl,fl +123,123 +Images,Images +Select...,Select... +"Advanced Pricing","Advanced Pricing" +"Tier Price","Tier Price" +"Customer Group","Customer Group" +"Special Price From","Special Price From" +To,To +Cancel,Cancel +Done,Done +"Add Selected","Add Selected" +"Customizable Options","Customizable Options" +"Custom options let shoppers choose the product variations they want.","Custom options let shoppers choose the product variations they want." +"Add Option","Add Option" +"New Option","New Option" +"Select Product","Select Product" +"Option Title","Option Title" +"Add Value","Add Value" +Title,Title +"Option Type","Option Type" +Required,Required +"Price Type","Price Type" +"Max Characters","Max Characters" +"Compatible File Extensions","Compatible File Extensions" +"Maximum Image Size","Maximum Image Size" +"Please leave blank if it is not an image.","Please leave blank if it is not an image." +%1,%1 +"This item has weight","This item has weight" +"This item has no weight","This item has no weight" +"Set Product as New From","Set Product as New From" +"Related Products, Up-Sells, and Cross-Sells","Related Products, Up-Sells, and Cross-Sells" +"Related products are shown to shoppers in addition to the item the shopper is looking at.","Related products are shown to shoppers in addition to the item the shopper is looking at." +"Add Related Products","Add Related Products" +"An up-sell item is offered to the customer as a pricier or higher-quality alternative to the product the customer is looking at.","An up-sell item is offered to the customer as a pricier or higher-quality alternative to the product the customer is looking at." +"Add Up-Sell Products","Add Up-Sell Products" +"Up-Sell Products","Up-Sell Products" +"These ""impulse-buy"" products appear next to the shopping cart as cross-sells to the items already in the shopping cart.","These ""impulse-buy"" products appear next to the shopping cart as cross-sells to the items already in the shopping cart." +"Add Cross-Sell Products","Add Cross-Sell Products" +"Cross-Sell Products","Cross-Sell Products" +"Add Selected Products","Add Selected Products" +Remove,Remove +Thumbnail,Thumbnail +Actions,Actions +"Schedule Update From","Schedule Update From" +"Product in Websites","Product in Websites" +"If your Magento site has multiple views, you can set the scope to apply to a specific view.","If your Magento site has multiple views, you can set the scope to apply to a specific view." +name,name +"Copy Data from","Copy Data from" +"If there are no custom parent categories, please use the default parent category. You can reassign the category at any time in Products > Categories.","If there are no custom parent categories, please use the default parent category. You can reassign the category at any time in Products > Categories." +"This operation can take a long time","This operation can take a long time" "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." +"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." +"Use Default Value","Use Default Value" "Manage Titles (Size, Color, etc.)","Manage Titles (Size, Color, etc.)" -"Manage Options (values of your attribute)","Manage Options (values of your attribute)" +"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" +"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." +"Sorry, we\'re unable to complete this request.","Sorry, we\'re unable to complete this request." +"You can\'t remove attributes from this attribute set.","You can\'t remove attributes from this attribute 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" +"The field isn\'t complete.","The field isn\'t complete." +"Compatible file extensions to upload","Compatible file extensions to upload" "Maximum image width","Maximum image width" "Maximum image height","Maximum image height" "Maximum number of characters:","Maximum number of characters:" +"start typing to search template","start typing to search template" "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" +Qty,Qty +"Out-of-Stock Threshold","Out-of-Stock Threshold" "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" @@ -450,95 +493,96 @@ Backorders,Backorders "Out of Stock","Out of Stock" "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." +"To hide an item in catalog or search results, set the status to ""Disabled"".","To hide an item in catalog or search results, set the status to ""Disabled""." +"We can\'t save custom-defined options for bundles with dynamic pricing.","We can\'t save custom-defined options for bundles with dynamic pricing." "Delete Custom Option","Delete Custom Option" "Sort Custom Options","Sort Custom Options" -"Allowed File Extensions","Allowed File Extensions" -"Maximum Image Size","Maximum Image Size" +"Input Type","Input Type" "%1 x %2 px.","%1 x %2 px." -"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" +Action,Action "and above","and above" "Delete Tier","Delete Tier" "Product In Websites","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.","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" +"Browse to find or drag image here","Browse to find or drag image here" +"Delete image","Delete image" +Hidden,Hidden "Alt Text","Alt Text" Role,Role +"Image Size","Image Size" +{size},{size} +"Image Resolution","Image Resolution" +"{width}^{height} px","{width}^{height} px" "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" +"Allow Multiple Boxes for Shipping","Allow Multiple Boxes for Shipping" +"start typing to search attribute","start typing to search attribute" "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?" +"Changes have been made to this section that have not been saved.","Changes have been made to this section that have not been saved." +"This tab contains invalid data. Please resolve this before saving.","This tab contains invalid data. Please resolve this before saving." +"Mass Actions","Mass Actions" +"Select All","Select All" +"Unselect All","Unselect All" +"Select Visible","Select Visible" +"Unselect Visible","Unselect Visible" +"Special Price","Special Price" +"Regular Price","Regular Price" "Buy %1 for: ","Buy %1 for: " -"Buy %1 for %2","Buy %1 for %2" -each,each -and,and -save,save -"Actual Price","Actual Price" +"Buy %1 for %2 each and save %4%","Buy %1 for %2 each and save %4%" +"Buy %1 for %2 each","Buy %1 for %2 each" "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" +"Add to Cart","Add to Cart" +"In stock","In stock" +"Out of stock","Out of stock" +"Add to Wish List","Add to Wish List" "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." +Next,Next +"We can\'t find products matching the selection.","We can\'t find 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)" +"We found other products you might like!","We found other products you might like!" "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)" +"%1 Items","%1 Items" 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." +"per page","per page" +"Sort By","Sort By" +"Set Ascending Direction","Set Ascending Direction" +"Set Descending Direction","Set Descending Direction" +"View as","View as" +"More Information","More Information" +Loading...,Loading... +"* Required Fields","* Required Fields" +Availability,Availability +"Warning message","Warning message" +Submit,Submit +"We don\'t recognize or support this file extension type.","We don\'t recognize or support this file extension type." "Configure Product","Configure Product" +OK,OK "Select type of option.","Select type of option." "Please add rows to option.","Please add rows to option." -"Select Product","Select Product" +"Please select items.","Please select items." "Choose existing category.","Choose existing category." -"Create Category","Create Category" +"Image Detail","Image Detail" +Adding...,Adding... +Added,Added "unselect all","unselect all" -"Maximal Depth","Maximal Depth" -"Anchor Custom Text","Anchor Custom Text" -"Anchor Custom Title","Anchor Custom Title" +Inventory,Inventory +"Catalog Section","Catalog Section" "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" @@ -547,7 +591,7 @@ Template,Template "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 +Storefront,Storefront "List Mode","List Mode" "Products per Page on Grid Allowed Values","Products per Page on Grid Allowed Values" Comma-separated.,Comma-separated. @@ -564,45 +608,34 @@ Comma-separated.,Comma-separated. "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 Optimization","Search Engine Optimization" -"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" +"Maximal Depth","Maximal Depth" "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" -"Warning! Applying MAP by default will hide all product prices on the front end.","Warning! 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" +"Top Level Category","Top Level Category" "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" +"Category Products","Category Products" "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" +"Product EAV","Product EAV" +"Index product EAV","Index product EAV" "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" @@ -612,6 +645,7 @@ Watermark,Watermark "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" +Template,Template "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" @@ -621,82 +655,62 @@ Watermark,Watermark "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" +"Select Product...","Select Product..." +"Anchor Custom Text","Anchor Custom Text" +"If empty, we'll use the product name here.","If empty, we'll use the product name here." +"Anchor Custom Title","Anchor Custom Title" "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" +"Select Category...","Select Category..." +"If empty, we'll use the category name here.","If empty, we'll use the category name here." "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""." -"Is Active","Is Active" +"Category Information","Category Information" +"Enable Category","Enable Category" +"Include in Menu","Include in Menu" +Content,Content +"Category Image","Category Image" +"Add CMS Block","Add CMS Block" +"Display Settings","Display Settings" +Anchor,Anchor +"Sort Products By","Sort Products By" +"Use All","Use All" +"Default Product Sorting","Default Product Sorting" +"Layered Navigation Price Step","Layered Navigation Price Step" "URL Key","URL Key" -"Description","Description" -"Image","Image" -"Page Title","Page Title" +"Meta Title","Meta Title" "Meta Keywords","Meta Keywords" "Meta Description","Meta Description" -"Include in Navigation Menu","Include in Navigation Menu" -"Display Mode","Display Mode" -"CMS Block","CMS Block" -"Is Anchor","Is Anchor" -"Available Product Listing Sort By","Available Product Listing Sort By" -"Default Product Listing Sort By","Default Product Listing Sort By" -"Layered Navigation Price Step","Layered Navigation Price Step" +"Products in Category","Products in Category" +Design,Design "Use Parent Category Settings","Use Parent Category Settings" -"Apply To Products","Apply To Products" -"Active From","Active From" -"Active To","Active To" -"Page Layout","Page Layout" -"Custom Layout Update","Custom Layout Update" -"Name","Name" -"Product Details","Product Details" -Configurations,Configurations -"Show / Hide Editor","Show / Hide Editor" -"Is this downloadable Product?","Is this downloadable Product?" -"Configurable products allow customers to choose options (Ex: shirt color). -You need to create a simple product for each configuration (Ex: a product for each color).","Configurable products allow customers to choose options (Ex: shirt color). -You need to create a simple product for each configuration (Ex: a product for each color)." -"Create Configurations","Create Configurations" -"Edit Configurations","Edit Configurations" -"Display Settings","Display Settings" -"Include in Navigation Menu","Include in Navigation Menu" -"Display Mode","Display Mode" -"CMS Block","CMS Block" -"Is Anchor","Is Anchor" -"Available Product Listing Sort By","Available Product Listing Sort By" -"Default Product Listing Sort By","Default Product Listing Sort By" -"Layered Navigation Price Step","Layered Navigation Price Step" -"Use Parent Category Settings","Use Parent Category Settings" -"Apply To Products","Apply To Products" -"Active From","Active From" -"Active To","Active To" -"Custom Layout Update","Custom Layout Update" -"Default View","Default View" -Columns,Columns -Filters,Filters -Storefront,Storefront -"Base Image","Base Image" -"Small Image","Small Image" -"Swatch Image","Swatch Image" -"Out-of-Stock Threshold","Out-of-Stock Threshold" -"Does this have a weight?","Does this have a weight?" -"Add Price","Add Price" -"Special Price From Date","Special Price From Date" -"Special Price To Date","Special Price To Date" -Cost,Cost -"Tier Price","Tier Price" -"Advanced Pricing","Advanced Pricing" -Autosettings,Autosettings -"Short Description","Short Description" -"Set Product as New from Date","Set Product as New from Date" -"Set Product as New to Date","Set Product as New to Date" -"Country of Manufacture","Country of Manufacture" -"Allow Gift Message","Allow Gift Message" -"Meta Title","Meta Title" -"Maximum 255 chars","Maximum 255 chars" -"The file is empty. Please choose another one","The file is empty. Please choose another one" +Theme,Theme +Layout,Layout +"Layout Update XML","Layout Update XML" +"Apply Design to Products","Apply Design to Products" +"Schedule Design Update","Schedule Design Update" +AttributeSetText,AttributeSetText +StatusText,StatusText +"Product Image Watermarks","Product Image Watermarks" +Base,Base +Image,Image +"Allowed file types: jpeg, gif, png.","Allowed file types: jpeg, gif, png." +"Image Opacity","Image Opacity" +"Example format: 200x300.","Example format: 200x300." +"Image Position","Image Position" +Small,Small +"Attribute Label","Attribute Label" +System,System +"All Store Views","All Store Views" +"Delete items","Delete items" +"Delete selected items?","Delete selected items?" +"Change status","Change status" +Enable,Enable +Disable,Disable +"Update attributes","Update attributes" +none,none +Overview,Overview +Details,Details diff --git a/app/code/Magento/CatalogImportExport/i18n/en_US.csv b/app/code/Magento/CatalogImportExport/i18n/en_US.csv index 1dc4dab023054..23e3ae14a2c93 100644 --- a/app/code/Magento/CatalogImportExport/i18n/en_US.csv +++ b/app/code/Magento/CatalogImportExport/i18n/en_US.csv @@ -1,16 +1,19 @@ -"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." +"Entity type model \'%1\' is not found","Entity type model \'%1\' is not found" +"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" +"Category ""%1"" has not been created.","Category ""%1"" has not been created." +"File directory \'%1\' is not readable.","File directory \'%1\' is not readable." +"File directory \'%1\' is not writable.","File directory \'%1\' is not writable." +"Value for \'price\' sub attribute in \'store\' attribute contains incorrect value","Value for \'price\' sub attribute in \'store\' attribute contains incorrect value" +"Value for \'type\' sub attribute in \'custom_options\' attribute contains incorrect value, acceptable values are: \'dropdown\', \'checkbox\'","Value for \'type\' sub attribute in \'custom_options\' attribute contains incorrect value, acceptable values are: \'dropdown\', \'checkbox\'" +"Please enter a value for title.","Please enter a value for title." +"Value for \'price\' sub attribute in \'custom_options\' attribute contains incorrect value","Value for \'price\' sub attribute in \'custom_options\' attribute contains incorrect value" +"Value for \'maximum characters\' sub attribute in \'custom_options\' attribute contains incorrect value","Value for \'maximum characters\' sub attribute in \'custom_options\' attribute contains incorrect value" +"Value for \'sort order\' sub attribute in \'custom_options\' attribute contains incorrect value","Value for \'sort order\' sub attribute in \'custom_options\' attribute contains incorrect value" +"Value for \'value price\' sub attribute in \'custom_options\' attribute contains incorrect value","Value for \'value price\' sub attribute in \'custom_options\' attribute contains incorrect value" +"This name is already being used for custom option. Please enter a different name.","This name is already being used for custom option. Please enter a different 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." +"Every option entity must have a parent product entity.","Every option entity must have a parent product entity." "Please correct the parameters.","Please correct the parameters." +"File \'%1\' was not found or has read restriction.","File \'%1\' was not found or has read restriction." diff --git a/app/code/Magento/CatalogInventory/i18n/en_US.csv b/app/code/Magento/CatalogInventory/i18n/en_US.csv index bc03c0c7d4795..6dbbf9a2d2b7a 100644 --- a/app/code/Magento/CatalogInventory/i18n/en_US.csv +++ b/app/code/Magento/CatalogInventory/i18n/en_US.csv @@ -1,41 +1,44 @@ -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","In Stock" -"Out of Stock","Out of Stock" "Customer Group","Customer Group" "Minimum Qty","Minimum Qty" "Add Minimum Qty","Add Minimum Qty" -"Stock Status","Stock Status" -"Index Product Stock Status","Index Product Stock Status" +"We can\'t rebuild the index for an undefined product.","We can\'t rebuild the index for an undefined product." +"Could not rebuild index for empty products array","Could not rebuild index for empty products array" +"Invalid stock id: %1. Only default stock with id %2 allowed","Invalid stock id: %1. Only default stock with id %2 allowed" +"Invalid stock item id: %1. Should be null or numeric value greater than 0","Invalid stock item id: %1. Should be null or numeric value greater than 0" +"Invalid stock item id: %1. Assigned stock item id is %2","Invalid stock item id: %1. Assigned stock item id is %2" +"The stock item for Product is not valid.","The stock item for Product is not valid." "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." +"Some of the products are out of stock.","Some of the products are out of stock." "The stock item for Product in option is not valid.","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","No Backorders" "Allow Qty Below 0","Allow Qty Below 0" "Allow Qty Below 0 and Notify Customer","Allow Qty Below 0 and Notify Customer" +"In Stock","In Stock" +"Out of Stock","Out of Stock" +"Stock Item with id ""%1"" does not exist.","Stock Item with id ""%1"" does not exist." +"Stock with id ""%1"" does not exist.","Stock with id ""%1"" does not exist." "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." +"Product with SKU ""%1"" does not exist","Product with SKU ""%1"" does not exist" "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" +"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 quantities of %2 at a time.","You can buy %1 only in quantities of %2 at a time." +"You can buy this product only in quantities of %1 at a time.","You can buy this product only in quantities of %1 at a time." +"Decimal qty increments is not allowed.","Decimal qty increments is not allowed." +"Stock Status","Stock Status" +"Advanced Inventory","Advanced Inventory" +"%1 is available to buy in increments of %2","%1 is available to buy in increments of %2" "Only %1 left","Only %1 left" +"Product availability","Product availability" "Product Name","Product Name" +Qty,Qty +"Inventory Section","Inventory Section" Inventory,Inventory "Stock Options","Stock Options" "Decrease Stock When Order is Placed","Decrease Stock When Order is Placed" @@ -43,14 +46,26 @@ Inventory,Inventory "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" +"Display Products Availability in Stock on Storefront","Display Products Availability in Stock on Storefront" "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" +"Manage Stock","Manage Stock" +Backorders,Backorders +"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart" +"Out-of-Stock Threshold","Out-of-Stock Threshold" +"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart" +"Notify for Quantity Below","Notify for Quantity Below" "Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock" -"Display products availability in stock on Storefront.","Display products availability in stock on Storefront." -"Changing can take some time due to processing whole catalog.","Changing can take some time due to processing whole catalog." +"Enable Qty Increments","Enable Qty Increments" +"Qty Increments","Qty Increments" +Stock,Stock +"Index stock","Index stock" +"Use Config Settings","Use Config Settings" +"Qty Uses Decimals","Qty Uses Decimals" +"Allow Multiple Boxes for Shipping","Allow Multiple Boxes for Shipping" +"Use deferred Stock update","Use deferred Stock update" +Quantity,Quantity diff --git a/app/code/Magento/CatalogRule/i18n/en_US.csv b/app/code/Magento/CatalogRule/i18n/en_US.csv index 733899349f2fa..2975dffc57739 100644 --- a/app/code/Magento/CatalogRule/i18n/en_US.csv +++ b/app/code/Magento/CatalogRule/i18n/en_US.csv @@ -1,63 +1,41 @@ -Product,Product -ID,ID -SKU,SKU -Apply,Apply -No,No -Yes,Yes -"Web Site","Web Site" -Status,Status +"Delete Rule","Delete Rule" +"Are you sure you want to do this?","Are you sure you want to do this?" +Reset,Reset +"Save and Apply","Save and Apply" "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" -"End on","End on" -Active,Active -"This rule no longer exists.","This rule no longer exists." -"General Information","General Information" -Websites,Websites -"Attribute Set","Attribute Set" -"Apply Rules","Apply Rules" -"Catalog Price Rules","Catalog Price Rules" +Save,Save +"Catalog Price Rule","Catalog Price Rule" "Add New Rule","Add New Rule" -"Save and Apply","Save and Apply" -"Edit Rule '%1'","Edit Rule '%1'" -"New Rule","New Rule" -"Rule Information","Rule Information" -"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" +"Apply Rules","Apply Rules" 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" -Priority,Priority -"Catalog Price Rule","Catalog Price Rule" +"Conditions (don\'t add conditions if rule is applied to all products)","Conditions (don\'t add conditions if rule is applied to all products)" +ID,ID +Type,Type +"Attribute Set","Attribute Set" +SKU,SKU +Product,Product Promotions,Promotions -Promo,Promo +"We found updated rules that are not applied. Please click ""Apply Rules"" to update your catalog.","We found updated rules that are not applied. Please click ""Apply Rules"" to update your catalog." +"We can\'t apply the rules.","We can\'t apply the rules." +"You deleted the rule.","You deleted the rule." +"We can\'t delete this rule right now. Please review the log and try again.","We can\'t delete this rule right now. Please review the log and try again." +"We can\'t find a rule to delete.","We can\'t find a rule to delete." +"This rule no longer exists.","This rule no longer exists." "New Catalog Price Rule","New Catalog Price Rule" "Edit Rule","Edit Rule" -"Wrong rule specified.","Wrong rule specified." -"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." +"New Rule","New Rule" +Catalog,Catalog +"You saved the rule.","You saved the rule." +"Something went wrong while saving the rule data. Please review the error log.","Something went wrong while saving the rule data. Please review the error log." +Promo,Promo +"Unable to save rule %1","Unable to save rule %1" +"Rule with specified ID ""%1"" not found.","Rule with specified ID ""%1"" not found." +"Unable to remove rule %1","Unable to remove rule %1" +"Could not rebuild index for empty products array","Could not rebuild index for empty products array" +"We can\'t rebuild the index for an undefined product.","We can\'t rebuild the index for an undefined product." +"Percentage discount should be between 0 and 100.","Percentage discount should be between 0 and 100." +"Discount value should be 0 or greater.","Discount value should be 0 or greater." +"Unknown action.","Unknown action." "Update the Product","Update the Product" "Rule price","Rule price" "To Fixed Value","To Fixed Value" @@ -65,11 +43,27 @@ Promo,Promo "By Fixed value","By Fixed value" "By Percentage","By Percentage" "Update product's %1 %2: %3","Update product's %1 %2: %3" +"Apply as percentage of original","Apply as percentage of original" +"Apply as fixed amount","Apply as fixed amount" +"Adjust final price to this percentage","Adjust final price to this percentage" +"Adjust final price to discount value","Adjust final price to discount value" "Conditions Combination","Conditions Combination" "Product Attribute","Product Attribute" -"The rules have been applied.","The rules have been applied." -"Percentage discount should be between 0 and 100.","Percentage discount should be between 0 and 100." -"Discount value should be 0 or greater.","Discount value should be 0 or greater." -"Unknown action.","Unknown action." -"Subproduct discounts","Subproduct discounts" -"Discard subsequent rules","Discard subsequent rules" +Active,Active +Inactive,Inactive +Yes,Yes +No,No +"Updated rules applied.","Updated rules applied." +"You disabled %1 Catalog Price Rules based on ""%2"" attribute.","You disabled %1 Catalog Price Rules based on ""%2"" attribute." +"Catalog Rule Product","Catalog Rule Product" +"Indexed rule/product association","Indexed rule/product association" +"Catalog Product Rule","Catalog Product Rule" +"Indexed product/rule association","Indexed product/rule association" +Rule,Rule +Start,Start +End,End +Status,Status +"Web Site","Web Site" +Back,Back +"Rule Information","Rule Information" +Actions,Actions diff --git a/app/code/Magento/CatalogSearch/i18n/en_US.csv b/app/code/Magento/CatalogSearch/i18n/en_US.csv index d701c5b14a78d..1a4a11594f4de 100644 --- a/app/code/Magento/CatalogSearch/i18n/en_US.csv +++ b/app/code/Magento/CatalogSearch/i18n/en_US.csv @@ -1,53 +1,36 @@ +Home,Home +"Go to Home Page","Go to Home Page" +"Catalog Advanced Search","Catalog Advanced Search" All,All -"Are you sure?","Are you sure?" +Yes,Yes 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 List,List -"Catalog Advanced Search","Catalog Advanced Search" +"Search Weight","Search Weight" 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." "%1 and greater","%1 and greater" "up to %1","up to %1" -"Attribute setting change related with Search Index. Please run Rebuild Search Index process.","Attribute setting change related with Search Index. Please run Rebuild Search Index process." -"Catalog Search","Catalog Search" -"Rebuild Catalog product fulltext search index","Rebuild Catalog product fulltext search index" -"Please specify correct data.","Please specify correct data." +Category,Category +"%1 and above","%1 and above" +"%1 - %2","%1 - %2" +"Bucket do not exists","Bucket do not exists" +Product,Product "Search Settings","Search Settings" +Search,Search +"Advanced Search","Advanced Search" "%1 item were found using the following search criteria","%1 item were found using the following search criteria" "%1 items were found using the following search criteria","%1 items 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" +"We can\'t find any items matching these search criteria.","We can\'t find any items matching these 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..." -"Advanced Search","Advanced Search" -"Your search returns no results.","Your search returns no results." -"There are no search terms available.","There are no search terms available." +"Your search returned no results.","Your search returned no results." "Popular Search Terms","Popular Search Terms" +"Catalog Search","Catalog Search" "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 +"Rebuild Catalog product fulltext search index","Rebuild Catalog product fulltext search index" diff --git a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv index e69de29bb2d1d..4d281e9158b44 100644 --- a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv +++ b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv @@ -0,0 +1,6 @@ +"Create Permanent Redirect for old URL","Create Permanent Redirect for old URL" +"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" diff --git a/app/code/Magento/CatalogWidget/i18n/en_US.csv b/app/code/Magento/CatalogWidget/i18n/en_US.csv index e69de29bb2d1d..9ecde5cb1a062 100644 --- a/app/code/Magento/CatalogWidget/i18n/en_US.csv +++ b/app/code/Magento/CatalogWidget/i18n/en_US.csv @@ -0,0 +1,20 @@ +"Conditions Combination","Conditions Combination" +"Product Attribute","Product Attribute" +SKU,SKU +"Please choose a condition to add.","Please choose a condition to add." +"Add to Cart","Add to Cart" +"In stock","In stock" +"Out of stock","Out of stock" +"Add to Wish List","Add to Wish List" +"Add to Compare","Add to Compare" +"Catalog Products List","Catalog Products List" +"List of Products","List of Products" +Title,Title +"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" +Template,Template +"Products Grid Template","Products Grid 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." +Conditions,Conditions diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv index 5d2f1d9d266a2..644bce05d45ab 100644 --- a/app/code/Magento/Checkout/i18n/en_US.csv +++ b/app/code/Magento/Checkout/i18n/en_US.csv @@ -1,167 +1,164 @@ -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" -Total,Total -"Incl. Tax","Incl. Tax" -"Total incl. tax","Total incl. tax" -"Move to Wishlist","Move to Wishlist" -"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" +City,City +Country,Country +State/Province,State/Province +"Zip/Postal Code","Zip/Postal Code" "My Cart (1 item)","My Cart (1 item)" "My Cart (%1 items)","My Cart (%1 items)" "My Cart","My Cart" -"New Address","New Address" -Country,Country -State/Province,State/Province -"Billing Information","Billing Information" -"Checkout Method","Checkout Method" -"Payment Information","Payment Information" -"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" +"For delivery questions.","For delivery questions." +"Customer is already registered","Customer is already registered" +"Your session has expired","Your session has expired" +"You added %1 to your shopping cart.","You added %1 to your shopping cart." +"We can\'t add this item to your shopping cart right now.","We can\'t add this item to your shopping cart right now." +"Out of stock","Out of stock" "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." +"You used coupon code ""%1"".","You used coupon code ""%1""." +"The coupon code ""%1"" is not valid.","The coupon code ""%1"" is not valid." +"You canceled the coupon code.","You canceled the coupon code." "We cannot apply the coupon code.","We cannot apply the coupon code." -"The onepage checkout is disabled.","The onepage checkout is disabled." +"We can\'t remove the item.","We can\'t remove the item." +"%1 was updated in your shopping cart.","%1 was updated in your shopping cart." +"We can\'t update the item right now.","We can\'t update the item right now." +"We can\'t update the shopping cart.","We can\'t update the shopping cart." +"One-page checkout is turned off.","One-page checkout is turned off." +"Guest checkout is disabled.","Guest checkout is disabled." Checkout,Checkout -"Unable to set Payment Method","Unable to set Payment Method" +"Page not found.","Page 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." -"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." +"Something went wrong while processing your order. Please try again later.","Something went wrong while processing your order. Please try again later." +"%1 doesn\'t extend \Magento\Checkout\CustomerData\ItemInterface","%1 doesn\'t extend \Magento\Checkout\CustomerData\ItemInterface" +"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." +"We adjusted product quantities to fit the required increments.","We adjusted product quantities to fit the required increments." "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" +"Cannot place order","Cannot place order" +"Shipping address is not set","Shipping address is not set" +"Unable to save address. Please check input data.","Unable to save address. Please check input data." +"Carrier with such method not found: %1, %2","Carrier with such method not found: %1, %2" +"Unable to save shipping information. Please check input data.","Unable to save shipping information. Please check input data." +"Cart contains virtual product(s) only. Shipping address is not applicable.","Cart contains virtual product(s) only. Shipping address is not applicable." +"Shipping method is not applicable for empty cart","Shipping method is not applicable for empty cart" +" item"," item" +" items"," items" +"Totals calculation is not applicable to empty cart","Totals calculation is not applicable to empty cart" "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 click here.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here." -"Discount Codes","Discount Codes" -"Enter your code","Enter your code" -"Apply Coupon","Apply Coupon" +"There are more than one shipping addresses.","There are more than one shipping addresses." +"Sorry, guest checkout is not available.","Sorry, guest checkout is not available." +"You must confirm your account. Please check your email for the confirmation link or click here for a new link.","You must confirm your account. Please check your email for the confirmation link or click here for a new link." +"Load customer quote error","Load customer quote error" +"Error message!","Error message!" +Error!,Error! +"DB exception","DB exception" +"Wrong minimum amount.","Wrong minimum amount." +Message,Message +"Print receipt","Print receipt" +"Apply Discount Code","Apply Discount Code" +"Enter discount code","Enter discount code" +"Apply Discount","Apply Discount" "Cancel Coupon","Cancel Coupon" +"Shopping Cart Items","Shopping Cart Items" +Item,Item +Price,Price +Qty,Qty +Subtotal,Subtotal "Continue Shopping","Continue Shopping" -"Update Shopping Cart","Update Shopping Cart" "Clear Shopping Cart","Clear Shopping Cart" +"Update Shopping Cart","Update 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)" +"See price before order confirmation.","See price before order confirmation." +"What's this?","What's this?" +"Edit item parameters","Edit item parameters" +Edit,Edit +"Remove item","Remove item" "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 here to continue shopping.","Click here to continue shopping." +"Estimate Tax","Estimate Tax" "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" -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" +"Excl. Tax","Excl. Tax" +Loading...,Loading... +"Order #","Order #" +"Proceed to Checkout","Proceed to Checkout" +"Product Name","Product Name" +"Incl. Tax","Incl. Tax" +"Your order number is: %1.","Your order number is: %1." +"Your order # is: %1.","Your order # is: %1." +"We\'ll email you an order confirmation with details and tracking info.","We\'ll email you an order confirmation with details and tracking info." +"Payment Transaction Failed","Payment Transaction Failed" +Reason,Reason +"Checkout Type","Checkout Type" +Customer:,Customer: +Items,Items 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." +"Billing Address:","Billing Address:" +"Shipping Address:","Shipping Address:" +"Shipping Method:","Shipping Method:" +"Payment Method:","Payment Method:" +"Date & Time:","Date & Time:" +"Sign In","Sign In" "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" +"Forgot Your Password?","Forgot Your Password?" +"My billing and shipping address are the same","My billing and shipping address are the same" +Update,Update +Cancel,Cancel "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" +"Estimated Total","Estimated Total" +"You can create an account after checkout.","You can create an account after checkout." +"You already have an account with us. Sign in or continue as guest.","You already have an account with us. Sign in or continue as guest." 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:" -"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 +Close,Close +item,item +items,items +"Go to Checkout","Go to Checkout" +"Recently added item(s)","Recently added item(s)" +"View and edit cart","View and edit cart" +"See Details","See Details" +"Options Details","Options Details" +Remove,Remove +"Cart Subtotal","Cart Subtotal" "No Payment Methods","No Payment Methods" -"Your Checkout Progress","Your Checkout Progress" -"Billing Address","Billing Address" -"Shipping Address","Shipping Address" -"Shipping method has not been selected yet","Shipping method has not been selected yet" -"Payment Method","Payment Method" +"Payment Information","Payment Information" +"No Payment method available.","No Payment method available." +"You can track your order status by creating an account.","You can track your order status by creating an account." +"A letter with further instructions will be sent to your email.","A letter with further instructions will be sent to your email." "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." -"Thank you for your purchase!","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.","You will receive an order confirmation email with details of your order and a link to track its progress." -"Click here to print a copy of your order confirmation.","Click here to print 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." +"Ship Here","Ship Here" +"Ship To:","Ship To:" +edit,edit +"Shipping Address","Shipping Address" +"New Address","New Address" +"Shipping Methods","Shipping Methods" +"Select Method","Select Method" +"Method Title","Method Title" +"Carrier Title","Carrier Title" +Next,Next +"Sorry, no quotes are available for this order at this time","Sorry, no quotes are available for this order at this time" +"Order Summary","Order Summary" +"Item in Cart","Item in Cart" +"Items in Cart","Items in Cart" +"View Details","View Details" +"Provided Zip/Postal Code seems to be invalid.","Provided Zip/Postal Code seems to be invalid." +" Example: "," Example: " +"If you believe it is the right one you can ignore this notice.","If you believe it is the right one you can ignore this notice." +"Review & Payments","Review & Payments" +Shipping,Shipping +"Save Address","Save Address" "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" @@ -173,13 +170,13 @@ Register,Register "Payment Failed Email Sender","Payment Failed Email Sender" "Payment Failed Email Receiver","Payment Failed Email Receiver" "Payment Failed Template","Payment Failed Template" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." "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." -"For delivery questions.","For delivery questions." -"You can create an account after checkout.","You can create an account after checkout." +"Order Total","Order Total" +"We'll send your order confirmation here.","We'll send your order confirmation here." +Payment,Payment "Not yet calculated","Not yet calculated" -"Order Summary","Order Summary" -"Estimated Total","Estimated Total" -"Phone Number","Phone Number" +"We received your order!","We received your order!" +"Thank you for your purchase!","Thank you for your purchase!" diff --git a/app/code/Magento/CheckoutAgreements/i18n/en_US.csv b/app/code/Magento/CheckoutAgreements/i18n/en_US.csv index b5db8f4036453..ae966c7743009 100644 --- a/app/code/Magento/CheckoutAgreements/i18n/en_US.csv +++ b/app/code/Magento/CheckoutAgreements/i18n/en_US.csv @@ -1,10 +1,3 @@ -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" @@ -13,21 +6,36 @@ Text,Text "New Terms and Conditions","New Terms and Conditions" "Terms and Conditions Information","Terms and Conditions Information" "Condition Name","Condition Name" +Status,Status +Enabled,Enabled +Disabled,Disabled "Show Content as","Show Content as" +Text,Text HTML,HTML +Applied,Applied +"Store View","Store View" "Checkbox Text","Checkbox Text" +Content,Content "Content Height (css)","Content Height (css)" "Content Height","Content Height" +ID,ID 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" +"This condition no longer exists.","This condition no longer exists." +"You deleted the condition.","You deleted the condition." +"Something went wrong while deleting this condition.","Something went wrong while deleting this condition." +"Edit Condition","Edit Condition" +"New Condition","New Condition" +"You saved the condition.","You saved the condition." +"Something went wrong while saving this condition.","Something went wrong while saving this condition." +Automatically,Automatically +Manually,Manually +"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order." +"Unable to save checkout agreement %1","Unable to save checkout agreement %1" +"Unable to remove checkout agreement %1","Unable to remove checkout agreement %1" +"Checkout agreement with specified ID ""%1"" not found.","Checkout agreement with specified ID ""%1"" not found." +Close,Close +"Terms & Conditions","Terms & Conditions" "Enable Terms and Conditions","Enable Terms and Conditions" -"Please input a valid CSS-height. For example 100px or 77pt or 20em or .5ex or 50%.","Please input a valid CSS-height. For example 100px or 77pt or 20em or .5ex or 50%." diff --git a/app/code/Magento/Cms/i18n/en_US.csv b/app/code/Magento/Cms/i18n/en_US.csv index 58485f3d9d2c5..5bde5766117f0 100644 --- a/app/code/Magento/Cms/i18n/en_US.csv +++ b/app/code/Magento/Cms/i18n/en_US.csv @@ -1,104 +1,102 @@ -ID,ID -Action,Action -"Delete File","Delete File" -"-- Please Select --","-- Please Select --" -"Custom Design","Custom Design" -"Block Information","Block Information" -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" -"Expand All","Expand All" "Static Blocks","Static Blocks" "Add New Block","Add New Block" -"Save Block","Save Block" +Back,Back "Delete Block","Delete Block" -"Edit Block '%1'","Edit Block '%1'" -"New Block","New Block" -"Block Title","Block Title" +"Are you sure you want to do this?","Are you sure you want to do this?" +Reset,Reset +"Save and Continue Edit","Save and Continue Edit" +"Save Block","Save Block" +ID,ID +Title,Title Identifier,Identifier +Status,Status +Disabled,Disabled +Enabled,Enabled "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" -"Page Layout","Page Layout" +"Save Page","Save Page" +"URL Key","URL Key" 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" -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" +"Store View","Store View" Created,Created Modified,Modified +Action,Action Preview,Preview "Media Storage","Media Storage" "Create Folder...","Create Folder..." "Delete Folder","Delete Folder" +"Delete File","Delete File" "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" +Home,Home +"Go to Home Page","Go to Home Page" CMS,CMS -Blocks,Blocks +"You deleted the block.","You deleted the block." +"We can\'t find a block to delete.","We can\'t find a block to delete." "This block no longer exists.","This block no longer exists." "Edit Block","Edit Block" -"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 +"New Block","New Block" +Blocks,Blocks +"Please correct the data sent.","Please correct the data sent." +"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted." +"You saved the block.","You saved the block." +"Something went wrong while saving the block.","Something went wrong while saving the block." +"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." "This page no longer exists.","This page no longer exists." "Edit Page","Edit Page" -"The page has been saved.","The page has been saved." +"New Page","New Page" +Pages,Pages "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." +"A total of %1 record(s) have been disabled.","A total of %1 record(s) have been disabled." +"A total of %1 record(s) have been enabled.","A total of %1 record(s) have been enabled." +"Page Title","Page Title" +"To apply changes you should fill in hidden required ""%1"" field","To apply changes you should fill in hidden required ""%1"" field" +"You saved the page.","You saved the page." "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." +"CMS Block with id ""%1"" does not exist.","CMS Block with id ""%1"" does not exist." "Enabled by Default","Enabled by Default" "Disabled by Default","Disabled by Default" "Disabled Completely","Disabled Completely" +"Could not save the page: %1","Could not save the page: %1" +"CMS Page with id ""%1"" does not exist.","CMS Page with id ""%1"" does not exist." +"Could not delete the page: %1","Could not delete the page: %1" "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." +"Please rename the folder using only letters, numbers, underscores and dashes.","Please rename the folder using 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." +"We can\'t upload the file right now.","We can\'t upload the file right now." +"We can\'t delete root directory %1 right now.","We can\'t delete root directory %1 right now." "Directory %1 is not under storage root path.","Directory %1 is not under storage root path." +LocalizedException,LocalizedException +RuntimeException,RuntimeException +Exception,Exception +"Could not create a directory.","Could not create a directory." +"All Store Views","All Store Views" +Edit,Edit +Delete,Delete +"Delete ${ $.$data.title }","Delete ${ $.$data.title }" +"Are you sure you wan\'t to delete a ${ $.$data.title } record?","Are you sure you wan\'t to delete a ${ $.$data.title } record?" +"Delete ""${ $.$data.title }""","Delete ""${ $.$data.title }""" +"Are you sure you wan\'t to delete a ""${ $.$data.title }"" record?","Are you sure you wan\'t to delete a ""${ $.$data.title }"" record?" +View,View +px.,px. "No files found","No files found" -Block,Block -Template,Template -"Anchor Custom Text","Anchor Custom Text" -"Anchor Custom Title","Anchor Custom Title" +"Browse Files...","Browse Files..." +"Collapse All","Collapse All" +"Expand All","Expand All" +"We could not detect a size.","We could not detect a size." +"Media Gallery","Media Gallery" +"Content Management","Content Management" "CMS Home Page","CMS Home Page" "CMS No Route Page","CMS No Route Page" "CMS No Cookies Page","CMS No Cookies Page" @@ -107,20 +105,47 @@ Template,Template "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 Page Link" "Link to a CMS Page","Link to a CMS Page" "CMS Page","CMS Page" +"Select Page...","Select Page..." +"Anchor Custom Text","Anchor Custom Text" "If empty, the Page Title will be used","If empty, the Page Title will be used" +"Anchor Custom Title","Anchor Custom Title" +Template,Template "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" +Block,Block +"Select Block...","Select Block..." "CMS Static Block Default Template","CMS Static Block Default Template" -Elements,Elements -Blocks,Blocks -Widgets,Widgets -Themes,Themes -Schedule,Schedule +"General Information","General Information" +"Enable Block","Enable Block" +"Block Title","Block Title" +"Delete items","Delete items" +"Are you sure you wan't to delete selected items?","Are you sure you wan't to delete selected items?" +"Page Information","Page Information" +"Enable Page","Enable Page" +Content,Content +"Content Heading","Content Heading" +"Search Engine Optimisation","Search Engine Optimisation" +"Meta Keywords","Meta Keywords" +"Meta Description","Meta Description" +"Page in Websites","Page in Websites" +Design,Design +"Layout Update XML","Layout Update XML" +"Custom Design Update","Custom Design Update" +From,From +To,To +"New Theme","New Theme" +"-- Please Select --","-- Please Select --" +"New Layout","New Layout" +Disable,Disable +Enable,Enable +"Custom design from","Custom design from" +"Custom design to","Custom design to" +"Custom Theme","Custom Theme" +"Custom Layout","Custom Layout" diff --git a/app/code/Magento/Config/i18n/en_US.csv b/app/code/Magento/Config/i18n/en_US.csv index 0aa4129389481..0bbeabde93603 100644 --- a/app/code/Magento/Config/i18n/en_US.csv +++ b/app/code/Magento/Config/i18n/en_US.csv @@ -1 +1,104 @@ +"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 --" +Enable,Enable +Disable,Disable Configuration,Configuration +System,System +"You saved the configuration.","You saved the configuration." +"Something went wrong while saving this configuration:","Something went wrong while saving this configuration:" +"Page not found.","Page not found." +"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 is not available in allowed currencies.","Sorry, the default display currency you selected is 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." +%1,%1 +"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: %1","The specified image adapter cannot be used because of: %1" +"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." +"The file ""%1"" does not exist","The file ""%1"" does not exist" +"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 +No,No +Optional,Optional +Required,Required +Website,Website +Store,Store +"Store View","Store View" +"HTTP (unsecure)","HTTP (unsecure)" +"HTTPS (SSL)","HTTPS (SSL)" +"Yes (302 Found)","Yes (302 Found)" +"Yes (301 Moved Permanently)","Yes (301 Moved Permanently)" +Yes,Yes +Specified,Specified +"Config form fieldset clone model required to be able to clone fields","Config form fieldset clone model required to be able to clone fields" +"Invalid XML in file %1:\n%2","Invalid XML in file %1:\n%2" +.,. +some_label,some_label +some_comment,some_comment +"some prefix","some prefix" +"element label","element label" +"element hint","element hint" +"element comment","element comment" +"element tooltip","element tooltip" +test,test +test2,test2 +"Add after","Add after" +Delete,Delete +"Current Configuration Scope:","Current Configuration Scope:" +Stores,Stores +"Group Label","Group Label" +"Some Label","Some Label" +"Tab Label","Tab Label" +"Allow everything","Allow everything" +"Magento Admin","Magento Admin" +Dashboard,Dashboard +"Manage Stores","Manage Stores" +"Field 2","Field 2" +"Field 3","Field 3" +"Field 3.1","Field 3.1" +"Field 3.1.1","Field 3.1.1" +"Field 4","Field 4" +"Advanced Section","Advanced Section" +"Advanced Admin Section","Advanced Admin Section" +"Design Section","Design Section" +"General Section","General Section" +"System Section","System Section" +"Currency Setup Section","Currency Setup Section" +"Developer Section","Developer Section" +"Web Section","Web Section" +"Store Email Addresses Section","Store Email Addresses Section" +"Email to a Friend","Email to a Friend" diff --git a/app/code/Magento/ConfigurableProduct/i18n/en_US.csv b/app/code/Magento/ConfigurableProduct/i18n/en_US.csv index 7622edffece48..ec07c74c8868b 100644 --- a/app/code/Magento/ConfigurableProduct/i18n/en_US.csv +++ b/app/code/Magento/ConfigurableProduct/i18n/en_US.csv @@ -1,56 +1,131 @@ -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" -"Configurable Product Settings","Configurable Product Settings" +"Add configurable attributes to the current Attribute Set (""%1"")","Add configurable attributes to the current Attribute Set (""%1"")" +"Add configurable attributes to the new Attribute Set based on current","Add configurable attributes to the new Attribute Set based on current" +"New attribute set name","New attribute set name" +"Add configurable attributes to the existing Attribute Set","Add configurable attributes to the existing Attribute Set" +"Choose existing Attribute Set","Choose existing Attribute Set" +Configurations,Configurations +"Attribute Values","Attribute Values" +"Bulk Images & Price","Bulk Images & Price" +"Create New Attribute","Create New Attribute" +"Select Attributes","Select Attributes" +Summary,Summary "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)." +"Product has been already attached","Product has been already attached" +"Product with specified sku: %1 is not a configurable product","Product with specified sku: %1 is not a configurable product" +"Requested option doesn\'t exist","Requested option doesn\'t exist" +"Requested option doesn\'t exist: %1","Requested option doesn\'t exist: %1" +"Cannot delete variations from product: %1","Cannot delete variations from product: %1" +"Cannot delete option with id: %1","Cannot delete option with id: %1" +"Option with id ""%1"" not found","Option with id ""%1"" not found" +"Something went wrong while saving option.","Something went wrong while saving option." +"Only implemented for configurable product: %1","Only implemented for configurable product: %1" +"Option attribute ID is not specified.","Option attribute ID is not specified." +"Option label is not specified.","Option label is not specified." +"Option values are not specified.","Option values are not specified." +"Value index is not specified for an option.","Value index is not specified for an option." +"Product with id ""%1"" does not contain required attribute ""%2"".","Product with id ""%1"" does not contain required attribute ""%2""." +"Products ""%1"" and ""%2"" have the same set of attribute values.","Products ""%1"" and ""%2"" have the same set of attribute values." +"You can\'t add the item to shopping cart.","You can\'t add the item to shopping cart." +"You need to choose options for your item.","You need to choose options for your item." "Some product variations fields are not valid.","Some product variations fields are not valid." +"Configuration must have specified attributes","Configuration must have specified attributes" +"Configurable product ""%1"" do not have sub-products","Configurable product ""%1"" do not have sub-products" "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." -"Delete Variations Group","Delete Variations Group" +"Associated Products","Associated Products" +"Step 2: Attribute Values","Step 2: Attribute Values" +"Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU." "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 +Options,Options +"Select All","Select All" +"Deselect All","Deselect All" +"Remove Attribute","Remove Attribute" +"Save Option","Save Option" +"Remove Option","Remove Option" +"Create New Value","Create New Value" +"Step 3: Bulk Images, Price and Quantity","Step 3: Bulk Images, Price and Quantity" +"Based on your selections + new products will be created. Use this step to customize images and price for your new products.","Based on your selections + new products will be created. Use this step to customize images and price for your new products." +Images,Images +"Apply single set of images to all SKUs","Apply single set of images to all SKUs" +"Apply unique images by attribute to each SKU","Apply unique images by attribute to each SKU" +"Skip image uploading at this time","Skip image uploading at this time" +"Browse Files...","Browse Files..." +"Browse to find or drag image here","Browse to find or drag image here" +"Remove image","Remove image" +"Edit role","Edit role" +Hidden,Hidden +"Alt Text","Alt Text" +Role,Role +"Hide from Product Page","Hide from Product Page" +"Select attribute","Select attribute" +Select,Select +Price,Price +"Apply single price to all SKUs","Apply single price to all SKUs" +"Apply unique prices by attribute to each SKU","Apply unique prices by attribute to each SKU" +"Skip price at this time","Skip price at this time" +Quantity,Quantity +"Apply single quantity to each SKUs","Apply single quantity to each SKUs" +"Apply unique quantity by attribute to each SKU","Apply unique quantity by attribute to each SKU" +"Skip quantity at this time","Skip quantity at this time" +"Step 1: Select Attributes","Step 1: Select Attributes" +"Selected Attributes:","Selected Attributes:" +"Step 4: Summary","Step 4: Summary" +"Configurable products allow customers to choose options (Ex: shirt color). + You need to create a simple product for each configuration (Ex: a product for each color).","Configurable products allow customers to choose options (Ex: shirt color). + You need to create a simple product for each configuration (Ex: a product for each color)." +"Edit Configurations","Edit Configurations" +"Create Configurations","Create Configurations" +"Add Products Manually","Add Products Manually" "Current Variations","Current Variations" -Display,Display +Image,Image +Name,Name +SKU,SKU Weight,Weight +Actions,Actions "Upload Image","Upload Image" -Choose,Choose -Select,Select +"Upload image","Upload image" "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 (""%1"")","Add configurable attributes to the current set (""%1"")" -"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 a different Product","Choose a different Product" +"Remove Product","Remove Product" +"Create Product Configurations","Create Product Configurations" "Choose Affected Attribute Set","Choose Affected Attribute Set" Confirm,Confirm -"File extension not known or unsupported type.","File extension not known or unsupported type." +Cancel,Cancel +"New Product Review","New Product Review" +"Here are the products you\'re about to create.","Here are the products you\'re about to create." +"You created these products for this configuration.","You created these products for this configuration." +"Disassociated Products","Disassociated Products" +"These products are not associated.","These products are not associated." +"Disable Product","Disable Product" +"Enable Product","Enable Product" +"Incl. Tax","Incl. Tax" +"Select Associated Product","Select Associated Product" +Done,Done +"For better results, add attributes and attribute values to your products.","For better results, add attributes and attribute values to your products." +"An attribute has been removed. This attribute will no longer appear in your configurations.","An attribute has been removed. This attribute will no longer appear in your configurations." +"Select options for all attributes or remove unused attributes.","Select options for all attributes or remove unused attributes." +"Please select attribute for {section} section.","Please select attribute for {section} section." +"Please fill in the values for {section} section.","Please fill in the values for {section} section." +"Please fill-in correct values.","Please fill-in correct values." +"Please select image(s) for your attribute.","Please select image(s) for your attribute." +"Please choose image(s).","Please choose image(s)." +"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." +"Please select attribute(s).","Please select attribute(s)." +"Generate Products","Generate Products" "Configurable Product Image","Configurable Product Image" -"Add Products Manually","Add Products Manually" +Select...,Select... +Status,Status +ID,ID +Thumbnail,Thumbnail +"Attribute Code","Attribute Code" +"Attribute Label","Attribute Label" +Required,Required +System,System +Visible,Visible +Scope,Scope +Searchable,Searchable +Comparable,Comparable diff --git a/app/code/Magento/Contact/i18n/en_US.csv b/app/code/Magento/Contact/i18n/en_US.csv index 71a433f896125..7d42624e2f7e2 100644 --- a/app/code/Magento/Contact/i18n/en_US.csv +++ b/app/code/Magento/Contact/i18n/en_US.csv @@ -1,16 +1,24 @@ -Email,Email +"Page not found.","Page not found." +"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." +"* Required Fields","* Required Fields" +"Write Us","Write Us" +"Jot us a note and we’ll get back to you as quickly as possible.","Jot us a note and we’ll get back to you as quickly as possible." Name,Name +Email,Email +"Phone Number","Phone Number" +"What’s on your mind?","What’s on your mind?" Submit,Submit -"* Required Fields","* 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","Contact Information" -Comment,Comment -"Email Template","Email Template" +"Name: %name","Name: %name" +"Email: %email","Email: %email" +"Phone Number: %telephone","Phone Number: %telephone" +"Comment: %comment","Comment: %comment" +"Contacts Section","Contacts Section" Contacts,Contacts "Contact Us","Contact Us" "Enable Contact Us","Enable Contact Us" "Email Options","Email Options" "Send Emails To","Send Emails To" "Email Sender","Email Sender" +"Email Template","Email Template" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." diff --git a/app/code/Magento/Cookie/i18n/en_US.csv b/app/code/Magento/Cookie/i18n/en_US.csv index e69de29bb2d1d..09424c22833fe 100644 --- a/app/code/Magento/Cookie/i18n/en_US.csv +++ b/app/code/Magento/Cookie/i18n/en_US.csv @@ -0,0 +1,13 @@ +"Invalid domain name: %1","Invalid domain name: %1" +"Invalid cookie lifetime: %1","Invalid cookie lifetime: %1" +"Invalid cookie path","Invalid cookie path" +"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." +"Learn more.","Learn more." +"Allow Cookies","Allow Cookies" +"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" diff --git a/app/code/Magento/Cron/i18n/en_US.csv b/app/code/Magento/Cron/i18n/en_US.csv index 7f0fe4935b818..404ffa293199e 100644 --- a/app/code/Magento/Cron/i18n/en_US.csv +++ b/app/code/Magento/Cron/i18n/en_US.csv @@ -1,7 +1,11 @@ -"We can't save the cron expression.","We can't save the cron expression." +"We can\'t save the cron expression.","We can\'t save the cron expression." Daily,Daily Weekly,Weekly Monthly,Monthly +"Invalid cron expression: %1","Invalid cron expression: %1" +"Invalid cron expression, expecting \'match/modulus\': %1","Invalid cron expression, expecting \'match/modulus\': %1" +"Invalid cron expression, expecting numeric modulus: %1","Invalid cron expression, expecting numeric modulus: %1" +"Invalid cron expression, expecting \'from-to\' structure: %1","Invalid cron expression, expecting \'from-to\' structure: %1" "Cron (Scheduled Tasks)","Cron (Scheduled Tasks)" "For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set. 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. All the times are in minutes." "Cron configuration options for group: ","Cron configuration options for group: " diff --git a/app/code/Magento/CurrencySymbol/i18n/en_US.csv b/app/code/Magento/CurrencySymbol/i18n/en_US.csv index 6caa2d36f3e44..b197ab0b1a5e3 100644 --- a/app/code/Magento/CurrencySymbol/i18n/en_US.csv +++ b/app/code/Magento/CurrencySymbol/i18n/en_US.csv @@ -1,20 +1,18 @@ +"Save Currency Rates","Save Currency Rates" Reset,Reset -System,System Import,Import -"Save Currency Rates","Save Currency Rates" "Manage Currency Rates","Manage Currency Rates" "Import Service","Import Service" "Save Currency Symbols","Save Currency Symbols" "Currency Symbols","Currency Symbols" "Use Standard","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" +"We can\'t initialize the import model.","We can\'t initialize the import model." +"Click ""Save"" to apply the rates we found.","Click ""Save"" to apply the rates we found." +"Currency Rates","Currency Rates" +"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 +System,System +"You applied the custom currency symbols.","You applied the custom currency symbols." "Old rate:","Old rate:" +Currency,Currency diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv index 8f8042a57e459..227032d13a56c 100644 --- a/app/code/Magento/Customer/i18n/en_US.csv +++ b/app/code/Magento/Customer/i18n/en_US.csv @@ -1,154 +1,84 @@ -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" -"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" +"Sign Out","Sign Out" +"Sign In","Sign 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 don\'t subscribe to our newsletter.","You don\'t subscribe 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" +"Create Order","Create Order" "Save Customer","Save Customer" "Delete Customer","Delete Customer" "Reset Password","Reset Password" +"Are you sure you want to revoke the customer\'s tokens?","Are you sure you want to revoke the customer\'s tokens?" +"Force Sign-In","Force Sign-In" "New Customer","New Customer" -"or ","or " -" Send auto-generated password"," Send auto-generated password" +"Save and Continue Edit","Save and Continue Edit" +Back,Back "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" +Reset,Reset +ID,ID +Product,Product +SKU,SKU +Quantity,Quantity +Price,Price +Total,Total +Action,Action +Configure,Configure +Delete,Delete "Shopping Cart from %1","Shopping Cart from %1" +Newsletter,Newsletter "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" +"End Date","End Date" "Receive Date","Receive Date" Subject,Subject +Status,Status Sent,Sent +Cancel,Cancel "Not Sent","Not Sent" Sending,Sending Paused,Paused +View,View Unknown,Unknown -"Purchase Date","Purchase Date" +Order,Order +Purchased,Purchased "Bill-to Name","Bill-to Name" "Ship-to Name","Ship-to Name" "Order Total","Order Total" "Purchase Point","Purchase Point" -Never,Never -Offline,Offline +"Customer View","Customer View" +"There are no items in customer\'s shopping cart.","There are no items in customer\'s shopping cart." +Qty,Qty 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" +Offline,Offline +Online,Online +Never,Never +Unlocked,Unlocked +Locked,Locked "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" -Addresses,Addresses -Wishlist,Wishlist -Newsletter,Newsletter -"Product Reviews","Product Reviews" +Unlock,Unlock +No,No +Yes,Yes +"Delete File","Delete File" Download,Download "Delete Image","Delete Image" "View Full Size","View Full Size" "All countries","All countries" +"Customer Groups","Customer Groups" "Add New Customer Group","Add New Customer Group" "Save Customer Group","Save Customer Group" "Delete Customer Group","Delete Customer Group" @@ -156,95 +86,127 @@ Download,Download "Edit Customer Group ""%1""","Edit Customer Group ""%1""" "Group Information","Group Information" "Group Name","Group Name" -"Maximum length must be less then %1 symbols","Maximum length must be less then %1 symbols" +"Maximum length must be less then %1 characters.","Maximum length must be less then %1 characters." "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." +"The customer is now assigned to Customer Group %s.","The customer is now 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 VAT ID is valid." +"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 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." +"The VAT ID is valid but no Customer Group is assigned for it.","The VAT ID is valid but no Customer Group is assigned for it." +"Based on the VAT ID, the customer belongs to the Customer Group %s.","Based on the VAT ID, the customer belongs to the Customer Group %s." +"Something went wrong while validating the VAT ID.","Something went wrong while validating the VAT ID." +"The customer would belong to Customer Group %s.","The customer would belong to Customer Group %s." +"There was an error detecting Customer Group.","There was an error detecting Customer Group." "Validate VAT Number","Validate VAT Number" "Customer Login","Customer Login" "Create New Customer Account","Create New Customer Account" -"This account is not confirmed.' ' Click here to resend confirmation email.","This account is not confirmed.' ' Click here to resend confirmation email." -"Invalid login or password.","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.","Login and password are required." -"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please click here.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please click here." -"There is already an account with this email address. If you are sure that it is your email address, click here 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, click here 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 here to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click here to enter you shipping address for proper VAT calculation" -"If you are a registered VAT customer, please click here to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click here to enter you billing address for proper VAT calculation" +"Date of Birth","Date of Birth" "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." +"If you are a registered VAT customer, please click here to enter your shipping address for proper VAT calculation.","If you are a registered VAT customer, please click here to enter your shipping address for proper VAT calculation." +"If you are a registered VAT customer, please click here to enter your billing address for proper VAT calculation.","If you are a registered VAT customer, please click here to enter your billing address for proper VAT calculation." +"Thank you for registering with %1.","Thank you for registering with %1." +"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." +"Your password reset link has expired.","Your password reset link has expired." +"You must confirm your account. Please check your email for the confirmation link or click here for a new link.","You must confirm your account. Please check your email for the confirmation link or click here for a new link." +"There is already an account with this email address. If you are sure that it is your email address, click here 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, click here to get your password and access your account." +"We can\'t save the customer.","We can\'t save the customer." +"Please make sure your passwords match.","Please make sure your passwords match." +"If you are a registered VAT customer, please click here to enter your shipping address for proper VAT calculation.","If you are a registered VAT customer, please click here to enter your shipping address for proper VAT calculation." +"If you are a registered VAT customer, please click here to enter your billing address for proper VAT calculation.","If you are a registered VAT customer, please click here to enter your billing address for proper VAT calculation." +"Account Information","Account Information" +"You saved the account information.","You saved the account information." +"Password confirmation doesn\'t match entered password.","Password confirmation doesn\'t match entered password." "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 new email.","Please enter new email." +"We\'re unable to send the password reset email.","We\'re unable to send the password reset email." "Please enter your email.","Please enter your email." -"Your password reset link has expired.","Your password reset link has expired." +"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." +"My Account","My Account" +"This account is not confirmed. Click here to resend confirmation email.","This account is not confirmed. Click here to resend confirmation email." +"The account is locked. Please wait and try again or contact %1.","The account is locked. Please wait and try again or contact %1." +"Invalid login or password.","Invalid login or password." +"An unspecified error occurred. Please contact us for assistance.","An unspecified error occurred. Please contact us for assistance." +"A login and a password are required.","A login and a password are required." "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." -"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." +"Please enter a new password.","Please enter a new password." +"You updated your password.","You updated your password." +"Something went wrong while saving the new password.","Something went wrong while saving the new password." +"You deleted the address.","You deleted the address." +"We can\'t delete the address right now.","We can\'t delete the address right now." +"You saved the address.","You saved the address." +"We can\'t save the address.","We can\'t save 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." +"You have revoked the customer\'s tokens.","You have revoked the customer\'s tokens." +"We can\'t find a customer to revoke.","We can\'t find a customer to revoke." +"You deleted the customer group.","You deleted the customer group." +"The customer group no longer exists.","The customer group no longer exists." +Customers,Customers "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." +"You saved the customer group.","You saved the customer group." +"Please select customer(s).","Please select customer(s)." +"Customer could not be deleted.","Customer could not be deleted." +"You deleted the customer.","You deleted the customer." +"Something went wrong while editing the customer.","Something went wrong while editing the customer." "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." +"Please correct the data sent.","Please correct the data sent." +"A total of %1 record(s) were updated.","A total of %1 record(s) were updated." "A total of %1 record(s) were deleted.","A total of %1 record(s) were deleted." -"Please select customer(s).","Please select customer(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." +"The customer will receive an email with a link to reset password.","The customer will receive an email with a link to reset password." +"Something went wrong while resetting customer password.","Something went wrong while resetting customer password." +"You saved the customer.","You saved the customer." +"Something went wrong while saving the customer.","Something went wrong while saving the customer." +"Page not found.","Page not found." +"Customer has been unlocked successfully.","Customer has been unlocked successfully." +"Online Customers","Online Customers" +"Customers Now Online","Customers Now Online" +"Please define Wish List item ID.","Please define Wish List item ID." +"Please load Wish List item.","Please load Wish List item." +"Login successful.","Login successful." +"""%1"" section source is not supported","""%1"" section source is not supported" +"%1 doesn\'t extend \Magento\Customer\CustomerData\SectionSourceInterface","%1 doesn\'t extend \Magento\Customer\CustomerData\SectionSourceInterface" +"The password doesn\'t match this account.","The password doesn\'t match this account." +"No confirmation needed.","No confirmation needed." +"Account already active","Account already active" +"Invalid confirmation token","Invalid confirmation token" +"This account is not confirmed.","This account is not confirmed." +"Please enter a password with at least %1 characters.","Please enter a password with at least %1 characters." +"The password can\'t begin or end with a space.","The password can\'t begin or end with a space." +"Minimum of different classes of characters in password is %1. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.","Minimum of different classes of characters in password is %1. Classes of characters: Lower Case, Upper Case, Digits, Special Characters." +"This customer already exists in this store.","This customer already exists in this store." +"A customer with the same email already exists in an associated website.","A customer with the same email already exists in an associated website." +"Reset password token mismatch.","Reset password token mismatch." +"Reset password token expired.","Reset password token expired." +"Please correct the transactional account email type.","Please correct the transactional account email type." "Please enter the first name.","Please enter the first name." "Please enter the last name.","Please enter the last name." "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 phone number.","Please enter the phone number." "Please enter the zip/postal code.","Please enter the zip/postal code." "Please enter the country.","Please enter the country." "Please enter the state/province.","Please enter the state/province." +"""%1"" is a required value.","""%1"" is a required value." +Global,Global "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." +"We can\'t share customer accounts globally when the accounts share identical email addresses on more than one website.","We can\'t share customer accounts globally when the accounts share identical email addresses on more than one website." +"Billing Address","Billing Address" +"Shipping Address","Shipping Address" +"-- Please Select --","-- Please Select --" +"Please enter a first name.","Please enter a first name." +"Please enter a last name.","Please enter a last name." "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." +"Please enter a date of birth.","Please enter a date of birth." +"Please enter a TAX/VAT number.","Please enter a TAX/VAT number." +"Please enter a gender.","Please enter a gender." +"Please enter a valid password reset token.","Please enter a valid password reset token." "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" @@ -255,19 +217,18 @@ Admin,Admin """%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"" uses too many characters.","""%1"" uses too many characters." +"'%value%' looks like an IP address, which is not an acceptable format.","'%value%' looks like an IP address, which is not an acceptable format." +"'%value%' looks like a DNS hostname but we cannot match the TLD against known list.","'%value%' looks like a DNS hostname but we cannot match the TLD against known list." +"'%value%' looks like a DNS hostname but contains a dash in an invalid position.","'%value%' looks like a DNS hostname but contains a dash in an invalid position." +"'%value%' looks like a DNS hostname but we cannot match it against the hostname schema for TLD '%tld%'.","'%value%' looks like a DNS hostname but we cannot match it against the hostname schema for TLD '%tld%'." +"'%value%' looks like a DNS hostname but cannot extract TLD part.","'%value%' looks like a DNS hostname but cannot extract TLD part." +"'%value%' does not look like a valid local network name.","'%value%' does not look like a valid local network name." +"'%value%' looks like a local network name, which is not an acceptable format.","'%value%' looks like a local network name, which is not an acceptable format." +"'%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." @@ -279,84 +240,173 @@ Admin,Admin """%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." +label,label +"Please enter a customer email.","Please enter a customer email." +"A customer website ID must be specified when using the website scope.","A customer website ID must be specified when using the website scope." +"Customer Group","Customer Group" +"You can\'t delete group ""%1"".","You can\'t delete group ""%1""." "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" +"Cannot delete group.","Cannot delete group." +"Error during VAT Number verification.","Error during VAT Number verification." +"PHP SOAP extension is required.","PHP SOAP extension is required." +"VAT Number is valid.","VAT Number is valid." +"Please enter a valid VAT number.","Please enter a valid VAT number." +"Your VAT ID was successfully validated.","Your VAT ID was successfully validated." +"You will be charged tax.","You will be charged tax." +"You will not be charged tax.","You will not be charged tax." +"The VAT ID entered (%1) is not a valid VAT ID.","The VAT ID entered (%1) is not a valid VAT ID." +"Your Tax ID cannot be validated.","Your Tax ID cannot be validated." +"If you believe this is an error, please contact us at %1","If you believe this is an error, please contact us at %1" +Male,Male +Female,Female +"Not Specified","Not Specified" +"Thank you for registering with","Thank you for registering with" +"enter your billing address for proper VAT calculation","enter your billing address for proper VAT calculation" +"enter your shipping address for proper VAT calculation","enter your shipping address for proper VAT calculation" +"Please enter new password.","Please enter new password." +message,message +NoSuchEntityException,NoSuchEntityException +Exception,Exception +InputException.,InputException. +InputException,InputException +"Exception message","Exception message" +"Validator Exception","Validator Exception" +"Localized Exception","Localized Exception" +"some error","some error" +"Minimum different classes of characters in password are %1. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.","Minimum different classes of characters in password are %1. Classes of characters: Lower Case, Upper Case, Digits, Special Characters." +Label,Label +Select...,Select... +Edit,Edit +Visitor,Visitor +Customer,Customer +"No item specified.","No item specified." +"Are you sure you want to remove this item?","Are you sure you want to remove this item?" +"Personal Information","Personal Information" "Last Logged In:","Last Logged In:" "Last Logged In (%1):","Last Logged In (%1):" +"Account Lock:","Account Lock:" "Confirmed email:","Confirmed email:" -"Account Created on:","Account Created on:" +"Account Created:","Account Created:" "Account Created on (%1):","Account Created on (%1):" "Account Created in:","Account Created in:" "Customer Group:","Customer Group:" +"Default Billing Address","Default Billing Address" "Sales Statistics","Sales Statistics" +"Web Site","Web Site" +Store,Store +"Store View","Store View" +"Lifetime Sales","Lifetime Sales" "Average Sale","Average Sale" +"All Store Views","All Store Views" +Change,Change "Manage Addresses","Manage Addresses" -"Hello,","Hello," -"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 Email","Change Email" -"Change Email and Password","Change Email and Password" +"Default Shipping Address","Default Shipping Address" +"Contact Information","Contact 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." +"You subscribe to ""General Subscription"".","You subscribe to ""General Subscription""." +or,or "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." +"Delete Address","Delete Address" +"You have no other address entries in your address book.","You have no other address entries in your address book." +"* Required Fields","* Required Fields" +Company,Company +"Phone Number","Phone Number" +Fax,Fax +Address,Address +"Street Address","Street Address" +"Street Address %1","Street Address %1" +"VAT Number","VAT Number" +City,City +State/Province,State/Province +"Please select a region, state or province.","Please select a region, state or province." +"Zip/Postal Code","Zip/Postal Code" +Country,Country +"It's a default billing address.","It's a default billing address." "Use as my default billing address","Use as my default billing address" +"It's a default shipping address.","It's a default shipping address." "Use as my default shipping address","Use as my default shipping address" "Save 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." +"Please enter your email below and we will send you the confirmation link.","Please enter your email below and we will send you the confirmation link." +Email,Email "Send confirmation link","Send confirmation link" -"Back to Login","Back to Login" +"Back to Sign In","Back to Sign In" +"Change Email","Change Email" +"Change Email and Password","Change Email and Password" "Current Password","Current Password" +"New Password","New 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." +Save,Save +"Please enter your email address below to receive a password reset link.","Please enter your email address below to receive a password reset link." +"Reset My Password","Reset My 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." +"If you have an account, sign in with your email address.","If you have an account, sign in with your email address." +Password,Password +"Forgot Your Password?","Forgot Your Password?" "Subscription option","Subscription option" "General Subscription","General Subscription" "Sign Up for Newsletter","Sign Up for Newsletter" "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 +"Sign-in Information","Sign-in Information" +"Confirm Password","Confirm Password" +"Create an Account","Create an Account" +"Set a New Password","Set a New Password" +"You have signed out and will go to our homepage in 5 seconds.","You have signed out and will go to our homepage in 5 seconds." +"New Customers","New Customers" +"Creating an account has many benefits: check out faster, keep more than one address, track orders and more.","Creating an account has many benefits: check out faster, keep more than one address, track orders and more." Gender,Gender +Name,Name "Tax/VAT number","Tax/VAT number" -"Subscribe to Newsletter","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" +"%name,","%name," +"Welcome to %store_name.","Welcome to %store_name." +"To sign in to our site, use these credentials during checkout or on the My Account page:","To sign in to our site, use these credentials during checkout or on the My Account page:" +Email:,Email: +Password:,Password: +"Password you set when creating account","Password you set when creating account" +"Forgot your account password? Click here to reset it.","Forgot your account password? Click here to reset it." +"When you sign in to your account, you will be able to:","When you sign in to your account, you will be able to:" +"Proceed through checkout faster","Proceed through checkout faster" +"Check the status of orders","Check the status of orders" +"View past orders","View past orders" +"Store alternative addresses (for shipping to multiple family members and friends)","Store alternative addresses (for shipping to multiple family members and friends)" +"You must confirm your %customer_email email before you can sign in (link is only valid once):","You must confirm your %customer_email email before you can sign in (link is only valid once):" +"Confirm Your Account","Confirm Your Account" +"Thank you for confirming your %store_name account.","Thank you for confirming your %store_name account." +"To sign in to our site and set a password, click on the link:","To sign in to our site and set a password, click on the link:" +"Hello,","Hello," +"We have received a request to change the following information associated with your account at %store_name: email.","We have received a request to change the following information associated with your account at %store_name: email." +"If you have not authorized this action, please contact us immediately at %store_email","If you have not authorized this action, please contact us immediately at %store_email" +"or call us at %store_phone","or call us at %store_phone" +"Thanks,
%store_name","Thanks,
%store_name" +"We have received a request to change the following information associated with your account at %store_name: email, password.","We have received a request to change the following information associated with your account at %store_name: email, password." +"There was recently a request to change the password for your account.","There was recently a request to change the password for your account." +"If you requested this change, set a new password here:","If you requested this change, set a new password here:" +"If you did not make this request, you can ignore this email and your password will remain the same.","If you did not make this request, you can ignore this email and your password will remain the same." +"We have received a request to change the following information associated with your account at %store_name: password.","We have received a request to change the following information associated with your account at %store_name: password." +"Checkout out as a new customer","Checkout out as a new customer" +"Creating an account has many benefits:","Creating an account has many benefits:" +"See order and shipping status","See order and shipping status" +"Track order history","Track order history" +"Check out faster","Check out faster" +"Checkout out using your account","Checkout out using your account" +"Email Address","Email Address" +"Are you sure you want to do this?","Are you sure you want to do this?" +"Are you sure you want to delete this address?","Are you sure you want to delete this address?" +"Guest checkout is disabled.","Guest checkout is disabled." +"All Customers","All Customers" +"Now Online","Now Online" +"Customers Section","Customers Section" "Customer Configuration","Customer Configuration" "Account Sharing Options","Account Sharing Options" "Share Customer Accounts","Share Customer Accounts" -"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" @@ -365,19 +415,44 @@ Gender,Gender "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" +"Show VAT Number on Storefront","Show VAT Number on Storefront" +"To show VAT number on Storefront, set Show VAT Number on Storefront option to Yes.","To show VAT number on Storefront, set Show VAT Number on Storefront option to Yes." "Default Email Domain","Default Email Domain" "Default Welcome Email","Default Welcome Email" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." +"Default Welcome Email Without Password","Default Welcome Email Without Password" +" + This email will be sent instead of the Default Welcome Email, if a customer was created without password.

+ Email template chosen based on theme fallback when ""Default"" option is selected. + "," + This email will be sent instead of the Default Welcome Email, if a customer was created without password.

+ Email template chosen based on theme fallback when ""Default"" option is selected. + " +"Email Sender","Email Sender" "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." +" + This email will be sent instead of the Default Welcome Email, after account confirmation.

+ Email template chosen based on theme fallback when ""Default"" option is selected. + "," + This email will be sent instead of the Default Welcome Email, after account confirmation.

+ Email template chosen based on theme fallback when ""Default"" option is selected. + " "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" +"Recovery Link Expiration Period (hours)","Recovery Link Expiration Period (hours)" +"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field." +"Number of Required Character Classes","Number of Required Character Classes" +"Number of different character classes required in password: Lowercase, Uppercase, Digits, Special Characters.","Number of different character classes required in password: Lowercase, Uppercase, Digits, Special Characters." +"Minimum Password Length","Minimum Password Length" +"Maximum Login Failures to Lockout Account","Maximum Login Failures to Lockout Account" +"Use 0 to disable account locking.","Use 0 to disable account locking." +"Lockout Time (minutes)","Lockout Time (minutes)" "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" @@ -401,65 +476,43 @@ Gender,Gender "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" +"Online Customers Options","Online Customers Options" +"Online Minutes Interval","Online Minutes Interval" +"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)." +"Enable Autocomplete on login/forgot password forms","Enable Autocomplete on login/forgot password forms" +"Customer Grid","Customer Grid" +"Rebuild Customer grid index","Rebuild Customer grid index" Group,Group -"Are you sure you want to delete?","Are you sure you want to delete?" +"Add New Customer","Add New Customer" +"Delete items","Delete items" +"Are you sure to delete selected customers?","Are you sure to delete selected customers?" +"Subscribe to Newsletter","Subscribe to Newsletter" "Unsubscribe from Newsletter","Unsubscribe from Newsletter" +"Are you sure to unsubscribe selected customers from newsletter?","Are you sure to unsubscribe selected customers from newsletter?" "Assign a Customer Group","Assign a Customer Group" +"Are you sure to assign selected customers to new group?","Are you sure to assign selected customers to new 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" -"All Customers","All Customers" -"Now Online","Now Online" -"Associate to Website","Associate to Website" -Prefix,Prefix -"Middle Name/Initial","Middle Name/Initial" -Suffix,Suffix -"Date Of Birth","Date Of Birth" -"Tax/VAT Number","Tax/VAT Number" -"Send Welcome Email From","Send Welcome Email From" -"Disable Automatic Group Change Based on VAT ID","Disable Automatic Group Change Based on VAT ID" -"Images and Videos","Images and Videos" -"Online Customers Options","Online Customers Options" -"Online Minutes Interval","Online Minutes Interval" -"Show VAT Number on Storefront","Show VAT Number on Storefront" -"To show VAT number on Storefront, set Show VAT Number on Storefront option to Yes.","To show VAT number on Storefront, set Show VAT Number on Storefront option to Yes." -"Default Welcome Email Without Password","Default Welcome Email Without Password" -"This email will be sent instead of the Default Welcome Email, if a customer was created without password.","This email will be sent instead of the Default Welcome Email, if a customer was created without password." -"This email will be sent instead of the Default Welcome Email, after account confirmation.","This email will be sent instead of the Default Welcome Email, after account confirmation." -"New Addresses","New Addresses" -"Add New Addresses","Add New Addresses" +"Last Logged In","Last Logged In" "Confirmed email","Confirmed email" "Account Created in","Account Created in" "Tax VAT Number","Tax VAT Number" -"We have received a request to change the following information associated with your account at %store_name: email, password.","We have received a request to change the following information associated with your account at %store_name: email, password." -"We have received a request to change the following information associated with your account at %store_name: email.","We have received a request to change the following information associated with your account at %store_name: email." -"We have received a request to change the following information associated with your account at %store_name: password.","We have received a request to change the following information associated with your account at %store_name: password." -"If you have not authorized this action, please contact us immediately at %store_email","If you have not authorized this action, please contact us immediately at %store_email" -"or call us at %store_phone","or call us at %store_phone" -"Thanks,
%store_name","Thanks,
%store_name" -"Number of Required Character Classes","Number of Required Character Classes" -"Number of different character classes required in password: Lowercase, Uppercase, Digits, Special Characters.","Number of different character classes required in password: Lowercase, Uppercase, Digits, Special Characters." -"Minimum Password Length","Minimum Password Length" -"Maximum Login Failures to Lockout Account","Maximum Login Failures to Lockout Account" -"Use 0 to disable account locking.","Use 0 to disable account locking." -"Lockout Time (minutes)","Lockout Time (minutes)" -"Account will be unlocked after provided time.","Account will be unlocked after provided time." -"Locked","Locked" -"Unlocked","Unlocked" -"Unlock","Unlock" -"The account is locked. Please wait and try again or contact %1.","The account is locked. Please wait and try again or contact %1." -"Customer has been unlocked successfully.","Customer has been unlocked successfully." -"Account Lock:","Account Lock:" +"Billing Firstname","Billing Firstname" +"Billing Lastname","Billing Lastname" "Account Lock","Account Lock" -"Minimum of different classes of characters in password is %1. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.","Minimum different classes of characters in password are %1. Classes of characters: Lower Case, Upper Case, Digits, Special Characters." -"The password can't begin or end with a space.","The password can't begin or end with a space." -"Please enter a password with at least %1 characters.","Please enter a password with at least %1 characters." +"First Name","First Name" +"Last Name","Last Name" +"Last Activity","Last Activity" +Type,Type +"Customer Information","Customer Information" +"If your Magento site has multiple views, you can set the scope to apply to a specific view.","If your Magento site has multiple views, you can set the scope to apply to a specific view." +"Disable Automatic Group Change Based on VAT ID","Disable Automatic Group Change Based on VAT ID" +"Send Welcome Email From","Send Welcome Email From" +Addresses,Addresses +"Are you sure you want to delete this item?","Are you sure you want to delete this item?" +"Account Dashboard","Account Dashboard" +"Edit Account Information","Edit Account Information" +"Password forgotten","Password forgotten" +"My Dashboard","My Dashboard" +"You are signed out","You are signed out" diff --git a/app/code/Magento/CustomerImportExport/i18n/en_US.csv b/app/code/Magento/CustomerImportExport/i18n/en_US.csv index d1c02bb98f9b2..4e141975ea23e 100644 --- a/app/code/Magento/CustomerImportExport/i18n/en_US.csv +++ b/app/code/Magento/CustomerImportExport/i18n/en_US.csv @@ -1,17 +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" +"Please specify a website.","Please specify a website." +"Please specify an email.","Please specify an email." +"We found an invalid value in a website column.","We found an invalid value in a website column." +"Please enter a valid email.","Please enter a valid email." +"Please make sure attribute ""%s"" is not empty.","Please make sure attribute ""%s"" is not empty." +"We can\'t find a customer who matches this email and website code.","We can\'t find a customer who matches this email and website code." "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" +"We can\'t find that customer address.","We can\'t find that customer address." +"Please enter a valid region.","Please enter a valid region." +"We found another row with this email, website and address ID combination.","We found another row with this email, website and address ID combination." +"This email is found more than once in the import file.","This email is found more than once in the 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" +"We can\'t find that email and website combination.","We can\'t find that email and website combination." +"Please enter a password with a valid length.","Please enter a password with a valid length." CSV,CSV "Excel XML","Excel XML" diff --git a/app/code/Magento/Developer/i18n/en_US.csv b/app/code/Magento/Developer/i18n/en_US.csv index 1cf1f79536095..4d4fd2c7eeeca 100644 --- a/app/code/Magento/Developer/i18n/en_US.csv +++ b/app/code/Magento/Developer/i18n/en_US.csv @@ -1,40 +1,9 @@ -"Front-end development workflow","Front-end development workflow" +"Format for IDE '%1' is not supported","Format for IDE '%1' is not supported" +"Client side less compilation","Client side less compilation" +"Server side less compilation","Server side less compilation" +"Frontend Development Workflow","Frontend Development Workflow" "Workflow type","Workflow type" "Not available in production mode","Not available in production mode" "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." -"Debug","Debug" -"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront" -"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin" -"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." -"Minify Html","Minify Html" -"Translate Inline","Translate Inline" -"Enabled for Storefront","Enabled for Storefront" -"Enabled for Admin","Enabled for Admin" -"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.","Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations." -"JavaScript Settings","JavaScript Settings" -"Enable Javascript Bundling","Enable Javascript Bundling" -"Merge JavaScript Files","Merge JavaScript Files" -"Minify JavaScript Files","Minify JavaScript Files" -"Translation Strategy","Translation Strategy" -"Dictionary (Translation on Storefront side)","Dictionary (Translation on Storefront side)" -"Embedded (Translation on Admin side)","Embedded (Translation on Admin side)" -"Log JS Errors to Session Storage","Log JS Errors to Session Storage" -"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key" -"CSS Settings","CSS Settings" -"Merge CSS Files","Merge CSS Files" -"Minify CSS Files","Minify CSS Files" -"Image Processing Settings","Image Processing Settings" -"Image Adapter","Image Adapter" -"Static Files Settings","Static Files Settings" -"Sign Static Files","Sign Static Files" -"Grid Settings","Grid Settings" -"Asynchronous indexing","Asynchronous indexing" -"Client side less compilation","Client side less compilation" -"Server side less compilation","Server side less compilation" -"Disable","Disable" -"Enable","Enable" diff --git a/app/code/Magento/Dhl/i18n/en_US.csv b/app/code/Magento/Dhl/i18n/en_US.csv index 296ef09b6b82f..168d1a3838758 100644 --- a/app/code/Magento/Dhl/i18n/en_US.csv +++ b/app/code/Magento/Dhl/i18n/en_US.csv @@ -1,8 +1,4 @@ -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." +"Select this to allow DHL to optimize shipping charges by splitting the order if it exceeds %1 %2.","Select this to allow DHL to optimize shipping charges by splitting the order if it exceeds %1 %2." "Wrong Content Type","Wrong Content Type" Pounds,Pounds Kilograms,Kilograms @@ -41,13 +37,13 @@ Jetline,Jetline "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)." +"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" +"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" @@ -55,12 +51,17 @@ Documents,Documents "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" +"Unable to retrieve shipping label","Unable to retrieve shipping label" "Non documents","Non documents" -Size,Size -Debug,Debug -"Gateway URL","Gateway URL" +None,None +"Field ","Field " +" is required."," is required." "Enabled for Checkout","Enabled for Checkout" +"Enabled for RMA","Enabled for RMA" +"Gateway URL","Gateway URL" +Title,Title "Access ID","Access ID" +Password,Password "Account Number","Account Number" "Content Type","Content Type" "Calculate Handling Fee","Calculate Handling Fee" @@ -68,12 +69,16 @@ Debug,Debug """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." +"Select this to allow DHL to optimize shipping charges by splitting the order if it exceeds 70 kg.","Select this to allow DHL to optimize shipping charges by splitting the order if it exceeds 70 kg." "Weight Unit","Weight Unit" +Size,Size "Allowed Methods","Allowed Methods" "Displayed Error Message","Displayed Error Message" "Free Method","Free Method" +"Enable Free Shipping Threshold","Enable Free Shipping Threshold" "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" +"Sort Order","Sort Order" +Debug,Debug diff --git a/app/code/Magento/Directory/i18n/en_US.csv b/app/code/Magento/Directory/i18n/en_US.csv index 404b8cbe4452d..c2811464f2324 100644 --- a/app/code/Magento/Directory/i18n/en_US.csv +++ b/app/code/Magento/Directory/i18n/en_US.csv @@ -1,23 +1,25 @@ -"--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 Select--","--Please Select--" +lbs,lbs +kgs,kgs +"Requested country is not available.","Requested country is not available." "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." +label,label +"We can\'t retrieve a rate from %1 for %2.","We can\'t retrieve a rate from %1 for %2." +"We can\'t retrieve a rate from %1.","We can\'t retrieve a rate from %1." "FATAL ERROR:","FATAL ERROR:" +"We can\'t initialize the import model.","We can\'t initialize the import model." "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" "Please correct the rates received","Please correct the rates received" -"--Please select--","--Please select--" +"Please select a region, state or province.","Please select a region, state or province." +Currency,Currency "Your current currency is: %1.","Your current currency is: %1." -"Start Time","Start Time" -Frequency,Frequency +Continue,Continue +"Currency Update Warnings","Currency Update Warnings" "Currency Setup","Currency Setup" "Currency Options","Currency Options" "Base Currency","Base Currency" @@ -31,12 +33,17 @@ Frequency,Frequency Webservicex,Webservicex "Connection Timeout in Seconds","Connection Timeout in Seconds" "Scheduled Import Settings","Scheduled Import Settings" +Enabled,Enabled "Error Email Recipient","Error Email Recipient" "Error Email Sender","Error Email Sender" "Error Email Template","Error Email Template" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." +Frequency,Frequency Service,Service +"Start Time","Start Time" "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" +"Weight Unit","Weight Unit" diff --git a/app/code/Magento/Downloadable/i18n/en_US.csv b/app/code/Magento/Downloadable/i18n/en_US.csv index 98719bb6bf408..f0b19e394f795 100644 --- a/app/code/Magento/Downloadable/i18n/en_US.csv +++ b/app/code/Magento/Downloadable/i18n/en_US.csv @@ -1,82 +1,107 @@ -Back,Back -Price,Price -SKU,SKU -Qty,Qty -"Excl. Tax","Excl. Tax" -Total,Total -"Incl. Tax","Incl. Tax" -"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" -"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 +"Add New Link","Add New Link" +"Upload Files","Upload Files" +"All Files","All Files" 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 %2.","Please log in to download your product or purchase %2." -"Please log in to download your product.","Please log in to download your product." +"Please sign in to download your product or purchase %2.","Please sign in to download your product or purchase %2." +"Please sign in to download your product.","Please sign in to download your product." "The link has expired.","The link has expired." "The link is not available.","The link is not available." +"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." "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)." +"Provided content must be valid base64 encoded data.","Provided content must be valid base64 encoded data." +"Provided file name contains forbidden characters.","Provided file name contains forbidden characters." +"Link price must have numeric positive value.","Link price must have numeric positive value." +"Number of downloads must be a positive integer.","Number of downloads must be a positive integer." +"Sort order must be a positive integer.","Sort order must be a positive integer." +"Link URL must have valid format.","Link URL must have valid format." +"Provided file content must be valid base64 encoded data.","Provided file content must be valid base64 encoded data." +"Sample URL must have valid format.","Sample URL must have valid format." "Order id cannot be null","Order id cannot be null" "Order item id cannot be null","Order item id cannot be null" +"Invalid link type.","Invalid link type." +"Link title cannot be empty.","Link title cannot be empty." +"There is no downloadable link with provided ID.","There is no downloadable link with provided ID." +"Cannot delete link with id %1","Cannot delete link with id %1" "Please specify product link(s).","Please specify product link(s)." +"Product type of the product must be \'downloadable\'.","Product type of the product must be \'downloadable\'." +"Invalid sample type.","Invalid sample type." +"Sample title cannot be empty.","Sample title cannot be empty." +"There is no downloadable sample with provided ID.","There is no downloadable sample with provided ID." +"Cannot delete sample with id %1","Cannot delete sample with id %1" +Yes,Yes +No,No +"Use config","Use config" +"Upload File","Upload File" +URL,URL attachment,attachment inline,inline Pending,Pending -sample,sample +Invoiced,Invoiced +"To enable the option set the weight to no","To enable the option set the weight to no" +"Is this downloadable Product?","Is this downloadable Product?" +Links,Links +Title,Title "Links can be purchased separately","Links can be purchased separately" -"Max. Downloads","Max. Downloads" -Shareable,Shareable +"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 \'_\'." +"Add Link","Add Link" +Price,Price +File,File 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 '_'." +Shareable,Shareable +"Max. Downloads","Max. Downloads" +Samples,Samples +"Use Default Value","Use Default Value" +sample,sample +"Add links to your product files here.","Add links to your product files here." +"[STORE VIEW]","[STORE VIEW]" +[GLOBAL],[GLOBAL] +"Sort Order","Sort Order" +"Attach File or Enter Link","Attach File or Enter Link" +"Sort Variations","Sort Variations" +"Browse Files...","Browse Files..." +Delete,Delete +"Add product preview files here.","Add product preview files here." +SKU,SKU U,U +"Select all","Select all" +"Unselect all","Unselect all" +Availability,Availability +"In stock","In stock" +"Out of stock","Out of stock" "Go to My Downloadable Products","Go to My Downloadable Products" "Downloadable Products","Downloadable Products" +"Order #","Order #" +Date,Date +Status,Status "Remaining Downloads","Remaining Downloads" "View Order","View Order" "Start Download","Start Download" "You have not purchased any downloadable products yet.","You have not purchased any downloadable products yet." +Back,Back download,download +"Gift Message","Gift Message" +From:,From: +To:,To: +Message:,Message: +"Product Name","Product Name" +Qty,Qty +Subtotal,Subtotal +"Discount Amount","Discount Amount" +"Row Total","Row Total" +"Qty Invoiced","Qty Invoiced" +Ordered,Ordered +Shipped,Shipped +Canceled,Canceled +Refunded,Refunded +"We could not detect a size.","We could not detect a size." +"Downloadable Product Section","Downloadable Product Section" +Downloads,Downloads "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" diff --git a/app/code/Magento/DownloadableImportExport/i18n/en_US.csv b/app/code/Magento/DownloadableImportExport/i18n/en_US.csv index e69de29bb2d1d..a2aaf1375ae21 100644 --- a/app/code/Magento/DownloadableImportExport/i18n/en_US.csv +++ b/app/code/Magento/DownloadableImportExport/i18n/en_US.csv @@ -0,0 +1,3 @@ +"File directory \'%1\' is not readable.","File directory \'%1\' is not readable." +"File directory \'%1\' is not writable.","File directory \'%1\' is not writable." +Error,Error diff --git a/app/code/Magento/Eav/i18n/en_US.csv b/app/code/Magento/Eav/i18n/en_US.csv index df3f5cced4c3a..fd3a112be0516 100644 --- a/app/code/Magento/Eav/i18n/en_US.csv +++ b/app/code/Magento/Eav/i18n/en_US.csv @@ -1,26 +1,35 @@ -None,None -No,No -Email,Email -Yes,Yes -System,System -Required,Required -label,label +"Attribute Properties","Attribute Properties" +"Default Label","Default Label" +"Default label","Default label" "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" +"This is used internally. Make sure you don\'t use spaces or more than %1 symbols.","This is used internally. Make sure you don\'t use spaces or more than %1 symbols." +"Catalog Input Type for Store Owner","Catalog Input Type for Store Owner" +"Values Required","Values Required" "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" +"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 +Required,Required +Yes,Yes +No,No +System,System +None,None +"Decimal Number","Decimal Number" +"Integer Number","Integer Number" +Email,Email +URL,URL +Letters,Letters +"Letters (a-z, A-Z) or Numbers (0-9)","Letters (a-z, A-Z) or Numbers (0-9)" "Text Field","Text Field" "Text Area","Text Area" Date,Date Yes/No,Yes/No -URL,URL +"Multiple Select","Multiple Select" +Dropdown,Dropdown +"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list." "Attribute object is undefined","Attribute object is undefined" +"Entity object is undefined","Entity 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." @@ -28,15 +37,15 @@ URL,URL """%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"" uses too many characters.","""%1"" uses too many characters." +"'%value%' looks like an IP address, which is not an acceptable format.","'%value%' looks like an IP address, which is not an acceptable format." +"'%value%' looks like a DNS hostname but we cannot match the TLD against known list.","'%value%' looks like a DNS hostname but we cannot match the TLD against known list." +"'%value%' looks like a DNS hostname but contains a dash in an invalid position.","'%value%' looks like a DNS hostname but contains a dash in an invalid position." +"'%value%' looks like a DNS hostname but we cannot match it against the hostname schema for TLD '%tld%'.","'%value%' looks like a DNS hostname but we cannot match it against the hostname schema for TLD '%tld%'." +"'%value%' looks like a DNS hostname but cannot extract TLD part.","'%value%' looks like a DNS hostname but cannot extract TLD part." +"'%value%' does not look like a valid local network name.","'%value%' does not look like a valid local network name." +"'%value%' looks like a local network name, which is not an acceptable format.","'%value%' looks like a local network name, which is not an acceptable format." +"'%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." @@ -47,37 +56,53 @@ URL,URL """%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"" cannot contain more than %2 lines.","""%1"" cannot contain more than %2 lines." """%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" -"Values Required","Values Required" -"Decimal Number","Decimal Number" -"Integer Number","Integer Number" -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" +"Attribute group does not belong to provided attribute set","Attribute group does not belong to provided attribute set" +"Cannot save attributeGroup","Cannot save attributeGroup" +"Group with id ""%1"" does not exist.","Group with id ""%1"" does not exist." +"Cannot delete attributeGroup with id %1","Cannot delete attributeGroup with id %1" +"AttributeSet with id ""%1"" does not exist.","AttributeSet with id ""%1"" does not exist." +"Wrong attribute set id provided","Wrong attribute set id provided" +"Attribute group does not belong to attribute set","Attribute group does not belong to attribute set" +"Attribute set not found: %1","Attribute set not found: %1" +"Attribute ""%1"" not found in attribute set %2.","Attribute ""%1"" not found in attribute set %2." +"System attribute can not be deleted","System attribute can not be deleted" +"Cannot save attribute","Cannot save attribute" +"Attribute with attributeCode ""%1"" does not exist.","Attribute with attributeCode ""%1"" does not exist." +"Cannot delete attribute.","Cannot delete attribute." +"Attribute with id ""%1"" does not exist.","Attribute with id ""%1"" does not exist." +"There was an error saving attribute set.","There was an error saving attribute set." +"Default attribute set can not be deleted","Default attribute set can not be deleted" +"There was an error deleting attribute set.","There was an error deleting attribute set." "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" +"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" +"An attribute code must not be more than %1 characters.","An attribute code must not be more than %1 characters." "Invalid default decimal value","Invalid default decimal value" "Invalid default date","Invalid default date" "Invalid entity supplied","Invalid entity supplied" "Invalid backend model specified: %1","Invalid backend model specified: %1" "Source model ""%1"" not found for attribute ""%2""","Source model ""%1"" not found for attribute ""%2""" +"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set" "The value of attribute ""%1"" must be unique","The value of attribute ""%1"" must be unique" "Invalid date","Invalid date" +"Empty attribute code","Empty attribute code" +"Attribute %1 doesn\'t work with options","Attribute %1 doesn\'t work with options" +"Cannot save attribute %1","Cannot save attribute %1" +"Attribute %1 doesn\'t have any option","Attribute %1 doesn\'t have any option" +"Attribute %1 does not contain option with Id %2","Attribute %1 does not contain option with Id %2" +"Cannot load options for attribute %1","Cannot load options for attribute %1" +"Entity attribute with id ""%1"" not found","Entity attribute with id ""%1"" not found" "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." +"An attribute set named ""%1"" already exists.","An attribute set named ""%1"" already exists." "No options found.","No options found." +label,label "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)" @@ -93,22 +118,25 @@ Letters,Letters "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 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" +"The current module pathname is undefined.","The current module pathname is undefined." +"The current module EAV entity is undefined.","The current module EAV entity is undefined." +"The form code is not defined.","The form code is not defined." +"The entity instance is not defined.","The 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" +"The storefront label is not defined.","The storefront label is not defined." +"Default option value is not defined","Default option value 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" +"The value of attribute ""%1"" is invalid.","The value of attribute ""%1"" is invalid." +"Wrong entity ID","Wrong entity ID" +"Wrong attribute set ID","Wrong attribute set ID" +"Wrong attribute group ID","Wrong attribute group ID" +"AttributeSet does not exist.","AttributeSet does not exist." +hello,hello +"Some internal exception message.","Some internal exception message." +"The value of attribute not valid","The value of attribute not valid" "EAV types and attributes","EAV types and attributes" -"Entity types declaration cache.","Entity types declaration cache." -"Default label","Default label" +"Entity types declaration cache","Entity types declaration cache" diff --git a/app/code/Magento/Email/i18n/en_US.csv b/app/code/Magento/Email/i18n/en_US.csv index 21c4989d602c2..58a26aa31cd66 100644 --- a/app/code/Magento/Email/i18n/en_US.csv +++ b/app/code/Magento/Email/i18n/en_US.csv @@ -1,18 +1,7 @@ -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" +Back,Back +Reset,Reset "Delete Template","Delete Template" "Convert to Plain Text","Convert to Plain Text" "Return Html Version","Return Html Version" @@ -21,26 +10,31 @@ Updated,Updated "Load Template","Load Template" "Edit Email Template","Edit Email Template" "New Email Template","New Email Template" -GLOBAL,GLOBAL +"Default Config","Default Config" "Template Information","Template Information" -"Used Currently For","Used Currently For" -"Used as Default For","Used as Default For" +"Currently Used For","Currently Used For" "Template Name","Template Name" "Template Subject","Template Subject" +"Insert Variable...","Insert Variable..." "Template Content","Template Content" "Template Styles","Template Styles" -"Email Templates","Email Templates" +Preview,Preview +Unknown,Unknown +"You deleted the email template.","You deleted the email template." +"The email template is currently being used.","The email template is currently being used." +"We can\'t delete email template data right now. Please review log and try again.","We can\'t delete email template data right now. Please review log and try again." +"We can\'t find an email template to delete.","We can\'t find an email template to delete." "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." +"Email Templates","Email Templates" +"Email Preview","Email Preview" "An error occurred. The email template can not be opened for preview.","An error occurred. The email template can not be opened for preview." +"This email template no longer exists.","This email template no longer exists." +"You saved the email template.","You saved the email template." +"Area is already set","Area is already set" +"Design config must have area and store.","Design config must have area and store." "Base Unsecure URL","Base Unsecure URL" "Base Secure URL","Base Secure URL" "General Contact Name","General Contact Name" @@ -53,22 +47,51 @@ GLOBAL,GLOBAL "Custom2 Contact Email","Custom2 Contact Email" "Store Name","Store Name" "Store Phone Number","Store Phone Number" +"Store Hours","Store Hours" +Country,Country Region/State,Region/State +"Zip/Postal Code","Zip/Postal Code" +City,City "Street Address 1","Street Address 1" "Street Address 2","Street Address 2" "Store Contact Information","Store Contact Information" +%1,%1 "Template Variables","Template Variables" -"The template Name must not be empty.","The template Name must not be empty." +"Please enter a template name.","Please enter a template name." "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""" +"""file"" parameter must be specified","""file"" parameter must be specified" +"Contents of %s could not be loaded or is empty","Contents of %s could not be loaded or is empty" +"""file"" parameter must be specified and must not be empty","""file"" parameter must be specified and must not be empty" +"Design params must be set before calling this method","Design params must be set before calling this method" +"
 %1
","
 %1
" +"CSS inlining error:","CSS inlining error:" +"Error filtering template: %s","Error filtering template: %s" +"We're sorry, an error has occurred while generating this email.","We're sorry, an error has occurred while generating this email." "Invalid sender data","Invalid sender data" +Title,Title "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" +"Are you sure you want to strip tags?","Are you sure you want to strip tags?" +"Are you sure you want to delete this template?","Are you sure you want to delete this template?" +"The template did not load. Please review the log for details.","The template did not load. Please review the log for details." +"Thank you, %store_name","Thank you, %store_name" +Communications,Communications "No Templates Found","No Templates Found" +ID,ID Added,Added +Updated,Updated +Subject,Subject "Template Type","Template Type" +Action,Action +"Logo Image","Logo Image" +"Allowed file types: jpg, jpeg, gif, png. To optimize logo for high-resolution displays, upload an image that is 3x normal size and then specify 1x dimensions in the width/height fields below.","Allowed file types: jpg, jpeg, gif, png. To optimize logo for high-resolution displays, upload an image that is 3x normal size and then specify 1x dimensions in the width/height fields below." +"Logo Image Alt","Logo Image Alt" +"Logo Width","Logo Width" +"Necessary only if an image has been uploaded above. Enter number of pixels, without appending ""px"".","Necessary only if an image has been uploaded above. Enter number of pixels, without appending ""px""." +"Logo Height","Logo Height" +"Necessary only if an image has been uploaded above. Enter image height size in pixels without appending ""px"".","Necessary only if an image has been uploaded above. Enter image height size in pixels without appending ""px""." +"Header Template","Header Template" +"Email template chosen based on theme fallback, when the ""Default"" option is selected.","Email template chosen based on theme fallback, when the ""Default"" option is selected." +"Footer Template","Footer Template" diff --git a/app/code/Magento/EncryptionKey/i18n/en_US.csv b/app/code/Magento/EncryptionKey/i18n/en_US.csv index f111edc33abb1..808f3145c3e22 100644 --- a/app/code/Magento/EncryptionKey/i18n/en_US.csv +++ b/app/code/Magento/EncryptionKey/i18n/en_US.csv @@ -1,20 +1,14 @@ -ID,ID -No,No -Yes,Yes -Username,Username -"Encryption Key","Encryption Key" "Change Encryption Key","Change Encryption Key" +"Encryption Key","Encryption Key" "New Encryption Key","New Encryption Key" "The encryption key is used to protect passwords and other sensitive data.","The encryption key is used to protect passwords and other sensitive data." "Auto-generate a Key","Auto-generate a Key" +No,No +Yes,Yes "The generated key will be displayed after changing.","The generated key will be displayed after changing." "New Key","New Key" -"To enable a key change this file must be writable: %1.","To enable a key change this file must be writable: %1." +"Deployment configuration file is not writable.","Deployment configuration file is not writable." "Please enter an encryption key.","Please enter an encryption key." "The encryption key has been changed.","The encryption key has been changed." -"This is your new encryption key: %1. Be sure to write it down and take good care of it!","This is your new encryption key: %1. Be sure to write it down and take good care of it!" -"Not supported cipher version","Not supported cipher version" -"The encryption key format is invalid.","The encryption key format is invalid." -"File %1 is not writeable.","File %1 is not writeable." -"Encryption Key Change","Encryption Key Change" +"This is your new encryption key: %1. Be sure to write it down and take good care of it!","This is your new encryption key: %1. Be sure to write it down and take good care of it!" "Manage Encryption Key","Manage Encryption Key" diff --git a/app/code/Magento/Fedex/i18n/en_US.csv b/app/code/Magento/Fedex/i18n/en_US.csv index 681ecc5610822..e7ce008576eaa 100644 --- a/app/code/Magento/Fedex/i18n/en_US.csv +++ b/app/code/Magento/Fedex/i18n/en_US.csv @@ -1,9 +1,3 @@ -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" @@ -41,32 +35,44 @@ Station,Station Adult,Adult Direct,Direct Indirect,Indirect +Pounds,Pounds +Kilograms,Kilograms +"For some reason we can\'t retrieve tracking info right now.","For some reason we can\'t retrieve tracking info right now." 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" +None,None +"Field ","Field " +" is required."," is required." FedEx,FedEx +"Enabled for Checkout","Enabled for Checkout" +"Enabled for RMA","Enabled for RMA" +Title,Title "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" +Key,Key +Password,Password "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 +"Weight Unit","Weight Unit" "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)" +"Calculate Handling Fee","Calculate Handling Fee" +"Handling Applied","Handling Applied" +"Handling Fee","Handling Fee" "Residential Delivery","Residential Delivery" +"Allowed Methods","Allowed Methods" "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." +"Free Method","Free Method" +"Free Shipping Amount Threshold","Free Shipping Amount Threshold" +"Enable Free Shipping Threshold","Enable Free Shipping Threshold" +"Displayed Error Message","Displayed Error Message" +"Ship to Applicable Countries","Ship to Applicable Countries" +"Ship to Specific Countries","Ship to Specific Countries" +Debug,Debug +"Show Method if Not Applicable","Show Method if Not Applicable" +"Sort Order","Sort Order" diff --git a/app/code/Magento/GiftMessage/i18n/en_US.csv b/app/code/Magento/GiftMessage/i18n/en_US.csv index fccfca3dc1731..5c82c8e5aeb81 100644 --- a/app/code/Magento/GiftMessage/i18n/en_US.csv +++ b/app/code/Magento/GiftMessage/i18n/en_US.csv @@ -1,22 +1,44 @@ -Cancel,Cancel +"Gift Messages are not applicable for empty cart","Gift Messages are not applicable for empty cart" +"Gift Messages are not applicable for virtual products","Gift Messages are not applicable for virtual products" +"Gift Message is not available","Gift Message is not available" +"Could not add gift message to shopping cart","Could not add gift message to shopping cart" +"There is no item with provided id in the cart","There is no item with provided id in the cart" +"There is no product with provided itemId: %1 in the cart","There is no product with provided itemId: %1 in the cart" +"There is no item with provided id in the order","There is no item with provided id in the order" +"There is no item with provided id in the order or gift message isn\'t allowed","There is no item with provided id in the order or gift message isn\'t allowed" +"Could not add gift message to order: ""%1""","Could not add gift message to order: ""%1""" +"There is no order with provided id or gift message isn\'t allowed","There is no order with provided id or gift message isn\'t allowed" +"There is no order with provided id","There is no order with provided id" +"Gift Messages are not applicable for empty order","Gift Messages are not applicable for empty order" +"Could not add gift message to order\'s item: ""%1""","Could not add gift message to order\'s item: ""%1""" +"Unknown entity type","Unknown entity type" +"Test label","Test label" +"Use Config Settings","Use Config Settings" From,From To,To -OK,OK -"Gift Message","Gift Message" Message,Message -"Unknown entity type","Unknown entity type" +Cancel,Cancel +OK,OK "Gift Options","Gift Options" +"Gift Message","Gift Message" "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." +"Leave this box blank 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." "Gift Options for Individual Items","Gift Options for Individual Items" +"Item %1 of %2","Item %1 of %2" +"Leave a box blank if you don\'t want to add a gift message for that item.","Leave a box blank if you don\'t want to add a gift message for that item." +"Add Gift Options for the Entire Order","Add Gift Options for the Entire Order" +"You can leave this box blank if you don\'t want to add a gift message for this address.","You can leave this box blank if you don\'t want to add a gift message for this address." "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." -"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 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 don\'t want to add a gift message for the item.","You can leave this box blank if you don\'t want to add a gift message for the item." +"Gift Message (optional)","Gift Message (optional)" +To:,To: +From:,From: +Message:,Message: +Update,Update +"Gift options","Gift options" +Edit,Edit +Delete,Delete "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/GoogleAdwords/i18n/en_US.csv b/app/code/Magento/GoogleAdwords/i18n/en_US.csv index 90126968a46d0..2dac00bc13b5b 100644 --- a/app/code/Magento/GoogleAdwords/i18n/en_US.csv +++ b/app/code/Magento/GoogleAdwords/i18n/en_US.csv @@ -1,9 +1,9 @@ -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" +Enable,Enable "Conversion ID","Conversion ID" "Conversion Language","Conversion Language" "Conversion Format","Conversion Format" diff --git a/app/code/Magento/GoogleAnalytics/i18n/en_US.csv b/app/code/Magento/GoogleAnalytics/i18n/en_US.csv index 2ddf9c21343fe..c4e19a4e08dd0 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" "Google API","Google API" "Google Analytics","Google Analytics" +Enable,Enable +"Account Number","Account Number" diff --git a/app/code/Magento/GoogleOptimizer/i18n/en_US.csv b/app/code/Magento/GoogleOptimizer/i18n/en_US.csv index 08fad3e5baa3d..e79c178c0d4b8 100644 --- a/app/code/Magento/GoogleOptimizer/i18n/en_US.csv +++ b/app/code/Magento/GoogleOptimizer/i18n/en_US.csv @@ -2,6 +2,6 @@ "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" +"Experiment code should be added to the original page only.","Experiment code should be added to the original page only." "Enable Content Experiments","Enable Content Experiments" +"Category View Optimization","Category View Optimization" diff --git a/app/code/Magento/GroupedProduct/i18n/en_US.csv b/app/code/Magento/GroupedProduct/i18n/en_US.csv index 5f49443a3bcef..b8e82c7582401 100644 --- a/app/code/Magento/GroupedProduct/i18n/en_US.csv +++ b/app/code/Magento/GroupedProduct/i18n/en_US.csv @@ -1,25 +1,35 @@ +"Grouped Products","Grouped Products" +"Please specify the quantity of product(s).","Please specify the quantity of product(s)." +"Cannot process the item.","Cannot process the item." +"Add Products to Group","Add Products to Group" Cancel,Cancel -Price,Price +"Add Selected Products","Add Selected Products" +"A grouped product is made up of multiple, standalone products that are presented as a group. You can offer variations of a single product, or group them by season or theme to create a coordinated set. Each product can be purchased separately, or as part of the group.","A grouped product is made up of multiple, standalone products that are presented as a group. You can offer variations of a single product, or group them by season or theme to create a coordinated set. Each product can be purchased separately, or as part of the group." +Remove,Remove ID,ID -SKU,SKU -Qty,Qty +Thumbnail,Thumbnail Name,Name -Availability,Availability -"In stock","In stock" -"Out of stock","Out of stock" +"Attribute Set","Attribute Set" +Status,Status +SKU,SKU +Price,Price +"Default Quantity","Default Quantity" +Actions,Actions +"Associated Products","Associated Products" Availability:,Availability: -"No options of this product are available.","No options of this product are available." -"Excl. Tax:","Excl. Tax:" -"Incl. Tax:","Incl. Tax:" +"Out of stock","Out of stock" "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)." +Qty,Qty +"No options of this product are available.","No options of this product are available." "There are no grouped products.","There are no grouped products." "Default Qty","Default Qty" -"Starting at:","Starting at:" +"Starting at","Starting at" +Availability,Availability +"In stock","In stock" "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" +Select...,Select... +Type,Type +Quantity,Quantity +AttributeSetText,AttributeSetText +StatusText,StatusText diff --git a/app/code/Magento/ImportExport/i18n/en_US.csv b/app/code/Magento/ImportExport/i18n/en_US.csv index 2ad0c144be94d..34a1de9e50439 100644 --- a/app/code/Magento/ImportExport/i18n/en_US.csv +++ b/app/code/Magento/ImportExport/i18n/en_US.csv @@ -1,96 +1,116 @@ -"-- Please Select --","-- Please Select --" -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" +From,From +To,To +"We can\'t filter an attribute with no attribute options.","We can\'t filter an attribute with no attribute options." Exclude,Exclude +"Attribute Label","Attribute Label" +"Attribute Code","Attribute Code" Filter,Filter "Unknown attribute filter type","Unknown attribute filter type" +Download,Download "Check Data","Check Data" +Import,Import "Import Settings","Import Settings" "Import Behavior","Import Behavior" +" "," " +"Allowed Errors Count","Allowed Errors Count" +"Please specify number of errors to halt import process","Please specify number of errors to halt import process" +"Field separator","Field separator" +"Multiple value separator","Multiple value separator" "File to Import","File to Import" "Select File to Import","Select File to Import" +"Images File Directory","Images File Directory" +"For Type ""Local Server"" use relative path to Magento installation, + e.g. var/export, var/import, var/export/some/dir","For Type ""Local Server"" use relative path to Magento installation, + e.g. var/export, var/import, var/export/some/dir" +"Download Sample File","Download Sample File" +"Please correct the data sent value.","Please correct the data sent value." Import/Export,Import/Export -"Please correct the data sent.","Please correct the data sent." +History,History +"Import History","Import History" +"Import history","Import history" +"There is no sample file for this entity.","There is no sample file for this entity." +Status,Status +"Maximum error count has been reached or system error is occurred!","Maximum error count has been reached or system error is occurred!" "Import successfully done","Import successfully done" -"File does not contain data. Please upload another one","File does not contain data. Please upload another one" +"This file is empty. Please try another one.","This file is empty. Please try another one." +"Data validation is failed. Please fix errors and re-upload the file..","Data validation is failed. Please fix errors and re-upload the 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" +"The file is valid, but we can\'t import it for some reason.","The file is valid, but we can\'t import it for some reason." "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" +"The file was not uploaded.","The file was not uploaded." +"Sorry, but the data is invalid or the file is not uploaded.","Sorry, but the data is invalid or the file is not uploaded." +"Show more","Show more" +"Additional data","Additional data" +"Following Error(s) has been occurred during importing process:","Following Error(s) has been occurred during importing process:" +"Only first 100 errors are displayed here. ","Only first 100 errors are displayed here. " +"Download full report","Download full report" "in rows:","in rows:" -"The total size of the uploadable files can't be more than %1M","The total size of the uploadable files can't be more than %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" +"Make sure your file isn\'t more than %1M.","Make sure your file isn\'t more than %1M." +"We can\'t provide the upload settings right now.","We can\'t provide the upload settings right now." +"Created: %1, Updated: %2, Deleted: %3","Created: %1, Updated: %2, Deleted: %3" +"Please enter a correct entity model.","Please enter a correct entity model." +"The entity adapter object must be an instance of %1 or %2.","The 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" +"The adapter object must be an instance of %1.","The 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" +"There is no data for the export.","There is no data for the export." "Exported %1 rows.","Exported %1 rows." -"Export has been done.","Export has been done." +"The export is finished.","The export is finished." "Please provide filter data.","Please provide filter data." -"Cannot determine attribute filter type","Cannot determine attribute filter type" +"We can\'t determine the attribute filter type.","We can\'t determine the 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" +"We can\'t identify this file format.","We can\'t identify this file format." +"Please correct the value for ""%1"" column.","Please correct the value for ""%1"" column." +"Please specify the writer.","Please specify the writer." +"The destination file path must be a string.","The destination file path must be a string." +"The destination directory is not writable.","The 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" +"The header column names are already set.","The header column names are already set." +"Data validation is failed. Please fix errors and re-upload the file.","Data validation is failed. Please fix errors and re-upload the file." "in rows","in rows" -"Validation finished successfully","Validation finished successfully" -"File does not contain data.","File does not contain data." +"The validation is complete.","The validation is complete." +"This file does not contain any data.","This file does not contain any 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" +"The import was successful.","The import was successful." +"The file you uploaded has no extension.","The file you uploaded has no extension." +"The source file moving process failed.","The source file moving process 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","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." +"Import data validation is complete.","Import data validation is complete." +"The behavior token for %1 is invalid.","The behavior token for %1 is invalid." +"Please enter a correct entity model","Please enter a correct entity model" +"Source file coping failed","Source file coping failed" +"The source is not set.","The source is not set." +"The adapter type must be a non-empty string.","The adapter type must be a non-empty string." +"\'%1\' file extension is not supported","\'%1\' file extension is not supported" "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." +"ImportExport: Import Data validation - Validation strategy not found","ImportExport: Import Data validation - Validation strategy not found" "Cannot get autoincrement value","Cannot get autoincrement value" "Error in data structure: %1 values are mixed","Error in data structure: %1 values are mixed" -"Add/Update","Add/Update" -"Field separator","Field separator" -"Multiple value separator","Multiple value separator" -"Images File Directory","Images File Directory" -"For Type ""Local Server"" use relative path to Magento installation, e.g. var/export, var/import, var/export/some/dir","For Type ""Local Server"" use relative path to Magento installation, e.g. var/export, var/import, var/export/some/dir" -"Replace Existing Complex Data","Replace Existing Complex Data" -"Delete Entities","Delete Entities" +"-- Please Select --","-- Please Select --" +label,label +Add/Update,Add/Update +Replace,Replace +Delete,Delete +"Note: Product IDs will be regenerated.","Note: Product IDs will be regenerated." "Add/Update Complex Data","Add/Update Complex Data" +"Delete Entities","Delete Entities" "Custom Action","Custom Action" +"Error message","Error message" +"URL key for specified store already exists.","URL key for specified store already exists." "Entity Attributes","Entity Attributes" +Continue,Continue "Validation Results","Validation Results" +ID,ID "Start Date&Time","Start Date&Time" +User,User "Imported File","Imported File" "Error File","Error File" "Execution Time","Execution Time" +Summary,Summary diff --git a/app/code/Magento/Indexer/i18n/en_US.csv b/app/code/Magento/Indexer/i18n/en_US.csv index aab33db9d1840..66627d5a3e358 100644 --- a/app/code/Magento/Indexer/i18n/en_US.csv +++ b/app/code/Magento/Indexer/i18n/en_US.csv @@ -1,19 +1,23 @@ -Status,Status -Description,Description -Never,Never -Updated,Updated -Mode,Mode -"Update on Save","Update on Save" -Ready,Ready -Processing,Processing "Indexer Management","Indexer Management" "Update by Schedule","Update by Schedule" +"Update on Save","Update on Save" "Reindex required","Reindex required" +Ready,Ready +Processing,Processing +Never,Never "Index Management","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." +"%1 indexer(s) are in ""Update by Schedule"" mode.","%1 indexer(s) are in ""Update by Schedule"" mode." "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." +"%1 indexer(s) are in ""Update on Save"" mode.","%1 indexer(s) are in ""Update on Save"" mode." +"One or more indexers are invalid. Make sure your Magento cron job is running.","One or more indexers are invalid. Make sure your Magento cron job is running." "State for the same indexer","State for the same indexer" "State for the same view","State for the same view" +"Some Exception Message","Some Exception Message" +"Test Phrase","Test Phrase" +"Change indexer mode","Change indexer mode" Indexer,Indexer +Description,Description +Mode,Mode +Status,Status +Updated,Updated diff --git a/app/code/Magento/Integration/i18n/en_US.csv b/app/code/Magento/Integration/i18n/en_US.csv index 9a94fa0c430bd..2ed3de8fbf52a 100644 --- a/app/code/Magento/Integration/i18n/en_US.csv +++ b/app/code/Magento/Integration/i18n/en_US.csv @@ -1,63 +1,107 @@ -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" +API,API +Save,Save "Save & Activate","Save & Activate" "New Integration","New Integration" "Edit Integration '%1'","Edit Integration '%1'" "Integration Info","Integration Info" +General,General +Name,Name +Email,Email "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." +"Current User Identity Verification","Current User Identity Verification" +"Your Password","Your Password" "Integration Details","Integration Details" +"Basic Settings","Basic Settings" "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" +Remove,Remove +View,View +Edit,Edit 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." +"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." "Integration ID is not specified or is invalid.","Integration ID is not specified or is invalid." +"Internal error. Check exception log for details.","Internal error. Check exception log for details." "View ""%1"" Integration","View ""%1"" Integration" "Edit ""%1"" Integration","Edit ""%1"" Integration" -"The integration '%1' has been saved.","The integration '%1' has been saved." +"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" +"Cannot edit integrations created via config file.","Cannot edit integrations created via config file." +"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' 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." +"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled." +"This user has no tokens.","This user has no tokens." +"The tokens could not be revoked.","The tokens could not be revoked." +"Sorry, something went wrong granting permissions. You can find out more in the exceptions log.","Sorry, something went wrong granting permissions. You can find out more in the exceptions log." +"Something went wrong while deleting roles and permissions. You can find out more in the exceptions log.","Something went wrong while deleting roles and permissions. You can find out more in the exceptions log." +"This customer has no tokens.","This customer has no tokens." +Inactive,Inactive +Active,Active +Reset,Reset +"Integration with name \'%1\' exists.","Integration with name \'%1\' exists." +"Integration with ID \'%1\' does not exist.","Integration with ID \'%1\' does not exist." +"One or more integrations have been reset because of a change to their xml configs.","One or more integrations have been reset because of a change to their xml configs." "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." +"Incorrect timestamp value in the oauth_timestamp parameter","Incorrect timestamp value in the oauth_timestamp parameter" +"The nonce is already being used by the consumer with ID %1","The nonce is already being used by the consumer with ID %1" +"An error occurred validating the nonce","An error occurred validating the nonce" +"Cannot convert to access token due to token is not request type","Cannot convert to access token due to token is not request type" +"Consumer key has expired","Consumer key has expired" +"Cannot create request token because consumer token is not a verifier token","Cannot create request token because consumer token is not a verifier token" +"Request token is not associated with the specified consumer","Request token is not associated with the specified consumer" +"Token is already being used","Token is already being used" +"Cannot get access token because consumer token is not a request token","Cannot get access token because consumer token is not a request token" +"Token is not associated with the specified consumer","Token is not associated with the specified consumer" +"Token is not an access token","Token is not an access token" +"Access token has been revoked","Access token has been revoked" +"Consumer key is not the correct length","Consumer key is not the correct length" +"A consumer having the specified key does not exist","A consumer having the specified key does not exist" +"Verifier is invalid","Verifier is invalid" +"Verifier is not the correct length","Verifier is not the correct length" +"Token verifier and verifier token do not match","Token verifier and verifier token do not match" +"A consumer with the ID %1 does not exist","A consumer with the ID %1 does not exist" +"Token is not the correct length","Token is not the correct length" +"Specified token does not exist","Specified token does not exist" +"A token with consumer ID %1 does not exist","A token with consumer ID %1 does not exist" +"Unexpected error. Unable to create oAuth consumer account.","Unexpected error. Unable to create oAuth consumer account." +"Unexpected error. Unable to load oAuth consumer account.","Unexpected error. Unable to load oAuth consumer account." "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." +"Unable to post data to consumer due to an unexpected error","Unable to post data to consumer due to an unexpected error" +"Consumer with ID \'%1\' does not exist.","Consumer with ID \'%1\' does not exist." +"Invalid token to except","Invalid token to except" +"Integration with ID '%1' doesn't exist.","Integration with ID '%1' doesn't exist." +"Your account is temporarily disabled.","Your account is temporarily disabled." +"You have entered an invalid password for current user.","You have entered an invalid password for current user." +"A token with consumer ID 0 does not exist","A token with consumer ID 0 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:" +"No permissions requested","No permissions requested" "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 +"Available APIs","Available APIs" +"Resource Access","Resource Access" +Custom,Custom +All,All +Resources,Resources "Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later." +Allow,Allow +Done,Done +Extensions,Extensions OAuth,OAuth "Cleanup Settings","Cleanup Settings" "Cleanup Probability","Cleanup Probability" @@ -66,10 +110,8 @@ OAuth,OAuth "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" -"Integer. Launch cleanup in X OAuth requests. 0 (not recommended) - to disable cleanup","Integer. Launch cleanup in X OAuth requests. 0 (not recommended) - to disable cleanup" -"Cleanup entries older than X minutes.","Cleanup entries older than X minutes." -"Timeout for OAuth consumer credentials Post request within X seconds.","Timeout for OAuth consumer credentials Post request within X seconds." -"Number of maximum redirects for OAuth consumer credentials Post request.","Number of maximum redirects for OAuth consumer credentials Post request." -"Consumer key/secret will expire if not used within X seconds after Oauth token exchange starts.","Consumer key/secret will expire if not used within X seconds after Oauth token exchange starts." +"Integration configuration file","Integration configuration file" +"Integrations API Configuration","Integrations API Configuration" +"Integrations API configuration file","Integrations API configuration file" +"We couldn't find any records.","We couldn't find any records." +Status,Status diff --git a/app/code/Magento/LayeredNavigation/i18n/en_US.csv b/app/code/Magento/LayeredNavigation/i18n/en_US.csv index 458c5d7556565..253291047ff75 100644 --- a/app/code/Magento/LayeredNavigation/i18n/en_US.csv +++ b/app/code/Magento/LayeredNavigation/i18n/en_US.csv @@ -1,19 +1,22 @@ +"Filterable (with results)","Filterable (with results)" +"Filterable (no results)","Filterable (no results)" No,No -Previous,Previous +"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" +"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." +"Use in Search Results Layered Navigation","Use in Search Results Layered Navigation" Position,Position -"Shop By","Shop By" -"Shopping Options","Shopping Options" +"Position in Layered Navigation","Position in Layered Navigation" +"Position of attribute in layered navigation block.","Position of attribute in layered navigation block." +item,item +items,items +"Now Shopping by","Now Shopping by" +Previous,Previous +Remove,Remove "Remove This Item","Remove This Item" +"Shop By","Shop By" "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:" +"Shopping Options","Shopping Options" "Layered Navigation","Layered Navigation" "Display Product Count","Display Product Count" "Price Navigation Step Calculation","Price Navigation Step Calculation" diff --git a/app/code/Magento/Marketplace/i18n/en_US.csv b/app/code/Magento/Marketplace/i18n/en_US.csv index 8c1698ba3b1ab..a71a3dbe766fc 100644 --- a/app/code/Magento/Marketplace/i18n/en_US.csv +++ b/app/code/Magento/Marketplace/i18n/en_US.csv @@ -1,13 +1,13 @@ +Partners,Partners +"Magento Marketplace","Magento Marketplace" "Platinum Partners","Platinum Partners" -"Representing Magento's highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform.","Representing Magento's highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform." +"Representing Magento\'s highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform.","Representing Magento\'s highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform." "Featured Platinum Partners","Featured Platinum Partners" "Partner search","Partner search" "Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possible customer experiences. They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. Visit the Magento Partner Directory to see all of our trusted partners.","Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possible customer experiences. They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. Visit the Magento Partner Directory to see all of our trusted partners." "More Partners","More Partners" -"Magento Marketplace","Magento Marketplace" "Extensions and Themes are an essential component of the Magento Ecosystem. Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store.","Extensions and Themes are an essential component of the Magento Ecosystem. Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store." "Visit Magento Marketplaces","Visit Magento Marketplaces" "Read More","Read More" "Partner Page","Partner Page" "No partners were found","No partners were found" -"Find Partners & Extensions","Find Partners & Extensions" diff --git a/app/code/Magento/MediaStorage/i18n/en_US.csv b/app/code/Magento/MediaStorage/i18n/en_US.csv index b5cc34a4d4963..67cd9ff2fd20f 100644 --- a/app/code/Magento/MediaStorage/i18n/en_US.csv +++ b/app/code/Magento/MediaStorage/i18n/en_US.csv @@ -1,10 +1,25 @@ -"Requested resource not found","Requested resource not found" +Synchronize,Synchronize +"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." "File %1 does not exist","File %1 does not exist" "File %1 is not readable","File %1 is not readable" +"File System","File System" +Database,Database +"database ""%1""","database ""%1""" "Parent directory does not exist: %1","Parent directory does not exist: %1" "File system","File system" "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 set available and/or protected paths list(s) before validation.","Please set available and/or protected paths list(s) before validation." +"File with an extension ""%value%"" is protected and cannot be uploaded","File with an extension ""%value%"" is protected and cannot be uploaded" "Unable to create directory: %1","Unable to create directory: %1" "Unable to save file: %1","Unable to save file: %1" +"Storage Configuration for Media","Storage Configuration for Media" +"Media Storage","Media Storage" +"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" diff --git a/app/code/Magento/Msrp/i18n/en_US.csv b/app/code/Magento/Msrp/i18n/en_US.csv index be8e733a4bfd1..d647f8527ec15 100644 --- a/app/code/Magento/Msrp/i18n/en_US.csv +++ b/app/code/Magento/Msrp/i18n/en_US.csv @@ -1,2 +1,18 @@ -"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront." -"Warning!","Warning!" +"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." +"On Gesture","On Gesture" +"In Cart","In Cart" +"Before Order Confirmation","Before Order Confirmation" +"Use config","Use config" +"Click for price","Click for price" +"What's this?","What's this?" +"Order total will be displayed before you submit the order","Order total will be displayed before you submit the order" +"You will see the order total before you submit the order.","You will see the order total before you submit the order." +Price,Price +"Actual Price","Actual Price" +"Add to Cart","Add to Cart" +"Minimum Advertised Price","Minimum Advertised Price" +"Enable MAP","Enable MAP" +"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" diff --git a/app/code/Magento/Multishipping/i18n/en_US.csv b/app/code/Magento/Multishipping/i18n/en_US.csv index 223b8ae5c284f..7a6798accd33a 100644 --- a/app/code/Magento/Multishipping/i18n/en_US.csv +++ b/app/code/Magento/Multishipping/i18n/en_US.csv @@ -1,80 +1,89 @@ -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,Total "Total for this address","Total for this address" "Shipping Methods","Shipping Methods" +"Edit Address","Edit Address" +"Edit Billing Address","Edit Billing Address" +"Edit Shipping Address","Edit Shipping Address" +"Create Billing Address","Create Billing Address" +"Create Shipping Address","Create Shipping Address" "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 check shipping address information.","Please check shipping address information." +"Please check billing address information.","Please check billing address information." "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." +"A payment method is not defined.","A 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." -"Please check shipping address information.","Please check shipping address information." "Select Addresses","Select Addresses" +"Shipping Information","Shipping Information" +"Billing Information","Billing Information" +"Place Order","Place Order" "Order Success","Order Success" "Default Billing","Default Billing" "Default Shipping","Default Shipping" "Select Address","Select Address" +"Add New Address","Add New 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" +Product,Product +Qty,Qty "Send To","Send To" -"Shipping selection is not applicable.","Shipping selection is not applicable." -"Continue to Shipping Information","Continue to Shipping Information" +"A shipping selection is not applicable.","A shipping selection is not applicable." +Actions,Actions +"Remove Item","Remove Item" +"Remove item","Remove item" +"Go to Shipping Information","Go to Shipping Information" "Update Qty & Addresses","Update Qty & Addresses" +"Enter a New Address","Enter a New Address" "Back to Shopping Cart","Back to Shopping Cart" -"Continue to Review Your Order","Continue to Review Your Order" +"Billing Address","Billing Address" +Change,Change +"Payment Method","Payment Method" +"Go to Review Your Order","Go 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 is not applicable.","Shipping is not applicable." +"Product Name","Product Name" +"Check Out with Multiple Addresses","Check Out with Multiple Addresses" +"Address %1 of %2","Address %1 of %2" "Shipping To","Shipping To" +"Shipping Method","Shipping Method" +"Incl. Tax","Incl. Tax" +"Excl. Tax","Excl. Tax" +"Order Review","Order Review" +Item,Item +Edit,Edit +Price,Price +Subtotal,Subtotal +Items,Items "Grand Total:","Grand Total:" "Submitting order information...","Submitting order information..." -"Select Shipping Method","Select Shipping Method" +"Sorry, no quotes are available for this order right now.","Sorry, no quotes are available for this order right now." "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." +"Thank you for your purchase!","Thank you for your purchase!" +"Thanks for your order. We\'ll email you order details and tracking information.","Thanks for your order. We\'ll email you order details and tracking information." +"Your order numbers are: ","Your order numbers are: " +"Your order number is: ","Your order number is: " +"Continue Shopping","Continue Shopping" +"We can\'t complete your order because you don\'t have a payment method set up.","We can\'t complete your order because you don\'t have a payment method set up." +"Please choose a payment method.","Please choose a payment method." +"Multishipping Settings Section","Multishipping Settings Section" "Multishipping Settings","Multishipping Settings" +Options,Options "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" +"Review Order","Review Order" +"Select Shipping Method","Select Shipping Method" +"We received your order!","We received your order!" diff --git a/app/code/Magento/Newsletter/i18n/en_US.csv b/app/code/Magento/Newsletter/i18n/en_US.csv index a30b48f0c939a..0af075250c7aa 100644 --- a/app/code/Magento/Newsletter/i18n/en_US.csv +++ b/app/code/Magento/Newsletter/i18n/en_US.csv @@ -1,49 +1,8 @@ -Cancel,Cancel +"Delete Selected Problems","Delete Selected Problems" +"Unsubscribe Selected","Unsubscribe Selected" 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" -"Delete Template","Delete Template" -"Convert to Plain Text","Convert to Plain Text" "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" -"Unsubscribe Selected","Unsubscribe Selected" "Save Newsletter","Save Newsletter" "Save and Resume","Save and Resume" "View Newsletter","View Newsletter" @@ -51,73 +10,109 @@ Recipients,Recipients "Queue Information","Queue Information" "Queue Date Start","Queue Date Start" "Subscribers From","Subscribers From" +Subject,Subject +"Sender Name","Sender Name" +"Sender Email","Sender Email" +Message,Message "Newsletter Styles","Newsletter Styles" Start,Start Pause,Pause "Do you really want to cancel the queue?","Do you really want to cancel the queue?" +Cancel,Cancel Resume,Resume +Preview,Preview +"Add New Template","Add New Template" "Newsletter Templates","Newsletter Templates" +"Convert to Plain Text","Convert to Plain Text" "Return HTML Version","Return HTML Version" +"Delete Template","Delete Template" "Save As","Save As" +"Save Template","Save Template" "Edit Newsletter Template","Edit Newsletter Template" "New Newsletter Template","New Newsletter Template" +"Template Information","Template Information" +"Template Name","Template Name" +"Template Subject","Template Subject" +"Template Content","Template Content" +"Template Styles","Template Styles" "No Templates Found","No Templates Found" +ID,ID +Template,Template Added,Added +Updated,Updated Sender,Sender "Template Type","Template Type" -"Queue Newsletter...","Queue Newsletter..." -"Newsletter Problems Report","Newsletter Problems Report" -"Newsletter Problem Reports","Newsletter Problem Reports" +Action,Action +"Queue Newsletter","Queue 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 Problems Report","Newsletter Problems Report" +"Newsletter Problem Reports","Newsletter Problem Reports" "Newsletter Queue","Newsletter Queue" "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." +"You saved the newsletter queue.","You saved the newsletter queue." "Newsletter Subscribers","Newsletter Subscribers" +Newsletter,Newsletter Subscribers,Subscribers "Please select one or more subscribers.","Please select one or more subscribers." +"Total of %1 record(s) were deleted.","Total of %1 record(s) were deleted." +"A total of %1 record(s) were updated.","A total of %1 record(s) were updated." +"The newsletter template has been deleted.","The newsletter template has been deleted." +"We can\'t delete this template right now.","We can\'t delete this template right now." +"Edit Template","Edit Template" +"New Template","New Template" "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 this template.","Something went wrong while saving this template." +"Newsletter Subscription","Newsletter Subscription" "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 register.","Sorry, but the administrator denied subscription for guests. ' 'Please register." +"Sorry, but the administrator denied subscription for guests. Please register.","Sorry, but the administrator denied subscription for guests. Please register." +"Please enter a valid email address.","Please enter a valid email address." +"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." +"You unsubscribed.","You unsubscribed." +"Something went wrong while unsubscribing you.","Something went wrong while unsubscribing you." +Sent,Sent Cancelled,Cancelled +"Not Sent","Not Sent" +Sending,Sending +Paused,Paused "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 ' '{{var subscriber.getUnsubscriptionLink()}}' '","Follow this link to unsubscribe ' '{{var subscriber.getUnsubscriptionLink()}}' '" +"Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}","Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}" "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." +"Please enter a new template name.","Please enter a new template name." " Copy"," Copy" +"Are you sure you want to delete this template?","Are you sure you want to delete this template?" "Sign Up for Our Newsletter:","Sign Up for Our Newsletter:" "Enter your email address","Enter your email address" Subscribe,Subscribe -CSV,CSV -"Excel XML","Excel XML" +"Thank you for subscribing to our newsletter.","Thank you for subscribing to our newsletter." +"To begin receiving the newsletter, you must first confirm your subscription by clicking on the following link:","To begin receiving the newsletter, you must first confirm your subscription by clicking on the following link:" +"You have been successfully subscribed to our newsletter.","You have been successfully subscribed to our newsletter." +"You have been unsubscribed from the newsletter.","You have been unsubscribed from the newsletter." +"Newsletter Template","Newsletter Template" +"Newsletter Section","Newsletter Section" "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" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." "Success Email Sender","Success Email Sender" "Success Email Template","Success Email Template" "Unsubscription Email Sender","Unsubscription Email Sender" @@ -130,12 +125,24 @@ Subscriber,Subscriber "Error Text","Error Text" "Queue Start","Queue Start" "Queue End","Queue End" +Status,Status Processed,Processed +Recipients,Recipients Unsubscribe,Unsubscribe +Delete,Delete +CSV,CSV +"Excel XML","Excel XML" +Email,Email +Type,Type +Guest,Guest +Customer,Customer "Customer First Name","Customer First Name" "Customer Last Name","Customer Last Name" "Not Activated","Not Activated" Subscribed,Subscribed Unsubscribed,Unsubscribed Unconfirmed,Unconfirmed -"Newsletter Template","Newsletter Template" +"Web Site","Web Site" +Store,Store +"Store View","Store View" +"Newsletter Subscriptions","Newsletter Subscriptions" diff --git a/app/code/Magento/OfflinePayments/i18n/en_US.csv b/app/code/Magento/OfflinePayments/i18n/en_US.csv index 9066dca05a762..43a743b29e3dd 100644 --- a/app/code/Magento/OfflinePayments/i18n/en_US.csv +++ b/app/code/Magento/OfflinePayments/i18n/en_US.csv @@ -1,21 +1,21 @@ -Enabled,Enabled -"Sort Order","Sort Order" -Title,Title "Make Check payable to:","Make Check payable to:" "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" +"Place Order","Place Order" +"Check / Money Order","Check / Money Order" +Enabled,Enabled "New Order Status","New Order Status" +"Sort Order","Sort Order" +Title,Title "Payment from Applicable Countries","Payment from Applicable Countries" "Payment from Specific Countries","Payment from Specific Countries" +"Make Check Payable to","Make Check Payable to" "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 diff --git a/app/code/Magento/OfflineShipping/i18n/en_US.csv b/app/code/Magento/OfflineShipping/i18n/en_US.csv index 7e5f5065d38fa..9c79289affc4c 100644 --- a/app/code/Magento/OfflineShipping/i18n/en_US.csv +++ b/app/code/Magento/OfflineShipping/i18n/en_US.csv @@ -1,16 +1,6 @@ -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 +"Zip/Postal Code","Zip/Postal Code" "Shipping Price","Shipping Price" "Export CSV","Export CSV" "Store Pickup","Store Pickup" @@ -22,28 +12,41 @@ Region/State,Region/State "# 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." +None,None "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" +"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"")" +No,No +"For matching items only","For matching items only" +"For shipment with matching items","For shipment with matching items" +"Field ","Field " +" is required."," is required." +"Flat Rate","Flat Rate" +Enabled,Enabled +"Method Name","Method Name" +Price,Price "Calculate Handling Fee","Calculate Handling Fee" "Handling Fee","Handling Fee" -"Displayed Error Message","Displayed Error Message" +"Sort Order","Sort Order" +Title,Title +Type,Type "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" +"Displayed Error Message","Displayed Error Message" "Table Rates","Table Rates" +Condition,Condition "Include Virtual Products in Price Calculation","Include Virtual Products in Price Calculation" +Export,Export +Import,Import +"Free Shipping","Free Shipping" "Minimum Order Amount","Minimum Order Amount" +"-- Please Select --","-- Please Select --" diff --git a/app/code/Magento/PageCache/i18n/en_US.csv b/app/code/Magento/PageCache/i18n/en_US.csv index abacc674024d7..0969aa936939b 100644 --- a/app/code/Magento/PageCache/i18n/en_US.csv +++ b/app/code/Magento/PageCache/i18n/en_US.csv @@ -1,4 +1,4 @@ -"Export VCL","Export VCL" +"Export VCL for Varnish %1","Export VCL for Varnish %1" "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 Cache","Built-in Cache" "Varnish Cache (Recommended)","Varnish Cache (Recommended)" @@ -6,8 +6,8 @@ "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. +"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." @@ -16,4 +16,4 @@ "TTL for public content","TTL for public content" "Public content cache lifetime in seconds. If field is empty default value 86400 will be saved. ","Public content cache lifetime in seconds. If field is empty default value 86400 will be saved. " "Page Cache","Page Cache" -"Full page caching.","Full page caching." +"Full page caching","Full page caching" diff --git a/app/code/Magento/Payment/i18n/en_US.csv b/app/code/Magento/Payment/i18n/en_US.csv index 6ecc7884d0c65..76f5396d2d316 100644 --- a/app/code/Magento/Payment/i18n/en_US.csv +++ b/app/code/Magento/Payment/i18n/en_US.csv @@ -1,41 +1,58 @@ -No,No -Discount,Discount -"Credit Card Type","Credit Card Type" -"Credit Card Number","Credit Card Number" -"Expiration Date","Expiration Date" -"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 +"We cannot retrieve the payment method model object.","We cannot retrieve the payment method model object." Month,Month Year,Year -"Start Date","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." +N/A,N/A +"Credit Card Type","Credit Card Type" +"Credit Card Number","Credit Card Number" "Switch/Solo/Maestro Issue Number","Switch/Solo/Maestro Issue Number" "Switch/Solo/Maestro Start Date","Switch/Solo/Maestro Start Date" +"We cannot retrieve the transparent payment method model object.","We cannot retrieve the transparent payment method model object." +"Command Executor for %1 is not defined.","Command Executor for %1 is not defined." +"Command %1 does not exist.","Command %1 does not exist." +"Transaction has been declined. Please try again later.","Transaction has been declined. Please try again later." +"Wrong gateway response format.","Wrong gateway response format." +"Validator for field %1 does not exist.","Validator for field %1 does not exist." +Discount,Discount +Shipping,Shipping "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." +"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." +"The void action is not available.","The void action is not available." "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." +"The credit card number doesn\'t match the credit card type.","The credit card number doesn\'t match the 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." +"This credit card type is not allowed for this payment method.","This 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." +"Please enter a valid credit card expiration date.","Please enter a valid credit card expiration date." +"%1 class doesn\'t implement \Magento\Payment\Model\MethodInterface","%1 class doesn\'t implement \Magento\Payment\Model\MethodInterface" +Yes,Yes +No,No +"Failure #1","Failure #1" +"Failure #2","Failure #2" +"Expiration Date","Expiration Date" +"Card Verification Number","Card Verification Number" "Switch/Solo/Maestro Only","Switch/Solo/Maestro Only" "Issue Number","Issue Number" +"Start Date","Start Date" " is not available. You still can process offline actions."," is not available. You still can process offline actions." +"Please Select","Please Select" +"We\'ll ask for your payment details before you place an order.","We\'ll ask for your payment details before you place an order." +"--Please Select--","--Please Select--" +"Card Verification Number Visual Reference","Card Verification Number Visual Reference" +"What is this?","What is this?" +"Credit Card Information","Credit Card Information" +"Place Order","Place Order" +"Forgot an Item?","Forgot an Item?" +"Edit Your Cart","Edit Your Cart" +"Payment Methods Section","Payment Methods Section" +"Payment Services","Payment Services" "Payment Methods","Payment Methods" diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv index 6dd455401072a..088dff63fe34c 100644 --- a/app/code/Magento/Paypal/i18n/en_US.csv +++ b/app/code/Magento/Paypal/i18n/en_US.csv @@ -45,33 +45,34 @@ Close,Close "Invalid block type","Invalid block type" "Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again." "You canceled the billing agreement.","You canceled the billing agreement." -"We can't cancel the billing agreement.","We can't cancel the billing agreement." +"We can\'t cancel the billing agreement.","We can\'t cancel the billing agreement." "You deleted the billing agreement.","You deleted the billing agreement." -"We can't delete the billing agreement.","We can't delete the billing agreement." +"We can\'t delete the billing agreement.","We can\'t delete the billing agreement." Reports,Reports Sales,Sales "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 can't fetch reports from ""%1@%2.""","We can't fetch reports from ""%1@%2.""" +"We can\'t fetch reports from ""%1@%2.""","We can\'t fetch reports from ""%1@%2.""" "The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled." "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." -"We can't start the billing agreement wizard.","We can't start the billing agreement wizard." +"We couldn\'t finish the billing agreement wizard.","We couldn\'t finish the billing agreement wizard." +"We can\'t start the billing agreement wizard.","We can\'t start the billing agreement wizard." "Billing Agreement # %1","Billing Agreement # %1" -"We can't initialize Express Checkout.","We can't initialize Express Checkout." +"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." "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" "Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order." -"We can't place the order.","We can't place the order." -"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 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 start Express Checkout.","We can\'t start Express Checkout." "To check out, please sign in with your email address.","To check out, please sign in with your email address." -"We can't start Express Checkout.","We can't start Express Checkout." +"Sorry, but something went wrong","Sorry, but something went wrong" "Your payment has been declined. Please try again.","Your payment has been declined. Please try again." "Requested payment method does not match with order.","Requested payment method does not match with order." "Error processing payment, please try again later.","Error processing payment, please try again later." @@ -80,8 +81,8 @@ Sales,Sales "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" "The PayPal gateway rejected the request. %1","The 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." +"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:" @@ -115,18 +116,18 @@ Never,Never "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." +"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." +"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." "A payer is not identified.","A payer is not identified." "Cannot get secure form URL from PayPal","Cannot get secure form URL from PayPal" "Last Transaction ID","Last Transaction ID" -"This customer didn't include a confirmed address.","This customer didn't include a confirmed address." +"This customer didn\'t include a confirmed address.","This customer didn\'t include a confirmed address." "The payment is authorized but not settled.","The payment is authorized but not settled." "The payment eCheck is not cleared.","The payment eCheck is not cleared." -"The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism.","The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism." -"The payment currency doesn't match any of the merchant's balances currency.","The payment currency doesn't match any of the merchant's balances currency." +"The merchant holds a non-U.S. account and doesn\'t have a withdrawal mechanism.","The merchant holds a non-U.S. account and doesn\'t have a withdrawal mechanism." +"The payment currency doesn\'t match any of the merchant\'s balances currency.","The payment currency doesn\'t 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." @@ -162,8 +163,8 @@ Never,Never "AVS Street Match","AVS Street Match" "AVS zip","AVS zip" "International AVS response","International AVS response" -"Buyer's Tax ID","Buyer's Tax ID" -"Buyer's Tax ID Type","Buyer's Tax ID Type" +"Buyer\'s Tax ID","Buyer\'s Tax ID" +"Buyer\'s Tax ID Type","Buyer\'s Tax ID Type" Chargeback,Chargeback Complaint,Complaint Dispute,Dispute @@ -215,7 +216,7 @@ CPF,CPF "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." "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 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" @@ -331,7 +332,7 @@ Daily,Daily "No Logo","No Logo" "Yes (PayPal recommends this option)","Yes (PayPal recommends this option)" "Created billing agreement #%1.","Created billing agreement #%1." -"We can't create a billing agreement for this order.","We can't create a billing agreement for this order." +"We can\'t create a billing agreement for this order.","We can\'t create a billing agreement for this order." "Pending PayPal","Pending PayPal" "PayPal Reversed","PayPal Reversed" "PayPal Canceled Reversal","PayPal Canceled Reversal" @@ -341,6 +342,8 @@ Error,Error Customer,Customer "Created At","Created At" "Updated At","Updated At" +ending,ending +expires,expires "Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click " here,here " to learn more."," to learn more." @@ -349,6 +352,10 @@ here,here "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" +"Credit Card Type","Credit Card Type" +"Credit Card Number","Credit Card Number" +"Expiration Date","Expiration Date" +"Card Verification Number","Card Verification Number" "Billing Agreement # ","Billing Agreement # " "Agreement Information","Agreement Information" "Reference ID:","Reference ID:" @@ -403,6 +410,12 @@ Continue,Continue "Save credit card info for future use.","Save credit card info for future use." "Sorry, something went wrong.","Sorry, something went wrong." "Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later." +"PayPal Section","PayPal Section" +"PayPal Settlement","PayPal Settlement" +Fetch,Fetch +Actions,Actions +Manage,Manage +"Place Order Using Billing Agreements","Place Order Using Billing Agreements" "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" @@ -440,6 +453,15 @@ Continue,Continue "Proxy Host","Proxy Host" "Proxy Port","Proxy Port" "Enable this Solution","Enable this Solution" +"Enable In-Context Checkout Experience","Enable In-Context Checkout Experience" +" + See PayPal Feature Support details and list of supported regions + here. + "," + See PayPal Feature Support details and list of supported regions + here. + " +"Merchant Account ID","Merchant Account ID" "Enable PayPal Credit","Enable PayPal Credit" "PayPal Express Checkout lets you give customers access to financing through PayPal Credit® - 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 PayPal Credit®. @@ -450,27 +472,23 @@ Continue,Continue " "Advertise PayPal Credit","Advertise PayPal Credit" " - Why Advertise Financing?
+ Why Advertise Financing?
Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing from PayPal Credit®. 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 PayPal Credit® 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. See Details. + or more. See Details. "," - Why Advertise Financing?
+ Why Advertise Financing?
Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing from PayPal Credit®. 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 PayPal Credit® 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. See Details. + or more. See Details. " "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 ""PayPal"" per store views.","It is recommended to set this value to ""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" "Home Page","Home Page" Display,Display Position,Position @@ -480,6 +498,7 @@ Size,Size "Checkout Cart Page","Checkout Cart Page" "Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout" Title,Title +"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views." "Sort Order","Sort Order" "Payment Action","Payment Action" "Display on Product Details Page","Display on Product Details Page" @@ -575,19 +594,19 @@ User,User "Test Mode","Test Mode" "Use Proxy","Use Proxy" " - Why Advertise Financing?
+ Why Advertise Financing?
Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing from PayPal Credit®. 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 PayPal Credit® 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. See Details. + or more. See Details. "," - Why Advertise Financing?
+ Why Advertise Financing?
Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing from PayPal Credit®. 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 PayPal Credit® 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. See Details. + or more. See Details. " "Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced" "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." @@ -607,22 +626,21 @@ User,User "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" " - Why Advertise Financing?
+ Why Advertise Financing?
Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing from PayPal Credit®. 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 PayPal Credit® 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. See Details. + or more. See Details. "," - Why Advertise Financing?
+ Why Advertise Financing?
Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing from PayPal Credit®. 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 PayPal Credit® 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. See Details. + or more. See Details. " "Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution" -"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views." "Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step" "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" @@ -645,31 +663,17 @@ User,User "Payflow Pro (Includes Express Checkout)","Payflow Pro (Includes Express Checkout)" "Payflow Pro and Express Checkout","Payflow Pro and Express Checkout" " - Why Advertise Financing?
+ Why Advertise Financing?
Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing from PayPal Credit®. 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 PayPal Credit® 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. See Details. + or more. See Details. "," - Why Advertise Financing?
+ Why Advertise Financing?
Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing from PayPal Credit®. 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 PayPal Credit® 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. See Details. + or more. See Details. " -"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" -"Display on Product Details Page","Display on Product Details Page" -verified,verified -unverified,unverified -Eligible,Eligible -Ineligible,Inligible -"PayPal Express Checkout","PayPal Express Checkout" -"payflowpro", "PayflowPro" -"Requested payment method does not match with order.","Requested payment method does not match with order." diff --git a/app/code/Magento/Persistent/i18n/en_US.csv b/app/code/Magento/Persistent/i18n/en_US.csv index cf99cb92b8aa4..09ff5532e5e94 100644 --- a/app/code/Magento/Persistent/i18n/en_US.csv +++ b/app/code/Magento/Persistent/i18n/en_US.csv @@ -1,16 +1,18 @@ -"(Not %1?)","(Not %1?)" +"Not you?","Not you?" "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." +"Method ""%1"" is not defined in ""%2""","Method ""%1"" is not defined in ""%2""" +"To check out, please sign in using your email address.","To check out, please sign in using your email address." "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" +"What\'s this?","What\'s this?" +"Check "Remember Me" to access your shopping cart on this computer even if you are not signed in.","Check "Remember Me" to access your shopping cart on this computer even if you are not signed in." +"Check \'Remember Me\' to access your shopping cart on this computer even if you are not signed in.","Check \'Remember Me\' to access your shopping cart on this computer even if you are not signed in." "Persistent Shopping Cart","Persistent Shopping Cart" +"General Options","General Options" "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" +"Clear Persistence on Sign Out","Clear Persistence on Sign Out" "Persist Shopping Cart","Persist Shopping Cart" diff --git a/app/code/Magento/ProductAlert/i18n/en_US.csv b/app/code/Magento/ProductAlert/i18n/en_US.csv index 8ecf4372a4f07..a7459f383df03 100644 --- a/app/code/Magento/ProductAlert/i18n/en_US.csv +++ b/app/code/Magento/ProductAlert/i18n/en_US.csv @@ -1,31 +1,35 @@ -"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." +"There are not enough parameters.","There are not enough parameters." +"We can\'t update the alert subscription right now.","We can\'t update the alert subscription right now." "Alert subscription has been saved.","Alert subscription has been saved." "You deleted the alert subscription.","You deleted the alert subscription." +"We can\'t find the product.","We can\'t find the product." "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." +"Unable to update the alert subscription.","Unable to update the alert subscription." "You will no longer receive stock alerts for this product.","You will no longer receive stock alerts for this product." +"The product was not found.","The product was not found." "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 change alert! We wanted you to know that prices have changed for these products:","Price change alert! We wanted you to know that prices have changed for these products:" Price:,Price: -"Click here not to receive alerts for this product.","Click here not to receive alerts for this product." +"Click here to stop alerts for this product.","Click here to stop 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:" +"In stock alert! We wanted you to know that these products are now available:","In stock alert! We wanted you to know that these products are now available:" "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" +"Product alerts cron warnings","Product alerts cron warnings" +"%name,","%name," +"Product Alerts","Product Alerts" "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" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." "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 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." +Frequency,Frequency +"Start Time","Start Time" +"Error Email Recipient","Error Email Recipient" +"Error Email Sender","Error Email Sender" +"Error Email Template","Error Email Template" +"Notify me when the price drops","Notify me when the price drops" +"Notify me when this product is in stock","Notify me when this product is in stock" diff --git a/app/code/Magento/ProductVideo/i18n/en_US.csv b/app/code/Magento/ProductVideo/i18n/en_US.csv index 7047317396999..4cfabe1592dd2 100644 --- a/app/code/Magento/ProductVideo/i18n/en_US.csv +++ b/app/code/Magento/ProductVideo/i18n/en_US.csv @@ -1,9 +1,42 @@ -"Add video","Add video" -"New Video","New Video" -"Product Video","Product Video" -"YouTube API key","YouTube API key" -"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved." -"Url","Url" +Url,Url +Title,Title +Description,Description "Preview Image","Preview Image" "Get Video Information","Get Video Information" -"Youtube or Vimeo supported","Youtube or Vimeo supported" +"Hide from Product Page","Hide from Product Page" +Role,Role +"YouTube and Vimeo supported.","YouTube and Vimeo supported." +"Vimeo supported.
To add YouTube video, please enter YouTube API Key first.","Vimeo supported.
To add YouTube video, please enter YouTube API Key first." +"Could not get preview image information. Please check your connection and try again.","Could not get preview image information. Please check your connection and try again." +"Add Video","Add Video" +"Browse to find or drag image here","Browse to find or drag image here" +"Delete video","Delete video" +"Delete image","Delete image" +Hidden,Hidden +"Alt Text","Alt Text" +"Image Size","Image Size" +{size},{size} +"Image Resolution","Image Resolution" +"{width}^{height} px","{width}^{height} px" +Title:,Title: +Uploaded:,Uploaded: +Uploader:,Uploader: +Duration:,Duration: +"Video Error","Video Error" +"Unknown video type","Unknown video type" +"Invalid video url","Invalid video url" +"Youtube API key is invalid","Youtube API key is invalid" +"Video cant be shown due to the following reason: ","Video cant be shown due to the following reason: " +"Video not found","Video not found" +"New Video","New Video" +Save,Save +Cancel,Cancel +Delete,Delete +"Edit Video","Edit Video" +"Images and Videos","Images and Videos" +"Product Video","Product Video" +"YouTube API Key","YouTube API Key" +"Autostart base video","Autostart base video" +"Show related video","Show related video" +"Auto restart video","Auto restart video" +"Images And Videos","Images And Videos" diff --git a/app/code/Magento/Quote/i18n/en_US.csv b/app/code/Magento/Quote/i18n/en_US.csv index 9e7925f16e2e2..dc071d42df5f6 100644 --- a/app/code/Magento/Quote/i18n/en_US.csv +++ b/app/code/Magento/Quote/i18n/en_US.csv @@ -1,22 +1,24 @@ -Subtotal,Subtotal -Discount,Discount -"Grand Total","Grand Total" -Tax,Tax -Shipping,Shipping -"Store Credit","Store Credit" -"An item option with code %1 already exists.","An item option with code %1 already exists." -"Discount (%1)","Discount (%1)" -"Shipping & Handling","Shipping & Handling" -"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." +"Unable to save address. Please check input data.","Unable to save address. Please check input data." +"Cart %1 doesn\'t contain products","Cart %1 doesn\'t contain products" +"Could not apply coupon code","Could not apply coupon code" +"Coupon code is not valid","Coupon code is not valid" +"Could not delete coupon code","Could not delete coupon code" +"Shipping address is not set","Shipping address is not set" +"The requested Payment Method is not available.","The requested Payment Method is not available." "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\Quote\Model\Quote\Address\Total\AbstractTotal.","The address total model should be extended from \Magento\Quote\Model\Quote\Address\Total\AbstractTotal." -"Subscription Items","Subscription Items" -"Regular Payment","Regular Payment" +"The address total model should be extended from + \Magento\Quote\Model\Quote\Address\Total\AbstractTotal.","The address total model should be extended from + \Magento\Quote\Model\Quote\Address\Total\AbstractTotal." +"Grand Total","Grand Total" "Shipping & Handling (%1)","Shipping & Handling (%1)" +"Shipping & Handling","Shipping & Handling" +Shipping,Shipping +Subtotal,Subtotal "We found an invalid item option format.","We found an invalid item option format." +"An item option with code %1 already exists.","An item option with code %1 already exists." "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." @@ -24,8 +26,32 @@ Shipping,Shipping "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." +"Cart %1 doesn\'t contain item %2","Cart %1 doesn\'t contain item %2" +"Could not save quote","Could not save quote" +"Could not remove item from quote","Could not remove item from quote" +"The qty value is required to update quote item.","The qty value is required to update quote item." +"Invalid customer id %1","Invalid customer id %1" +"Invalid address id %1","Invalid address id %1" +"Cannot create quote","Cannot create quote" +"Cannot assign customer to the given cart. The cart belongs to different store.","Cannot assign customer to the given cart. The cart belongs to different store." +"Cannot assign customer to the given cart. The cart is not anonymous.","Cannot assign customer to the given cart. The cart is not anonymous." +"Cannot assign customer to the given cart. Customer already has active cart.","Cannot assign customer to the given cart. Customer already has active cart." +"Cannot place order.","Cannot place order." +"This item price or quantity is not valid for checkout.","This item price or quantity is not valid for checkout." "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." +"Store Credit","Store Credit" +Discount,Discount +Tax,Tax +"Cart contains virtual product(s) only. Shipping address is not applicable.","Cart contains virtual product(s) only. Shipping address is not applicable." +"Shipping address not set.","Shipping address not set." +"Shipping method is not applicable for empty cart","Shipping method is not applicable for empty cart" +"Cart contains virtual product(s) only. Shipping method is not applicable.","Cart contains virtual product(s) only. Shipping method is not applicable." +"Carrier with such method not found: %1, %2","Carrier with such method not found: %1, %2" +"Cannot set shipping method. %1","Cannot set shipping method. %1" +error123,error123 +error345,error345 +Carts,Carts +"Manage carts","Manage carts" diff --git a/app/code/Magento/Reports/i18n/en_US.csv b/app/code/Magento/Reports/i18n/en_US.csv index a13d243b60b94..8b01a51aba0af 100644 --- a/app/code/Magento/Reports/i18n/en_US.csv +++ b/app/code/Magento/Reports/i18n/en_US.csv @@ -1,104 +1,59 @@ -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" -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" -"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" -"Match Period To","Match Period To" +Filter,Filter +"Date Used","Date Used" +Day,Day +Month,Month +Year,Year Period,Period +From,From +To,To +Yes,Yes +No,No "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." +Refresh,Refresh +"We can\'t find records for this period.","We can\'t find records for this period." "Show Reviews","Show Reviews" "Products Report","Products Report" Downloads,Downloads +Product,Product +Link,Link +SKU,SKU Purchases,Purchases CSV,CSV "Excel XML","Excel XML" -Viewed,Viewed -Purchased,Purchased +Unlimited,Unlimited "Low stock","Low stock" "Products Ordered","Products Ordered" "Most Viewed","Most Viewed" "Show Report","Show Report" Interval,Interval +Total,Total +Price,Price +Views,Views "Refresh Statistics","Refresh Statistics" "Customers Reviews","Customers Reviews" "Reviews for %1","Reviews for %1" +Customer,Customer +Title,Title Detail,Detail +Created,Created "Products Reviews","Products Reviews" "Products Bestsellers Report","Products Bestsellers Report" +"Order Quantity","Order Quantity" "Coupons Usage Report","Coupons Usage Report" +Subtotal,Subtotal +"Coupon Code","Coupon Code" "Price Rule","Price Rule" +Uses,Uses "Sales Subtotal","Sales Subtotal" "Sales Discount","Sales Discount" "Sales Total","Sales Total" +Discount,Discount "Total Invoiced vs. Paid Report","Total Invoiced vs. Paid Report" +Orders,Orders "Invoiced Orders","Invoiced Orders" "Total Invoiced","Total Invoiced" "Paid Invoices","Paid Invoices" @@ -110,84 +65,129 @@ Detail,Detail "Offline Refunds","Offline Refunds" "Total Ordered Report","Total Ordered Report" "Sales Items","Sales Items" +Items,Items +Revenue,Revenue Profit,Profit +Invoiced,Invoiced Paid,Paid +Refunded,Refunded "Sales Tax","Sales Tax" +Tax,Tax "Sales Shipping","Sales Shipping" +Shipping,Shipping +Canceled,Canceled "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 +"Tax Amount","Tax Amount" "Abandoned carts","Abandoned carts" +Email,Email +Products,Products +Quantity,Quantity "Applied Coupon","Applied Coupon" +Updated,Updated +"IP Address","IP Address" +Customers,Customers +ID,ID +"First Name","First Name" +"Last Name","Last Name" +"Items in Cart","Items in Cart" "Products in carts","Products in carts" Carts,Carts +Name,Name "Wish Lists","Wish Lists" -"Wishlist Purchase","Wishlist Purchase" +"Wish List Purchase","Wish List 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 statistics, ' 'click here.","Last updated: %1. To refresh last day's statistics, ' 'click here." +Reports,Reports +"Last updated: %1. To refresh last day\'s statistics, click here.","Last updated: %1. To refresh last day\'s statistics, click here." "New Accounts Report","New Accounts Report" -"Order Count Report","Order Count Report" "Customers by Number of Orders","Customers by Number of Orders" +"Order Count Report","Order Count Report" "Order Total Report","Order Total Report" +"Downloads Report","Downloads Report" +"Low Stock","Low Stock" +"Low Stock Report","Low Stock 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" +"Product Views Report","Product Views Report" +"An error occurred while showing the product views report. Please review the log and try again.","An error occurred while showing the product views report. Please review the log and try again." Review,Review Reviews,Reviews -"Customer Reviews Report","Customer Reviews Report" "Customers Report","Customers Report" +"Customer Reviews Report","Customer Reviews Report" "Product Reviews Report","Product Reviews Report" -"Sales Report","Sales Report" +"Product Reviews","Product Reviews" +Details,Details +Sales,Sales "Bestsellers Report","Bestsellers Report" -"Tax Report","Tax Report" -"Shipping Report","Shipping Report" +Coupons,Coupons +"Coupons Report","Coupons Report" "Invoice Report","Invoice Report" "Refunds Report","Refunds Report" -"Coupons Report","Coupons Report" -Coupons,Coupons +"Sales Report","Sales Report" +"Orders Report","Orders Report" +"Shipping Report","Shipping Report" +"Tax Report","Tax Report" +"Shopping Cart","Shopping Cart" +"Abandoned Carts","Abandoned Carts" "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." +"You refreshed lifetime statistics.","You refreshed lifetime statistics." +"We can\'t refresh lifetime statistics.","We can\'t refresh lifetime statistics." "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." +"We can\'t refresh recent statistics.","We can\'t refresh recent 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" +Bestsellers,Bestsellers "Most Viewed Products Report","Most Viewed Products Report" +Error,Error "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" +"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:" +"All Websites","All Websites" "Recently Viewed","Recently Viewed" -"Recently Compared Products","Recently Compared Products" -"Recently Viewed Products","Recently Viewed Products" +"Add to Cart","Add to Cart" +"In stock","In stock" +"Out of stock","Out of stock" +"Add to Wish List","Add to Wish List" +"Add to Compare","Add to Compare" "Recently Compared","Recently Compared" +"Learn More","Learn More" +Marketing,Marketing +"Products in Cart","Products in Cart" +"Abandoned Cart","Abandoned Cart" +"Search Terms","Search Terms" +"By Customers","By Customers" +"By Products","By Products" +Refunds,Refunds +"Order Total","Order Total" +"Order Count","Order Count" +New,New +Ordered,Ordered "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" +Dashboard,Dashboard "Year-To-Date Starts","Year-To-Date Starts" "Current Month Starts","Current Month Starts" "Select day of the month.","Select day of the month." +"Recently Viewed Products","Recently Viewed Products" "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" @@ -195,36 +195,31 @@ Statistics,Statistics "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" +"Recently Compared Products","Recently Compared Products" "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." +Average,Average "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." +"For accurate reporting, be sure to refresh lifetime statistics whenever you change the time zone.","For accurate reporting, be sure to refresh lifetime statistics whenever you change the time zone." +Guest,Guest +Action,Action "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." +"Order Created","Order Created" +"Order Updated","Order Updated" +"The Order Updated report is created in real time and does not require a refresh.","The Order Updated report is created in real time and does not require a refresh." "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." +"Are you sure you want to refresh lifetime statistics right now? This operation may slow down your customers' shopping experience.","Are you sure you want to refresh lifetime statistics right now? This operation may slow down your customers' shopping experience." "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?" +"Are you sure you want to refresh statistics for the last day?","Are you sure you want to refresh statistics for the last day?" +Report,Report +Description,Description undefined,undefined -"Products in Cart","Products in Cart" -"By Customers","By Customers" -"By Products","By Products" -Refunds,Refunds -"PayPal Settlement","PayPal Settlement" -"Order Count","Order Count" -Bestseller,Bestseller -"Date Used","Date Used" -"For accurate reporting, be sure to refresh lifetime statistics whenever you change the time zone.","For accurate reporting, be sure to refresh lifetime statistics whenever you change the time zone." diff --git a/app/code/Magento/Review/i18n/en_US.csv b/app/code/Magento/Review/i18n/en_US.csv index 941143029a0b5..b27c7b1a99684 100644 --- a/app/code/Magento/Review/i18n/en_US.csv +++ b/app/code/Magento/Review/i18n/en_US.csv @@ -1,66 +1,47 @@ -"Are you sure?","Are you sure?" -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" +"New Review","New Review" "Review Details","Review Details" +Product,Product "Product Rating","Product Rating" -"Visible In","Visible In" +Status,Status +Visibility,Visibility Nickname,Nickname "Summary of Review","Summary of Review" +Review,Review +Previous,Previous "Save and Previous","Save and Previous" "Save and Next","Save and Next" +Next,Next "Delete Review","Delete Review" +"Are you sure you want to do this?","Are you sure you want to do this?" "Edit Review '%1'","Edit Review '%1'" -"New Review","New Review" -"%2 %3 (%4)","%2 %3 (%4)" +"%2 %3 (%4)","%2 %3 (%4)" Administrator,Administrator -"Posted By","Posted By" +Guest,Guest +Author,Author "Summary Rating","Summary Rating" "Detailed Rating","Detailed Rating" -"Pending Reviews RSS","Pending Reviews RSS" +ID,ID +Created,Created +Title,Title +Type,Type +SKU,SKU +Action,Action +Edit,Edit +Delete,Delete +"Are you sure?","Are you sure?" "Update Status","Update Status" +Customer,Customer "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" +Name,Name "Product Store Name","Product Store Name" +Price,Price +Quantity,Quantity +Websites,Websites "Manage Ratings","Manage Ratings" "Add New Rating","Add New Rating" "Save Rating","Save Rating" @@ -68,56 +49,74 @@ Administrator,Administrator "Edit Rating #%1","Edit Rating #%1" "New Rating","New Rating" "Rating Title","Rating Title" +"Default Value","Default Value" "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." +"Sort Order","Sort Order" "Rating Information","Rating Information" +"Product Reviews","Product Reviews" +"Pending product review(s)","Pending product review(s)" +"Product: %2
","Product: %2
" +"Summary of review: %1
","Summary of review: %1
" +"Review: %1
","Review: %1
" +"Store: %1
","Store: %1
" +"Click here to see the review.","Click here to see the review." +"Product: ""%1"" reviewed by: %2","Product: ""%1"" reviewed by: %2" +"Pending Reviews RSS","Pending Reviews RSS" +"Reviews %1","Reviews %1" +Reviews,Reviews +"The review has been deleted.","The review has been deleted." +"Something went wrong deleting this review.","Something went wrong deleting this review." "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." +"We can\'t retrieve the product ID.","We can\'t retrieve the product ID." +"Please select review(s).","Please select review(s)." +"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted." +"Something went wrong while deleting these records.","Something went wrong while deleting these records." +"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated." +"Something went wrong while updating these review(s).","Something went wrong while updating these review(s)." "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." +"The review was removed by another user or does not exist.","The review was removed by another user or does not exist." "You deleted the rating.","You deleted the rating." Ratings,Ratings +"You saved the rating.","You saved the rating." "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." +"You submitted your review for moderation.","You submitted your review for moderation." +"We can\'t post your review right now.","We can\'t post your review right now." "Storage key was not set","Storage key was not set" Approved,Approved +Pending,Pending "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." +"Please enter a review summary.","Please enter a review summary." +"Please enter a nickname.","Please enter a nickname." +"Please enter a review.","Please enter a review." "Rating isn't Available","Rating isn't Available" +"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." "Assigned Options","Assigned Options" "Option Title:","Option Title:" +"Product Name","Product Name" Rating,Rating +Actions,Actions +"See Details","See Details" "You have submitted no reviews.","You have submitted no reviews." +Back,Back "My Recent Reviews","My Recent Reviews" -"View All Reviews","View All Reviews" +"View All","View All" "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):" +"Your Review","Your Review" +"Submitted on %1","Submitted on %1" "Back to My Reviews","Back to My Reviews" +"Ratings Review Summary","Ratings Review Summary" "Be the first to review this product","Be the first to review this product" "Write Your Own Review","Write Your Own Review" +"* Required Fields","* Required Fields" "You're reviewing:","You're reviewing:" -"How do you rate this product?","How do you rate this product?" +"Your Rating","Your Rating" "%1 %2","%1 %2" -"Summary of Your Review","Summary of Your Review" +Summary,Summary "Submit Review","Submit Review" -"Only registered users can write reviews. Please, log in or register","Only registered users can write reviews. Please, log in or register" -Review(s),Review(s) +"Only registered users can write reviews. Please Sign in or create an account","Only registered users can write reviews. Please Sign in or create an account" "Add Your Review","Add Your Review" "%1 Review(s)","%1 Review(s)" "Review by","Review by" @@ -127,4 +126,8 @@ Review(s),Review(s) "Product Rating:","Product Rating:" "Product Review (submitted on %1):","Product Review (submitted on %1):" "Back to Product Reviews","Back to Product Reviews" +"By Customers","By Customers" +"By Products","By Products" "Allow Guests to Write Reviews","Allow Guests to Write Reviews" +Active,Active +Inactive,Inactive diff --git a/app/code/Magento/Rss/i18n/en_US.csv b/app/code/Magento/Rss/i18n/en_US.csv index 3115697730fff..c9f5532c3f6a6 100644 --- a/app/code/Magento/Rss/i18n/en_US.csv +++ b/app/code/Magento/Rss/i18n/en_US.csv @@ -1,56 +1,8 @@ -Subtotal,Subtotal -Discount,Discount -"Grand Total","Grand Total" -Tax,Tax -Catalog,Catalog -From:,From: -To:,To: -"Gift Message","Gift Message" -Message:,Message: -"Click for price","Click for price" -"New Products","New Products" -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: %2
","Product: %2
" -"Summary of review: %1
","Summary of review: %1
" -"Review: %1
","Review: %1
" -"Store: %1
","Store: %1
" -"Click here to view the review.","Click here 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
","Notified Date: %1
" -"Comment: %1
","Comment: %1
" -"Current Status: %1
","Current Status: %1
" -"Total: %1
","Total: %1
" -"%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" +"Page not found.","Page not found." +Feed,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 Section","RSS Feeds Section" "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/Rule/i18n/en_US.csv b/app/code/Magento/Rule/i18n/en_US.csv index bdbdc90e3b03c..53258e206d2ae 100644 --- a/app/code/Magento/Rule/i18n/en_US.csv +++ b/app/code/Magento/Rule/i18n/en_US.csv @@ -1,33 +1,34 @@ -Remove,Remove Apply,Apply -Add,Add -"Please wait, loading...","Please wait, loading..." -"Attribute Set","Attribute Set" -Category,Category -"Conditions Combination","Conditions Combination" -contains,contains -"Open Chooser","Open Chooser" -"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" -is,is -"is not","is not" -"Invalid discount amount.","Invalid discount amount." +"Please choose a valid discount amount.","Please choose a valid 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." +"Please specify a website.","Please specify a website." +"Please specify Customer Groups.","Please specify Customer Groups." to,to by,by "Please choose an action to add.","Please choose an action to add." "Perform following actions","Perform following actions" +is,is +"is not","is not" +"equals or greater than","equals or greater than" +"equals or less than","equals or less than" +"greater than","greater than" +"less than","less than" +contains,contains "does not contain","does not contain" +"is one of","is one of" +"is not one of","is not one of" "Please choose a condition to add.","Please choose a condition to add." +Add,Add +Remove,Remove ALL,ALL ANY,ANY TRUE,TRUE FALSE,FALSE "If %1 of these conditions are %2:","If %1 of these conditions are %2:" +"Conditions Combination","Conditions Combination" +"Attribute Set","Attribute Set" +Category,Category +"Open Chooser","Open Chooser" +"Unknown condition operator","Unknown condition operator" "There is no information about associated entity type ""%1"".","There is no information about associated entity type ""%1""." +"This won\'t take long . . .","This won\'t take long . . ." diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv index 6b1649aa33f3e..a3367fd46e31d 100644 --- a/app/code/Magento/Sales/i18n/en_US.csv +++ b/app/code/Magento/Sales/i18n/en_US.csv @@ -1,186 +1,28 @@ -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 -"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 -"Account Information","Account Information" -"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" -"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" -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." -New,New -"Custom Price","Custom Price" -Processing,Processing -"Add To Order","Add To Order" -"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" -"Shipping & Handling","Shipping & Handling" "Credit Memos","Credit Memos" +Orders,Orders Invoices,Invoices -"We cannot get the order instance.","We cannot get the order instance." +"We can\'t get the order instance right now.","We can\'t get the order instance right now." "Create New Order","Create New Order" "Save Order Address","Save Order Address" +Shipping,Shipping +Billing,Billing "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 Comment","Submit Comment" "Submit Order","Submit Order" "Are you sure you want to cancel this order?","Are you sure you want to cancel this order?" +Cancel,Cancel +"Billing Address","Billing Address" +"Payment Method","Payment Method" "Order Comment","Order Comment" -"Please select a customer.","Please select a customer." +Coupons,Coupons +"Please select a customer","Please select a customer" "Create New Customer","Create New Customer" +"Account Information","Account Information" +From,From +To,To +Message,Message "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" @@ -194,13 +36,30 @@ Invoices,Invoices "%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" +Configure,Configure "This product does not have any configurable options","This product does not have any configurable options" +"Newsletter Subscription","Newsletter Subscription" +"Please select products","Please select products" "Add Selected Product(s) to Order","Add Selected Product(s) to Order" +ID,ID +Product,Product +SKU,SKU +Price,Price +Select,Select +Quantity,Quantity +"Shipping Address","Shipping Address" +"Shipping Method","Shipping Method" "Update Changes","Update Changes" +"Shopping Cart","Shopping Cart" "Are you sure you want to delete all items from shopping cart?","Are you sure you want to delete all items from shopping cart?" +"Clear Shopping Cart","Clear Shopping Cart" "Products in Comparison List","Products in Comparison List" +"Recently Compared Products","Recently Compared Products" +"Recently Viewed Products","Recently Viewed Products" "Last Ordered Items","Last Ordered Items" -"Please select a store.","Please select a store." +"Recently Viewed","Recently Viewed" +"Wish List","Wish List" +"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)" @@ -209,40 +68,45 @@ Invoices,Invoices "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" +"Update Qty\'s","Update Qty\'s" Refund,Refund "Refund Offline","Refund Offline" "Paid Amount","Paid Amount" "Refund Amount","Refund Amount" +"Shipping Amount","Shipping 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" +"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?" +Void,Void +Print,Print +"The credit memo email was sent.","The credit memo email was sent." +"The credit memo email wasn\'t sent.","The credit memo email wasn\'t 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?" +"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" +"The invoice email was sent.","The invoice email was sent." +"The invoice email wasn\'t sent.","The invoice email wasn\'t sent." "Invoice #%1 | %2 | %4 (%3)","Invoice #%1 | %2 | %4 (%3)" +"Invalid parent block for this block","Invalid parent block for this block" "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" +"Order Status","Order Status" "Order State","Order State" "Use Order Status As Default","Use Order Status As Default" -"Visible On Frontend","Visible On Frontend" +"Visible On Storefront","Visible On Storefront" "Edit Order Status","Edit Order Status" "Save Status","Save Status" "New Order Status","New Order Status" @@ -251,9 +115,11 @@ Capture,Capture "Status Label","Status Label" "Store View Specific Labels","Store View Specific Labels" "Total Paid","Total Paid" +"Total Refunded","Total Refunded" "Total Due","Total Due" +Edit,Edit "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?" +"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 @@ -269,9 +135,10 @@ 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." +"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" +" [deleted]"," [deleted]" "Order Credit Memos","Order Credit Memos" "Credit memo #%1 created","Credit memo #%1 created" "Credit memo #%1 comment added","Credit memo #%1 comment added" @@ -282,16 +149,30 @@ Reorder,Reorder "Tracking number %1 for %2 assigned","Tracking number %1 for %2 assigned" "Comments History","Comments History" "Order History","Order History" +Information,Information "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" +Any,Any +Specified,Specified +"Applies to Any of the Specified Order Statuses except canceled orders","Applies to Any of the Specified Order Statuses except canceled orders" +"Cart Price Rule","Cart Price Rule" +Yes,Yes +No,No "Show Actual Values","Show Actual Values" +"New Order RSS","New Order RSS" +Subtotal,Subtotal +"Shipping & Handling","Shipping & Handling" +"Discount (%1)","Discount (%1)" +Discount,Discount +"Grand Total","Grand Total" +Back,Back Fetch,Fetch "Transaction # %1 | %2","Transaction # %1 | %2" +N/A,N/A Key,Key Value,Value "We found an invalid entity model.","We found an invalid entity model." @@ -300,168 +181,212 @@ Value,Value "View Another Order","View Another Order" "About Your Refund","About Your Refund" "My Orders","My Orders" +"Subscribe to Order Status","Subscribe to Order Status" "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." +"We can\'t add this item to your shopping cart right now.","We can\'t add this item to your shopping cart right now." +"You sent the message.","You sent the message." +Sales,Sales "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." +"Please enter a comment.","Please enter a comment." "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." +"We can\'t update the order address right now.","We can\'t update the order address right now." +"You have not canceled the item.","You have not canceled the item." +"You canceled the order.","You canceled the order." +"""%1"" coupon code was not applied. Do not apply discount is selected for item(s)","""%1"" coupon code was not applied. Do not apply discount is selected for item(s)" """%1"" coupon code is not valid.","""%1"" coupon code is not valid." "The coupon code has been accepted.","The coupon code has been accepted." +"Quote item id is not received.","Quote item id is not received." +"Quote item is not loaded.","Quote item is not loaded." "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" +"You created the order.","You created the order." +"Order saving error: %1","Order saving error: %1" +"Cannot add new comment.","Cannot add new comment." +"The credit memo has been canceled.","The credit memo has been canceled." +"Credit memo has not been canceled.","Credit memo has not been canceled." "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." +"The credit memo\'s total must be positive.","The 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." +"We can\'t save the credit memo right now.","We can\'t save the credit memo right now." +"We can\'t update the item\'s quantity right now.","We can\'t update the item\'s quantity right now." +"View Memo for #%1","View Memo for #%1" +"View Memo","View 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." +"We can\'t void the credit memo.","We can\'t void the credit memo." +"The order no longer exists.","The order no longer exists." +"We can\'t create credit memo for the order.","We can\'t create credit memo for the order." "Edit Order","Edit Order" -"The invoice no longer exists.","The invoice no longer exists." +"You sent the order email.","You sent the order email." +"We can\'t send the email order right now.","We can\'t send the email order right now." +"You have not put the order on hold.","You have not put the order on hold." +"You put the order on hold.","You put the order on hold." +"You canceled the invoice.","You canceled the invoice." +"Invoice canceling error","Invoice canceling error" +"The invoice has been captured.","The invoice has been captured." +"Invoice capturing error","Invoice capturing error" "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." +"You can\'t create an invoice without products.","You can\'t 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." +"We can\'t save the invoice right now.","We can\'t save the invoice right now." +"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" +"We can\'t send the invoice email right now.","We can\'t send the invoice email right now." +"We can\'t send the shipment right now.","We can\'t send the shipment right now." +"Cannot update item quantity.","Cannot update item quantity." "The invoice has been voided.","The invoice has been voided." "Invoice voiding error","Invoice voiding error" +"%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 accepted.","The payment has been accepted." +"The payment has been denied.","The payment has been denied." +"Transaction has been approved.","Transaction has been approved." +"Transaction has been voided/declined.","Transaction has been voided/declined." +"There is no update for the transaction.","There is no update for the transaction." +"We can\'t update the payment right now.","We can\'t update the payment right now." +"You assigned the order status.","You assigned the order status." +"Something went wrong while assigning the order status.","Something went wrong while assigning the order status." +"We can\'t find this order status.","We can\'t find this order status." "Create New Order Status","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.","An error occurred while assigning order status. Status has not been assigned." +"You saved the order status.","You saved the order status." +"We can\'t add the order status right now.","We can\'t add the order status right now." "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 unassigning the order.","Something went wrong while unassigning the order." +"Can\'t unhold order.","Can\'t unhold order." +"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." +"Exception occurred during order load","Exception occurred during order load" "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." +"You saved the gift card message.","You saved the gift card message." +"The payment has been voided.","The payment has been voided." +"We can\'t void the payment right now.","We can\'t void the payment right now." "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." +"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." +Home,Home +"Go to Home Page","Go to Home Page" +"We can\'t find this wish list.","We can\'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." +"Please specify order items.","Please specify order items." +"Please specify a shipping method.","Please specify a shipping method." +"Please specify a payment method.","Please specify a payment method." "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." +"Validation is failed.","Validation is failed." +"You did not email your customer. Please check your email settings.","You did not email your customer. Please check your email settings." +"Path ""%1"" is not part of allowed directory ""%2""","Path ""%1"" is not part of allowed directory ""%2""" +"Identifying Fields required","Identifying Fields required" +"Id required","Id required" "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." +Guest,Guest +"Please enter the first name.","Please enter the first name." +"Please enter the last name.","Please enter the last name." +"Please enter the street.","Please enter the street." +"Please enter the city.","Please enter the city." +"Please enter the phone number.","Please enter the phone number." +"Please enter the zip/postal code.","Please enter the zip/postal code." +"Please enter the country.","Please enter the country." +"Please enter the state/province.","Please enter the state/province." +"Requested entity doesn\'t exist","Requested entity doesn\'t exist" +"Could not delete order address","Could not delete order address" +"Could not save order address","Could not save order address" +Pending,Pending +Refunded,Refunded +Canceled,Canceled "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" +"Could not delete credit memo","Could not delete credit memo" +"Could not save credit memo","Could not save credit memo" +"This order already has associated customer account","This order already has associated customer account" +Paid,Paid "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""." +"ID required","ID required" "Unknown Status","Unknown Status" +Ordered,Ordered +Shipped,Shipped +Invoiced,Invoiced Backordered,Backordered +Returned,Returned 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""" +"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2"". Credit Memo has not been created. Please create offline Credit Memo.","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %1. Transaction ID: ""%2"". Credit Memo has not been created. Please create offline Credit Memo." "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 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." +"The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet." +"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." +"Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","Order is suspended as its authorizing amount %1 is suspected to be fraudulent." +"Authorized amount of %1","Authorized amount of %1" +"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" +"The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway." +"Ordered amount of %1","Ordered amount of %1" +"Registered notification about captured amount of %1.","Registered notification about captured amount of %1." +"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." "The parent transaction ID must have a transaction ID.","The parent transaction ID must have a transaction ID." +"Payment transactions disallow storing objects.","Payment transactions disallow storing objects." "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." +Order,Order +Authorization,Authorization "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." +"Please set a proper payment and order id.","Please set a proper payment and order id." +"Please enter a Transaction ID.","Please enter a Transaction ID." +"You can\'t do this without a transaction object.","You can\'t do this without a transaction object." +"Order # ","Order # " +"Order Date: ","Order Date: " "Sold to:","Sold to:" "Ship to:","Ship to:" +"Payment Method:","Payment Method:" "Shipping Method:","Shipping Method:" "Total Shipping Charges","Total Shipping Charges" +Title,Title +Number,Number "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." +"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." +Products,Products "Total (ex)","Total (ex)" +Qty,Qty +Tax,Tax "Total (inc)","Total (inc)" "Credit Memo # ","Credit Memo # " "Invoice # ","Invoice # " @@ -470,44 +395,126 @@ Mixed,Mixed "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." +"Excl. Tax","Excl. Tax" +"Incl. Tax","Incl. Tax" "Packing Slip # ","Packing Slip # " +title,title +"The PDF total model %1 must be or extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal.","The PDF total model %1 must be or extend \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal." "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""." +"We found an invalid quantity to ship for item ""%1"".","We found an invalid quantity to ship for item ""%1""." +"Please enter a tracking number.","Please enter a tracking number." +"Could not delete shipment","Could not delete shipment" +"Could not save shipment","Could not save shipment" +"The last status can\'t be unassigned from its current state.","The last status can\'t be unassigned from its current state." +"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)." "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." "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." +City,City +Company,Company +Country,Country +Email,Email +"First Name","First Name" +"Last Name","Last Name" +State/Province,State/Province +"Street Address","Street Address" +"Phone Number","Phone Number" +"Zip/Postal Code","Zip/Postal Code" +"We can't save the address:\n%1","We can't save the address:\n%1" +"Cannot save comment:\n%1","Cannot save comment:\n%1" +"We don\'t have enough information to save the parent transaction ID.","We don\'t have enough information to save the parent transaction ID." +"We cannot create an empty shipment.","We cannot create an empty shipment." +"Cannot save track:\n%1","Cannot save track:\n%1" +"Cannot unassign status from state","Cannot unassign status from state" +"New Orders","New Orders" +"Order #%1 created at %2","Order #%1 created at %2" +"Details for %1 #%2","Details for %1 #%2" +"Notified Date: %1","Notified Date: %1" +"Comment: %1
","Comment: %1
" +"Current Status: %1
","Current Status: %1
" +"Total: %1
","Total: %1
" +"Order # %1 Notification(s)","Order # %1 Notification(s)" +"You can not cancel Credit Memo","You can not cancel Credit Memo" +"Could not cancel creditmemo","Could not cancel creditmemo" +"We cannot register an existing credit memo.","We cannot register an existing credit memo." +"The most money available to refund is %1.","The most money available to refund is %1." +"We found an invalid quantity to invoice item ""%1"".","We found an invalid quantity to invoice item ""%1""." +"The Order State ""%1"" must not be set manually.","The Order State ""%1"" must not be set manually." +"VAT Request Identifier","VAT Request Identifier" +"VAT Request Date","VAT Request Date" "Pending Payment","Pending Payment" +Processing,Processing "On Hold","On Hold" Complete,Complete +Closed,Closed "Suspected Fraud","Suspected Fraud" "Payment Review","Payment Review" +New,New +"test message","test message" +"Email has not been sent","Email has not been sent" +" Transaction ID: ""%1"""," Transaction ID: ""%1""" +View,View +"Group was removed","Group was removed" "Changing address information will not recalculate shipping, tax or other order amount.","Changing address information will not recalculate shipping, tax or other order amount." +"Comment Text","Comment Text" +"Notify Customer by Email","Notify Customer by Email" +"Visible on Storefront","Visible on Storefront" +Customer,Customer +Notified,Notified +"Not Notified","Not Notified" +"No Payment Methods","No Payment Methods" "Order Comments","Order Comments" +"Apply Coupon Code","Apply Coupon Code" +Apply,Apply +"Remove Coupon Code","Remove Coupon Code" +Remove,Remove +"Address Information","Address Information" +"Payment & Shipping Information","Payment & Shipping Information" +"Order Total","Order Total" "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." +"Select from existing customer addresses:","Select from existing customer addresses:" +"Add New Address","Add New Address" +"Save in address book","Save in address book" +"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" +"Leave this box blank 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." +"Row Subtotal","Row Subtotal" +Action,Action +"No ordered items","No ordered items" +"Update Items and Quantities","Update Items and Quantities" +"Total %1 product(s)","Total %1 product(s)" +Subtotal:,Subtotal: +"Tier Pricing","Tier Pricing" +"Custom Price","Custom Price" +"Please select","Please select" "Move to Shopping Cart","Move to Shopping Cart" +"Move to Wish List","Move to Wish List" "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" +"You don\'t need to select a shipping method.","You don\'t need to select a shipping method." +"Customer\'s Activities","Customer\'s Activities" +Refresh,Refresh +Item,Item +"Add To Order","Add To Order" +"Configure and Add to Order","Configure and Add to Order" +"No items","No items" "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)" +"Payment & Shipping Method","Payment & Shipping Method" +"Payment Information","Payment Information" "The order was placed using %1.","The order was placed using %1." +"Shipping Information","Shipping Information" "Items to Refund","Items to Refund" "Return to Stock","Return to Stock" "Qty to Refund","Qty to Refund" +"Tax Amount","Tax Amount" +"Discount Amount","Discount Amount" "Row Total","Row Total" "No Items To Refund","No Items To Refund" "Credit Memo Comments","Credit Memo Comments" @@ -516,15 +523,25 @@ Complete,Complete "Please enter a positive number in this field.","Please enter a positive number in this field." "Items Refunded","Items Refunded" "No Items","No Items" +"Memo Total","Memo Total" "Credit Memo History","Credit Memo History" "Credit Memo Totals","Credit Memo Totals" +"Customer Name: %1","Customer Name: %1" +"Purchased From: %1","Purchased From: %1" +"Gift Message","Gift Message" +From:,From: +To:,To: +Message:,Message: +"Shipping & Handling","Shipping & Handling" +"Gift Options","Gift Options" "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." +%1,%1 "Qty to Invoice","Qty to Invoice" "Invoice History","Invoice History" "Invoice Comments","Invoice Comments" "Invoice Totals","Invoice Totals" -"Capture Amount","Capture Amount" +Amount,Amount "Capture Online","Capture Online" "Capture Offline","Capture Offline" "Not Capture","Not Capture" @@ -534,60 +551,102 @@ Complete,Complete "Total Tax","Total Tax" "From Name","From Name" "To Name","To Name" -"Add Order Comments","Add Order Comments" +Status,Status +Comment,Comment "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 & Account Information","Order & Account Information" +"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","Order Date" "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:" +"Customer Name","Customer Name" +"Customer Group","Customer Group" "Item Status","Item Status" "Original Price","Original Price" "Tax Percent","Tax Percent" +"Notes for this Order","Notes for this Order" +"Comment added","Comment added" "Transaction Data","Transaction Data" +"Transaction ID","Transaction ID" "Parent Transaction ID","Parent Transaction ID" +"Order ID","Order ID" "Transaction Type","Transaction Type" "Is Closed","Is Closed" +"Created At","Created At" "Child Transactions","Child Transactions" "Transaction Details","Transaction Details" +Items,Items "Gift Message for this Order","Gift Message for this Order" "Shipped By","Shipped By" "Tracking Number","Tracking Number" "Billing Last Name","Billing Last Name" -"Find Order By:","Find Order By:" +"Find Order By","Find Order By" "ZIP Code","ZIP Code" "Billing ZIP Code","Billing ZIP Code" +Continue,Continue "Print All Refunds","Print All Refunds" "Refund #","Refund #" "Print Refund","Print Refund" +"Product Name","Product Name" +"Order #","Order #" +Date,Date +"Ship To","Ship To" +Actions,Actions +"View Order","View Order" "You have placed no orders.","You have placed no orders." -"Order Date: %1","Order Date: %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 #" "Print Invoice","Print Invoice" "Qty Invoiced","Qty Invoiced" +Close,Close +"About Your Order","About Your Order" +"Order Date: %1","Order Date: %1" "Refund #%1","Refund #%1" -"Invoice #%1","Invoice #%1" "Shipment #%1","Shipment #%1" -"Items Shipped","Items Shipped" "Qty Shipped","Qty Shipped" +"Recent Orders","Recent Orders" "View All","View All" "Gift Message for This Order","Gift Message for This Order" -"About Your Order","About Your Order" -"Shipment Comments","Shipment Comments" +"Recently Ordered","Recently Ordered" +"Add to Cart","Add to Cart" +Search,Search +"%name,","%name," +"Thank you for your order from %store_name.","Thank you for your order from %store_name." +"You can check the status of your order by logging into your account.","You can check the status of your order by logging into your account." +"If you have questions about your order, you can email us at %store_email","If you have questions about your order, you can email us at %store_email" +"or call us at %store_phone","or call us at %store_phone" +"Our hours are %store_hours.","Our hours are %store_hours." +"Your Credit Memo #%creditmemo_id for Order #%order_id","Your Credit Memo #%creditmemo_id for Order #%order_id" +"Billing Info","Billing Info" +"Shipping Info","Shipping Info" +"Your order #%increment_id has been updated with a status of %order_status.","Your order #%increment_id has been updated with a status of %order_status." +"Your Invoice #%invoice_id for Order #%order_id","Your Invoice #%invoice_id for Order #%order_id" +"%customer_name,","%customer_name," +"Once your package ships we will send you a tracking number.","Once your package ships we will send you a tracking number." +"Your Order #%increment_id","Your Order #%increment_id" +"Placed on %created_at","Placed on %created_at" +"Once your package ships we will send an email with a link to track your order.","Once your package ships we will send an email with a link to track your order." +"Your shipping confirmation is below. Thank you again for your business.","Your shipping confirmation is below. Thank you again for your business." +"Your Shipment #%shipment_id for Order #%order_id","Your Shipment #%shipment_id for Order #%order_id" "Gift Options for ","Gift Options for " +"Add Products","Add Products" +"You have item changes","You have item changes" Ok,Ok -"Anchor Custom Title","Anchor Custom Title" -Phone,Phone -"Default Template","Default Template" -"Minimum Order Amount","Minimum Order Amount" -Comma-separated,Comma-separated +Operations,Operations +Create,Create +"Send Order Email","Send Order Email" +"Accept or Deny Payment","Accept or Deny Payment" +"Send Sales Emails","Send Sales Emails" +"Sales Section","Sales Section" +"Sales Emails Section","Sales Emails Section" +General,General "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" @@ -605,8 +664,12 @@ Comma-separated,Comma-separated "," Logo for HTML documents only. If empty, default will be used.
(jpeg, gif, png) " +Address,Address +"Minimum Order Amount","Minimum Order Amount" +Enable,Enable "Minimum Amount","Minimum Amount" "Subtotal after discount","Subtotal after discount" +"Include Tax to Amount","Include Tax to Amount" "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" @@ -615,12 +678,19 @@ Comma-separated,Comma-separated "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." +Dashboard,Dashboard "Use Aggregated Data","Use Aggregated Data" +"Orders Cron Settings","Orders Cron Settings" +"Pending Payment Order Lifetime (minutes)","Pending Payment Order Lifetime (minutes)" "Sales Emails","Sales Emails" +"Asynchronous sending","Asynchronous sending" +Enabled,Enabled "New Order Confirmation Email Sender","New Order Confirmation Email Sender" "New Order Confirmation Template","New Order Confirmation Template" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." "New Order Confirmation Template for Guest","New Order Confirmation Template for Guest" "Send Order Email Copy To","Send Order Email Copy To" +Comma-separated,Comma-separated "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" @@ -643,6 +713,7 @@ Shipment,Shipment "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 Comments","Shipment Comments" "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" @@ -660,31 +731,40 @@ Shipment,Shipment "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" +"Customer Order Status Notification","Customer Order Status Notification" +"Asynchronous indexing","Asynchronous indexing" "Orders and Returns Search Form","Orders and Returns Search Form" -"PDF Credit Memos","PDF Credit Memos" -"PDF Invoices","PDF Invoices" -"Invoice Date","Invoice Date" +"Anchor Custom Title","Anchor Custom Title" +Template,Template +"Default Template","Default Template" +Name,Name +Phone,Phone "ZIP/Post Code","ZIP/Post Code" "Signed-up Point","Signed-up Point" +Website,Website order-header,order-header -"New Order RSS","New Order RSS" +"Bill-to Name","Bill-to Name" +Created,Created +"Invoice Date","Invoice Date" +"Ship-to Name","Ship-to Name" +"Ship Date","Ship Date" +"Total Quantity","Total Quantity" +"Default Status","Default Status" +"State Code and Title","State Code and Title" +"All Store Views","All Store Views" +"PDF Credit Memos","PDF Credit Memos" +"Purchase Point","Purchase Point" "Print Invoices","Print Invoices" "Print Packing Slips","Print Packing Slips" "Print Credit Memos","Print Credit Memos" "Print All","Print All" "Print Shipping Labels","Print Shipping Labels" -"Ship Date","Ship Date" -"Total Quantity","Total Quantity" -"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)." -Operations,Operations -"Include Tax to Amount","Include Tax to Amount" -"Orders Cron Settings","Orders Cron Settings" -"Pending Payment Order Lifetime (minutes)","Pending Payment Order Lifetime (minutes)" -"Asynchronous sending","Asynchronous sending" -"Grid Settings","Grid Settings" -"Asynchronous indexing","Asynchronous indexing" -"Visible On Storefront","Visible On Storefront" -"Please select a customer","Please select a customer" +"Purchase Date","Purchase Date" +"Grand Total (Base)","Grand Total (Base)" +"Grand Total (Purchased)","Grand Total (Purchased)" +"Customer Email","Customer Email" +"Shipping and Handling","Shipping and Handling" +"PDF Invoices","PDF Invoices" +"PDF Shipments","PDF Shipments" +"PDF Creditmemos","PDF Creditmemos" +Refunds,Refunds diff --git a/app/code/Magento/SalesRule/i18n/en_US.csv b/app/code/Magento/SalesRule/i18n/en_US.csv index 6c8ff5a08cd75..0a07a321e39fa 100644 --- a/app/code/Magento/SalesRule/i18n/en_US.csv +++ b/app/code/Magento/SalesRule/i18n/en_US.csv @@ -1,89 +1,16 @@ -ID,ID -Apply,Apply -No,No -Subtotal,Subtotal -Discount,Discount -Uses,Uses +"Cart Price Rules","Cart Price Rules" +"Add New Rule","Add New Rule" Delete,Delete -Yes,Yes -"Web Site","Web Site" -Status,Status +"Are you sure you want to delete this?","Are you sure you want to delete this?" +Reset,Reset "Save and Continue Edit","Save and Continue Edit" -Description,Description -Catalog,Catalog +Save,Save 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" -"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" -"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 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 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)." +Conditions,Conditions "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." @@ -92,32 +19,68 @@ CSV,CSV "Code Suffix","Code Suffix" "Dash Every X Characters","Dash Every X Characters" "If empty no separation.","If empty no separation." +Generate,Generate +"Coupon Code","Coupon Code" +Created,Created +Uses,Uses +No,No +Yes,Yes "Times Used","Times Used" +CSV,CSV +"Excel XML","Excel XML" "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" -"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." -"Uses per Coupon","Uses per Coupon" -"Uses per Customer","Uses per Customer" -"Public In RSS Feed","Public In RSS Feed" -"Cart Price Rules","Cart Price Rules" +"Store View Specific Labels","Store View Specific Labels" +ID,ID +Rule,Rule +Start,Start +End,End +Status,Status +"%1 - Discounts and Coupons","%1 - Discounts and Coupons" +Coupons/Discounts,Coupons/Discounts +Promotions,Promotions +"You deleted the rule.","You deleted the rule." +"We can\'t delete the rule right now. Please review the log and try again.","We can\'t delete the rule right now. Please review the log and try again." +"We can\'t find a rule to delete.","We can\'t find a rule to delete." +"This rule no longer exists.","This rule no longer exists." +"Edit Rule","Edit Rule" +"New Rule","New Rule" "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" "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." +Catalog,Catalog +"The wrong rule is specified.","The wrong rule is specified." +"You saved the rule.","You saved the rule." +"Something went wrong while saving the rule data. Please review the error log.","Something went wrong while saving the rule data. Please review the error log." +Alphanumeric,Alphanumeric +Alphabetical,Alphabetical +Numeric,Numeric "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." +"Specified rule does not allow coupons","Specified rule does not allow coupons" +"Specified rule only allows auto generated coupons","Specified rule only allows auto generated coupons" +"Specified rule does not allow auto generated coupons","Specified rule does not allow auto generated coupons" +"Error occurred when saving coupon: %1","Error occurred when saving coupon: %1" +"Discount (%1)","Discount (%1)" +Discount,Discount "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." +Auto,Auto +"Can\'t acquire coupon.","Can\'t acquire coupon." +"Update the Product","Update the Product" "Special Price","Special 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" +Subtotal,Subtotal "Total Items Quantity","Total Items Quantity" +"Total Weight","Total Weight" +"Payment Method","Payment Method" +"Shipping Method","Shipping Method" "Shipping Postcode","Shipping Postcode" "Shipping Region","Shipping Region" "Shipping State/Province","Shipping State/Province" @@ -129,20 +92,73 @@ Labels,Labels "Quantity in cart","Quantity in cart" "Price in cart","Price in cart" "Row total in cart","Row total in cart" +"Conditions Combination","Conditions Combination" "Cart Item Attribute","Cart Item Attribute" +"Product Attribute","Product 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" +is,is +"is not","is not" +"equals or greater than","equals or greater than" +"equals or less than","equals or less than" +"greater than","greater than" +"less than","less than" +"is one of","is one of" +"is not one of","is not one of" "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." -"Error occurred when saving coupon: %1","Error occurred when saving coupon: %1" +"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)" +Active,Active +Inactive,Inactive +"Specified rule does not allow automatic coupon generation","Specified rule does not allow automatic coupon generation" "Error occurred when generating coupons: %1","Error occurred when generating coupons: %1" "Some coupons are invalid.","Some coupons are invalid." -"Specified rule does not allow automatic coupon generation","Specified rule does not allow automatic coupon generation" -"Specified rule does not allow coupons","Specified rule does not allow coupons" -"Specified rule only allows auto generated coupons","Specified rule only allows auto generated coupons" -"Specified rule does not allow auto generated coupons","Specified rule does not allow auto generated coupons" +"Item totals are not set for the rule.","Item totals are not set for the rule." +"%1 Cart Price Rules based on ""%2"" attribute have been disabled.","%1 Cart Price Rules based on ""%2"" attribute have been disabled." +"To test exception","To test exception" +"Apply Discount Code","Apply Discount Code" +"Enter discount code","Enter discount code" +"Apply Discount","Apply Discount" +"Cancel coupon","Cancel coupon" +"Your coupon was successfully removed.","Your coupon was successfully removed." +"Your coupon was successfully applied.","Your coupon was successfully applied." +Promotion,Promotion +"Auto Generated Specific Coupon Codes","Auto Generated Specific Coupon Codes" +"Web Site","Web Site" +Priority,Priority +"Cart Price Rule","Cart Price Rule" +Back,Back +"Rule Information","Rule Information" +"Rule Name","Rule Name" +Description,Description +Websites,Websites +"Customer Groups","Customer Groups" +Coupon,Coupon +"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. + " +"Uses per Coupon","Uses per Coupon" +"Uses per Customer","Uses per Customer" +" + Usage limit enforced for logged in customers only. + "," + Usage limit enforced for logged in customers only. + " +From,From +To,To +"Public In RSS Feed","Public In RSS Feed" +Apply,Apply +"Discount Amount","Discount Amount" +"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" +"Discard subsequent rules","Discard subsequent rules" +"Default Rule Label for All Store Views","Default Rule Label for All Store Views" diff --git a/app/code/Magento/SalesSequence/i18n/en_US.csv b/app/code/Magento/SalesSequence/i18n/en_US.csv index e69de29bb2d1d..651e75241b590 100644 --- a/app/code/Magento/SalesSequence/i18n/en_US.csv +++ b/app/code/Magento/SalesSequence/i18n/en_US.csv @@ -0,0 +1,2 @@ +"Entity Sequence profile not added to meta active profile","Entity Sequence profile not added to meta active profile" +"Not enough arguments","Not enough arguments" diff --git a/app/code/Magento/Search/i18n/en_US.csv b/app/code/Magento/Search/i18n/en_US.csv index 6e37bee7e9152..bf86a7b00badb 100644 --- a/app/code/Magento/Search/i18n/en_US.csv +++ b/app/code/Magento/Search/i18n/en_US.csv @@ -26,21 +26,24 @@ Store,Store "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." "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" Marketing,Marketing +"Search synonyms are not supported by the %1 search engine. Any synonyms you enter won\'t be used.","Search synonyms are not supported by the %1 search engine. Any synonyms you enter won\'t be used." "The synonym group has been deleted.","The synonym group has been deleted." -"We can't find a synonym group to delete.","We can't find a synonym group to delete." +"We can\'t find a synonym group to delete.","We can\'t find a synonym group to delete." "This synonyms group no longer exists.","This synonyms group no longer exists." "Edit Synonym Group","Edit Synonym Group" "Synonym Group","Synonym Group" -"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted." +"Failed to delete %1 synonym group(s).","Failed to delete %1 synonym group(s)." +"A total of %1 synonym group(s) have been deleted.","A total of %1 synonym group(s) have been deleted." "This synonym group no longer exists.","This synonym group no longer exists." +"You saved the synonym group.","You saved the synonym group." +"The terms you entered, (%1), belong to 1 existing synonym group, %2. Select the ""Merge existing synonyms"" checkbox so the terms can be merged.","The terms you entered, (%1), belong to 1 existing synonym group, %2. Select the ""Merge existing synonyms"" checkbox so the terms can be merged." +"The terms you entered, (%1), belong to %2 existing synonym groups, %3 and %4. Select the ""Merge existing synonyms"" checkbox so the terms can be merged.","The terms you entered, (%1), belong to %2 existing synonym groups, %3 and %4. Select the ""Merge existing synonyms"" checkbox so the terms can be merged." "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." +"We can\'t find a search term to delete.","We can\'t find a search term to delete." "This search no longer exists.","This search no longer exists." "Edit Search","Edit Search" "Please select searches.","Please select searches." @@ -50,10 +53,9 @@ Reports,Reports "You saved the search term.","You saved the search term." "Something went wrong while saving the search query.","Something went wrong while saving the search query." "You already have an identical search term query.","You already have an identical search term query." -"Your search query can't be longer than %1, so we shortened your query.","Your search query can't be longer than %1, so we shortened your query." +"Your search query can\'t be longer than %1, so we shortened your query.","Your search query can\'t be longer than %1, so we shortened your query." "Synonym group with id %1 cannot be deleted. %2","Synonym group with id %1 cannot be deleted. %2" -"You saved the synonym group.","You saved the synonym group." -"Global (All Store Views)","Global (All Store Views)" +"Merge conflict with existing synonym group(s): %1","Merge conflict with existing synonym group(s): %1" "All Websites","All Websites" " All Store Views"," All Store Views" "All Store Views","All Store Views" @@ -68,20 +70,18 @@ CSV,CSV ID,ID Hits,Hits "Are you sure?","Are you sure?" -Synonym,Synonym "Suggested Terms","Suggested Terms" yes,yes no,no Action,Action Edit,Edit Scope,Scope -"If your Magento site has multiple views, you can adjust the scope of this synonym group(i.e. global, website level or store view level)","If your Magento site has multiple views, you can adjust the scope of this synonym group(i.e. global, website level or store view level)" +"You can adjust the scope of this synonym group by selecting an option from the list.","You can adjust the scope of this synonym group by selecting an option from the list." Synonyms,Synonyms -"Comma separated list of synonyms","Comma separated list of synonyms" -"Merge on conflict","Merge on conflict" +"Comma-separated list of synonyms. The terms entered (separated by commas) will be used as an “OR” search query to search your entire store. For example, if you enter “shoes,footwear”, and user were to search for ""shoes"", the search results will include any product or content with term “shoes"" or ""footwear.”","Comma-separated list of synonyms. The terms entered (separated by commas) will be used as an “OR” search query to search your entire store. For example, if you enter “shoes,footwear”, and user were to search for ""shoes"", the search results will include any product or content with term “shoes"" or ""footwear.”" +"Merge existing synonyms","Merge existing synonyms" +"Automatically merges synonyms in groups that share the same scope. If you check this box and you add one or more of the same terms to different synonym groups in the same scope, automatically merges all the terms to one group. If this isn't what you want, uncheck the box and an error displays if you try to add the same terms.","Automatically merges synonyms in groups that share the same scope. If you check this box and you add one or more of the same terms to different synonym groups in the same scope, automatically merges all the terms to one group. If this isn't what you want, uncheck the box and an error displays if you try to add the same terms." "Store View","Store View" Website,Website "Delete items","Delete items" "Are you sure you want to delete the selected synonym groups?","Are you sure you want to delete the selected synonym groups?" -"The terms you entered, (%1), belong to 1 existing synonym group, %2. Select the "Merge existing synonyms" checkbox so the terms can be merged.","The terms you entered, (%1), belong to 1 existing synonym group, %2. Select the "Merge existing synonyms" checkbox so the terms can be merged." -"The terms you entered, (%1), belong to %2 existing synonym groups, %3 and %4. Select the "Merge existing synonyms" checkbox so the terms can be merged.","The terms you entered, (%1), belong to %2 existing synonym groups, %3 and %4. Select the "Merge existing synonyms" checkbox so the terms can be merged." diff --git a/app/code/Magento/Security/i18n/en_US.csv b/app/code/Magento/Security/i18n/en_US.csv index 8d86b0c6bb168..6160c41a0e1ef 100644 --- a/app/code/Magento/Security/i18n/en_US.csv +++ b/app/code/Magento/Security/i18n/en_US.csv @@ -1,20 +1,29 @@ "Account Activity","Account Activity" -"Admin Account Sharing","Admin Account Sharing" -"All other open sessions for this account were terminated","All other open sessions for this account were terminated" -"Are you sure that you want to log out all other sessions?","Are you sure that you want to log out all other sessions?" -"By Email","By Email" +"All other open sessions for this account were terminated.","All other open sessions for this account were terminated." +"We couldn't logout because of an error.","We couldn't logout because of an error." +"Someone logged into this account from another device or browser. Your current session is terminated.","Someone logged into this account from another device or browser. Your current session is terminated." +"Your current session is terminated by another user of this account.","Your current session is terminated by another user of this account." +"Your account is temporarily disabled.","Your account is temporarily disabled." +"Your current session has been expired.","Your current session has been expired." "By IP and Email","By IP and Email" "By IP","By IP" +"By Email","By Email" +None,None +"Security module: Unknown security event type","Security module: Unknown security event type" +"Too many password reset requests. Please wait and try again or contact %1.","Too many password reset requests. Please wait and try again or contact %1." +"Incorrect Security Checker class. It has to implement SecurityCheckerInterface","Incorrect Security Checker class. It has to implement SecurityCheckerInterface" +"some error","some error" +"This administrator account is open in more than one location. Note that other locations might be different browsers or sessions on the same computer.","This administrator account is open in more than one location. Note that other locations might be different browsers or sessions on the same computer." "Concurrent session information:","Concurrent session information:" -"Delay in minutes between password reset requests. Use 0 to disable.","Delay in minutes between password reset requests. Use 0 to disable." -"If set to Yes, you can log in from multiple computers into same account. Default setting No improves security.","If set to Yes, you can log in from multiple computers into same account. Default setting No improves security." "IP Address","IP Address" -"Limit Number of Password Reset Requests","Limit Number of Password Reset Requests" +"Time of session start","Time of session start" +"Are you sure that you want to log out all other sessions?","Are you sure that you want to log out all other sessions?" +"Log out all other sessions","Log out all other sessions" +"This computer is using IP address %1.","This computer is using IP address %1." +"Admin Account Sharing","Admin Account Sharing" +"If set to Yes, you can log in from multiple computers into same account. Default setting No improves security.","If set to Yes, you can log in from multiple computers into same account. Default setting No improves security." "Limit Password Reset Requests Method","Limit Password Reset Requests Method" +"Limit Number of Password Reset Requests","Limit Number of Password Reset Requests" "Limit the number of password reset request per hour. Use 0 to disable.","Limit the number of password reset request per hour. Use 0 to disable." "Limit Time Between Password Reset Requests","Limit Time Between Password Reset Requests" -"Log out all other sessions","Log out all other sessions" -"None","None" -"This administrator account is open in more than one location. Note that other location might be different browser or session on the same computer.","This administrator account is open in more than one location. Note that other location might be different browser or session on the same computer." -"This computer is using IP address %1.","This computer is using IP address %1." -"Time of session start","Time of session start" +"Delay in minutes between password reset requests. Use 0 to disable.","Delay in minutes between password reset requests. Use 0 to disable." diff --git a/app/code/Magento/SendFriend/i18n/en_US.csv b/app/code/Magento/SendFriend/i18n/en_US.csv index ae4c737497f89..6cbe26e9b2aba 100644 --- a/app/code/Magento/SendFriend/i18n/en_US.csv +++ b/app/code/Magento/SendFriend/i18n/en_US.csv @@ -1,36 +1,45 @@ -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 Templates","Email Templates" -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." +"Page not found.","Page not found." +"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." +"You\'ve met your limit of %1 sends in an hour.","You\'ve met your limit of %1 sends in an hour." +"Please enter a sender name.","Please enter a sender name." "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 message.","Please enter a message." +"Please specify at least one recipient.","Please specify at least one recipient." "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." +"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." -"Remove Email","Remove Email" +"Please define the correct sender information.","Please define the correct sender information." +"IP Address","IP Address" +"Cookie (unsafe)","Cookie (unsafe)" +"No Product Exception.","No Product Exception." +"No Category Exception.","No Category Exception." +"Some error","Some error" +"Localized Exception.","Localized Exception." +Exception.,Exception. +"Remove Recipent","Remove Recipent" +Remove,Remove +Name,Name +Email,Email +"* Required Fields","* Required Fields" +Sender,Sender +Message,Message +Invitee,Invitee "Maximum %1 email addresses allowed.","Maximum %1 email addresses allowed." +"Add Invitee","Add Invitee" +"Send Email","Send Email" +Back,Back +"%name,","%name," +"%sender_name wants to share this product with you:","%sender_name wants to share this product with you:" +"Message from %sender_name:","Message from %sender_name:" +"Email to a Friend","Email to a Friend" +"Email Templates","Email Templates" +Enabled,Enabled "Select Email Template","Select Email Template" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." "Allow for Guests","Allow for Guests" "Max Recipients","Max Recipients" "Max Products Sent in 1 Hour","Max Products Sent in 1 Hour" diff --git a/app/code/Magento/Shipping/i18n/en_US.csv b/app/code/Magento/Shipping/i18n/en_US.csv index ca8390a68b276..54d7c83e94c77 100644 --- a/app/code/Magento/Shipping/i18n/en_US.csv +++ b/app/code/Magento/Shipping/i18n/en_US.csv @@ -1,141 +1,143 @@ -"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" -"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" -"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." +"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." +"Products should be added to package(s)","Products should be added to package(s)" "The value that you entered is not valid.","The value that you entered is not valid." "Add Tracking Number","Add Tracking Number" +"Custom Value","Custom Value" +Add,Add "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?" +Print,Print "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..." +"Print Shipping Label","Print Shipping Label" +"Show Packages","Show Packages" "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." +"Order # %1","Order # %1" +"Back to My Orders","Back to My Orders" +"View Another Order","View Another Order" +"Please enter a comment.","Please enter a comment." +"Cannot add new comment.","Cannot add new comment." +"Please specify a carrier.","Please specify a carrier." "Please enter a tracking number.","Please enter a tracking number." -"New Shipment","New Shipment" -"The shipment has been created.","The shipment has been created." +Shipments,Shipments +"We can\'t initialize shipment for adding tracking number.","We can\'t initialize shipment for adding tracking number." +"Cannot add tracking number.","Cannot add tracking number." "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." +"New Shipment","New Shipment" +"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." +"We can\'t initialize shipment for delete tracking number.","We can\'t initialize shipment for delete tracking number." +"We can\'t delete tracking number.","We can\'t delete tracking number." +"We can\'t load track with retrieving identifier right now.","We can\'t load track with retrieving identifier right now." +"We can\'t save the shipment right now.","We can\'t save the shipment right now." +"The shipment has been created.","The shipment has been created." +"Cannot save shipment.","Cannot save shipment." +"The order no longer exists.","The order no longer exists." +"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." "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." +"Page not found.","Page not found." +"Tracking Information","Tracking Information" +"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." +"No packages for request","No packages for request" +"Security validation of XML document has been failed.","Security validation of XML document has been failed." +"All Allowed Countries","All Allowed Countries" +"Specific Countries","Specific Countries" Development,Development Live,Live "Divide to equal weight (one request)","Divide to equal weight (one request)" "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." +Packages,Packages +Package,Package +Type,Type +Length,Length +"Signature Confirmation","Signature Confirmation" +"Customs Value","Customs Value" +Width,Width +Contents,Contents +"Total Weight","Total Weight" +Height,Height +Size,Size +Girth,Girth +"Items in the Package","Items in the Package" +Product,Product +Weight,Weight +"Qty Ordered","Qty Ordered" +Qty,Qty +"No detail for number ""%1""","No detail for number ""%1""" +"Shipping labels is not available.","Shipping labels is not available." +"Response info is not exist.","Response info is not exist." +"Invalid carrier: %1","Invalid carrier: %1" +"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 Order","Per Order" "Per Package","Per Package" +Fixed,Fixed +Percent,Percent "Tracking information is unavailable.","Tracking information is unavailable." +message,message +"Email has not been sent","Email has not been sent" +"Payment & Shipping Method","Payment & Shipping Method" +"Payment Information","Payment Information" +"The order was placed using %1.","The order was placed using %1." +"Shipping Information","Shipping Information" +"Total Shipping Charges","Total Shipping Charges" +"Incl. Tax","Incl. Tax" "Items to Ship","Items to Ship" "Qty to Ship","Qty to Ship" +Ship,Ship +"Shipment Total","Shipment Total" "Shipment Comments","Shipment Comments" +"Comment Text","Comment Text" +"Shipment Options","Shipment Options" +"Create Shipping Label","Create Shipping Label" +"Append Comments","Append 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." +"Select All","Select All" +"Product Name","Product Name" +Delete,Delete +"Create Packages","Create Packages" +Cancel,Cancel +Save,Save +"Add Package","Add Package" +"Add Selected Product(s) to Package","Add Selected Product(s) to Package" +"Add Products to Package","Add Products to Package" +"USPS domestic shipments don\'t use package types.","USPS domestic shipments don\'t use package types." +in,in +cm,cm +lb,lb +kg,kg +"Delete Package","Delete Package" +Explanation,Explanation +Carrier,Carrier +Title,Title +Number,Number +Action,Action +"Are you sure?","Are you sure?" "Shipping & Handling Information","Shipping & Handling Information" "Track Order","Track Order" +"No shipping information available","No shipping information available" +"Shipping and Tracking Information","Shipping and Tracking Information" +"Track this shipment","Track this shipment" +"Items Shipped","Items Shipped" +"Order Total","Order Total" "Shipment History","Shipment History" +"Qty Shipped","Qty Shipped" "Print All Shipments","Print All Shipments" "Shipment #","Shipment #" "Print Shipment","Print Shipment" "Tracking Number(s):","Tracking Number(s):" +SKU,SKU +"Order tracking","Order tracking" "Tracking Number:","Tracking Number:" Carrier:,Carrier: Error:,Error: @@ -145,18 +147,35 @@ Error:,Error: "email us at ","email us at " Info:,Info: Track:,Track: +Status:,Status: "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: +N/A,N/A +"Track history","Track history" +Location,Location +Date,Date "Local Time","Local Time" +Description,Description "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" +"Close Window","Close Window" +"See our Shipping Policy","See our Shipping Policy" +"Shipping Settings Section","Shipping Settings Section" +"Shipping Policy Parameters Section","Shipping Policy Parameters Section" +"Shipping Methods Section","Shipping Methods Section" "Shipping Settings","Shipping Settings" Origin,Origin +Country,Country +Region/State,Region/State +"ZIP/Postal Code","ZIP/Postal Code" +City,City +"Street Address","Street Address" +"Street Address Line 2","Street Address Line 2" "Shipping Policy Parameters","Shipping Policy Parameters" "Apply custom Shipping Policy","Apply custom Shipping Policy" +"Shipping Policy","Shipping Policy" +"Shipping Methods","Shipping Methods" diff --git a/app/code/Magento/Sitemap/i18n/en_US.csv b/app/code/Magento/Sitemap/i18n/en_US.csv index ab061da7a8cf3..310fabce89bf2 100644 --- a/app/code/Magento/Sitemap/i18n/en_US.csv +++ b/app/code/Magento/Sitemap/i18n/en_US.csv @@ -1,21 +1,3 @@ -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" "New Sitemap","New Sitemap" @@ -23,40 +5,61 @@ Frequency,Frequency 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)" +Path,Path +"example: ""/sitemap/"" or ""/"" for base path (path must be writeable)","example: ""/sitemap/"" or ""/"" for base path (path must be writeable)" +"Store View","Store View" +Generate,Generate "XML Sitemap","XML Sitemap" "Add Sitemap","Add Sitemap" -"Site Map","Site Map" +Catalog,Catalog +"You deleted the sitemap.","You deleted the sitemap." +"We can\'t find a sitemap to delete.","We can\'t find a sitemap to delete." "This sitemap no longer exists.","This sitemap no longer exists." +"Site Map","Site Map" "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." +"We can\'t generate the sitemap right now.","We can\'t generate the sitemap right now." +"We can\'t find a sitemap to generate.","We can\'t find a sitemap to generate." +"You saved the sitemap.","You saved the sitemap." "The priority must be between 0 and 1.","The priority must be between 0 and 1." +Always,Always +Hourly,Hourly +Daily,Daily +Weekly,Weekly +Monthly,Monthly Yearly,Yearly +Never,Never "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." +None,None "Base Only","Base Only" -"Error Email Recipient","Error Email Recipient" -"Error Email Sender","Error Email Sender" -"Error Email Template","Error Email Template" +All,All +"Sitemap Generation Warnings","Sitemap Generation Warnings" +"XML Sitemap Section","XML Sitemap Section" "Categories Options","Categories Options" +Frequency,Frequency +Priority,Priority "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" +Enabled,Enabled +"Error Email Recipient","Error Email Recipient" +"Error Email Sender","Error Email Sender" +"Error Email Template","Error Email Template" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." +"Start Time","Start Time" "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" +ID,ID "Link for Google","Link for Google" "Last Generated","Last Generated" +Action,Action diff --git a/app/code/Magento/Store/i18n/en_US.csv b/app/code/Magento/Store/i18n/en_US.csv index 5cbbe3e5697db..66956dd8500e7 100644 --- a/app/code/Magento/Store/i18n/en_US.csv +++ b/app/code/Magento/Store/i18n/en_US.csv @@ -1,26 +1,36 @@ -"All Store Views","All Store Views" -"-- Please Select --","-- Please Select --" -Admin,Admin +"Invalid store parameter.","Invalid store parameter." +"Current store is not active.","Current store is not active." +"Requested store is inactive","Requested store is inactive" +"Requested store is not found","Requested store is not found" +"Environment emulation nesting is not allowed.","Environment emulation nesting is not allowed." +"Only default scope allowed","Only default scope allowed" +"Invalid scope object","Invalid scope object" "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" +"Website code may only contain letters (a-z), numbers (0-9) or underscore (_), and the first character must be a letter.","Website code may only contain letters (a-z), numbers (0-9) or underscore (_), and 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" +"The store code may contain only letters (a-z), numbers (0-9) or underscore (_), and the first character must be a letter.","The store code may contain only letters (a-z), numbers (0-9) or underscore (_), and the first character must be a letter." +"Store is inactive","Store is inactive" +"Default store is inactive","Default store is inactive" +"All Store Views","All Store Views" +"-- Please Select --","-- Please Select --" +Admin,Admin +"More than one default website is defined","More than one default website is defined" +"Default website is not defined","Default website is not defined" +"no such entity exception","no such entity exception" "Your Language:","Your Language:" "Your Language","Your Language" Language,Language "Select Store","Select Store" -"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%" +Configuration,Configuration +"Various XML configurations that were collected across modules and merged","Various XML configurations that were collected across modules and merged" Layouts,Layouts -"Layout building instructions.","Layout building instructions." +"Layout building instructions","Layout building instructions" "Blocks HTML output","Blocks HTML output" -"Page blocks HTML.","Page blocks HTML." -"Paths to view files (e.g., PHTML templates, images, CSS, JS files).","Paths to view files (e.g., PHTML templates, images, CSS, JS files)." -"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)." +"Page blocks HTML","Page blocks HTML" "Collections Data","Collections Data" -"Collection data files.","Collection data files." -"All Stores","All Stores" -"Other Settings","Other Settings" -Attribute,Attribute +"Collection data files","Collection data files" +"Reflection Data","Reflection Data" +"API interfaces reflection data","API interfaces reflection data" +"Database DDL operations","Database DDL operations" +"Results of DDL queries, such as describing tables or indexes","Results of DDL queries, such as describing tables or indexes" diff --git a/app/code/Magento/Swatches/i18n/en_US.csv b/app/code/Magento/Swatches/i18n/en_US.csv index f0aa34bbef26e..d000032ee429a 100644 --- a/app/code/Magento/Swatches/i18n/en_US.csv +++ b/app/code/Magento/Swatches/i18n/en_US.csv @@ -1,2 +1,35 @@ -"Swatch","Swatch" +"Admin is a required field in the each row","Admin is a required field in the each row" +"Update Product Preview Image","Update Product Preview Image" +"Filtering by this attribute will update the product image on catalog page","Filtering by this attribute will update the product image on catalog page" +"Use Product Image for Swatch if Possible","Use Product Image for Swatch if Possible" +"Allows use fallback logic for replacing swatch image with product swatch or base image","Allows use fallback logic for replacing swatch image with product swatch or base image" +"Visual Swatch","Visual Swatch" +"Text Swatch","Text Swatch" +"Manage Swatch (Values of Your Attribute)","Manage Swatch (Values of Your Attribute)" +"Is Default","Is Default" +Swatch,Swatch +"Add Swatch","Add Swatch" +"Sort Option","Sort Option" +Delete,Delete +"Choose a color","Choose a color" +"Upload a file","Upload a file" +Clear,Clear +"Step 2: Attribute Values","Step 2: Attribute Values" +"Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU." +"Sort Variations","Sort Variations" +Options,Options +"Select All","Select All" +"Deselect All","Deselect All" +"Remove Attribute","Remove Attribute" +"Save Option","Save Option" +"Remove Option","Remove Option" +"Create New Value","Create New Value" +"These changes affect all related products.","These changes affect all related products." "Swatches per Product","Swatches per Product" +"Swatch Image","Swatch Image" +Image,Image +"Allowed file types: jpeg, gif, png.","Allowed file types: jpeg, gif, png." +"Image Opacity","Image Opacity" +"Image Size","Image Size" +"Example format: 200x300.","Example format: 200x300." +"Image Position","Image Position" diff --git a/app/code/Magento/Tax/i18n/en_US.csv b/app/code/Magento/Tax/i18n/en_US.csv index 731dd4c7e9f80..aaffda34b4aa8 100644 --- a/app/code/Magento/Tax/i18n/en_US.csv +++ b/app/code/Magento/Tax/i18n/en_US.csv @@ -1,36 +1,3 @@ -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?" -"New Rule","New Rule" -Priority,Priority -"Edit Rule","Edit Rule" -Country,Country -"Billing Address","Billing Address" -"Shipping Address","Shipping Address" -Sales,Sales -CSV,CSV -"Excel XML","Excel XML" -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" -"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" @@ -39,73 +6,100 @@ Rate,Rate "Range From","Range From" "Range To","Range To" State,State +Country,Country "Rate Percent","Rate Percent" "Tax Titles","Tax Titles" "Add New Tax Rate","Add New Tax Rate" +Back,Back +Reset,Reset "Delete Rate","Delete Rate" +"Are you sure you want to do this?","Are you sure you want to do this?" "Save Rate","Save Rate" "Manage Tax Rules","Manage Tax Rules" "Add New Tax Rule","Add New Tax Rule" "Save Rule","Save Rule" "Delete Rule","Delete Rule" +"Save and Continue Edit","Save and Continue Edit" "Tax Rule Information","Tax Rule Information" +Name,Name "Customer Tax Class","Customer Tax Class" "Product Tax Class","Product Tax Class" "Tax Rate","Tax Rate" +Priority,Priority "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" +"Sort Order","Sort Order" "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" +"Shipping Incl. Tax (%1)","Shipping Incl. Tax (%1)" +"Shipping Excl. Tax (%1)","Shipping Excl. Tax (%1)" "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" +Sales,Sales +Tax,Tax "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." +"Tax Zones and Rates","Tax Zones and Rates" +"We can\'t delete this tax rate right now.","We can\'t delete this tax rate right now." +"An error occurred while loading this tax rate.","An error occurred while loading this tax rate." +"We can\'t save this rate right now.","We can\'t save this rate right now." +"You deleted the tax rate.","You deleted the tax rate." +"We can\'t delete this rate because of an incorrect rate ID.","We can\'t delete this rate because of an incorrect rate ID." "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" +"Edit Tax Rate","Edit Tax Rate" +"You saved the tax rate.","You saved the tax rate." "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." +"This rule no longer exists.","This rule no longer exists." "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." -"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." +"New Tax Rule","New Tax Rule" +"Edit Rule","Edit Rule" +"New Rule","New Rule" +"You saved the tax rule.","You saved the tax rule." +"We can\'t save this tax rule right now.","We can\'t save this tax rule right now." +"Invalid name of tax class specified.","Invalid name of tax class specified." +"We can\'t delete this tax class right now.","We can\'t delete this tax class right now." +"We can\'t save this tax class right now.","We can\'t save this tax class right now." +"Make sure all required information is valid.","Make sure all required information is valid." +"The Rate Percent should be a positive number.","The 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." +"Use digits only for the zip code.","Use digits only for the zip code." "Range To should be equal or greater than Range From.","Range To should be equal or greater than Range From." +"The tax rate cannot be removed. It exists in a tax rule.","The tax rate cannot be removed. It exists in a tax rule." "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 Address","Shipping Address" +"Billing Address","Billing Address" "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)" +"Invalid attribute %1","Invalid attribute %1" +Code,Code +"Invalid type supplied","Invalid type supplied" +"Class name and class type","Class name and class type" "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)" +"Subtotal (Excl. Tax)","Subtotal (Excl. Tax)" +"Subtotal (Incl. Tax)","Subtotal (Incl. Tax)" +Subtotal,Subtotal +"Unit Price","Unit Price" +"Row Total","Row Total" +Total,Total "Before Discount","Before Discount" "After Discount","After Discount" "Excluding Tax","Excluding Tax" "Including Tax","Including Tax" +None,None "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: " @@ -115,33 +109,49 @@ State,State than a customer might expect. " "Please see documentation for more details. ","Please see documentation for more details. " "Click here to go to Tax Configuration and change your settings.","Click here to go to Tax Configuration and change your settings." +"Invalid type of tax class ""%1""","Invalid type of tax class ""%1""" +"Updating classType is not allowed.","Updating classType is not allowed." +"A class with the same name already exists for ClassType %1.","A class with the same name already exists for ClassType %1." "customer group","customer group" product,product -"Import Tax Rates","Import Tax Rates" -"Export Tax Rates","Export Tax Rates" +"Excl. tax:","Excl. tax:" +"Incl. Tax","Incl. Tax" +"Entity already exists","Entity already exists" +"Cannot save titles","Cannot save titles" +"Some Message","Some Message" +"Something went wrong","Something went wrong" +"Could not save","Could not save" +"No such entity","No such entity" +"Excl. Tax","Excl. Tax" 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." +"An error occurred","An error occurred" "Do you really want to delete this tax rate?","Do you really want to delete this tax rate?" +Save,Save "Add New Class","Add New Class" -"Default Country","Default Country" -"Tax Calculation Based On","Tax Calculation Based On" +"Grand Total Excl. Tax","Grand Total Excl. Tax" +"Grand Total Incl. Tax","Grand Total Incl. Tax" +Taxes,Taxes +"Tax Section","Tax Section" "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" +"Tax Calculation Based On","Tax Calculation 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." +"This sets whether catalog prices entered from Magento Admin include tax.","This sets whether catalog prices entered from Magento 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." +"This sets whether shipping amounts entered from Magento Admin or obtained from gateways include tax.","This sets whether shipping amounts entered from Magento 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 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." +"When catalog price includes tax, enable this setting to fix the price no matter what the customer's tax rate.","When catalog price includes tax, enable this setting to fix the price no matter what the customer's tax rate." "Default Tax Destination Calculation","Default Tax Destination Calculation" +"Default Country","Default Country" "Default State","Default State" "Default Post Code","Default Post Code" "Price Display Settings","Price Display Settings" @@ -151,12 +161,16 @@ Note:,Note: "Display Prices","Display Prices" "Display Subtotal","Display Subtotal" "Display Shipping Amount","Display Shipping Amount" -"Include Tax In Grand Total","Include Tax In Grand Total" +"Include Tax In Order Total","Include Tax In Order 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 +Rate,Rate "Subtotal Only","Subtotal Only" -Taxes,Taxes -"Import/Export Tax Rates","Import/Export Tax Rates" -"Asynchronous sending","Asynchronous sending" +"(Excl. Tax)","(Excl. Tax)" +"(Incl. Tax)","(Incl. Tax)" +"Order Total Excl. Tax","Order Total Excl. Tax" +"Order Total Incl. Tax","Order Total Incl. Tax" +"Order Total","Order Total" +"Your credit card will be charged for","Your credit card will be charged for" diff --git a/app/code/Magento/TaxImportExport/i18n/en_US.csv b/app/code/Magento/TaxImportExport/i18n/en_US.csv index e69de29bb2d1d..cadecc39a391c 100644 --- a/app/code/Magento/TaxImportExport/i18n/en_US.csv +++ b/app/code/Magento/TaxImportExport/i18n/en_US.csv @@ -0,0 +1,19 @@ +Code,Code +Country,Country +State,State +"Zip/Post Code","Zip/Post Code" +Rate,Rate +"Zip/Post is Range","Zip/Post is Range" +"Range From","Range From" +"Range To","Range To" +"Tax Zones and Rates","Tax Zones and Rates" +"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" +"Invalid file upload attempt.","Invalid file upload attempt." +"Invalid file format.","Invalid file format." +"One of the countries has invalid code.","One of the countries has invalid code." +"Import Tax Rates","Import Tax Rates" +"Export Tax Rates","Export Tax Rates" +CSV,CSV +"Excel XML","Excel XML" diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv index 5fd68c735ec8e..3acb4616ea012 100644 --- a/app/code/Magento/Theme/i18n/en_US.csv +++ b/app/code/Magento/Theme/i18n/en_US.csv @@ -1,53 +1,15 @@ -Remove,Remove -Close,Close -"Delete File","Delete File" -"-- Please Select --","-- Please Select --" -General,General +Back,Back +Save,Save +%1,%1 +Default,Default +Themes,Themes "Save and Continue Edit","Save and Continue Edit" -"About the calendar","About the calendar" -"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" +"Custom CSS","Custom CSS" "Select CSS File to Upload","Select CSS File to Upload" "Upload CSS File","Upload CSS File" "Download CSS File","Download CSS File" @@ -58,85 +20,152 @@ Manage,Manage "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." +"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" +General,General "Copy of %1","Copy of %1" "Max image size %1M","Max image size %1M" "Theme JavaScript","Theme JavaScript" +"Select JS Files to Upload","Select JS Files to Upload" "Upload JS Files","Upload JS Files" "JS Editor","JS Editor" "Allowed file types *.js.","Allowed file types *.js." +Theme,Theme +"Media Storage","Media Storage" +"Create Folder","Create Folder" +"Delete Folder","Delete Folder" +"Delete File","Delete File" +"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" +Global,Global +"Design Configuration","Design Configuration" +"You saved the configuration.","You saved the configuration." +"Something went wrong while saving this configuration:","Something went wrong while saving this configuration:" +"You deleted the theme.","You deleted the theme." +"We cannot delete the theme.","We cannot delete the theme." +"File not found: ""%1"".","File not found: ""%1""." +"We can\'t find file.","We can\'t find file." "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." +"This theme is not editable.","This theme is not 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 can\'t upload the CSS file right now.","We can\'t upload the CSS file right now." "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""." +"We can\'t upload the JS file right now.","We can\'t upload the JS file right now." +"Sorry, something went wrong. That\'s all we know.","Sorry, something went wrong. That\'s all we know." +"Invalid type","Invalid type" +"Invalid scope or scope id","Invalid scope or scope id" +"%1 does not contain field \'%2\'","%1 does not contain field \'%2\'" +"Invalid regular expression: ""%1"".","Invalid regular expression: ""%1""." +"%1 does not contain field \'file\'","%1 does not contain field \'file\'" +"Backend model is not specified for %1","Backend model is not specified for %1" +"Can not save empty config","Can not save empty config" +label,label +"-- Please Select --","-- Please Select --" +"The start date can\'t follow the end date.","The start date can\'t follow the end date." +"The date range for this design change overlaps another design change for the specified store.","The date range for this design change overlaps another design change for the specified store." +Copy,Copy +"Theme id should be set","Theme id should be set" +"Circular-reference in theme inheritance detected for ""%1""","Circular-reference in theme inheritance detected for ""%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." +"We can\'t upload the file right now.","We can\'t upload the file right now." "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 can\'t delete root directory %1 right now.","We can\'t delete root directory %1 right now." +"Theme isn\'t deletable.","Theme isn\'t deletable." +"Exception message","Exception message" +"localized exception","localized exception" +Message,Message +"Test Label","Test Label" +Phrase,Phrase +testMessage,testMessage +exception,exception +Edit,Edit "We found no files.","We found no files." -"Help Us to Keep Magento Healthy","Help Us to Keep Magento Healthy" +"Browse Files","Browse Files" +Scope:,Scope: +Remove,Remove +"Help Us Keep Magento Healthy","Help Us Keep Magento Healthy" +"Report All Bugs","Report All Bugs" "Toggle Nav","Toggle Nav" "JavaScript seems to be disabled in your browser.","JavaScript seems to be disabled in your browser." -"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!" +"For the best experience on our site, be sure to turn on Javascript in your browser.","For the best experience on our site, be sure to turn on Javascript in your browser." "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." -"Learn more.","Learn more." -"Allow Cookies","Allow Cookies" +"For the best experience on our site, be sure to turn on Local Storage in your browser.","For the best experience on our site, be sure to turn on Local Storage in your browser." +"This is demo store. No orders will be fulfilled.","This is demo store. No orders will be fulfilled." "Items %1 to %2 of %3 total","Items %1 to %2 of %3 total" -"You're currently reading page","You're currently reading page" +"%1 Item","%1 Item" +"%1 Item(s)","%1 Item(s)" +Page,Page +Previous,Previous +"You\'re currently reading page","You\'re currently reading page" +Next,Next +Show,Show +"per page","per page" +"About the calendar","About the calendar" +Close,Close +"Go Today","Go Today" +WK,WK +Time,Time +Hour,Hour +Minute,Minute +"We could not detect a size.","We could not detect a size." "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" +"Welcome, %1!","Welcome, %1!" +Empty,Empty +"1 column","1 column" +Configuration,Configuration +"Search Engine Robots","Search Engine Robots" +"Default Robots","Default Robots" +"This will be included before head closing tag in page HTML.","This will be included before head closing tag in page HTML." +"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." +"Default Description","Default Description" +"Default welcome msg!","Default welcome msg!" +"Copyright © 2016 Magento. All rights reserved.","Copyright © 2016 Magento. All rights reserved." +"Design Config Grid","Design Config Grid" +"Rebuild design config grid index","Rebuild design config grid index" +"Admin empty","Admin empty" +"Admin 1column","Admin 1column" +"Theme Information","Theme Information" +"Other Settings","Other Settings" "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!" +"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." +Header,Header +"Logo Image","Logo Image" +"Allowed file types: png, gif, jpg, jpeg, svg.","Allowed file types: png, gif, jpg, jpeg, svg." +"Logo Image Width","Logo Image Width" +"Logo Image Height","Logo Image Height" "Welcome Text","Welcome Text" +"Logo Image Alt","Logo Image Alt" 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!" -"© 2015 Magento Demo Store. All Rights Reserved.","© 2015 Magento Demo Store. All Rights Reserved." -"1 column","1 column" +"This will be displayed just before the body closing tag.","This will be displayed just before the body closing tag." +Copyright,Copyright +Website,Website +Store,Store +"Store View","Store View" +"Skip to Content","Skip to Content" "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" -"Invalid regular expression: ""%1"".","Invalid regular expression: ""%1""." -"Start date cannot be greater than end date.","Start date cannot be greater than end date." -"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." -Copy,Copy -"Circular-reference in theme inheritance detected for ""%1""","Circular-reference in theme inheritance detected for ""%1""" diff --git a/app/code/Magento/Translation/i18n/en_US.csv b/app/code/Magento/Translation/i18n/en_US.csv index 9fc1349b8ca37..5efbfe971eae4 100644 --- a/app/code/Magento/Translation/i18n/en_US.csv +++ b/app/code/Magento/Translation/i18n/en_US.csv @@ -1,148 +1,5 @@ -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 and trailing spaces will be ignored.","Please enter 6 or more characters. Leading and 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." -"Translation Strategy","Translation Strategy" -"Please put your store into maintenance mode and redeploy static files after changing strategy","Please put your store into maintenance mode and redeploy static files after changing strategy" "Dictionary (Translation on Storefront side)","Dictionary (Translation on Storefront side)" "Embedded (Translation on Admin side)","Embedded (Translation on Admin side)" -"Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored.","Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored." +"Translation Strategy","Translation Strategy" +Translations,Translations +"Translation files","Translation files" diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv index 2efac126b857c..f7f5b845ef8b6 100644 --- a/app/code/Magento/Ui/i18n/en_US.csv +++ b/app/code/Magento/Ui/i18n/en_US.csv @@ -1,4 +1,111 @@ +"Condition type ""%1"" is not allowed","Condition type ""%1"" is not allowed" +"The configuration parameter ""formElement"" is a required for ""%1"" field.","The configuration parameter ""formElement"" is a required for ""%1"" field." +"Remove %1","Remove %1" +"Add New %1","Add New %1" +"New %1","New %1" +"Please select item(s).","Please select item(s)." +"Unsupported bookmark action.","Unsupported bookmark action." +"Parameter ""class"" must be present.","Parameter ""class"" must be present." +"Parameter ""sortOrder"" must be present.","Parameter ""sortOrder"" must be present." +"Initialization error component, check the spelling of the name or the correctness of the call.","Initialization error component, check the spelling of the name or the correctness of the call." +"Bookmark with id ""%1"" does not exist.","Bookmark with id ""%1"" does not exist." +Cancel,Cancel +Back,Back +Next,Next +"Changes have been made to this section that have not been saved.","Changes have been made to this section that have not been saved." +Assign,Assign +Options,Options +"records found","records found" +selected,selected +Filters,Filters +Add,Add +"Something went wrong.","Something went wrong." +Yes,Yes +No,No +Done,Done +options,options +Select...,Select... +Selected,Selected +"Select All","Select All" +"Deselect All","Deselect All" +"Select All on This Page","Select All on This Page" +"Deselect All on This Page","Deselect All on This Page" +On,On +Off,Off +"Go to Details Page","Go to Details Page" +"New View","New View" +"Default View","Default View" +"${ $.visible } out of ${ $.total } visible","${ $.visible } out of ${ $.total } visible" +"You have successfully saved your edits.","You have successfully saved your edits." +"You haven\'t selected any items!","You haven\'t selected any items!" +"Search by keyword","Search by keyword" +Keyword,Keyword +"Please enter more or equal than {0} symbols.","Please enter more or equal than {0} symbols." +"Please enter less or equal than {0} symbols.","Please enter less or equal than {0} symbols." +"Please enter {0} words or less.","Please enter {0} words or less." +"Please enter at least {0} words.","Please enter at least {0} words." +"Please enter between {0} and {1} words.","Please enter between {0} and {1} words." +"Letters or punctuation only please","Letters or punctuation only please" +"Letters, numbers, spaces or underscores only please","Letters, numbers, spaces or underscores only please" +"Letters only please","Letters only please" +"No white space please","No white space please" +"Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx","Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx" +"A positive or negative non-decimal number please","A positive or negative non-decimal number please" +"The specified vehicle identification number (VIN) is invalid.","The specified vehicle identification number (VIN) is invalid." +"Please enter a correct date","Please enter a correct date" +"Vul hier een geldige datum in.","Vul hier een geldige datum in." +"Please enter a valid time, between 00:00 and 23:59","Please enter a valid time, between 00:00 and 23:59" +"Please enter a valid time, between 00:00 am and 12:00 pm","Please enter a valid time, between 00:00 am and 12:00 pm" +"Please specify a valid phone number","Please specify a valid phone number" +"Please specify a valid mobile number","Please specify a valid mobile number" +"Please enter at least {0} characters","Please enter at least {0} characters" +"Please enter a valid credit card number.","Please enter a valid credit card number." +"Please enter a valid IP v4 address.","Please enter a valid IP v4 address." +"Please enter a valid IP v6 address.","Please enter a valid IP v6 address." +"Invalid format.","Invalid format." +"HTML tags are not allowed.","HTML tags are not allowed." +"Please select an option.","Please select an option." +"Empty Value.","Empty Value." +"Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field." +"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter." +"Please use only letters (a-z or A-Z), numbers (0-9), spaces and ""#"" in this field.","Please use only letters (a-z or A-Z), numbers (0-9), spaces and ""#"" 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 fax number (Ex: 123-456-7890).","Please enter a valid fax number (Ex: 123-456-7890)." +"Please enter a valid email address (Ex: johndoe@domain.com).","Please enter a valid email address (Ex: johndoe@domain.com)." +"Please enter 6 or more characters. Leading and trailing spaces will be ignored.","Please enter 6 or more characters. Leading and trailing spaces will be ignored." +"Please enter 7 or more characters, using both numeric and alphabetic.","Please enter 7 or more characters, using both numeric and alphabetic." +"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. 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 XML-identifier (Ex: something_1, block5, id-4).","Please enter a valid XML-identifier (Ex: something_1, block5, id-4)." +"Please enter a valid social security number (Ex: 123-45-6789).","Please enter a valid social security number (Ex: 123-45-6789)." +"Please enter a valid zip code (Ex: 90602 or 90602-1234).","Please enter a valid zip code (Ex: 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 enter a valid $ amount. For example $100.00.","Please enter a valid $ amount. For example $100.00." +"Please enter a number 0 or greater in this field.","Please enter a number 0 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 input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%).","Please input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%)." +"Please enter a valid number in this field.","Please enter a valid number in this field." +"The value is not within the specified range.","The value is not within the specified range." +"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, and the first character should be a letter.","Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter." +"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed." +"Please enter a valid date.","Please enter a valid date." +"Please enter a valid URL Key (Ex: ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"").","Please enter a valid URL Key (Ex: ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"")." +"Please enter a valid zip code.","Please enter a valid zip code." +"Please select State/Province.","Please select State/Province." +"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 is a required field.","This is a required field." +"Please enter positive number in this field.","Please enter positive number in this field." +"Please enter a valid value, ex: 10,20,30","Please enter a valid value, ex: 10,20,30" +"We don\'t recognize or support this file extension type.","We don\'t recognize or support this file extension type." +"File you are trying to upload exceeds maximum file size limit.","File you are trying to upload exceeds maximum file size limit." +"Please use tag SCRIPT with SRC attribute or with proper content to include JavaScript to the document.","Please use tag SCRIPT with SRC attribute or with proper content to include JavaScript to the document." +Attention,Attention +OK,OK +Close,Close +Ok,Ok "Log JS Errors to Session Storage","Log JS Errors to Session Storage" -"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting" "Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key" -"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors" +Action,Action +CSV,CSV +"Excel XML","Excel XML" diff --git a/app/code/Magento/Ups/i18n/en_US.csv b/app/code/Magento/Ups/i18n/en_US.csv index 93a5ab41bfa25..ea6c0800846c3 100644 --- a/app/code/Magento/Ups/i18n/en_US.csv +++ b/app/code/Magento/Ups/i18n/en_US.csv @@ -1,15 +1,3 @@ -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" @@ -45,6 +33,7 @@ Mode,Mode "2nd Day Air","2nd Day Air" "2nd Day Air Letter","2nd Day Air Letter" "3 Day Select","3 Day Select" +Ground,Ground "Ground Commercial","Ground Commercial" "Ground Residential","Ground Residential" "Canada Standard","Canada Standard" @@ -68,44 +57,58 @@ Pallet,Pallet "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""." +Pounds,Pounds +Kilograms,Kilograms +"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" +status,status error_message,error_message +"Empty response","Empty response" "Delivery Confirmation","Delivery Confirmation" "Signature Required","Signature Required" "Adult Signature Required","Adult Signature Required" +"Not Required","Not Required" +None,None +label,label "United Parcel Service","United Parcel Service" "United Parcel Service XML","United Parcel Service XML" -"User ID","User ID" +"Field ","Field " +" is required."," is required." +UPS,UPS +"Access License Number","Access License Number" +"Enabled for Checkout","Enabled for Checkout" +"Enabled for RMA","Enabled for RMA" +"Allowed Methods","Allowed Methods" +"Packages Request Type","Packages Request Type" Container,Container -Debug,Debug +"Free Shipping Amount Threshold","Free Shipping Amount Threshold" +"Destination Type","Destination Type" +"Free Method","Free Method" "Gateway URL","Gateway URL" -"Enabled for Checkout","Enabled for Checkout" +"Gateway XML URL","Gateway XML URL" "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" +Password,Password "Pickup Method","Pickup Method" +"Sort Order","Sort Order" +Title,Title "Tracking XML URL","Tracking XML URL" "UPS Type","UPS Type" -"Live account","Live account" +"Live Account","Live Account" +"Weight Unit","Weight Unit" +"User ID","User ID" "Enable Negotiated Rates","Enable Negotiated Rates" "Shipper Number","Shipper Number" "Required for negotiated rates; 6-character UPS","Required for negotiated rates; 6-character UPS" +"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" +"Displayed Error Message","Displayed Error Message" +Mode,Mode "This enables or disables SSL verification of the Magento server by UPS.","This enables or disables SSL verification of the Magento server by UPS." +Debug,Debug diff --git a/app/code/Magento/UrlRewrite/i18n/en_US.csv b/app/code/Magento/UrlRewrite/i18n/en_US.csv index ef0b25b6b8366..9b07b52236304 100644 --- a/app/code/Magento/UrlRewrite/i18n/en_US.csv +++ b/app/code/Magento/UrlRewrite/i18n/en_US.csv @@ -1,63 +1,61 @@ -Custom,Custom -Back,Back -ID,ID -SKU,SKU -No,No -Custom,Custom -Back,Back -ID,ID -SKU,SKU -No,No -Action,Action -Reset,Reset -Edit,Edit -"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" -"Request Path for Specified Store","Request Path for Specified Store" -"Temporary (302)","Temporary (302)" -"Permanent (301)","Permanent (301)" "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." +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." +"Please assign a website to the selected category.","Please assign a website to the selected category." "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:" +Product:,Product: "Skip Category Selection","Skip Category Selection" -"Name","Name" -"Status","Status" +ID,ID +Name,Name +SKU,SKU +Status,Status "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" +"Please assign a website to the selected CMS page.","Please assign a website to the selected CMS page." +Title,Title "URL Key","URL Key" "Store View","Store View" "Edit URL Rewrite","Edit URL Rewrite" "Add New URL Rewrite","Add New URL Rewrite" -"Delete","Delete" +Reset,Reset +Back,Back +Delete,Delete "Are you sure you want to do this?","Are you sure you want to do this?" -"Save","Save" +Save,Save "Block Information","Block Information" "URL Rewrite Information","URL Rewrite Information" "Request Path","Request Path" "Target Path","Target Path" -"Redirect","Redirect" -"Description","Description" -"Store","Store" +"Redirect Type","Redirect Type" +Description,Description +Store,Store "URL Rewrite Management","URL Rewrite Management" "Add URL Rewrite","Add URL Rewrite" +Custom,Custom "For category","For category" "For product","For product" "For CMS page","For CMS page" "Create URL Rewrite:","Create URL Rewrite:" +"You deleted the URL rewrite.","You deleted the URL rewrite." +"We can\'t delete URL Rewrite right now.","We can\'t delete URL Rewrite right now." "URL Rewrites","URL Rewrites" -"[New/Edit] URL Rewrite","[New/Edit] URL Rewrite" +"The product you chose is not associated with the selected store or category.","The product you chose is not associated with the selected store or category." +"The category you chose is not associated with the selected store.","The category you chose is not associated with the selected store." "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." -"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." +"Something went wrong while saving URL Rewrite.","Something went wrong while saving URL Rewrite." +"Do not use two or more consecutive slashes in the request path.","Do not use two or more consecutive slashes in the request path." +"Anchor symbol (#) is not supported in request path.","Anchor symbol (#) is not supported in request path." +"Do not use two or more consecutive slashes in the url rewrite suffix.","Do not use two or more consecutive slashes in the url rewrite suffix." +"Anchor symbol (#) is not supported in url rewrite suffix.","Anchor symbol (#) is not supported in url rewrite suffix." +No,No +"Temporary (302)","Temporary (302)" +"Permanent (301)","Permanent (301)" +"Request Path for Specified Store","Request Path for Specified Store" +"URL key for specified store already exists.","URL key for specified store already exists." +"Custom storage message","Custom storage message" "Select Category","Select Category" -"Options","Options" -"Redirect Type","Redirect Type" +Action,Action +Edit,Edit diff --git a/app/code/Magento/User/i18n/en_US.csv b/app/code/Magento/User/i18n/en_US.csv index 918bdef218b14..215e458d6e28c 100644 --- a/app/code/Magento/User/i18n/en_US.csv +++ b/app/code/Magento/User/i18n/en_US.csv @@ -1,128 +1,135 @@ -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" +"Are you sure you want to do this?","Are you sure you want to do this?" "Save Role","Save Role" Roles,Roles "Add New Role","Add New Role" "Role Information","Role Information" "Role Users","Role Users" "User ID","User ID" +"User Name","User Name" +"First Name","First Name" +"Last Name","Last Name" +Email,Email +Status,Status +Active,Active +Inactive,Inactive "Role Resources","Role Resources" "Role Info","Role Info" "Role Name","Role Name" +"Current User Identity Verification","Current User Identity Verification" +"Your Password","Your Password" "Add New User","Add New User" Users,Users "Save User","Save User" "Delete User","Delete User" +"Are you sure you want to revoke the user\'s tokens?","Are you sure you want to revoke the user\'s tokens?" +"Force Sign-In","Force Sign-In" "Edit User '%1'","Edit User '%1'" "New User","New User" +"Account Information","Account Information" +"User Email","User Email" +Password,Password +"New Password","New Password" +"Password Confirmation","Password Confirmation" +"Interface Locale","Interface Locale" "This account is","This account is" "Account Status","Account Status" "User Roles Information","User Roles Information" Assigned,Assigned +Role,Role "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." +"Your password reset link has expired.","Your password reset link has expired." +"We\'ll email you a link to reset your password.","We\'ll email you a link to reset your password." +"Please correct this email address:","Please correct this email address:" +"Please enter an email address.","Please enter an email address." +"You updated your password.","You updated your password." +"Locked Users","Locked Users" +"Unlocked %1 user(s).","Unlocked %1 user(s)." +System,System 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" +"We can\'t find a user to delete.","We can\'t find a user to delete." +"This user no longer exists.","This user no longer exists." +"Edit User","Edit User" +"You have revoked the user\'s tokens.","You have revoked the user\'s tokens." +"We can\'t find a user to revoke.","We can\'t find a user to revoke." "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." +"Edit Role","Edit Role" +"New Role","New Role" "This role no longer exists.","This role no longer exists." "You saved the role.","You saved the role." +"You have entered an invalid password for current user.","You have entered an invalid password for current user." "An error occurred while saving this role.","An error occurred while saving this role." +"You saved the user.","You saved the user." "A user with the same user name or email already exists.","A user with the same user name or email already exists." +Recommended,Recommended +Forced,Forced +"Sorry, but this password has already been used. Please create another.","Sorry, but this password has already been used. Please create another." +email,email +password,password +username,username +"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled." +"You need more permissions to access this.","You need more permissions to access this." +"Your account is temporarily disabled.","Your account is temporarily disabled." "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." -"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled." -"Forgot your user name or password?","Forgot your user name or password?" +"It\'s time to change your password.","It\'s time to change your password." +"It\'s time to change your password.","It\'s time to change your password." +"Your password has expired; please contact your administrator.","Your password has expired; please contact your administrator." +"Password Help","Password Help" +"Enter your email address. You will receive an email with a link to reset your password.","Enter your email address. You will receive an email with a link to reset your password." +"Email address","Email address" "Retrieve Password","Retrieve Password" +"Back to Sign in","Back to Sign in" "Forgot your password?","Forgot your password?" +"Reset a Password","Reset a Password" +"Confirm New Password","Confirm New Password" +"Reset Password","Reset Password" "Roles Resources","Roles Resources" "Resource Access","Resource Access" +Custom,Custom +All,All 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?" +"%name,","%name," +"There was recently a request to change the password for your account.","There was recently a request to change the password for your account." +"If you requested this change, reset your password here:","If you requested this change, reset your password here:" +"If you did not make this request, you can ignore this email and your password will remain the same.","If you did not make this request, you can ignore this email and your password will remain the same." +"Thank you,","Thank you," +"Hello,","Hello," +"We have received a request to change the following information associated with your account at %store_name: %changes.","We have received a request to change the following information associated with your account at %store_name: %changes." +"If you have not authorized this action, please contact us immediately at %store_email","If you have not authorized this action, please contact us immediately at %store_email" +"or call us at %store_phone","or call us at %store_phone" +"Thanks,","Thanks," +"All Users","All Users" +"User Roles","User Roles" "User Notification Template","User Notification Template" -No,No -Yes,Yes -Username,Username -"Locked Users","Locked Users" -"Unlocked %1 user(s).","Unlocked %1 user(s)." -"This account is locked.","This account is locked." -"It's time to change your password.","It's time to change your password." -"It's time to change your password.","It's time to change your password." -"Sorry, but this password has already been used. Please create another.","Sorry, but this password has already been used. Please create another." -"Your password has expired; please contact your administrator.","Your password has expired; please contact your administrator." -Recommended,Recommended -Forced,Forced +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." "Maximum Login Failures to Lockout Account","Maximum Login Failures to Lockout Account" "We will disable this feature if the value is empty.","We will disable this feature if the value is empty." "Lockout Time (minutes)","Lockout Time (minutes)" "Password Lifetime (days)","Password Lifetime (days)" "We will disable this feature if the value is empty. ","We will disable this feature if the value is empty. " "Password Change","Password Change" -"Admin Accounts Locks","Admin Accounts Locks" Unlock,Unlock +ID,ID +Username,Username "Last login","Last login" Failures,Failures Unlocked,Unlocked -"All Users","All Users" -"User Roles","User Roles" -"Your Password","Your Password" -"Hello,","Hello," -"We have received a request to change the following information associated with your account at %store_name: %changes.","We have received a request to change the following information associated with your account at %store_name: %changes." -"If you have not authorized this action, please contact us immediately at %store_email","If you have not authorized this action, please contact us immediately at %store_email" -"or call us at %store_phone","or call us at %store_phone" -"Thanks,","Thanks," diff --git a/app/code/Magento/Usps/i18n/en_US.csv b/app/code/Magento/Usps/i18n/en_US.csv index d5043c9f78bbf..a39c283149673 100644 --- a/app/code/Magento/Usps/i18n/en_US.csv +++ b/app/code/Magento/Usps/i18n/en_US.csv @@ -1,26 +1,3 @@ -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" @@ -98,32 +75,59 @@ Length,Length Letter,Letter Flat,Flat Parcel,Parcel +Variable,Variable "Flat-Rate Box","Flat-Rate Box" "Flat-Rate Envelope","Flat-Rate Envelope" Rectangular,Rectangular Non-rectangular,Non-rectangular +Regular,Regular Large,Large +Yes,Yes +No,No +"Not Required","Not Required" +Required,Required +"For some reason we can\'t retrieve tracking info right now.","For some reason we can\'t retrieve tracking info right now." +"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." track_summary,track_summary +"Empty response","Empty response" "Service type does not match","Service type does not match" Merchandise,Merchandise +Sample,Sample Gift,Gift +Documents,Documents +Return,Return Other,Other -Container,Container -Debug,Debug -"Gateway URL","Gateway URL" +None,None +"Field ","Field " +" is required."," is required." +USPS,USPS "Enabled for Checkout","Enabled for Checkout" +"Enabled for RMA","Enabled for RMA" +"Gateway URL","Gateway URL" +"Secure Gateway URL","Secure Gateway URL" +Title,Title +"User ID","User ID" +Password,Password +Mode,Mode +"Packages Request Type","Packages Request Type" +Container,Container +Size,Size +Width,Width +Length,Length +Height,Height +Girth,Girth +Machinable,Machinable +"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)" "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" +"Enable Free Shipping Threshold","Enable Free Shipping Threshold" "Free Shipping Amount Threshold","Free Shipping Amount Threshold" +"Displayed Error Message","Displayed Error Message" "Ship to Applicable Countries","Ship to Applicable Countries" "Ship to Specific Countries","Ship to Specific Countries" +Debug,Debug "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 +"Sort Order","Sort Order" diff --git a/app/code/Magento/Variable/i18n/en_US.csv b/app/code/Magento/Variable/i18n/en_US.csv index d68ff06262284..c141f901bf926 100644 --- a/app/code/Magento/Variable/i18n/en_US.csv +++ b/app/code/Magento/Variable/i18n/en_US.csv @@ -1,4 +1,21 @@ "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" +No,No +Yes,Yes +"Variable HTML Value","Variable HTML Value" +"Variable Plain Value","Variable Plain Value" +"You deleted the custom variable.","You deleted the custom variable." +"You saved the custom variable.","You saved the custom variable." "Variable Code must be unique.","Variable Code must be unique." "Validation has failed.","Validation has failed." +%1,%1 "Insert Variable...","Insert Variable..." +"Variable ID","Variable ID" +Name,Name diff --git a/app/code/Magento/Webapi/i18n/en_US.csv b/app/code/Magento/Webapi/i18n/en_US.csv index 83b5ca4338967..51bd2666b38d5 100644 --- a/app/code/Magento/Webapi/i18n/en_US.csv +++ b/app/code/Magento/Webapi/i18n/en_US.csv @@ -1,34 +1,23 @@ -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 match any of the given Accept HTTP header media type(s) from the request: "%1 with media types from the config of response renderer.", "Server cannot match any of the given Accept HTTP header media type(s) from the request: "%1 with media types from the config of response renderer." +"Cannot perform GET operation with store code \'all\'","Cannot perform GET operation with store code \'all\'" "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""" +"Operation ""%1"" not found.","Operation ""%1"" not found." +"SOAP extension is not loaded.","SOAP extension is not loaded." "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" +message,message +Message,Message +"Soap fault reason.","Soap fault reason." +"Manage Customers","Manage Customers" +"Create Customer","Create Customer" +"Edit Customer","Edit Customer" +"Get Customer","Get Customer" +"Delete Customer","Delete Customer" "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." +"REST and SOAP configurations, generated WSDL file","REST and SOAP configurations, generated WSDL file" diff --git a/app/code/Magento/Weee/i18n/en_US.csv b/app/code/Magento/Weee/i18n/en_US.csv index 668926b681505..a52418cacbb9b 100644 --- a/app/code/Magento/Weee/i18n/en_US.csv +++ b/app/code/Magento/Weee/i18n/en_US.csv @@ -1,16 +1,24 @@ -Action,Action -Tax,Tax -Website,Website -"All Websites","All Websites" "Add Tax","Add Tax" "Delete Tax","Delete Tax" +"All Websites","All Websites" +FPT,FPT "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. Including FPT description and final price","Excluding FPT. Including FPT description and final price" "Excluding FPT","Excluding FPT" +label_value,label_value +frontend_label,frontend_label "Fixed Product Tax","Fixed Product Tax" Country/State,Country/State +Tax,Tax +Website,Website +Action,Action +"Excl. Tax","Excl. Tax" +Total,Total +"Incl. Tax","Incl. Tax" +"Total Incl. Tax","Total Incl. Tax" +"Final Price","Final Price" "Fixed Product Taxes","Fixed Product Taxes" "Enable FPT","Enable FPT" "Display Prices In Product Lists","Display Prices In Product Lists" @@ -19,4 +27,3 @@ Country/State,Country/State "Display Prices In Emails","Display Prices In Emails" "Apply Tax To FPT","Apply Tax To FPT" "Include FPT In Subtotal","Include FPT In Subtotal" -"FPT","FPT" diff --git a/app/code/Magento/Widget/i18n/en_US.csv b/app/code/Magento/Widget/i18n/en_US.csv index 307d9e67a3a4c..ce6e178bb1b4c 100644 --- a/app/code/Magento/Widget/i18n/en_US.csv +++ b/app/code/Magento/Widget/i18n/en_US.csv @@ -1,59 +1,72 @@ -All,All -Close,Close -Products,Products -Apply,Apply -"Design Theme","Design Theme" -"-- Please Select --","-- Please Select --" -"Sort Order","Sort Order" -"Save and Continue Edit","Save and Continue Edit" -Type,Type -Page,Page -label,label -"Frontend Properties","Frontend Properties" -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" +label,label Choose...,Choose... +Close,Close +"Not Selected","Not Selected" Widget,Widget "Widget Type","Widget Type" +"-- Please Select --","-- Please Select --" "Manage Widget Instances","Manage Widget Instances" -"Add New Widget Instance","Add New Widget Instance" +"Add Widget","Add Widget" +"Save and Continue Edit","Save and Continue Edit" "Widget ""%1""","Widget ""%1""" "New Widget Instance","New Widget Instance" "Custom Layouts","Custom Layouts" "Page Layouts","Page Layouts" "Please Select Container First","Please Select Container First" +"Storefront Properties","Storefront Properties" +Type,Type "Design Package/Theme","Design Package/Theme" -"Widget Instance Title","Widget Instance Title" +"Widget Title","Widget Title" "Assign to Store Views","Assign to Store Views" +"Sort Order","Sort Order" "Sort Order of widget instances in the same container","Sort Order of widget instances in the same container" "Layout Updates","Layout Updates" +Categories,Categories "Anchor Categories","Anchor Categories" "Non-Anchor Categories","Non-Anchor Categories" "All Product Types","All Product Types" +Products,Products "Generic Pages","Generic Pages" "All Pages","All Pages" "Specified Page","Specified Page" "Add Layout Update","Add Layout Update" "Remove Layout Update","Remove Layout Update" "Widget Options","Widget Options" -"Widget Instance","Widget Instance" +Settings,Settings +"Design Theme","Design Theme" +Continue,Continue "Please specify a Widget Type.","Please specify a Widget Type." -"Widgets","Widgets" +CMS,CMS "Please specify a correct widget.","Please specify a correct widget." +"The widget instance has been deleted.","The widget instance has been deleted." "New Widget","New Widget" +Widgets,Widgets "The widget instance has been saved.","The widget instance has been saved." -"The widget instance has been deleted.","The widget instance has been deleted." +name,name 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." +None,None +%1,%1 Container,Container +Template,Template +All,All "Specific %1","Specific %1" +"Open Chooser","Open Chooser" +Apply,Apply +Page,Page +"Orders and Returns","Orders and Returns" +"Orders and Returns Search Form","Orders and Returns Search Form" +"Anchor Custom Title","Anchor Custom Title" +"CMS Page Link Block Template","CMS Page Link Block Template" +"CMS Page Link Inline Template","CMS Page Link Inline Template" +"Display a Link to Loading a Spreadsheet","Display a Link to Loading a Spreadsheet" +"Defines whether a link to My Account","Defines whether a link to My Account" +"Link Text","Link Text" +"The text of the link to the My Account > Order by SKU page","The text of the link to the My Account > Order by SKU page" +"Load a list of SKUs","Load a list of SKUs" +Product,Product +"Select Product...","Select Product..." +Conditions,Conditions "Widget ID","Widget ID" diff --git a/app/code/Magento/Wishlist/i18n/en_US.csv b/app/code/Magento/Wishlist/i18n/en_US.csv index 5bbcbde21a808..e5f125ba78868 100644 --- a/app/code/Magento/Wishlist/i18n/en_US.csv +++ b/app/code/Magento/Wishlist/i18n/en_US.csv @@ -1,105 +1,116 @@ -Back,Back -Product Name,Product Name -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" -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" -"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 here to continue shopping.","%1 has been added to your wishlist. Click here 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 %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" -"The requested cart item doesn't exist.","The requested cart item doesn't exist." +"%1's Wish List","%1's Wish List" +"Page not found.","Page not found." +"We can\'t specify a product.","We can\'t specify a product." +"We can\'t add the item to Wish List right now: %1.","We can\'t add the item to Wish List right now: %1." +"We can\'t add the item to Wish List right now.","We can\'t add the item to Wish List right now." +"You added %1 to your shopping cart.","You added %1 to your shopping cart." +"This product(s) is out of stock.","This product(s) is out of stock." +"We can\'t add the item to the cart right now.","We can\'t add the item to the cart right now." +"We can\'t load the Wish List item right now.","We can\'t load the Wish List item right now." +"We can\'t configure the product right now.","We can\'t configure the product right now." +"The requested cart item doesn\'t exist.","The requested cart item doesn\'t exist." "%1 has been moved to your wish list.","%1 has been moved to your wish list." -"We can't move the item to the wish list.","We can't move the item to the wish list." +"We can\'t move the item to the wish list.","We can\'t move the item to the wish list." +"We can\'t delete the item from Wish List right now because of an error: %1.","We can\'t delete the item from Wish List right now because of an error: %1." +"We can\'t delete the item from the Wish List right now.","We can\'t delete the item from the Wish List right now." "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." +"Please enter an email address.","Please enter an email address." +"This wish list can be shared %1 more times.","This wish list can be shared %1 more times." +"Please enter a valid email address.","Please enter a valid email address." "Your wish list has been shared.","Your wish list has been shared." -"Please enter your comments.","Please enter your comments." +"We can\'t delete item from Wish List right now.","We can\'t delete item from Wish List right now." +"Can\'t save description %1","Can\'t save description %1" +"Can\'t update wish list","Can\'t update wish list" +"%1 has been updated in your Wish List.","%1 has been updated in your Wish List." +"We can\'t update your Wish List right now.","We can\'t update your Wish List right now." +"The requested Wish List doesn\'t exist.","The requested Wish List doesn\'t exist." +"We can\'t create the Wish List right now.","We can\'t create the Wish List right now." +"%1 items","%1 items" +"1 item","1 item" +Comment,Comment "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." +"Display item quantities","Display item quantities" +"An item option with code %1 already exists.","An item option with code %1 already exists." +"We can\'t specify a wish list.","We can\'t specify a wish list." "Cannot specify product.","Cannot specify product." +"Product is not salable.","Product is not salable." "Invalid item option format.","Invalid item option format." -"We can't specify a wish list item.","We can't specify a wish list item." +"%1 for ""%2"".","%1 for ""%2""." +"We can\'t add this item to your shopping cart right now.","We can\'t add this item to your shopping cart right now." +"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 the Wish List right now.","We can\'t update the Wish List right now." +"%1 product(s) have been added to shopping cart: %2.","%1 product(s) have been added to shopping cart: %2." +Comment:,Comment: +"We cannot retrieve the Wish List.","We cannot retrieve the Wish List." +"%1\'s Wishlist","%1\'s Wishlist" +"We can\'t specify a wish list item.","We can\'t specify a wish list item." +"The product does not exist.","The product does not exist." +"Test Phrase","Test Phrase" +message,message +Message,Message +error-message,error-message +LocalizedException,LocalizedException +"Product Exception.","Product Exception." +"Localized Exception.","Localized Exception." +"Are you sure you want to remove this item?","Are you sure you want to remove this item?" "Share Wish List","Share Wish List" "Add All to Cart","Add All to Cart" "Update Wish List","Update Wish List" +"Move to Wishlist","Move to Wishlist" "View Product","View Product" -"RSS link to %1's wishlist","RSS link to %1's wishlist" +Qty,Qty +"Add to Cart","Add to Cart" +Availability,Availability +"In stock","In stock" +"Out of stock","Out of stock" +Edit,Edit +"Remove Item","Remove Item" +"Remove item","Remove item" +"Add to Compare","Add to Compare" "This Wish List has no Items","This Wish List has no Items" +"See Details","See Details" +"Options Details","Options Details" +"RSS link to %1's wishlist","RSS link to %1's wishlist" +"RSS Feed","RSS Feed" +Product,Product +"Add to Wish List","Add to Wish List" +Back,Back "Wish List is empty now.","Wish List is empty now." +"* Required Fields","* Required Fields" +"Sharing Information","Sharing Information" "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." -"Share Wishlist","Share Wishlist" +"Check here to link an RSS feed to your Wish List.","Check here to link an RSS feed to your Wish List." "Last Added Items","Last Added Items" +"Remove This Item","Remove This Item" "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" -"General Options","General Options" +"Are you sure you want to remove this product from your Wish List?","Are you sure you want to remove this product from your Wish List?" +"%customer_name wants to share this Wish List from %store_name with you:","%customer_name wants to share this Wish List from %store_name with you:" +"Message from %customer_name:","Message from %customer_name:" +"View all Wish List items","View all Wish List items" +"Wish List Section","Wish List Section" "Share Options","Share Options" +"Email Sender","Email Sender" +"Email Template","Email Template" +"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected." "Max Emails Allowed to be Sent","Max Emails Allowed to be Sent" -"10 by default. Max - 10000","10 by default. Max - 10000" "Email Text Length Limit","Email Text Length Limit" -"255 by default","255 by default" +"General Options","General Options" +Enabled,Enabled "My Wish List Link","My Wish List Link" "Display Wish List Summary","Display Wish List Summary" +"Enable RSS","Enable RSS" "No Items Found","No Items Found" +"Product Name","Product Name" "User Description","User Description" +Quantity,Quantity +"Add Locale","Add Locale" +"Add Date","Add Date" +"Days in Wish List","Days in Wish List" +Action,Action +Configure,Configure +Delete,Delete "Product Details and Comment","Product Details and Comment" diff --git a/app/design/frontend/Magento/blank/i18n/en_US.csv b/app/design/frontend/Magento/blank/i18n/en_US.csv index a982e1632caae..b9a1d343b7f2d 100644 --- a/app/design/frontend/Magento/blank/i18n/en_US.csv +++ b/app/design/frontend/Magento/blank/i18n/en_US.csv @@ -1 +1,7 @@ Summary,Summary +"Account Dashboard","Account Dashboard" +"Account Information","Account Information" +"Address Book","Address Book" +Menu,Menu +Account,Account +Settings,Settings diff --git a/app/design/frontend/Magento/luma/i18n/en_US.csv b/app/design/frontend/Magento/luma/i18n/en_US.csv index 26d45f7795b93..6f79508746d9d 100644 --- a/app/design/frontend/Magento/luma/i18n/en_US.csv +++ b/app/design/frontend/Magento/luma/i18n/en_US.csv @@ -1,21 +1,44 @@ -"Add to Wish List", "Wish List" -"Add to Compare", "Compare" -"Your Checkout Progress", "Checkout Progress" -"Card Verification Number", "CVV" -"Items %1-%2 of %3","%3 items" -"Regular Price", "was" -"Shop By","Filter" -"Remove item", "Remove" -"Proceed to Checkout", "Go to Checkout" -"Grand Total", "Estimated Total" -"Review by", "By" -"View Order", "View" -"Update Shopping Cart", "Update Cart" -"Print Order", "Print" -"Move to Wish List","Move" -"Copy to Wish List","Copy" -"Move Selected to Wish List", "Move Selected" -"Copy Selected to Wish List", "Copy Selected" -"%1 items in wish list", "%1 items" -"1 item in wish list", "1 item" -"Continue to Shipping Information", "Select Shipping Method" +"Now Shopping by","Now Shopping by" +Previous,Previous +Remove,Remove +"Remove This Item","Remove This Item" +"Shop By","Shop By" +"Clear All","Clear All" +"Shopping Options","Shopping Options" +"%name,","%name," +"Welcome to %store_name.","Welcome to %store_name." +"To sign in to our site, use these credentials during checkout or on the My Account page:","To sign in to our site, use these credentials during checkout or on the My Account page:" +Email:,Email: +Password:,Password: +"Password you set when creating account","Password you set when creating account" +"Forgot your account password? Click here to reset it.","Forgot your account password? Click here to reset it." +"When you sign in to your account, you will be able to:","When you sign in to your account, you will be able to:" +"Quick Checkout","Quick Checkout" +"Proceed through checkout faster","Proceed through checkout faster" +"Order Status","Order Status" +"Check the status of orders","Check the status of orders" +"Manage Addresses","Manage Addresses" +"Store alternative addresses","Store alternative addresses" +"For shipping to multiple family members and friends","For shipping to multiple family members and friends" +"Order History","Order History" +"View past orders","View past orders" +"About Us","About Us" +"Customer Service","Customer Service" +"%store_phone","%store_phone" +"Hours of Operation:
%store_hours.","Hours of Operation:
%store_hours." +"Thank you for your order from %store_name.","Thank you for your order from %store_name." +"You can check the status of your order by logging into your account.","You can check the status of your order by logging into your account." +"If you have questions about your order, you can email us at %store_email.","If you have questions about your order, you can email us at %store_email." +"Your Credit Memo #%creditmemo_id for Order #%order_id","Your Credit Memo #%creditmemo_id for Order #%order_id" +"Billing Info","Billing Info" +"Shipping Info","Shipping Info" +"Payment Method","Payment Method" +"Shipping Method","Shipping Method" +"Your order #%increment_id has been updated with a status of %order_status.","Your order #%increment_id has been updated with a status of %order_status." +"Your Invoice #%invoice_id for Order #%order_id","Your Invoice #%invoice_id for Order #%order_id" +"%customer_name,","%customer_name," +"Once your package ships we will send you a tracking number.","Once your package ships we will send you a tracking number." +"Your Order #%increment_id","Your Order #%increment_id" +"Placed on %created_at","Placed on %created_at" +"Your shipping confirmation is below. Thank you again for your business.","Your shipping confirmation is below. Thank you again for your business." +"Your Shipment #%shipment_id for Order #%order_id","Your Shipment #%shipment_id for Order #%order_id" diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist index ef8df73676a75..e078323e26036 100644 --- a/dev/tests/integration/phpunit.xml.dist +++ b/dev/tests/integration/phpunit.xml.dist @@ -51,7 +51,7 @@ - + diff --git a/lib/web/i18n/en_US.csv b/lib/web/i18n/en_US.csv index 07dafcbfe73ba..db8a2345b3858 100644 --- a/lib/web/i18n/en_US.csv +++ b/lib/web/i18n/en_US.csv @@ -1,23 +1,27 @@ +"Backup options","Backup options" +Warning,Warning +Cancel,Cancel +Ok,Ok "Insert Widget...","Insert Widget..." "No records found.","No records found." "Recent items","Recent items" "Show all...","Show all..." -"Method ","Method " -"Please wait...","Please wait..." +"Method %s does not exist on jQuery.decorate","Method %s does not exist on jQuery.decorate" +Close,Close +Next,Next +Previous,Previous "Please wait...","Please wait..." Loading...,Loading... -Loading...,Loading... -Cancel,Cancel +"All ","All " +more,more 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 date between %min and %max.","Please enter a date between %min and %max." "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." -"Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored.","Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored." +"Please enter a date from the past.","Please enter a date from the past." From 11c026dae7cff11921cc9a6a5b6dcd8fb1d949a4 Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Mon, 7 Mar 2016 11:14:25 -0600 Subject: [PATCH 10/44] MAGETWO-47595: [Github] Translation files are inconsistent with the code - Revert change to phpunit.xml --- dev/tests/integration/phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist index e078323e26036..ef8df73676a75 100644 --- a/dev/tests/integration/phpunit.xml.dist +++ b/dev/tests/integration/phpunit.xml.dist @@ -51,7 +51,7 @@ - + From 983d59b5c0014bc3fed282f77a664a2b0678c837 Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Mon, 7 Mar 2016 21:46:53 +0200 Subject: [PATCH 11/44] MAGETWO-50030: ObjectManager/Runtime unit test fails on running single - fixed SwitcherTest --- app/code/Magento/Store/Test/Unit/Block/Store/SwitcherTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Store/Test/Unit/Block/Store/SwitcherTest.php b/app/code/Magento/Store/Test/Unit/Block/Store/SwitcherTest.php index fe061e474c665..369f157d0fcf8 100644 --- a/app/code/Magento/Store/Test/Unit/Block/Store/SwitcherTest.php +++ b/app/code/Magento/Store/Test/Unit/Block/Store/SwitcherTest.php @@ -52,7 +52,7 @@ protected function setUp() ->getMock(); $this->storeGroupFactoryMock = $this->getMockBuilder('Magento\Store\Model\GroupFactory') ->disableOriginalConstructor() - ->setMethods([]) + ->setMethods(['create']) ->getMock(); $this->loadMocks(); $this->model = $objectManager->getObject( From 7b14b91ef2fb50f38209bd73fc9e28eefbf73142 Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Mon, 7 Mar 2016 14:58:55 -0600 Subject: [PATCH 12/44] MAGETWO-49451: Incorrect labels on PCF - Changed labels. --- .../Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php | 2 +- .../Ui/DataProvider/Product/Form/Modifier/CustomOptions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php index ea952c8ea24b5..c65df6f35d9b2 100644 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php @@ -445,7 +445,7 @@ protected function getTierPriceStructure($tierPricePath) 'formElement' => Select::NAME, 'componentType' => Field::NAME, 'dataScope' => 'website_id', - 'label' => __('Web Site'), + 'label' => __('Website'), 'options' => $this->getWebsites(), 'value' => $this->getDefaultWebsite(), 'visible' => $this->isMultiWebsites(), diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php index 3adcd5b57fc87..0496c42e2d1d1 100644 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php @@ -279,7 +279,7 @@ protected function getHeaderContainerConfig($sortOrder) 'componentType' => Container::NAME, 'template' => 'ui/form/components/complex', 'sortOrder' => $sortOrder, - 'content' => __('Custom options let shoppers choose the product variations they want.'), + 'content' => __('Custom options let customers choose the product variations they want.'), ], ], ], From ed8117d2519f928aed9db5297a214ee77ed52c44 Mon Sep 17 00:00:00 2001 From: Alexander Paliarush Date: Mon, 7 Mar 2016 15:16:04 -0600 Subject: [PATCH 13/44] MAGETWO-49939: Merchant can't assign CMS Page to few storeviews --- app/code/Magento/Cms/Model/Page/DataProvider.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Cms/Model/Page/DataProvider.php b/app/code/Magento/Cms/Model/Page/DataProvider.php index 9decacde3f178..6fa1e3f319e5c 100644 --- a/app/code/Magento/Cms/Model/Page/DataProvider.php +++ b/app/code/Magento/Cms/Model/Page/DataProvider.php @@ -61,10 +61,10 @@ public function getData() if (isset($this->loadedData)) { return $this->loadedData; } - $items = $this->collection->getItems(); - /** @var \Magento\Cms\Model\Page $page */ - foreach ($items as $page) { - $this->loadedData[$page->getId()] = $page->getData(); + foreach ($this->collection->getAllIds() as $pageId) { + /** @var \Magento\Cms\Model\Page $page */ + $page = $this->collection->getNewEmptyItem(); + $this->loadedData[$pageId] = $page->load($pageId)->getData(); } $data = $this->dataPersistor->get('cms_page'); From 7d00f2c98265d2887ad6d5cf1265f892e36e92f8 Mon Sep 17 00:00:00 2001 From: Alexander Paliarush Date: Mon, 7 Mar 2016 16:52:11 -0600 Subject: [PATCH 14/44] MAGETWO-49939: Merchant can't assign CMS Page to few storeviews - Fixed store view column content on the CMS Page grid --- .../Magento/Cms/Model/Page/DataProvider.php | 1 + .../ResourceModel/Page/Grid/Collection.php | 40 ++++++++++++------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/Cms/Model/Page/DataProvider.php b/app/code/Magento/Cms/Model/Page/DataProvider.php index 6fa1e3f319e5c..36db6e1e710bf 100644 --- a/app/code/Magento/Cms/Model/Page/DataProvider.php +++ b/app/code/Magento/Cms/Model/Page/DataProvider.php @@ -64,6 +64,7 @@ public function getData() foreach ($this->collection->getAllIds() as $pageId) { /** @var \Magento\Cms\Model\Page $page */ $page = $this->collection->getNewEmptyItem(); + /** Load every record separately to make sure the list of associated stores is available */ $this->loadedData[$pageId] = $page->load($pageId)->getData(); } diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php index 258391615b54a..98caec26f15d5 100644 --- a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php +++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php @@ -6,7 +6,7 @@ namespace Magento\Cms\Model\ResourceModel\Page\Grid; use Magento\Framework\Api\Search\SearchResultInterface; -use Magento\Framework\Search\AggregationInterface; +use Magento\Framework\Api\Search\AggregationInterface; use Magento\Cms\Model\ResourceModel\Page\Collection as PageCollection; /** @@ -20,6 +20,11 @@ class Collection extends PageCollection implements SearchResultInterface */ protected $aggregations; + /** + * @var \Magento\Framework\View\Element\UiComponent\DataProvider\Document[] + */ + private $loadedData; + /** * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory * @param \Psr\Log\LoggerInterface $logger @@ -86,19 +91,6 @@ public function setAggregations($aggregations) } - /** - * Retrieve all ids for collection - * Backward compatibility with EAV collection - * - * @param int $limit - * @param int $offset - * @return array - */ - public function getAllIds($limit = null, $offset = null) - { - return $this->getConnection()->fetchCol($this->_getAllIdsSelect($limit, $offset), $this->_bindParams); - } - /** * Get search criteria. * @@ -154,4 +146,24 @@ public function setItems(array $items = null) { return $this; } + + /** + * {@inheritdoc} + */ + public function getItems() + { + if (isset($this->loadedData)) { + return $this->loadedData; + } + /** Load every record separately to make sure the list of associated stores is available */ + /** @var \Magento\Framework\View\Element\UiComponent\DataProvider\Document $pageDocument */ + foreach (parent::getItems() as $pageDocument) { + /** @var \Magento\Cms\Model\Page $page */ + $page = $this->_entityFactory->create(\Magento\Cms\Model\Page::class); + $pageId = $pageDocument->getId(); + $this->loadedData[$pageId] = $pageDocument->setData($page->load($pageId)->getData()); + } + + return $this->loadedData; + } } From 5d065797eec26c84a1f92a4248751d423588efdf Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Tue, 8 Mar 2016 11:03:17 +0200 Subject: [PATCH 15/44] MAGETWO-50030: ObjectManager/Runtime unit test fails on running single - fixed tests with autogenearated objects --- .../Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php index 1870806dd4262..adfd191b4b70b 100644 --- a/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php +++ b/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php @@ -63,10 +63,12 @@ public function setUp() $this->detailsFactoryMock = $this->getMockBuilder('\Magento\Tax\Api\Data\GrandTotalDetailsInterfaceFactory') ->disableOriginalConstructor() + ->setMethods(['create']) ->getMock(); $this->ratesFactoryMock = $this->getMockBuilder('\Magento\Tax\Api\Data\GrandTotalRatesInterfaceFactory') ->disableOriginalConstructor() + ->setMethods(['create']) ->getMock(); $this->taxConfigMock = $this->getMockBuilder('\Magento\Tax\Model\Config') From f2013b503a18d1a3a3a079e950968262e5bf7ed3 Mon Sep 17 00:00:00 2001 From: Arkadii Chyzhov Date: Tue, 8 Mar 2016 12:01:33 +0200 Subject: [PATCH 16/44] MAGETWO-50030: ObjectManager/Runtime unit test fails on running single - fixed tests with autogenearated objects --- .../Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php b/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php index c52b985bc471a..2b4099a40e0b3 100644 --- a/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php +++ b/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php @@ -24,7 +24,7 @@ protected function setUp() $this->websiteCollectionFactoryMock = $this->getMockBuilder('Magento\Store\Model\ResourceModel\Website\CollectionFactory') ->disableOriginalConstructor() - ->setMethods([]) + ->setMethods(['create']) ->getMock(); $this->model = $objectManager->getObject( 'Magento\Store\Model\WebsiteRepository', From 47e2e815a81d57701c4379c12160c1e520ee8f4d Mon Sep 17 00:00:00 2001 From: Cari Spruiell Date: Tue, 8 Mar 2016 11:35:56 -0600 Subject: [PATCH 17/44] MAGETWO-49601: Language packs and case of names feels wrong - change case of magento and language pack directories --- app/i18n/{magento/de_de => Magento/de_DE}/LICENSE.txt | 0 app/i18n/{magento/de_de => Magento/de_DE}/LICENSE_AFL.txt | 0 app/i18n/{magento/de_de => Magento/de_DE}/composer.json | 0 app/i18n/{magento/de_de => Magento/de_DE}/language.xml | 0 app/i18n/{magento/de_de => Magento/de_DE}/registration.php | 0 app/i18n/{magento/en_us => Magento/en_US}/LICENSE.txt | 0 app/i18n/{magento/en_us => Magento/en_US}/LICENSE_AFL.txt | 0 app/i18n/{magento/en_us => Magento/en_US}/composer.json | 0 app/i18n/{magento/en_us => Magento/en_US}/language.xml | 0 app/i18n/{magento/en_us => Magento/en_US}/registration.php | 0 app/i18n/{magento/es_es => Magento/es_ES}/LICENSE.txt | 0 app/i18n/{magento/es_es => Magento/es_ES}/LICENSE_AFL.txt | 0 app/i18n/{magento/es_es => Magento/es_ES}/composer.json | 0 app/i18n/{magento/es_es => Magento/es_ES}/language.xml | 0 app/i18n/{magento/es_es => Magento/es_ES}/registration.php | 0 app/i18n/{magento/fr_fr => Magento/fr_FR}/LICENSE.txt | 0 app/i18n/{magento/fr_fr => Magento/fr_FR}/LICENSE_AFL.txt | 0 app/i18n/{magento/fr_fr => Magento/fr_FR}/composer.json | 0 app/i18n/{magento/fr_fr => Magento/fr_FR}/language.xml | 0 app/i18n/{magento/fr_fr => Magento/fr_FR}/registration.php | 0 app/i18n/{magento/nl_nl => Magento/nl_NL}/LICENSE.txt | 0 app/i18n/{magento/nl_nl => Magento/nl_NL}/LICENSE_AFL.txt | 0 app/i18n/{magento/nl_nl => Magento/nl_NL}/composer.json | 0 app/i18n/{magento/nl_nl => Magento/nl_NL}/language.xml | 0 app/i18n/{magento/nl_nl => Magento/nl_NL}/registration.php | 0 app/i18n/{magento/pt_br => Magento/pt_BR}/LICENSE.txt | 0 app/i18n/{magento/pt_br => Magento/pt_BR}/LICENSE_AFL.txt | 0 app/i18n/{magento/pt_br => Magento/pt_BR}/composer.json | 0 app/i18n/{magento/pt_br => Magento/pt_BR}/language.xml | 0 app/i18n/{magento/pt_br => Magento/pt_BR}/registration.php | 0 app/i18n/{magento/zh_hans_cn => Magento/zh_Hans_CN}/LICENSE.txt | 0 .../{magento/zh_hans_cn => Magento/zh_Hans_CN}/LICENSE_AFL.txt | 0 app/i18n/{magento/zh_hans_cn => Magento/zh_Hans_CN}/composer.json | 0 app/i18n/{magento/zh_hans_cn => Magento/zh_Hans_CN}/language.xml | 0 .../{magento/zh_hans_cn => Magento/zh_Hans_CN}/registration.php | 0 35 files changed, 0 insertions(+), 0 deletions(-) rename app/i18n/{magento/de_de => Magento/de_DE}/LICENSE.txt (100%) rename app/i18n/{magento/de_de => Magento/de_DE}/LICENSE_AFL.txt (100%) rename app/i18n/{magento/de_de => Magento/de_DE}/composer.json (100%) rename app/i18n/{magento/de_de => Magento/de_DE}/language.xml (100%) rename app/i18n/{magento/de_de => Magento/de_DE}/registration.php (100%) rename app/i18n/{magento/en_us => Magento/en_US}/LICENSE.txt (100%) rename app/i18n/{magento/en_us => Magento/en_US}/LICENSE_AFL.txt (100%) rename app/i18n/{magento/en_us => Magento/en_US}/composer.json (100%) rename app/i18n/{magento/en_us => Magento/en_US}/language.xml (100%) rename app/i18n/{magento/en_us => Magento/en_US}/registration.php (100%) rename app/i18n/{magento/es_es => Magento/es_ES}/LICENSE.txt (100%) rename app/i18n/{magento/es_es => Magento/es_ES}/LICENSE_AFL.txt (100%) rename app/i18n/{magento/es_es => Magento/es_ES}/composer.json (100%) rename app/i18n/{magento/es_es => Magento/es_ES}/language.xml (100%) rename app/i18n/{magento/es_es => Magento/es_ES}/registration.php (100%) rename app/i18n/{magento/fr_fr => Magento/fr_FR}/LICENSE.txt (100%) rename app/i18n/{magento/fr_fr => Magento/fr_FR}/LICENSE_AFL.txt (100%) rename app/i18n/{magento/fr_fr => Magento/fr_FR}/composer.json (100%) rename app/i18n/{magento/fr_fr => Magento/fr_FR}/language.xml (100%) rename app/i18n/{magento/fr_fr => Magento/fr_FR}/registration.php (100%) rename app/i18n/{magento/nl_nl => Magento/nl_NL}/LICENSE.txt (100%) rename app/i18n/{magento/nl_nl => Magento/nl_NL}/LICENSE_AFL.txt (100%) rename app/i18n/{magento/nl_nl => Magento/nl_NL}/composer.json (100%) rename app/i18n/{magento/nl_nl => Magento/nl_NL}/language.xml (100%) rename app/i18n/{magento/nl_nl => Magento/nl_NL}/registration.php (100%) rename app/i18n/{magento/pt_br => Magento/pt_BR}/LICENSE.txt (100%) rename app/i18n/{magento/pt_br => Magento/pt_BR}/LICENSE_AFL.txt (100%) rename app/i18n/{magento/pt_br => Magento/pt_BR}/composer.json (100%) rename app/i18n/{magento/pt_br => Magento/pt_BR}/language.xml (100%) rename app/i18n/{magento/pt_br => Magento/pt_BR}/registration.php (100%) rename app/i18n/{magento/zh_hans_cn => Magento/zh_Hans_CN}/LICENSE.txt (100%) rename app/i18n/{magento/zh_hans_cn => Magento/zh_Hans_CN}/LICENSE_AFL.txt (100%) rename app/i18n/{magento/zh_hans_cn => Magento/zh_Hans_CN}/composer.json (100%) rename app/i18n/{magento/zh_hans_cn => Magento/zh_Hans_CN}/language.xml (100%) rename app/i18n/{magento/zh_hans_cn => Magento/zh_Hans_CN}/registration.php (100%) diff --git a/app/i18n/magento/de_de/LICENSE.txt b/app/i18n/Magento/de_DE/LICENSE.txt similarity index 100% rename from app/i18n/magento/de_de/LICENSE.txt rename to app/i18n/Magento/de_DE/LICENSE.txt diff --git a/app/i18n/magento/de_de/LICENSE_AFL.txt b/app/i18n/Magento/de_DE/LICENSE_AFL.txt similarity index 100% rename from app/i18n/magento/de_de/LICENSE_AFL.txt rename to app/i18n/Magento/de_DE/LICENSE_AFL.txt diff --git a/app/i18n/magento/de_de/composer.json b/app/i18n/Magento/de_DE/composer.json similarity index 100% rename from app/i18n/magento/de_de/composer.json rename to app/i18n/Magento/de_DE/composer.json diff --git a/app/i18n/magento/de_de/language.xml b/app/i18n/Magento/de_DE/language.xml similarity index 100% rename from app/i18n/magento/de_de/language.xml rename to app/i18n/Magento/de_DE/language.xml diff --git a/app/i18n/magento/de_de/registration.php b/app/i18n/Magento/de_DE/registration.php similarity index 100% rename from app/i18n/magento/de_de/registration.php rename to app/i18n/Magento/de_DE/registration.php diff --git a/app/i18n/magento/en_us/LICENSE.txt b/app/i18n/Magento/en_US/LICENSE.txt similarity index 100% rename from app/i18n/magento/en_us/LICENSE.txt rename to app/i18n/Magento/en_US/LICENSE.txt diff --git a/app/i18n/magento/en_us/LICENSE_AFL.txt b/app/i18n/Magento/en_US/LICENSE_AFL.txt similarity index 100% rename from app/i18n/magento/en_us/LICENSE_AFL.txt rename to app/i18n/Magento/en_US/LICENSE_AFL.txt diff --git a/app/i18n/magento/en_us/composer.json b/app/i18n/Magento/en_US/composer.json similarity index 100% rename from app/i18n/magento/en_us/composer.json rename to app/i18n/Magento/en_US/composer.json diff --git a/app/i18n/magento/en_us/language.xml b/app/i18n/Magento/en_US/language.xml similarity index 100% rename from app/i18n/magento/en_us/language.xml rename to app/i18n/Magento/en_US/language.xml diff --git a/app/i18n/magento/en_us/registration.php b/app/i18n/Magento/en_US/registration.php similarity index 100% rename from app/i18n/magento/en_us/registration.php rename to app/i18n/Magento/en_US/registration.php diff --git a/app/i18n/magento/es_es/LICENSE.txt b/app/i18n/Magento/es_ES/LICENSE.txt similarity index 100% rename from app/i18n/magento/es_es/LICENSE.txt rename to app/i18n/Magento/es_ES/LICENSE.txt diff --git a/app/i18n/magento/es_es/LICENSE_AFL.txt b/app/i18n/Magento/es_ES/LICENSE_AFL.txt similarity index 100% rename from app/i18n/magento/es_es/LICENSE_AFL.txt rename to app/i18n/Magento/es_ES/LICENSE_AFL.txt diff --git a/app/i18n/magento/es_es/composer.json b/app/i18n/Magento/es_ES/composer.json similarity index 100% rename from app/i18n/magento/es_es/composer.json rename to app/i18n/Magento/es_ES/composer.json diff --git a/app/i18n/magento/es_es/language.xml b/app/i18n/Magento/es_ES/language.xml similarity index 100% rename from app/i18n/magento/es_es/language.xml rename to app/i18n/Magento/es_ES/language.xml diff --git a/app/i18n/magento/es_es/registration.php b/app/i18n/Magento/es_ES/registration.php similarity index 100% rename from app/i18n/magento/es_es/registration.php rename to app/i18n/Magento/es_ES/registration.php diff --git a/app/i18n/magento/fr_fr/LICENSE.txt b/app/i18n/Magento/fr_FR/LICENSE.txt similarity index 100% rename from app/i18n/magento/fr_fr/LICENSE.txt rename to app/i18n/Magento/fr_FR/LICENSE.txt diff --git a/app/i18n/magento/fr_fr/LICENSE_AFL.txt b/app/i18n/Magento/fr_FR/LICENSE_AFL.txt similarity index 100% rename from app/i18n/magento/fr_fr/LICENSE_AFL.txt rename to app/i18n/Magento/fr_FR/LICENSE_AFL.txt diff --git a/app/i18n/magento/fr_fr/composer.json b/app/i18n/Magento/fr_FR/composer.json similarity index 100% rename from app/i18n/magento/fr_fr/composer.json rename to app/i18n/Magento/fr_FR/composer.json diff --git a/app/i18n/magento/fr_fr/language.xml b/app/i18n/Magento/fr_FR/language.xml similarity index 100% rename from app/i18n/magento/fr_fr/language.xml rename to app/i18n/Magento/fr_FR/language.xml diff --git a/app/i18n/magento/fr_fr/registration.php b/app/i18n/Magento/fr_FR/registration.php similarity index 100% rename from app/i18n/magento/fr_fr/registration.php rename to app/i18n/Magento/fr_FR/registration.php diff --git a/app/i18n/magento/nl_nl/LICENSE.txt b/app/i18n/Magento/nl_NL/LICENSE.txt similarity index 100% rename from app/i18n/magento/nl_nl/LICENSE.txt rename to app/i18n/Magento/nl_NL/LICENSE.txt diff --git a/app/i18n/magento/nl_nl/LICENSE_AFL.txt b/app/i18n/Magento/nl_NL/LICENSE_AFL.txt similarity index 100% rename from app/i18n/magento/nl_nl/LICENSE_AFL.txt rename to app/i18n/Magento/nl_NL/LICENSE_AFL.txt diff --git a/app/i18n/magento/nl_nl/composer.json b/app/i18n/Magento/nl_NL/composer.json similarity index 100% rename from app/i18n/magento/nl_nl/composer.json rename to app/i18n/Magento/nl_NL/composer.json diff --git a/app/i18n/magento/nl_nl/language.xml b/app/i18n/Magento/nl_NL/language.xml similarity index 100% rename from app/i18n/magento/nl_nl/language.xml rename to app/i18n/Magento/nl_NL/language.xml diff --git a/app/i18n/magento/nl_nl/registration.php b/app/i18n/Magento/nl_NL/registration.php similarity index 100% rename from app/i18n/magento/nl_nl/registration.php rename to app/i18n/Magento/nl_NL/registration.php diff --git a/app/i18n/magento/pt_br/LICENSE.txt b/app/i18n/Magento/pt_BR/LICENSE.txt similarity index 100% rename from app/i18n/magento/pt_br/LICENSE.txt rename to app/i18n/Magento/pt_BR/LICENSE.txt diff --git a/app/i18n/magento/pt_br/LICENSE_AFL.txt b/app/i18n/Magento/pt_BR/LICENSE_AFL.txt similarity index 100% rename from app/i18n/magento/pt_br/LICENSE_AFL.txt rename to app/i18n/Magento/pt_BR/LICENSE_AFL.txt diff --git a/app/i18n/magento/pt_br/composer.json b/app/i18n/Magento/pt_BR/composer.json similarity index 100% rename from app/i18n/magento/pt_br/composer.json rename to app/i18n/Magento/pt_BR/composer.json diff --git a/app/i18n/magento/pt_br/language.xml b/app/i18n/Magento/pt_BR/language.xml similarity index 100% rename from app/i18n/magento/pt_br/language.xml rename to app/i18n/Magento/pt_BR/language.xml diff --git a/app/i18n/magento/pt_br/registration.php b/app/i18n/Magento/pt_BR/registration.php similarity index 100% rename from app/i18n/magento/pt_br/registration.php rename to app/i18n/Magento/pt_BR/registration.php diff --git a/app/i18n/magento/zh_hans_cn/LICENSE.txt b/app/i18n/Magento/zh_Hans_CN/LICENSE.txt similarity index 100% rename from app/i18n/magento/zh_hans_cn/LICENSE.txt rename to app/i18n/Magento/zh_Hans_CN/LICENSE.txt diff --git a/app/i18n/magento/zh_hans_cn/LICENSE_AFL.txt b/app/i18n/Magento/zh_Hans_CN/LICENSE_AFL.txt similarity index 100% rename from app/i18n/magento/zh_hans_cn/LICENSE_AFL.txt rename to app/i18n/Magento/zh_Hans_CN/LICENSE_AFL.txt diff --git a/app/i18n/magento/zh_hans_cn/composer.json b/app/i18n/Magento/zh_Hans_CN/composer.json similarity index 100% rename from app/i18n/magento/zh_hans_cn/composer.json rename to app/i18n/Magento/zh_Hans_CN/composer.json diff --git a/app/i18n/magento/zh_hans_cn/language.xml b/app/i18n/Magento/zh_Hans_CN/language.xml similarity index 100% rename from app/i18n/magento/zh_hans_cn/language.xml rename to app/i18n/Magento/zh_Hans_CN/language.xml diff --git a/app/i18n/magento/zh_hans_cn/registration.php b/app/i18n/Magento/zh_Hans_CN/registration.php similarity index 100% rename from app/i18n/magento/zh_hans_cn/registration.php rename to app/i18n/Magento/zh_Hans_CN/registration.php From e2bcefefe9d05b47f0dbc1a9229b83f7041186f9 Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Tue, 8 Mar 2016 14:03:30 -0600 Subject: [PATCH 18/44] MAGETWO-50195: Admin Url is getting indexed in Google - Now only frontend area is indexed. --- .../Magento/Framework/View/Page/Config.php | 24 +++++++++++++++++++ .../View/Test/Unit/Page/ConfigTest.php | 20 ++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php index 45d47247212d3..ef23455f0a000 100644 --- a/lib/internal/Magento/Framework/View/Page/Config.php +++ b/lib/internal/Magento/Framework/View/Page/Config.php @@ -117,6 +117,27 @@ class Config 'robots' => null, ]; + /** + * @var \Magento\Framework\App\State + */ + private $areaResolver; + + /** + * This getter serves as a workaround to add this dependency to this class without breaking constructor structure. + * + * @return \Magento\Framework\App\State + * + * @deprecated + */ + private function getAreaResolver() + { + if ($this->areaResolver === null) { + $this->areaResolver = \Magento\Framework\App\ObjectManager::getInstance() + ->get('Magento\Framework\App\State'); + } + return $this->areaResolver; + } + /** * @param \Magento\Framework\View\Asset\Repository $assetRepo * @param \Magento\Framework\View\Asset\GroupedCollection $pageAssets @@ -350,6 +371,9 @@ public function setRobots($robots) */ public function getRobots() { + if ($this->getAreaResolver()->getAreaCode() !== 'frontend') { + return 'NOINDEX,NOFOLLOW'; + } $this->build(); if (empty($this->metadata['robots'])) { $this->metadata['robots'] = $this->scopeConfig->getValue( diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php index 3519062bbc3ec..7d56e64d8e5e3 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php @@ -59,6 +59,11 @@ class ConfigTest extends \PHPUnit_Framework_TestCase */ protected $title; + /** + * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject + */ + protected $areaResolverMock; + public function setUp() { $this->assetRepo = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false); @@ -84,6 +89,11 @@ public function setUp() 'localeResolver' => $locale, ] ); + + $this->areaResolverMock = $this->getMock('Magento\Framework\App\State', [], [], '', false); + $areaResolverReflection = (new \ReflectionClass(get_class($this->model)))->getProperty('areaResolver'); + $areaResolverReflection->setAccessible(true); + $areaResolverReflection->setValue($this->model, $this->areaResolverMock); } public function testSetBuilder() @@ -202,6 +212,7 @@ public function testKeywordsEmpty() public function testRobots() { + $this->areaResolverMock->expects($this->once())->method('getAreaCode')->willReturn('frontend'); $robots = 'test_robots'; $this->model->setRobots($robots); $this->assertEquals($robots, $this->model->getRobots()); @@ -209,6 +220,7 @@ public function testRobots() public function testRobotsEmpty() { + $this->areaResolverMock->expects($this->once())->method('getAreaCode')->willReturn('frontend'); $expectedData = 'default_robots'; $this->scopeConfig->expects($this->once())->method('getValue')->with( 'design/search_engine_robots/default_robots', @@ -218,6 +230,14 @@ public function testRobotsEmpty() $this->assertEquals($expectedData, $this->model->getRobots()); } + public function testRobotsAdminhtml() + { + $this->areaResolverMock->expects($this->once())->method('getAreaCode')->willReturn('adminhtml'); + $robots = 'test_robots'; + $this->model->setRobots($robots); + $this->assertEquals('NOINDEX,NOFOLLOW', $this->model->getRobots()); + } + public function testGetAssetCollection() { $this->assertInstanceOf('Magento\Framework\View\Asset\GroupedCollection', $this->model->getAssetCollection()); From 82771f84f79a0d5498a510249b644891b3ff7091 Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Tue, 8 Mar 2016 18:42:41 -0600 Subject: [PATCH 19/44] MAGETWO-48568: CLONE - PHP bug in libxml can bring website down [is relevant for php versions less than 5.5.22] - Bumped up minimum php55 supported version to 5.5.22 --- composer.json | 2 +- composer.lock | 131 ++++++++++++++++++++++++++------------------------ 2 files changed, 68 insertions(+), 65 deletions(-) diff --git a/composer.json b/composer.json index db3b1b781892e..e85db262fb81f 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "php": "~5.5.0|~5.6.0|~7.0.0", + "php": "~5.5.22|~5.6.0|~7.0.0", "zendframework/zend-stdlib": "~2.4.6", "zendframework/zend-code": "~2.4.6", "zendframework/zend-server": "~2.4.6", diff --git a/composer.lock b/composer.lock index d7525677fdd8f..bbba1b6a518e7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "ac56596efe7d8aa9a070776885b20938", - "content-hash": "cedec14d2f9b4094b7aca6bdbbfc17c9", + "hash": "2b000fed4f4ab6d59860e6d9b6076025", + "content-hash": "5a20af08ed39755e0bc81620f125c596", "packages": [ { "name": "braintree/braintree_php", @@ -301,16 +301,16 @@ }, { "name": "magento/magento-composer-installer", - "version": "0.1.5", + "version": "0.1.6", "source": { "type": "git", "url": "https://github.com/magento/magento-composer-installer.git", - "reference": "1b33917bfc3f4a0856276dcbe46ce35362f50fc3" + "reference": "5b5d29ebe060bc6754c2999206923489db8ca641" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/1b33917bfc3f4a0856276dcbe46ce35362f50fc3", - "reference": "1b33917bfc3f4a0856276dcbe46ce35362f50fc3", + "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/5b5d29ebe060bc6754c2999206923489db8ca641", + "reference": "5b5d29ebe060bc6754c2999206923489db8ca641", "shasum": "" }, "require": { @@ -373,7 +373,7 @@ "composer-installer", "magento" ], - "time": "2015-09-14 19:59:55" + "time": "2016-01-25 22:04:43" }, { "name": "magento/zendframework1", @@ -797,7 +797,7 @@ }, { "name": "symfony/console", - "version": "v2.6.12", + "version": "v2.6.13", "target-dir": "Symfony/Component/Console", "source": { "type": "git", @@ -855,16 +855,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.8.1", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc" + "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc", - "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/78c468665c9568c3faaa9c416a7134308f2d85c3", + "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3", "shasum": "" }, "require": { @@ -911,20 +911,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-10-30 20:15:42" + "time": "2016-01-27 05:14:19" }, { "name": "symfony/finder", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "c90fabdd97e431ee19b6383999cf35334dff27da" + "reference": "877bb4b16ea573cc8c024e9590888fcf7eb7e0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/c90fabdd97e431ee19b6383999cf35334dff27da", - "reference": "c90fabdd97e431ee19b6383999cf35334dff27da", + "url": "https://api.github.com/repos/symfony/finder/zipball/877bb4b16ea573cc8c024e9590888fcf7eb7e0f7", + "reference": "877bb4b16ea573cc8c024e9590888fcf7eb7e0f7", "shasum": "" }, "require": { @@ -960,20 +960,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-01-14 08:26:52" + "time": "2016-02-22 16:12:45" }, { "name": "symfony/process", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac" + "reference": "7dedd5b60550f33dca16dd7e94ef8aca8b67bbfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac", - "reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac", + "url": "https://api.github.com/repos/symfony/process/zipball/7dedd5b60550f33dca16dd7e94ef8aca8b67bbfe", + "reference": "7dedd5b60550f33dca16dd7e94ef8aca8b67bbfe", "shasum": "" }, "require": { @@ -1009,7 +1009,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-01-06 09:59:23" + "time": "2016-02-02 13:33:15" }, { "name": "tedivm/jshrink", @@ -2658,16 +2658,16 @@ }, { "name": "fabpot/php-cs-fixer", - "version": "v1.11.1", + "version": "v1.11.2", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "2c9f8298181f059c5077abda78019b9a0c9a7cc0" + "reference": "41f70154642ec0f9ea9ea9c290943f3b5dfa76fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/2c9f8298181f059c5077abda78019b9a0c9a7cc0", - "reference": "2c9f8298181f059c5077abda78019b9a0c9a7cc0", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/41f70154642ec0f9ea9ea9c290943f3b5dfa76fc", + "reference": "41f70154642ec0f9ea9ea9c290943f3b5dfa76fc", "shasum": "" }, "require": { @@ -2708,7 +2708,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2016-01-20 19:00:28" + "time": "2016-02-26 07:37:29" }, { "name": "league/climate", @@ -2868,16 +2868,16 @@ }, { "name": "phpmd/phpmd", - "version": "2.3.2", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "08b5bcd454a7148579b68931fc500d824afd3bb5" + "reference": "1ce4c586f4071d27a82421e56ae0e9864c89094d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/08b5bcd454a7148579b68931fc500d824afd3bb5", - "reference": "08b5bcd454a7148579b68931fc500d824afd3bb5", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/1ce4c586f4071d27a82421e56ae0e9864c89094d", + "reference": "1ce4c586f4071d27a82421e56ae0e9864c89094d", "shasum": "" }, "require": { @@ -2929,7 +2929,7 @@ "phpmd", "pmd" ], - "time": "2015-09-24 14:37:49" + "time": "2016-03-08 21:43:36" }, { "name": "phpunit/php-code-coverage", @@ -3417,16 +3417,16 @@ }, { "name": "sebastian/environment", - "version": "1.3.3", + "version": "1.3.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6e7133793a8e5a5714a551a8324337374be209df" + "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df", - "reference": "6e7133793a8e5a5714a551a8324337374be209df", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", + "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", "shasum": "" }, "require": { @@ -3463,7 +3463,7 @@ "environment", "hhvm" ], - "time": "2015-12-02 08:37:27" + "time": "2016-02-26 18:40:46" }, { "name": "sebastian/exporter", @@ -3749,22 +3749,25 @@ }, { "name": "symfony/config", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "41ee6c70758f40fa1dbf90d019ae0a66c4a09e74" + "reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/41ee6c70758f40fa1dbf90d019ae0a66c4a09e74", - "reference": "41ee6c70758f40fa1dbf90d019ae0a66c4a09e74", + "url": "https://api.github.com/repos/symfony/config/zipball/0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19", + "reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19", "shasum": "" }, "require": { "php": ">=5.3.9", "symfony/filesystem": "~2.3|~3.0.0" }, + "suggest": { + "symfony/yaml": "To use the yaml reference dumper" + }, "type": "library", "extra": { "branch-alias": { @@ -3795,20 +3798,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2016-01-03 15:33:41" + "time": "2016-02-22 16:12:45" }, { "name": "symfony/dependency-injection", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "ba94a914e244e0d05f0aaef460d5558d5541d2b1" + "reference": "62251761a7615435b22ccf562384c588b431be44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ba94a914e244e0d05f0aaef460d5558d5541d2b1", - "reference": "ba94a914e244e0d05f0aaef460d5558d5541d2b1", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/62251761a7615435b22ccf562384c588b431be44", + "reference": "62251761a7615435b22ccf562384c588b431be44", "shasum": "" }, "require": { @@ -3857,20 +3860,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2016-01-12 17:46:01" + "time": "2016-02-28 16:34:46" }, { "name": "symfony/filesystem", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "637b64d0ee10f44ae98dbad651b1ecdf35a11e8c" + "reference": "65cb36b6539b1d446527d60457248f30d045464d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/637b64d0ee10f44ae98dbad651b1ecdf35a11e8c", - "reference": "637b64d0ee10f44ae98dbad651b1ecdf35a11e8c", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/65cb36b6539b1d446527d60457248f30d045464d", + "reference": "65cb36b6539b1d446527d60457248f30d045464d", "shasum": "" }, "require": { @@ -3906,20 +3909,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2016-01-13 10:28:07" + "time": "2016-02-22 15:02:30" }, { "name": "symfony/stopwatch", - "version": "v3.0.1", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800" + "reference": "4a204804952ff267ace88cf499e0b4bb302a475e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6aeac8907e3e1340a0033b0a9ec075f8e6524800", - "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4a204804952ff267ace88cf499e0b4bb302a475e", + "reference": "4a204804952ff267ace88cf499e0b4bb302a475e", "shasum": "" }, "require": { @@ -3955,20 +3958,20 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2015-10-30 23:35:59" + "time": "2016-01-03 15:35:16" }, { "name": "symfony/yaml", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8" + "reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/34c8a4b51e751e7ea869b8262f883d008a2b81b8", - "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8", + "url": "https://api.github.com/repos/symfony/yaml/zipball/2a4ee40acb880c56f29fb1b8886e7ffe94f3b995", + "reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995", "shasum": "" }, "require": { @@ -4004,7 +4007,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-01-13 10:28:07" + "time": "2016-02-23 07:41:20" } ], "aliases": [], @@ -4016,7 +4019,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "~5.5.0|~5.6.0|~7.0.0", + "php": "~5.5.22|~5.6.0|~7.0.0", "lib-libxml": "*", "ext-ctype": "*", "ext-gd": "*", From 9f4675657a3a8df98a959ae3b9b85c38b0dc41f3 Mon Sep 17 00:00:00 2001 From: "Tanniru, Murali(mtanniru)" Date: Wed, 9 Mar 2016 10:38:01 -0600 Subject: [PATCH 20/44] MAGETWO-49886: [PS-API-FT] Test 'EditCurrencySymbolEntityTest' failed with message 'Timed out after 120 seconds'. - After currency rate import, added functionality to add/edit Currency Rate explicitly. - That fixed the error where if import fails, ft script will add Currency Rate explicitly. --- .../System/Currency/Rate/CurrencyRateForm.php | 22 +++++++++++++++++++ .../Page/Adminhtml/ConfigCurrencySetUp.xml | 12 ++++++++++ .../AbstractCurrencySymbolEntityTest.php | 17 +++++++++++++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/ConfigCurrencySetUp.xml diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php index dd274d5fc172f..185bef1678c7a 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php @@ -28,6 +28,7 @@ class CurrencyRateForm extends Form * @var string */ protected $importButton = '[data-ui-id$="import-button"]'; + protected $setUSDUAHRate = '[name$="rate[USD][UAH]"]'; /** * Click on the "Import" button. @@ -50,6 +51,27 @@ function () use ($browser, $selector) { ); } + /* + * Populate USD-UAH rate value. + * + * @throws \Exception + * @return void + */ + public function setCurrencyUSDUAHRate() + { + $this->_rootElement->find($this->setUSDUAHRate)->setValue('2.000'); + + //Wait message + $browser = $this->browser; + $selector = $this->message; + $browser->waitUntil( + function () use ($browser, $selector) { + $message = $browser->find($selector); + return $message->isVisible() ? true : null; + } + ); + } + /** * Fill "Currency Rates" form. * diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/ConfigCurrencySetUp.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/ConfigCurrencySetUp.xml new file mode 100644 index 0000000000000..c47ea06aa3561 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/ConfigCurrencySetUp.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php index acc4e79d62648..c78ea68355906 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php @@ -9,6 +9,7 @@ use Magento\Mtf\Fixture\FixtureFactory; use Magento\Mtf\TestCase\Injectable; use Magento\Catalog\Test\Fixture\CatalogProductSimple; +use Magento\Config\Test\Page\Adminhtml\ConfigCurrencySetup; use Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencyIndex; use Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencySymbolIndex; @@ -17,6 +18,13 @@ */ abstract class AbstractCurrencySymbolEntityTest extends Injectable { + /** + * Store>Config>General>CurrencyPage + * + * @var ConfigCurrencySetup + */ + + protected $ConfigCurrencySetup; /** * System Currency Symbol grid page. * @@ -40,17 +48,19 @@ abstract class AbstractCurrencySymbolEntityTest extends Injectable /** * Create simple product and inject pages. - * + * @param ConfigCurrencySetup $configCurrencySetup * @param SystemCurrencySymbolIndex $currencySymbolIndex * @param SystemCurrencyIndex $currencyIndex * @param FixtureFactory $fixtureFactory * @return array */ public function __inject( + ConfigCurrencySetup $configCurrencySetup, SystemCurrencySymbolIndex $currencySymbolIndex, SystemCurrencyIndex $currencyIndex, FixtureFactory $fixtureFactory ) { + $this->ConfigCurrencySetup = $configCurrencySetup; $this->currencySymbolIndex = $currencySymbolIndex; $this->currencyIndex = $currencyIndex; $this->fixtureFactory = $fixtureFactory; @@ -77,9 +87,14 @@ protected function importCurrencyRate($configData) ['configData' => $configData] )->run(); + //Click 'Save Config' on 'Config>>Currency Setup' page. + $this->ConfigCurrencySetup->open(); + $this->ConfigCurrencySetup->getFormPageActions()->save(); + // Import Exchange Rates for currencies $this->currencyIndex->open(); $this->currencyIndex->getCurrencyRateForm()->clickImportButton(); + $this->currencyIndex->getCurrencyRateForm()->setCurrencyUSDUAHRate(); if ($this->currencyIndex->getMessagesBlock()->isVisibleMessage('warning')) { throw new \Exception($this->currencyIndex->getMessagesBlock()->getWarningMessages()); } From 7dcc56a54909a4f5e6d1955bb43952780f1cf27f Mon Sep 17 00:00:00 2001 From: Alexander Paliarush Date: Wed, 9 Mar 2016 10:38:04 -0600 Subject: [PATCH 21/44] MAGETWO-49939: Merchant can't assign CMS Page to few storeviews --- .../Cms/Model/ResourceModel/Page/Grid/Collection.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php index 98caec26f15d5..7dac815ba58b3 100644 --- a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php +++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php @@ -90,7 +90,6 @@ public function setAggregations($aggregations) $this->aggregations = $aggregations; } - /** * Get search criteria. * @@ -155,13 +154,14 @@ public function getItems() if (isset($this->loadedData)) { return $this->loadedData; } + /** @var \Magento\Cms\Model\Page $page */ + $page = $this->_entityFactory->create(\Magento\Cms\Model\Page::class); /** Load every record separately to make sure the list of associated stores is available */ /** @var \Magento\Framework\View\Element\UiComponent\DataProvider\Document $pageDocument */ foreach (parent::getItems() as $pageDocument) { - /** @var \Magento\Cms\Model\Page $page */ - $page = $this->_entityFactory->create(\Magento\Cms\Model\Page::class); - $pageId = $pageDocument->getId(); - $this->loadedData[$pageId] = $pageDocument->setData($page->load($pageId)->getData()); + $this->loadedData[$pageDocument->getId()] = $pageDocument->setData( + $page->load($pageDocument->getId())->getData() + ); } return $this->loadedData; From 06906af00c7a9c581702e6a566c4b229614dad82 Mon Sep 17 00:00:00 2001 From: Cari Spruiell Date: Wed, 9 Mar 2016 10:59:21 -0600 Subject: [PATCH 22/44] MAGETWO-49601: Language packs and case of names feels wrong - updated language.xml files for case changes in vendor and package --- app/i18n/Magento/de_DE/language.xml | 4 ++-- app/i18n/Magento/en_US/language.xml | 4 ++-- app/i18n/Magento/es_ES/language.xml | 4 ++-- app/i18n/Magento/fr_FR/language.xml | 4 ++-- app/i18n/Magento/nl_NL/language.xml | 4 ++-- app/i18n/Magento/pt_BR/language.xml | 4 ++-- app/i18n/Magento/zh_Hans_CN/language.xml | 4 ++-- .../Test/Integrity/App/Language/_files/known_valid.xml | 4 ++-- lib/internal/Magento/Framework/App/Language/package.xsd | 2 +- .../Magento/Framework/App/Test/Unit/Language/ConfigTest.php | 2 +- .../Framework/App/Test/Unit/Language/_files/language.xml | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/i18n/Magento/de_DE/language.xml b/app/i18n/Magento/de_DE/language.xml index cd2064951a20a..6df9ea0b5d93f 100644 --- a/app/i18n/Magento/de_DE/language.xml +++ b/app/i18n/Magento/de_DE/language.xml @@ -7,6 +7,6 @@ --> de_DE - magento - de_de + Magento + de_DE diff --git a/app/i18n/Magento/en_US/language.xml b/app/i18n/Magento/en_US/language.xml index 2e972271be60d..26e7be425b9d7 100644 --- a/app/i18n/Magento/en_US/language.xml +++ b/app/i18n/Magento/en_US/language.xml @@ -7,6 +7,6 @@ --> en_US - magento - en_us + Magento + en_US diff --git a/app/i18n/Magento/es_ES/language.xml b/app/i18n/Magento/es_ES/language.xml index 900c00b8eb94e..d61d88d4f0572 100644 --- a/app/i18n/Magento/es_ES/language.xml +++ b/app/i18n/Magento/es_ES/language.xml @@ -7,6 +7,6 @@ --> es_ES - magento - es_es + Magento + es_ES diff --git a/app/i18n/Magento/fr_FR/language.xml b/app/i18n/Magento/fr_FR/language.xml index bf9efc5171311..0a27452165a1f 100644 --- a/app/i18n/Magento/fr_FR/language.xml +++ b/app/i18n/Magento/fr_FR/language.xml @@ -7,6 +7,6 @@ --> fr_FR - magento - fr_fr + Magento + fr_FR diff --git a/app/i18n/Magento/nl_NL/language.xml b/app/i18n/Magento/nl_NL/language.xml index 6928b7fa994f7..af69a573acdf7 100644 --- a/app/i18n/Magento/nl_NL/language.xml +++ b/app/i18n/Magento/nl_NL/language.xml @@ -7,6 +7,6 @@ --> nl_NL - magento - nl_nl + Magento + nl_NL diff --git a/app/i18n/Magento/pt_BR/language.xml b/app/i18n/Magento/pt_BR/language.xml index 8fd675a6a5179..31bee1a53868d 100644 --- a/app/i18n/Magento/pt_BR/language.xml +++ b/app/i18n/Magento/pt_BR/language.xml @@ -7,6 +7,6 @@ --> pt_BR - magento - pt_br + Magento + pt_BR diff --git a/app/i18n/Magento/zh_Hans_CN/language.xml b/app/i18n/Magento/zh_Hans_CN/language.xml index e3d04aae39223..f52fc6ba0e6f4 100644 --- a/app/i18n/Magento/zh_Hans_CN/language.xml +++ b/app/i18n/Magento/zh_Hans_CN/language.xml @@ -7,6 +7,6 @@ --> zh_Hans_CN - magento - zh_hans_cn + Magento + zh_Hans_CN diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/_files/known_valid.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/_files/known_valid.xml index d57e77e60a93c..2aff73bf7d128 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/_files/known_valid.xml +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/_files/known_valid.xml @@ -7,8 +7,8 @@ --> en_GB - magento - en_gb + Magento + en_GB 100 diff --git a/lib/internal/Magento/Framework/App/Language/package.xsd b/lib/internal/Magento/Framework/App/Language/package.xsd index d90f6ea172f14..714298be5a5e2 100644 --- a/lib/internal/Magento/Framework/App/Language/package.xsd +++ b/lib/internal/Magento/Framework/App/Language/package.xsd @@ -41,7 +41,7 @@ - + diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php index 5b2f4270d215b..01b54dd985f8b 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php @@ -58,7 +58,7 @@ public function testConfiguration() { $this->assertEquals('en_GB', $this->config->getCode()); $this->assertEquals('magento', $this->config->getVendor()); - $this->assertEquals('en_gb', $this->config->getPackage()); + $this->assertEquals('en_GB', $this->config->getPackage()); $this->assertEquals('100', $this->config->getSortOrder()); $this->assertEquals( [ diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Language/_files/language.xml b/lib/internal/Magento/Framework/App/Test/Unit/Language/_files/language.xml index d57e77e60a93c..2aff73bf7d128 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Language/_files/language.xml +++ b/lib/internal/Magento/Framework/App/Test/Unit/Language/_files/language.xml @@ -7,8 +7,8 @@ --> en_GB - magento - en_gb + Magento + en_GB 100 From ee19408bb060f921d1ee426beb8240d327a6b7b8 Mon Sep 17 00:00:00 2001 From: Cari Spruiell Date: Wed, 9 Mar 2016 13:24:44 -0600 Subject: [PATCH 23/44] MAGETWO-49601: Language packs and case of names feels wrong - fix test case --- .../Magento/Framework/App/Test/Unit/Language/ConfigTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php index 01b54dd985f8b..c87d499a3044d 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php @@ -57,7 +57,7 @@ function ($arguments) use ($validationStateMock) { public function testConfiguration() { $this->assertEquals('en_GB', $this->config->getCode()); - $this->assertEquals('magento', $this->config->getVendor()); + $this->assertEquals('Magento', $this->config->getVendor()); $this->assertEquals('en_GB', $this->config->getPackage()); $this->assertEquals('100', $this->config->getSortOrder()); $this->assertEquals( From 387ae1667cd7d7fac34a21378f5e6b6839327f8d Mon Sep 17 00:00:00 2001 From: "Tanniru, Murali(mtanniru)" Date: Wed, 9 Mar 2016 14:11:43 -0600 Subject: [PATCH 24/44] MAGETWO-49886: [PS-API-FT] Test 'EditCurrencySymbolEntityTest' failed with message 'Timed out after 120 seconds'. - Updated code to include comments from code review. - After currency rate import, added functionality to add/edit Currency Rate explicitly. - That fixed the error where if import fails, ft script will add Currency Rate explicitly. --- .../System/Currency/Rate/CurrencyRateForm.php | 12 +++++++++--- .../TestCase/AbstractCurrencySymbolEntityTest.php | 7 ++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php index 185bef1678c7a..b8a55d4dfb2a9 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php @@ -28,7 +28,13 @@ class CurrencyRateForm extends Form * @var string */ protected $importButton = '[data-ui-id$="import-button"]'; - protected $setUSDUAHRate = '[name$="rate[USD][UAH]"]'; + + /** + * Locator value for "[USD][UAH] Rate" text field. + * + * @var string + */ + protected $USDUAHRate = '[name$="rate[USD][UAH]"]'; /** * Click on the "Import" button. @@ -57,9 +63,9 @@ function () use ($browser, $selector) { * @throws \Exception * @return void */ - public function setCurrencyUSDUAHRate() + public function fillCurrencyUSDUAHRate() { - $this->_rootElement->find($this->setUSDUAHRate)->setValue('2.000'); + $this->_rootElement->find($this->USDUAHRate)->setValue('2.000'); //Wait message $browser = $this->browser; diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php index c78ea68355906..52d76826f67dc 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php @@ -19,12 +19,12 @@ abstract class AbstractCurrencySymbolEntityTest extends Injectable { /** - * Store>Config>General>CurrencyPage + * Store>Config>General>Currency Page. * * @var ConfigCurrencySetup */ - protected $ConfigCurrencySetup; + /** * System Currency Symbol grid page. * @@ -48,6 +48,7 @@ abstract class AbstractCurrencySymbolEntityTest extends Injectable /** * Create simple product and inject pages. + * * @param ConfigCurrencySetup $configCurrencySetup * @param SystemCurrencySymbolIndex $currencySymbolIndex * @param SystemCurrencyIndex $currencyIndex @@ -94,7 +95,7 @@ protected function importCurrencyRate($configData) // Import Exchange Rates for currencies $this->currencyIndex->open(); $this->currencyIndex->getCurrencyRateForm()->clickImportButton(); - $this->currencyIndex->getCurrencyRateForm()->setCurrencyUSDUAHRate(); + $this->currencyIndex->getCurrencyRateForm()->fillCurrencyUSDUAHRate(); if ($this->currencyIndex->getMessagesBlock()->isVisibleMessage('warning')) { throw new \Exception($this->currencyIndex->getMessagesBlock()->getWarningMessages()); } From 0c4cff4a14267099909ab8d35cacf115d0414c47 Mon Sep 17 00:00:00 2001 From: "Tanniru, Murali(mtanniru)" Date: Wed, 9 Mar 2016 14:48:39 -0600 Subject: [PATCH 25/44] MAGETWO-49886: [PS-API-FT] Test 'EditCurrencySymbolEntityTest' failed with message 'Timed out after 120 seconds'. - Updated code to include suggestions from code review. - After currency rate import, added functionality to add/edit Currency Rate explicitly. - That fixed the error where if import fails, ft script will add Currency Rate explicitly. --- .../TestCase/AbstractCurrencySymbolEntityTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php index 52d76826f67dc..ff3a4a8e5a456 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php @@ -19,11 +19,11 @@ abstract class AbstractCurrencySymbolEntityTest extends Injectable { /** - * Store>Config>General>Currency Page. + * Store config Currency Setup page. * * @var ConfigCurrencySetup */ - protected $ConfigCurrencySetup; + protected $configCurrencySetup; /** * System Currency Symbol grid page. @@ -49,19 +49,19 @@ abstract class AbstractCurrencySymbolEntityTest extends Injectable /** * Create simple product and inject pages. * - * @param ConfigCurrencySetup $configCurrencySetup + * @param configCurrencySetup $configCurrencySetup * @param SystemCurrencySymbolIndex $currencySymbolIndex * @param SystemCurrencyIndex $currencyIndex * @param FixtureFactory $fixtureFactory * @return array */ public function __inject( - ConfigCurrencySetup $configCurrencySetup, + configCurrencySetup $configCurrencySetup, SystemCurrencySymbolIndex $currencySymbolIndex, SystemCurrencyIndex $currencyIndex, FixtureFactory $fixtureFactory ) { - $this->ConfigCurrencySetup = $configCurrencySetup; + $this->configCurrencySetup = $configCurrencySetup; $this->currencySymbolIndex = $currencySymbolIndex; $this->currencyIndex = $currencyIndex; $this->fixtureFactory = $fixtureFactory; @@ -89,8 +89,8 @@ protected function importCurrencyRate($configData) )->run(); //Click 'Save Config' on 'Config>>Currency Setup' page. - $this->ConfigCurrencySetup->open(); - $this->ConfigCurrencySetup->getFormPageActions()->save(); + $this->configCurrencySetup->open(); + $this->configCurrencySetup->getFormPageActions()->save(); // Import Exchange Rates for currencies $this->currencyIndex->open(); From 48de6ea1cab97290ff108c104367439de64b0243 Mon Sep 17 00:00:00 2001 From: Alex Akimov Date: Thu, 10 Mar 2016 12:20:46 +0200 Subject: [PATCH 26/44] MAGETWO-49956: Store Selector for Product Page - Implemented workaround for product validation issue on custom store view; --- .../Model/Attribute/ScopeOverriddenValue.php | 2 +- .../Magento/Catalog/Model/ProductRepository.php | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php b/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php index 7ec725b01de34..559bf8d6a2596 100644 --- a/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php +++ b/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php @@ -140,7 +140,7 @@ private function initAttributeValues($entityType, $entity, $storeId) 'a.attribute_id = t.attribute_id', ['attribute_code' => 'a.attribute_code'] ) - ->where($metadata->getLinkField() . ' = ?', $entity->getId()) + ->where($metadata->getLinkField() . ' = ?', $entity->getData($metadata->getLinkField())) ->where('t.attribute_id IN (?)', $attributeCodes) ->where('t.store_id IN (?)', $storeIds); $selects[] = $select; diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php index 9f1087544ae23..76d048ebf2e98 100644 --- a/app/code/Magento/Catalog/Model/ProductRepository.php +++ b/app/code/Magento/Catalog/Model/ProductRepository.php @@ -498,12 +498,16 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO $product->setCanSaveCustomOptions(true); } - $validationResult = $this->resourceModel->validate($product); - if (true !== $validationResult) { - throw new \Magento\Framework\Exception\CouldNotSaveException( - __('Invalid product data: %1', implode(',', $validationResult)) - ); + $useValidation = \Magento\Store\Model\Store::ADMIN_CODE === $this->storeManager->getStore()->getCode(); + if ($useValidation) { + $validationResult = $this->resourceModel->validate($product); + if (true !== $validationResult) { + throw new \Magento\Framework\Exception\CouldNotSaveException( + __('Invalid product data: %1', implode(',', $validationResult)) + ); + } } + try { if ($tierPrices !== null) { $product->setData('tier_price', $tierPrices); From 706ea99b39fa3f9f1931f9a7dacbb147e85781bd Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Thu, 10 Mar 2016 11:18:14 -0600 Subject: [PATCH 27/44] MAGETWO-50223: [Currency Rates] When user navigates to Currency Rates page, on the grid, no rate (text) fields are displayed. - Updated matrix view to show a warning that would tell the user to configure the options before importing rates. - Updated the view with a button to quickly access configuration options for currency rates. --- .../Block/Adminhtml/System/Currency.php | 8 ++ .../system/currency/rate/matrix.phtml | 94 ++++++++++--------- 2 files changed, 57 insertions(+), 45 deletions(-) diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php index 2a75aaa720363..08485f59c9a28 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php @@ -37,6 +37,14 @@ protected function _prepareLayout() ] ); + $onClick = "setLocation('" . $this->getUrl('adminhtml/system_config/edit/section/currency') . "')"; + + $this->getToolbar()->addChild( + 'options_button', + 'Magento\Backend\Block\Widget\Button', + ['label' => __('Options'), 'onclick' => $onClick] + ); + $this->getToolbar()->addChild( 'reset_button', 'Magento\Backend\Block\Widget\Button', diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml index be2df0aae29af..2cfc1c1f81574 100644 --- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml +++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml @@ -17,53 +17,57 @@ $_oldRates = $block->getOldRates(); $_newRates = $block->getNewRates(); $_rates = ($_newRates) ? $_newRates : $_oldRates; ?> -
- getBlockHtml('formkey')?> -
- - + +

+ + + getBlockHtml('formkey')?> +
+
+ + + + getAllowedCurrencies() as $_currencyCode): ?> + + + + + getDefaultCurrencies() as $_currencyCode): ?> - - getAllowedCurrencies() as $_currencyCode): ?> - - + + $_value): ?> + + + + + + + + - - getDefaultCurrencies() as $_currencyCode): ?> - - - $_value): ?> - - - - - - - - - - -
 
  + /> + +
+ + 		+ /> + +
+ +
- /> - -
- - 		- /> - -
- -
-
-
+ + + + +