Merge pull request #185 from OpenLitterMap/staging

Merge Staging

Author: xlcrr

assets/data/litterkeys.js

@@ -237,9 +237,11 @@ const LITTERKEYS = {
         'tayto', // Tayto
         'tesco', // Tesco
         'thins', // Thins
+        'tim_hortons',
         'volvic', // Volvic
         'waitrose', // Waitrose
         'walkers', // Walkers
+        'wendys',
         'wilde_and_greene', // Wilde-and-Greene
         'woolworths', // Woolworths
         'wrigleys' // Wrigley

assets/langs/ar/litter.json

@@ -250,9 +250,11 @@
         "tayto": "Tayto",
         "tesco": "Tesco",
         "thins": "Thins",
+        "tim_hortons": "Tim Hortons",
         "volvic": "Volvic",
         "waitrose": "Waitrose",
         "walkers": "Walkers",
+        "wendys": "Wendy's",
         "wilde_and_greene": "Wilde-and-Greene",
         "woolworths": "Woolworths",
         "wrigleys": "Wrigleys"

assets/langs/ar/tag.json

@@ -14,7 +14,7 @@
     "delete": "نعم ، احذف",
     "custom-tags": "العلامات المخصصة",
     "custom-tags-min": "يجب أن يكون طوله 3 أحرف على الأقل",
-    "custom-tags-max": "يجب ألا يزيد طوله عن 100 حرف",
+    "custom-tags-max": "يمكن أن تكون العلامة بحد أقصى 100 حرف",
     "tag-already-added": "تمت إضافة العلامة بالفعل",
     "tag-limit-reached": "يمكنك تحميل ما يصل إلى 3 علامات مخصصة"
 }

assets/langs/de/litter.json

@@ -256,9 +256,11 @@
         "tayto": "Tayto",
         "tesco": "Tesco",
         "thins": "Thins",
+        "tim_hortons": "Tim Hortons",
         "volvic": "Volvic",
         "waitrose": "Waitrose",
         "walkers": "Walkers",
+        "wendys": "Wendy's",
         "wilde_and_greene": "Wilde-and-Greene",
         "woolworths": "Woolworths",
         "wrigleys": "Wrigleys"

assets/langs/de/tag.json

@@ -13,8 +13,8 @@
     "cancel": "Abbrechen",
     "delete": "Ja, löschen",
     "custom-tags": "Custom Tags",
-    "custom-tags-min": "Es muss mindestens 3 Zeichen lang sein",
-    "custom-tags-max": "Es darf höchstens 100 Zeichen lang sein",
+    "custom-tags-min": "Tag muss mindestens 3 Zeichen lang sein",
+    "custom-tags-max": "Tag darf maximal 100 Zeichen lang sein",
     "tag-already-added": "Tag bereits hinzugefügt",
     "tag-limit-reached": "Sie können bis zu 3 benutzerdefinierte Tags hochladen"
 }

assets/langs/en/litter.json

@@ -252,10 +252,12 @@
         "supervalu": "Supervalu",
         "tayto": "Tayto",
         "tesco": "Tesco",
+        "tim_hortons": "Tim Hortons",
         "thins": "Thins",
         "volvic": "Volvic",
         "waitrose": "Waitrose",
         "walkers": "Walkers",
+        "wendys": "Wendy's",
         "wilde_and_greene": "Wilde-and-Greene",
         "woolworths": "Woolworths",
         "wrigleys": "Wrigleys"

assets/langs/en/tag.json

@@ -13,8 +13,8 @@
     "cancel": "Cancel",
     "delete": "Yes, Delete",
     "custom-tags": "Custom Tags",
-    "custom-tags-min": "It needs to be at least 3 characters long.",
-    "custom-tags-max": "It needs to be at most 100 characters long.",
-    "tag-already-added": "Tag already added.",
+    "custom-tags-min": "Tag needs to be at least 3 characters long",
+    "custom-tags-max": "Tag can be a maximum of 100 characters",
+    "tag-already-added": "Tag already added",
     "tag-limit-reached": "You can upload up to 3 custom tags."
 }

assets/langs/es/litter.json

@@ -249,10 +249,12 @@
         "supervalu": "Supervalu",
         "tayto": "Tayto",
         "tesco": "Tesco",
+        "tim_hortons": "Tim Hortons",
         "thins": "Thins",
         "volvic": "Volvic",
         "waitrose": "Waitrose",
         "walkers": "Walkers",
+        "wendys": "Wendy's",
         "wilde_and_greene": "Wilde-and-Greene",
         "woolworths": "Woolworths",
         "wrigleys": "Wrigleys"

assets/langs/es/tag.json

@@ -13,8 +13,8 @@
     "cancel": "Cancelar",
     "delete": "Sí, eliminar",
     "custom-tags": "Etiquetas Personalizadas",
-    "custom-tags-min": "Debe tener al menos 3 caracteres.",
-    "custom-tags-max": "Debe tener como máximo 100 caracteres.",
+    "custom-tags-min": "La etiqueta debe tener al menos 3 caracteres",
+    "custom-tags-max": "La etiqueta puede tener un máximo de 100 caracteres",
     "tag-already-added": "Etiqueta ya añadida.",
     "tag-limit-reached": "Puede cargar hasta 3 etiquetas personalizadas."
 }

assets/langs/fr/litter.json

@@ -250,9 +250,11 @@
         "tayto": "Tayto",
         "tesco": "Tesco",
         "thins": "Thins",
+        "tim_hortons": "Tim Hortons",
         "volvic": "Volvic",
         "waitrose": "Waitrose",
         "walkers": "Walkers",
+        "wendys": "Wendy's",
         "wilde_and_greene": "Wilde-and-Greene",
         "woolworths": "Woolworths",
         "wrigleys": "Wrigleys"