Merge branch 'master' into develop

assets/themes/atm/atm.json

@@ -111,7 +111,8 @@
               "es": "OpenStreetMap sabe sobre <a href='#{_closest_osm_poi}'>un ATM que es {_closest_osm_poi_distance} de distancia.</a> ",
               "ca": "OpenStreetMap sap sobre <a href='#{_closest_osm_poi}'>un caixer automàtic que està a {_closest_osm_poi_distance} de distància.</a> ",
               "cs": "OpenStreetMap ví o <a href='#{_closest_osm_poi}'> bankomatu, který je {_closest_osm_poi_distance} metr daleko.</a> ",
-              "pl": "OpenStreetMap wie o <a href='#{_closest_osm_poi}'>bankomacie oddalonym o {_closest_osm_poi_distance} metry.</a> "
+              "pl": "OpenStreetMap wie o <a href='#{_closest_osm_poi}'>bankomacie oddalonym o {_closest_osm_poi_distance} metry.</a> ",
+              "nl": "OpenStreetMap kent <a href='#{_closest_osm_poi}'>een geldautomaat die {_closest_osm_poi_distance} meter weg is</a> "
             }
           },
           {
@@ -130,7 +131,8 @@
                   "ca": "Afegeix totes les etiquetes suggerides al caixer automàtic més proper",
                   "eu": "Gehitu iradokitako etiketa guztiak hurbilen dagoen kutxazainari",
                   "pl": "Dodaj wszystkie sugerowane znaczniki do najbliższego bankomatu",
-                  "cs": "Přidání všech navrhovaných značek do nejbližšího bankomatu"
+                  "cs": "Přidání všech navrhovaných značek do nejbližšího bankomatu",
+                  "nl": "Voeg alle gesuggereerde tags toe aan de dichtstbijzijnde geldautomaat"
                 },
                 "image": "./assets/svg/addSmall.svg",
                 "maproulette_id": "mr_taskId"

assets/themes/etymology/etymology.json

@@ -1,9 +1,9 @@
 {
   "id": "etymology",
   "title": {
-    "en": "Etymology - what is a street named after?",
+    "en": "Etymology - what is a place named after?",
     "nl": "Etymologie - waarnaar is een straat vernoemd?",
-    "de": "Etymologie - Wonach ist eine Straße benannt?",
+    "de": "Etymologie - Wonach ist ein Ort benannt?",
     "it": "Apri Carta Etimologica",
     "ru": "Открытая этимологическая карта",
     "zh_Hant": "開放詞源地圖",

assets/themes/velopark/velopark.json

@@ -1,5 +1,4 @@
 {
-
   "id": "velopark",
   "title": {
     "en": "Velopark to OpenStreetMap synchronisation tool",
@@ -27,7 +26,7 @@
   "defaultBackgroundId": "photo",
   "hideFromOverview": true,
   "layers": [
-     {
+    {
       "id": "velopark_maproulette",
       "description": "Maproulette challenge containing velopark data",
       "source": {
@@ -65,7 +64,6 @@
             }
           }
         },
-
         {
           "id": "login",
           "render": {
@@ -143,7 +141,6 @@
           "render": {
             "en": "<h3>Closing without importing or linking</h3>",
             "nl": "<h3>Afsluiten zonder importeren of linken</h3>"
-
           }
         },
         {
@@ -171,7 +168,7 @@
             "nl": "<h3>Extra informatie</h3>"
           }
         },
-         {
+        {
           "id": "show-data-velopark",
           "render": {
             "special": {
@@ -263,7 +260,10 @@
       "builtin": [
         "bike_parking"
       ],
-      "hideTagRenderingsWithLabels": ["images","leftover-questions"],
+      "hideTagRenderingsWithLabels": [
+        "images",
+        "leftover-questions"
+      ],
       "override": {
         "id": "bike_parking_with_velopark_ref",
         "=presets": [],
@@ -318,7 +318,9 @@
             ]
           }
         ],
-        "+tagRenderings": ["questions"],
+        "+tagRenderings": [
+          "questions"
+        ],
         "tagRenderings+": [
           "images"
         ]
@@ -328,11 +330,16 @@
       "builtin": [
         "bike_parking"
       ],
-      "hideTagRenderingsWithLabels": ["images","leftover-questions"],
+      "hideTagRenderingsWithLabels": [
+        "images",
+        "leftover-questions"
+      ],
       "override": {
         "doCount": false,
         "minzoom": 14,
-        "+tagRenderings": ["questions"],
+        "+tagRenderings": [
+          "questions"
+        ],
         "tagRenderings+": [
           "images"
         ]
@@ -344,9 +351,13 @@
         "bike_repair_station",
         "bicycle_rental"
       ],
-      "hideTagRenderingsWithLabels": ["leftover-questions"],
+      "hideTagRenderingsWithLabels": [
+        "leftover-questions"
+      ],
       "override": {
-        "+tagRenderings": ["questions"],
+        "+tagRenderings": [
+          "questions"
+        ],
         "doCount": false,
         "minzoom": 18
       }

assets/themes/waste_basket/waste_basket.json

@@ -1,8 +1,8 @@
 {
   "id": "waste_basket",
   "title": {
-    "en": "Waste Basket",
-    "nl": "Vuilnisbak",
+    "en": "Waste Baskets",
+    "nl": "Vuilnisbakken",
     "de": "Abfalleimer",
     "it": "Cestino dei rifiuti",
     "zh_Hant": "垃圾筒",