Resolved Conflicts

spryker · May 7, 2019 · 5c99877 · 5c99877
2 parents eb7e92a + 73a42ca
commit 5c99877
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/data/translation/Zed/de_DE.csv b/data/translation/Zed/de_DE.csv
@@ -1,4 +1,4 @@
-"There are too many products in th, please reduce the list size to {number} or fewer","There are too many products in the list, please reduce the list size to {number} or fewer"
+"There are too many products in the list, please reduce the list size to {number} or fewer","Die Liste enthält zu viele Produkte. Bitte reduzieren Sie die Listengröße auf {number} oder weniger"
 "Abstract Product List","Abstrakte Produktliste"
 "content_product_abstract_list.template.default","Standard"
-"content_product_abstract_list.template.top-title","Titel oben"
+"content_product_abstract_list.template.top-title","Titel oben"
diff --git a/data/translation/Zed/en_US.csv b/data/translation/Zed/en_US.csv
@@ -1,4 +1,4 @@
 "There are too many products in the list, please reduce the list size to {number} or fewer","There are too many products in the list, please reduce the list size to {number} or fewer"
 "Abstract Product List","Abstract Product List"
 "content_product_abstract_list.template.default","Default"
-"content_product_abstract_list.template.top-title","Top Title"
+"content_product_abstract_list.template.top-title","Top Title"