Merge remote-tracking branch 'github/develop' into prs

Author: vpelipenko

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"

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

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."

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."

dev/tools/Magento/Tools/Di/compiler.php

@@ -27,7 +27,7 @@
 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 @@
     $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());