Merge branch 'plenty_dev'

Release commit
plentymarkets · Nov 25, 2015 · e9c2de7 · e9c2de7
2 parents 660a03a + a24be69
commit e9c2de7
Show file tree

Hide file tree

Showing 64 changed files with 9,866 additions and 11,455 deletions.
diff --git a/dist/README.md b/dist/README.md
diff --git a/dist/lang/de_DE.json b/dist/lang/de_DE.json
@@ -7,5 +7,7 @@
   "Save": "Speichern",
   "Do you really want to remove \"{{item}}\" from your basket?": "Möchten Sie den Artikel \"{{item}}\" wirklich aus dem Warenkorb entfernen?",
   "Select order parameters": "Bestellmerkmale wählen",
-  "Edit order parameters": "Bestellmerkmale ändern"
+  "Edit order parameters": "Bestellmerkmale ändern",
+  "Packstations and post offices in your area": "Packstationen und Postfilialen in der Nähe",
+  "Please enter a ZIP code and/or a city.": "Bitte geben Sie eine Postleitzahl und/oder einen Ort an."
 }
diff --git a/dist/lang/en_EN.json b/dist/lang/en_EN.json
@@ -7,5 +7,7 @@
   "Save": "Save",
   "Do you really want to remove \"{{item}}\" from your basket?": "Do you really want to remove \"{{item}}\" from your basket?",
   "Select order parameters": "Select order parameters",
-  "Edit order parameters": "Edit order parameters"
+  "Edit order parameters": "Edit order parameters",
+  "Packstations and post offices in your area": "Packstations and post offices in your area",
+  "Please enter a ZIP code and/or a city.": "Please enter a ZIP code and/or a city."
 }