diff --git a/composer.lock b/composer.lock index ce4f68c76b..54d20e18fb 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.81.3", + "version": "3.82.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "e569fa3e8998dd20896ff189b063b61a5d42369d" + "reference": "651557da601b70d5bbcc6a9c371e8f8b6314f679" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e569fa3e8998dd20896ff189b063b61a5d42369d", - "reference": "e569fa3e8998dd20896ff189b063b61a5d42369d", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/651557da601b70d5bbcc6a9c371e8f8b6314f679", + "reference": "651557da601b70d5bbcc6a9c371e8f8b6314f679", "shasum": "" }, "require": { @@ -87,7 +87,7 @@ "s3", "sdk" ], - "time": "2018-12-11T23:08:33+00:00" + "time": "2018-12-18T23:04:30+00:00" }, { "name": "codeitnowin/barcode", @@ -3512,16 +3512,16 @@ }, { "name": "spryker-shop/company-page", - "version": "2.3.1", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/spryker-shop/company-page.git", - "reference": "e0f27a66a76bc96e7deda8d2112c92176bde4769" + "reference": "aa19b144d23b2650432cf2ffa3b7186d96277912" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/company-page/zipball/e0f27a66a76bc96e7deda8d2112c92176bde4769", - "reference": "e0f27a66a76bc96e7deda8d2112c92176bde4769", + "url": "https://api.github.com/repos/spryker-shop/company-page/zipball/aa19b144d23b2650432cf2ffa3b7186d96277912", + "reference": "aa19b144d23b2650432cf2ffa3b7186d96277912", "shasum": "" }, "require": { @@ -3573,7 +3573,7 @@ "proprietary" ], "description": "CompanyPage module", - "time": "2018-11-22T14:03:09+00:00" + "time": "2018-11-29T15:28:29+00:00" }, { "name": "spryker-shop/company-user-invitation-page", @@ -5637,16 +5637,16 @@ }, { "name": "spryker-shop/quick-order-page", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/spryker-shop/quick-order-page.git", - "reference": "9f58d1897853e2629124c69f75df06a241f7dba9" + "reference": "52031f4b82d39b1ef0c021e0a02f0107e0965f13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/quick-order-page/zipball/9f58d1897853e2629124c69f75df06a241f7dba9", - "reference": "9f58d1897853e2629124c69f75df06a241f7dba9", + "url": "https://api.github.com/repos/spryker-shop/quick-order-page/zipball/52031f4b82d39b1ef0c021e0a02f0107e0965f13", + "reference": "52031f4b82d39b1ef0c021e0a02f0107e0965f13", "shasum": "" }, "require": { @@ -5686,7 +5686,7 @@ "proprietary" ], "description": "QuickOrderPage module", - "time": "2018-10-11T17:28:11+00:00" + "time": "2018-12-11T17:20:45+00:00" }, { "name": "spryker-shop/redirect-page", @@ -7080,16 +7080,16 @@ }, { "name": "spryker/auth-rest-api", - "version": "2.2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/spryker/auth-rest-api.git", - "reference": "bab0e73f27d0f9feabbf2eba23db32f29ee2599c" + "reference": "618a302f6bfb00775834125e112ba779907759ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/auth-rest-api/zipball/bab0e73f27d0f9feabbf2eba23db32f29ee2599c", - "reference": "bab0e73f27d0f9feabbf2eba23db32f29ee2599c", + "url": "https://api.github.com/repos/spryker/auth-rest-api/zipball/618a302f6bfb00775834125e112ba779907759ee", + "reference": "618a302f6bfb00775834125e112ba779907759ee", "shasum": "" }, "require": { @@ -7123,7 +7123,7 @@ "proprietary" ], "description": "AuthRestApi module", - "time": "2018-12-07T12:16:27+00:00" + "time": "2018-12-13T16:04:45+00:00" }, { "name": "spryker/availability", @@ -10857,16 +10857,16 @@ }, { "name": "spryker/company-role-gui", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/spryker/company-role-gui.git", - "reference": "dd5c5e6309f14fd34f73b268e3a28e579a74cfd3" + "reference": "a25b6e64889ac3472f64ad992cf0ceacec6ca353" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/company-role-gui/zipball/dd5c5e6309f14fd34f73b268e3a28e579a74cfd3", - "reference": "dd5c5e6309f14fd34f73b268e3a28e579a74cfd3", + "url": "https://api.github.com/repos/spryker/company-role-gui/zipball/a25b6e64889ac3472f64ad992cf0ceacec6ca353", + "reference": "a25b6e64889ac3472f64ad992cf0ceacec6ca353", "shasum": "" }, "require": { @@ -10901,7 +10901,7 @@ "proprietary" ], "description": "CompanyRoleGui module", - "time": "2018-10-16T15:32:44+00:00" + "time": "2018-11-30T10:12:12+00:00" }, { "name": "spryker/company-supplier", @@ -12643,16 +12643,16 @@ }, { "name": "spryker/customers-rest-api", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/spryker/customers-rest-api.git", - "reference": "6c388c8e336309d6b47b5db259ca425047c37b14" + "reference": "d5c1337eb1196c2295359f226aaf9d09a5209523" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/customers-rest-api/zipball/6c388c8e336309d6b47b5db259ca425047c37b14", - "reference": "6c388c8e336309d6b47b5db259ca425047c37b14", + "url": "https://api.github.com/repos/spryker/customers-rest-api/zipball/d5c1337eb1196c2295359f226aaf9d09a5209523", + "reference": "d5c1337eb1196c2295359f226aaf9d09a5209523", "shasum": "" }, "require": { @@ -12690,7 +12690,7 @@ "proprietary" ], "description": "CustomersRestApi module", - "time": "2018-12-07T09:27:06+00:00" + "time": "2018-12-17T12:08:10+00:00" }, { "name": "spryker/customers-rest-api-extension", @@ -13153,16 +13153,16 @@ }, { "name": "spryker/documentation-generator-rest-api", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/spryker/documentation-generator-rest-api.git", - "reference": "8c2036deae17c3bc4393a5ea056189f33c4ac926" + "reference": "2403a6ce689f84fb7e169c83f1286aac1e481e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/documentation-generator-rest-api/zipball/8c2036deae17c3bc4393a5ea056189f33c4ac926", - "reference": "8c2036deae17c3bc4393a5ea056189f33c4ac926", + "url": "https://api.github.com/repos/spryker/documentation-generator-rest-api/zipball/2403a6ce689f84fb7e169c83f1286aac1e481e78", + "reference": "2403a6ce689f84fb7e169c83f1286aac1e481e78", "shasum": "" }, "require": { @@ -13197,7 +13197,7 @@ "proprietary" ], "description": "DocumentationGeneratorRestApi module", - "time": "2018-12-01T10:17:50+00:00" + "time": "2018-12-17T10:47:58+00:00" }, { "name": "spryker/documentation-generator-rest-api-extension", @@ -16843,16 +16843,16 @@ }, { "name": "spryker/orders-rest-api", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/spryker/orders-rest-api.git", - "reference": "5f87ffc9833cc455aebfadba3ae5a32380f2715c" + "reference": "79941a4aea1e62a688c5550e887f9baa45b6a411" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/orders-rest-api/zipball/5f87ffc9833cc455aebfadba3ae5a32380f2715c", - "reference": "5f87ffc9833cc455aebfadba3ae5a32380f2715c", + "url": "https://api.github.com/repos/spryker/orders-rest-api/zipball/79941a4aea1e62a688c5550e887f9baa45b6a411", + "reference": "79941a4aea1e62a688c5550e887f9baa45b6a411", "shasum": "" }, "require": { @@ -16883,7 +16883,7 @@ "proprietary" ], "description": "OrdersRestApi module", - "time": "2018-12-11T10:45:39+00:00" + "time": "2018-12-13T14:57:52+00:00" }, { "name": "spryker/payment", @@ -18260,16 +18260,16 @@ }, { "name": "spryker/product-alternative-storage", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/spryker/product-alternative-storage.git", - "reference": "656be2b985c844936ce45bb1f69d24d1cc184d9a" + "reference": "f3e161a7fc49a6bb3fe0c84170d906837da2a1e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-alternative-storage/zipball/656be2b985c844936ce45bb1f69d24d1cc184d9a", - "reference": "656be2b985c844936ce45bb1f69d24d1cc184d9a", + "url": "https://api.github.com/repos/spryker/product-alternative-storage/zipball/f3e161a7fc49a6bb3fe0c84170d906837da2a1e3", + "reference": "f3e161a7fc49a6bb3fe0c84170d906837da2a1e3", "shasum": "" }, "require": { @@ -18308,7 +18308,7 @@ "proprietary" ], "description": "ProductAlternativeStorage module", - "time": "2018-11-20T14:22:12+00:00" + "time": "2018-11-30T13:44:39+00:00" }, { "name": "spryker/product-alternative-storage-extension", @@ -21137,16 +21137,16 @@ }, { "name": "spryker/product-page-search", - "version": "2.6.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/spryker/product-page-search.git", - "reference": "f8713d1f00162d95dabdc05444bdb4c161fdf8e1" + "reference": "250c446e7b7dbe9036b838c9973ce2739a51e23a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-page-search/zipball/f8713d1f00162d95dabdc05444bdb4c161fdf8e1", - "reference": "f8713d1f00162d95dabdc05444bdb4c161fdf8e1", + "url": "https://api.github.com/repos/spryker/product-page-search/zipball/250c446e7b7dbe9036b838c9973ce2739a51e23a", + "reference": "250c446e7b7dbe9036b838c9973ce2739a51e23a", "shasum": "" }, "require": { @@ -21198,7 +21198,7 @@ "proprietary" ], "description": "ProductPageSearch module", - "time": "2018-12-03T16:56:18+00:00" + "time": "2018-12-17T16:51:31+00:00" }, { "name": "spryker/product-page-search-extension", @@ -22679,16 +22679,16 @@ }, { "name": "spryker/products-rest-api", - "version": "2.2.2", + "version": "2.2.3", "source": { "type": "git", "url": "https://github.com/spryker/products-rest-api.git", - "reference": "0d20c2220e2bdffa291ea14c8e93801db824ea46" + "reference": "13db539d641342ee84fa2be92a8e537dbbab8fa7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/products-rest-api/zipball/0d20c2220e2bdffa291ea14c8e93801db824ea46", - "reference": "0d20c2220e2bdffa291ea14c8e93801db824ea46", + "url": "https://api.github.com/repos/spryker/products-rest-api/zipball/13db539d641342ee84fa2be92a8e537dbbab8fa7", + "reference": "13db539d641342ee84fa2be92a8e537dbbab8fa7", "shasum": "" }, "require": { @@ -22720,7 +22720,7 @@ "proprietary" ], "description": "ProductsRestApi module", - "time": "2018-11-20T10:51:41+00:00" + "time": "2018-12-13T14:14:06+00:00" }, { "name": "spryker/propel", @@ -23946,16 +23946,16 @@ }, { "name": "spryker/setup", - "version": "4.1.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/spryker/setup.git", - "reference": "d7797be62323306be851a3229e6c6b76e4834bba" + "reference": "a6aca472e63a671aeab5e5843654e522ebe04d83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/setup/zipball/d7797be62323306be851a3229e6c6b76e4834bba", - "reference": "d7797be62323306be851a3229e6c6b76e4834bba", + "url": "https://api.github.com/repos/spryker/setup/zipball/a6aca472e63a671aeab5e5843654e522ebe04d83", + "reference": "a6aca472e63a671aeab5e5843654e522ebe04d83", "shasum": "" }, "require": { @@ -23990,7 +23990,7 @@ "proprietary" ], "description": "Setup module", - "time": "2018-11-15T10:26:05+00:00" + "time": "2018-12-17T11:30:53+00:00" }, { "name": "spryker/setup-frontend", @@ -28772,16 +28772,16 @@ }, { "name": "twig/twig", - "version": "v1.35.4", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a" + "reference": "730c9c4471b5152d23061feb02b03382264c8a15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a", - "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/730c9c4471b5152d23061feb02b03382264c8a15", + "reference": "730c9c4471b5152d23061feb02b03382264c8a15", "shasum": "" }, "require": { @@ -28791,12 +28791,12 @@ "require-dev": { "psr/container": "^1.0", "symfony/debug": "^2.7", - "symfony/phpunit-bridge": "^3.3" + "symfony/phpunit-bridge": "^3.4.19|^4.1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.35-dev" + "dev-master": "1.36-dev" } }, "autoload": { @@ -28834,7 +28834,7 @@ "keywords": [ "templating" ], - "time": "2018-07-13T07:12:17+00:00" + "time": "2018-12-16T10:34:11+00:00" }, { "name": "willdurand/negotiation", @@ -28950,16 +28950,16 @@ }, { "name": "zendframework/zend-filter", - "version": "2.9.0", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-filter.git", - "reference": "875da9790e5cb16b9a12f41453d5f7c441452daf" + "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/875da9790e5cb16b9a12f41453d5f7c441452daf", - "reference": "875da9790e5cb16b9a12f41453d5f7c441452daf", + "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/1c3e6d02f9cd5f6c929c9859498f5efbe216e86f", + "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f", "shasum": "" }, "require": { @@ -29011,7 +29011,7 @@ "filter", "zf" ], - "time": "2018-12-12T23:14:25+00:00" + "time": "2018-12-17T16:00:04+00:00" }, { "name": "zendframework/zend-servicemanager", @@ -31997,7 +31997,7 @@ ], "authors": [ { - "name": "Sullivan SENECHAL", + "name": "Sullivan Sénéchal", "email": "soullivaneuh@gmail.com" } ], @@ -32156,16 +32156,16 @@ }, { "name": "spryker/development", - "version": "3.16.0", + "version": "3.16.1", "source": { "type": "git", "url": "https://github.com/spryker/development.git", - "reference": "881fcf5c13a0478eeb74a7e2680883d81c67d313" + "reference": "1e76a226583a2edd4717ac9164b6d7ea7e1875e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/development/zipball/881fcf5c13a0478eeb74a7e2680883d81c67d313", - "reference": "881fcf5c13a0478eeb74a7e2680883d81c67d313", + "url": "https://api.github.com/repos/spryker/development/zipball/1e76a226583a2edd4717ac9164b6d7ea7e1875e9", + "reference": "1e76a226583a2edd4717ac9164b6d7ea7e1875e9", "shasum": "" }, "require": { @@ -32203,7 +32203,7 @@ "proprietary" ], "description": "Development module", - "time": "2018-12-11T14:51:36+00:00" + "time": "2018-12-18T08:49:34+00:00" }, { "name": "spryker/testify", diff --git a/data/import/glossary.csv b/data/import/glossary.csv index fc3c6f00f8..41cf561b34 100644 --- a/data/import/glossary.csv +++ b/data/import/glossary.csv @@ -238,7 +238,7 @@ shipment.hermes,Hermes,en_US customer.first_name,Vorname,de_DE customer.first_name,First Name,en_US customer.last_name,Name,de_DE -customer.last_name,Name,en_US +customer.last_name,Last Name,en_US customer.salutation.mr,Herr,de_DE customer.salutation.mr,Mr.,en_US customer.salutation.mrs,Frau,de_DE @@ -407,8 +407,8 @@ customer.profile.order_history,Last Orders,en_US customer.profile.order_history,Letzte Bestellungen,de_DE customer.account.no_orders,No orders at the moment,en_US customer.account.no_orders,Keine Bestellungen,de_DE -customer.address.updated,New address updated,en_US -customer.address.updated,Neue Adresse hinzugefügt,de_DE +customer.address.updated,Address was successfully updated,en_US +customer.address.updated,Adresse wurde erfolgreich aktualisiert,de_DE customer.address.delete.success,Address deleted successfully,en_US customer.address.delete.success,Adresse erfolgreich gelöscht,de_DE customer.address.added,Address was successfully added,en_US @@ -1931,16 +1931,18 @@ packaging_unit_type.pack_mixed.name,Mixed Screws boxes,en_US packaging_unit_type.pack_mixed.name,Gemischte Schraubenkästen,de_DE business_on_behalf_widget.no_selected_company,No selected company,en_US business_on_behalf_widget.no_selected_company,Kein Unternehmen ausgewählt,de_DE -business_on_behalf_widget.change_company_user,Change Company User,en_US -business_on_behalf_widget.change_company_user,Firmenbenutzer Profil ändern,de_DE +business_on_behalf_widget.change_company_user,Select Business Unit,en_US +business_on_behalf_widget.change_company_user,Geschäftseinheit auswählen,de_DE company_user.business_on_behalf.error.company_not_active,"You can not select this company user, company is not active.",en_US company_user.business_on_behalf.error.company_not_active,"Sie können diesen Firmennutzer nicht auswählen da die Firma inaktiv ist",de_DE company_user.business_on_behalf.error.company_user_invalid,"You can not select this company user, it is invalid.",en_US company_user.business_on_behalf.error.company_user_invalid,"Sie können diesen Firmennutzer nicht auswählen da er ungültig ist",de_DE -company_user.change_company_user,Change Company User,en_US -company_user.change_company_user,Veränderung Firmennutzer,de_DE -company_user.no_company,No Company,en_US -company_user.no_company,Kein Unternehmen,de_DE +company_user.change_company_user,Select Business Unit,en_US +company_user.change_company_user,Geschäftseinheit auswählen,de_DE +company_user.no_company,No Business Unit,en_US +company_user.no_company,Keine Geschäftseinheit,de_DE +company_user.company_choice,Business Unit,en_US +company_user.company_choice,Geschäftseinheit,de_DE company_user.remember_choice,Remember choice,en_US company_user.remember_choice,Auswahl speichern,de_DE company_page.company_user_restricted_message,Regular customers are not allowed to operate on company pages,en_US