diff --git a/app/code/Magento/Catalog/i18n/de_DE.csv b/app/code/Magento/Catalog/i18n/de_DE.csv index 8b0df7438ce015d65e4ac23080bbc9c5a67408c3..ecbd2cb02116bf9af5c3f6ac5bae02811a89a110 100644 --- a/app/code/Magento/Catalog/i18n/de_DE.csv +++ b/app/code/Magento/Catalog/i18n/de_DE.csv @@ -14,7 +14,7 @@ Qty,Qty Action,Aktion Reset,Zurücksetzen Edit,Bearbeiten -"Add to Cart","Zum Warenkobrn hinzufügen" +"Add to Cart","Zum Warenkorb hinzufügen" "Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)" "First Name",Vorname "Last Name","Letzter Name" diff --git a/app/code/Magento/Reports/i18n/de_DE.csv b/app/code/Magento/Reports/i18n/de_DE.csv index 2afa2d4426da71b2bb9d16e7ce8c58030a01a160..b2bd8ea9e794c94b53e26c11e1327a4b606c2230 100644 --- a/app/code/Magento/Reports/i18n/de_DE.csv +++ b/app/code/Magento/Reports/i18n/de_DE.csv @@ -11,7 +11,7 @@ Subtotal,Zwischensumme Discount,Discount Action,Aktion Total,Gesamtbetrag -"Add to Cart","Zum Warenkobrn hinzufügen" +"Add to Cart","Zum Warenkorb hinzufügen" Orders,Aufträge Bestsellers,Bestseller Customer,Kundenname diff --git a/app/code/Magento/Sales/i18n/de_DE.csv b/app/code/Magento/Sales/i18n/de_DE.csv index 6cec0c16a19dcdfc2f2ad2c88fb48fc7fe70b71c..38a17ecbf53862979255598c32f030d117e98342 100644 --- a/app/code/Magento/Sales/i18n/de_DE.csv +++ b/app/code/Magento/Sales/i18n/de_DE.csv @@ -33,7 +33,7 @@ Total,Gesamt "Move to Wishlist","Auf Wunschzettel schreiben" Edit,Bearbeiten Item,Objekt -"Add to Cart","Zum Warenkobrn hinzufügen" +"Add to Cart","Zum Warenkorb hinzufügen" Sku,SKU "Order saving error: %1","Order saving error: %1" "You created the order.","You created the order." diff --git a/app/code/Magento/Wishlist/i18n/de_DE.csv b/app/code/Magento/Wishlist/i18n/de_DE.csv index 43fc5de10f58cd7d56db31beb798c1000f58ffc8..364939cebbb084d7898b300060311b23bf45dab1 100644 --- a/app/code/Magento/Wishlist/i18n/de_DE.csv +++ b/app/code/Magento/Wishlist/i18n/de_DE.csv @@ -7,7 +7,7 @@ Action,Action "Are you sure that you want to remove this item?","Are you sure that you want to remove this item?" Edit,Bearbeiten "Remove item","Artikel löschen" -"Add to Cart","Zum Warenkobrn hinzufügen" +"Add to Cart","Zum Warenkorb hinzufügen" Delete,Delete Enabled,Enabled "We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart." diff --git a/dev/tools/Magento/Tools/Di/compiler.php b/dev/tools/Magento/Tools/Di/compiler.php index f838a21987b9a7f1123b3d881765136e05b35ae5..6f185bc3587e6f03ddd65d6b934db10c5679f110 100644 --- a/dev/tools/Magento/Tools/Di/compiler.php +++ b/dev/tools/Magento/Tools/Di/compiler.php @@ -27,7 +27,7 @@ $codeScanDir = realpath($rootDir . '/app'); try { $opt = new Zend_Console_Getopt( [ - 'serializer=w' => 'serializer function that should be used (serialize|binary) default = serialize', + 'serializer=w' => 'serializer function that should be used (serialize|igbinary) default: serialize', 'verbose|v' => 'output report after tool run', 'extra-classes-file=s' => 'path to file with extra proxies and factories to generate', 'generation=s' => 'absolute path to generated classes, <magento_root>/var/generation by default', @@ -55,7 +55,7 @@ try { $errorWriter = new Writer\Console(); $log = new Log($logWriter, $errorWriter); - $serializer = $opt->getOption('serializer') == 'binary' ? new Serializer\Igbinary() : new Serializer\Standard(); + $serializer = $opt->getOption('serializer') == 'igbinary' ? new Serializer\Igbinary() : new Serializer\Standard(); $validator = new \Magento\Framework\Code\Validator(); $validator->add(new \Magento\Framework\Code\Validator\ConstructorIntegrity());