diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json index ea2062d4f..851a43b84 100644 --- a/assets/layers/bench/bench.json +++ b/assets/layers/bench/bench.json @@ -711,7 +711,7 @@ } ], "description": { - "nl": "Deze laag toont zitbanken en enkele vragen over deze zitbanken", + "nl": "Een zitbank is een houten, metalen, stenen, … oppervlak waar een mens kan zitten. Deze laag toont ze en stelt er enkele vragen over.", "en": "A bench is a wooden, metal, stone, … surface where a human can sit. This layers visualises them and asks a few questions about them.", "fr": "Un banc est une surface en bois, métal, pierre… sur laquelle un humain peut s'asseoir. Cette couche permet de les visualiser et pose des questions à leur sujet.", "de": "Diese Karte stellt Sitzbänke aus Holz, Metall, Stein, … dar und stellt ein paar Fragen, um weitere Informationen zu ergänzen.", diff --git a/assets/layers/climbing_area/climbing_area.json b/assets/layers/climbing_area/climbing_area.json index ab75354ba..ffa386cbb 100644 --- a/assets/layers/climbing_area/climbing_area.json +++ b/assets/layers/climbing_area/climbing_area.json @@ -141,7 +141,8 @@ "en": "

Contains {_contained_climbing_routes_count} routes

", "fr": "

Contient {_contained_climbing_routes_count} voies

", "it": "

Contiene {_contained_climbing_routes_count} vie

", - "de": "

Enthält {_contained_climbing_routes_count} Routen

" + "de": "

Enthält {_contained_climbing_routes_count} Routen

", + "nl": "

Bevat {_contained_climbing_routes_count} routes

" }, "condition": "_contained_climbing_routes~*", "id": "Contained_climbing_routes" diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json index 107ec35ab..ecdba430b 100644 --- a/assets/layers/climbing_opportunity/climbing_opportunity.json +++ b/assets/layers/climbing_opportunity/climbing_opportunity.json @@ -66,7 +66,8 @@ "ja": "ここで登坂はできますか?", "nb_NO": "Er klatring mulig her?", "fr": "Est-il possible d’escalader ici ?", - "it": "È possibile arrampicarsi qua?" + "it": "È possibile arrampicarsi qua?", + "nl": "Is klimmen hier mogelijk?" }, "mappings": [ { diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 7289dfe15..107503c96 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -792,7 +792,8 @@ "question": { "en": "Accepts cash", "de": "Akzeptiert Bargeld", - "es": "Acepta efectivo" + "es": "Acepta efectivo", + "nl": "Accepteert cash" } } ] @@ -805,7 +806,8 @@ "question": { "en": "Accepts payment cards", "de": "Akzeptiert Kartenzahlung", - "es": "Acepta tarjetas de pago" + "es": "Acepta tarjetas de pago", + "nl": "Accepteert betaalkaarten" } } ] diff --git a/assets/layers/maxspeed/maxspeed.json b/assets/layers/maxspeed/maxspeed.json index dbf5d65f9..ca0ff2dcb 100644 --- a/assets/layers/maxspeed/maxspeed.json +++ b/assets/layers/maxspeed/maxspeed.json @@ -42,20 +42,23 @@ "if": "name=", "then": { "en": "Road without a name", - "de": "Straße ohne Namen" + "de": "Straße ohne Namen", + "nl": "Weg zonder een naam" } } ] }, "description": { "en": "Shows the allowed speed for every road", - "de": "Zeigt die zulässige Geschwindigkeit für jede Straße an" + "de": "Zeigt die zulässige Geschwindigkeit für jede Straße an", + "nl": "Toont de toegestane snelheid voor elke weg" }, "tagRenderings": [ { "render": { "en": "The maximum allowed speed on this road is {maxspeed}", - "de": "Die zulässige Höchstgeschwindigkeit auf dieser Straße ist {maxspeed}" + "de": "Die zulässige Höchstgeschwindigkeit auf dieser Straße ist {maxspeed}", + "nl": "De maximum toegestane snelheid op deze weg is {maxspeed}" }, "question": { "es": "Qué velocidad tiene", @@ -70,10 +73,15 @@ "mappings": [ { "if": { - "and":["highway=living_street","_country!=be"] + "and": [ + "highway=living_street", + "_country!=be" + ] }, "then": { - "en": "This is a living street" + "en": "This is a living street, which has a maxspeed of 20km/h", + "de": "Dies ist eine Wohnstraße, auf der eine Höchstgeschwindigkeit von 20 km/h gilt", + "nl": "Dit is een woonerf en heeft dus een maximale snelheid van 20km/h" }, "icon": { "path": "./assets/layers/maxspeed/living_street_be.svg", diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index dd8538c8f..341fd4c0d 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -107,11 +107,13 @@ "nl": "Wat voor soort winkel is dit?" }, "render": { - "en":"This is a {shop}" + "en": "This is a {shop}" }, "freeform": { "key": "shop", - "addExtraTags": ["fixme=freeform shop key used, to be reviewed"] + "addExtraTags": [ + "fixme=freeform shop key used, to be reviewed" + ] } } }, diff --git a/langs/layers/de.json b/langs/layers/de.json index 525455f6d..2d686ca62 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -4276,6 +4276,9 @@ "mappings": { "0": { "then": "Dies ist eine Wohnstraße, auf der eine Höchstgeschwindigkeit von 20 km/h gilt" + }, + "1": { + "then": "Dies ist eine Wohnstraße, auf der eine Höchstgeschwindigkeit von 20 km/h gilt" } }, "question": "Wie hoch ist die zulässige Höchstgeschwindigkeit, die man auf dieser Straße fahren darf?", @@ -5281,9 +5284,6 @@ "tagRenderings": { "shops-name": { "question": "Wie ist der Name dieses Geschäfts?" - }, - "shops-type-from-id": { - "question": "Was ist das für ein Geschäft?" } }, "title": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 0b3b8a767..305bfde70 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4334,6 +4334,90 @@ "render": "Map" } }, + "maproulette": { + "description": "Layer showing all tasks in MapRoulette", + "filter": { + "0": { + "options": { + "0": { + "question": "Show tasks with all statuses" + }, + "1": { + "question": "Show tasks that are created" + }, + "2": { + "question": "Show tasks that are fixed" + }, + "3": { + "question": "Show tasks that are false positives" + }, + "4": { + "question": "Show tasks that are skipped" + }, + "5": { + "question": "Show tasks that are deleted" + }, + "6": { + "question": "Show tasks that are already fixed" + }, + "7": { + "question": "Show tasks that are marked as too hard" + }, + "8": { + "question": "Show tasks that are disabled" + } + } + }, + "1": { + "options": { + "0": { + "question": "Challenge name contains {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Challenge ID matches {search}" + } + } + } + }, + "name": "MapRoulette Tasks", + "tagRenderings": { + "status": { + "mappings": { + "0": { + "then": "Task is created" + }, + "1": { + "then": "Task is fixed" + }, + "2": { + "then": "Task is a false positive" + }, + "3": { + "then": "Task is skipped" + }, + "4": { + "then": "Task is deleted" + }, + "5": { + "then": "Task is already fixed" + }, + "6": { + "then": "Task is marked as too hard" + }, + "7": { + "then": "Task is disabled" + } + } + } + }, + "title": { + "render": "MapRoulette Item: {parentName}" + } + }, "maxspeed": { "description": "Shows the allowed speed for every road", "name": "Maxspeed", @@ -4342,6 +4426,9 @@ "mappings": { "0": { "then": "This is a living street, which has a maxspeed of 20km/h" + }, + "1": { + "then": "This is a living street, which has a maxspeed of 20km/h" } }, "question": "What is the legal maximum speed one is allowed to drive on this road?", @@ -5402,7 +5489,8 @@ "tagRenderings": { "2": { "override": { - "question": "What kind of shop is this?" + "question": "What kind of shop is this?", + "render": "This is a {shop}" } }, "copyshop-print-sizes": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 9613c44f3..db44efd9a 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2438,6 +2438,9 @@ "Contained routes length hist": { "render": "

Overzicht van lengtes

{histogram(_length_hist)}" }, + "Contained_climbing_routes": { + "render": "

Bevat {_contained_climbing_routes_count} routes

" + }, "Rock type (crag/rock/cliff only)": { "mappings": { "0": { @@ -2455,9 +2458,6 @@ }, "question": "Wat is de naam van dit Klimgelegenheid?", "render": "{name}" - }, - "Contained_climbing_routes": { - "render": "

Bevat {_contained_climbing_routes_count} routes

" } }, "title": { @@ -4182,16 +4182,27 @@ } }, "maxspeed": { + "description": "Toont de toegestane snelheid voor elke weg", "tagRenderings": { "maxspeed-maxspeed": { "mappings": { "0": { "then": "Dit is een woonerf en heeft dus een maximale snelheid van 20km/h" + }, + "1": { + "then": "Dit is een woonerf en heeft dus een maximale snelheid van 20km/h" } }, "render": "De maximum toegestane snelheid op deze weg is {maxspeed}" } }, + "title": { + "mappings": { + "0": { + "then": "Weg zonder een naam" + } + } + }, "units": { "0": { "applicableUnits": { @@ -4205,14 +4216,6 @@ } } } - }, - "description": "Toont de toegestane snelheid voor elke weg", - "title": { - "mappings": { - "0": { - "then": "Weg zonder een naam" - } - } } }, "nature_reserve": { @@ -6431,4 +6434,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/themes/en.json b/langs/themes/en.json index b3e3d3a17..7b3cd083c 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -717,6 +717,10 @@ "shortDescription": "Shows changes made by MapComplete", "title": "Changes made with MapComplete" }, + "maproulette": { + "description": "Theme showing MapRoulette tasks, allowing you to search, filter and fix them.", + "title": "MapRoulette Tasks" + }, "maps": { "description": "On this map you can find all maps OpenStreetMap knows - typically a big map on an information board showing the area, city or region, e.g. a tourist map on the back of a billboard, a map of a nature reserve, a map of cycling networks in the region, ...)

If a map is missing, you can easily map this map on OpenStreetMap.", "shortDescription": "This theme shows all (touristic) maps that OpenStreetMap knows of",