From ab8aa7a2bafadc2a91af9882a7cee25d1ed9a539 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 17 Dec 2022 10:25:28 +0000 Subject: [PATCH 01/29] Translated using Weblate (English) Currently translated at 100.0% (76 of 76 strings) Translation: MapComplete/shared-questions Translate-URL: https://hosted.weblate.org/projects/mapcomplete/shared-questions/en/ --- langs/shared-questions/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index 84eaaf6371..4681b030bf 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -27,7 +27,7 @@ "then": "2 euro coins are accepted" } }, - "question": "Whith what coins can you pay here?" + "question": "With what coins can you pay here?" }, "description": { "question": "Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts" @@ -271,4 +271,4 @@ "question": "What is the corresponding item on Wikipedia?" } } -} \ No newline at end of file +} From 12813043f076853814d0582e21f0f81205e1db90 Mon Sep 17 00:00:00 2001 From: kjon Date: Sat, 17 Dec 2022 10:23:41 +0000 Subject: [PATCH 02/29] Translated using Weblate (German) Currently translated at 100.0% (753 of 753 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/de/ --- langs/de.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/langs/de.json b/langs/de.json index 2597921ca0..40479dda7f 100644 --- a/langs/de.json +++ b/langs/de.json @@ -984,5 +984,14 @@ "wikidata": { "description": "Eine Wikidata-Kennung" } + }, + "userinfo": { + "gotoInbox": "Öffnen Sie Ihren Posteingang", + "moveToHome": "Verschieben Sie die Karte an Ihren Heimatstandort", + "noDescription": "Sie haben noch keine Beschreibung in Ihrem Profil", + "noDescriptionCallToAction": "Eine Profilbeschreibung hinzufügen", + "gotoSettings": "Gehen Sie zu Ihren Einstellungen auf OpenStreetMap.org", + "newMessages": "Sie haben neue Nachrichten", + "welcome": "Willkommen {user}" } } From f469b7e30ce1dcc69427d1e6894cd95a7df26b56 Mon Sep 17 00:00:00 2001 From: kjon Date: Fri, 16 Dec 2022 18:17:17 +0000 Subject: [PATCH 03/29] Translated using Weblate (German) Currently translated at 100.0% (396 of 396 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/de/ --- langs/themes/de.json | 48 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/langs/themes/de.json b/langs/themes/de.json index 59a525650d..789e319d42 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -1174,5 +1174,51 @@ "description": "Auf dieser Karte findest Du Abfalleimer in Deiner Nähe. Wenn ein Abfalleimer auf dieser Karte fehlt, kannst du ihn selbst hinzufügen", "shortDescription": "Eine Karte mit Abfalleimern", "title": "Abfalleimer" + }, + "stations": { + "layers": { + "15": { + "presets": { + "0": { + "description": "Fügen Sie eine Tafel hinzu, auf der Abfahrten angezeigt werden, entweder elektronisch oder in Papierform", + "title": "eine Abfahrtstafel" + } + }, + "description": "Anzeigen der Züge, die von diesem Bahnhof abfahren", + "name": "Abfahrtstafeln", + "title": { + "render": "Abfahrtstafel" + }, + "tagRenderings": { + "type": { + "mappings": { + "1": { + "then": "Dies ist eine elektronische Tafel, die nächste Abfahrten in Echtzeit anzeigt" + }, + "0": { + "then": "Dies ist eine Abfahrtstafel eines unbekannten Typs" + }, + "3": { + "then": "Es gibt ein Schild, das den Takt der Züge anzeigt" + }, + "2": { + "then": "Dies ist ein Papierfahrplan" + } + }, + "question": "Was ist das für eine Abfahrtstafel?" + } + } + }, + "3": { + "description": "Ebene mit Bahnhöfen", + "name": "Bahnhöfe" + } + }, + "description": "Bahnhofsdetails ansehen, bearbeiten und hinzufügen", + "title": "Bahnhöfe" + }, + "atm": { + "description": "Diese Karte zeigt Geldautomaten zum Abheben oder Einzahlen von Geld", + "title": "Geldautomaten" } -} \ No newline at end of file +} From 99352d21ec152e33161ab4a5530403c8ed115cc8 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 17 Dec 2022 10:00:11 +0000 Subject: [PATCH 04/29] Translated using Weblate (Dutch) Currently translated at 98.2% (389 of 396 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/nl/ --- langs/themes/nl.json | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 820c78cf45..3b470431cb 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -1359,5 +1359,47 @@ "description": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen", "shortDescription": "Een kaart met vuilnisbakken", "title": "Vuilnisbak" + }, + "stations": { + "layers": { + "3": { + "name": "Treinstations", + "description": "Laag met treinstations" + }, + "15": { + "tagRenderings": { + "type": { + "mappings": { + "2": { + "then": "Dit is een papieren vertrekstaat" + }, + "1": { + "then": "Dit is een elektronisch bord, met realtime vertrektijden" + }, + "0": { + "then": "Dit is een vertrektijdenbord van een onbekend type" + }, + "3": { + "then": "Er is een bord met de tijden tussen treinen" + } + }, + "question": "Wat voor vertrektijdenbord is dit?" + } + }, + "presets": { + "0": { + "description": "Voeg een bord met vertrektijden toe, elektronisch of op papier", + "title": "een vertrektijdenbord" + } + }, + "name": "Vertrektijdenborden", + "title": { + "render": "Vertrektijdenbord" + }, + "description": "Schermen die treinen tonen die van dit station vertrekken" + } + }, + "title": "Treinstations", + "description": "Bekijk, bewerk en voeg details to aan een treinstation" } -} \ No newline at end of file +} From b58bfed5f7764951f9475b9ee4b6e00a698a0cf3 Mon Sep 17 00:00:00 2001 From: kjon Date: Fri, 16 Dec 2022 18:03:29 +0000 Subject: [PATCH 05/29] Translated using Weblate (German) Currently translated at 98.6% (75 of 76 strings) Translation: MapComplete/shared-questions Translate-URL: https://hosted.weblate.org/projects/mapcomplete/shared-questions/de/ --- langs/shared-questions/de.json | 48 +++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index 60bf084d34..e866d4e247 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -222,6 +222,52 @@ } }, "question": "Wie lautet der zugehörige Wikipedia Artikel?" + }, + "denominations-coins": { + "mappings": { + "0": { + "then": "1-Cent-Münzen werden akzeptiert" + }, + "1": { + "then": "2-Cent-Münzen werden akzeptiert" + }, + "2": { + "then": "5-Cent-Münzen werden akzeptiert" + }, + "5": { + "then": "50-Cent-Münzen werden akzeptiert" + }, + "6": { + "then": "1-Euro-Münzen werden akzeptiert" + }, + "3": { + "then": "10-Cent-Münzen werden akzeptiert" + }, + "4": { + "then": "20-Cent-Münzen werden akzeptiert" + }, + "7": { + "then": "2-Euro-Münzen werden akzeptiert" + } + } + }, + "payment-options-split": { + "override": { + "mappings+": { + "3": { + "then": "Kreditkarten werden hier akzeptiert" + }, + "0": { + "then": "Münzen werden hier akzeptiert" + }, + "2": { + "then": "Debitkarten werden hier akzeptiert" + }, + "1": { + "then": "Geldscheine werden hier akzeptiert" + } + } + } } } -} \ No newline at end of file +} From 81b39f113c83881ab1dfaafdd4b24d609f62f555 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 17 Dec 2022 10:25:28 +0000 Subject: [PATCH 06/29] Translated using Weblate (German) Currently translated at 98.6% (75 of 76 strings) Translation: MapComplete/shared-questions Translate-URL: https://hosted.weblate.org/projects/mapcomplete/shared-questions/de/ --- langs/shared-questions/de.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index e866d4e247..8d87386928 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -249,7 +249,8 @@ "7": { "then": "2-Euro-Münzen werden akzeptiert" } - } + }, + "question": "Mit welchen Münzen kann man hier bezahlen?" }, "payment-options-split": { "override": { From 1654dbbaea4de8a29d295470edd3e4de127dc5ed Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 17 Dec 2022 10:25:53 +0000 Subject: [PATCH 07/29] Translated using Weblate (Dutch) Currently translated at 84.2% (64 of 76 strings) Translation: MapComplete/shared-questions Translate-URL: https://hosted.weblate.org/projects/mapcomplete/shared-questions/nl/ --- langs/shared-questions/nl.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json index e6f990bfe8..3fb7c0349a 100644 --- a/langs/shared-questions/nl.json +++ b/langs/shared-questions/nl.json @@ -222,6 +222,9 @@ } }, "question": "Welk Wikipedia-artikel beschrijft dit object?" + }, + "denominations-coins": { + "question": "Met welke munten kan je hier betalen?" } } -} \ No newline at end of file +} From 02b52ee821f59a2b7fea3cefa7c032b5d1e89f21 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 17 Dec 2022 10:34:39 +0000 Subject: [PATCH 08/29] Translated using Weblate (Dutch) Currently translated at 96.9% (730 of 753 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/nl/ --- langs/nl.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/langs/nl.json b/langs/nl.json index b26bdca0e3..eb624a1e52 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -961,5 +961,14 @@ "wikidata": { "description": "Een Wikidata-code" } + }, + "userinfo": { + "gotoSettings": "Ga naar je instellingen op OpenStreetMap.org", + "newMessages": "je hebt nieuwe berichten", + "moveToHome": "Beweeg de kaart naar je thuislocatie", + "gotoInbox": "Open je inbox", + "noDescriptionCallToAction": "Voeg een profielbeschrijving toe", + "noDescription": "Je hebt nog een beschrijving op je profiel", + "welcome": "Welkom {user}" } } From 4c11ffe5b02c9fa8c670de4764b166e18017b9b4 Mon Sep 17 00:00:00 2001 From: kjon Date: Sat, 17 Dec 2022 10:22:20 +0000 Subject: [PATCH 09/29] Translated using Weblate (German) Currently translated at 100.0% (2571 of 2571 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/ --- langs/layers/de.json | 266 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 263 insertions(+), 3 deletions(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index 333490ee82..0c503bc005 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -142,6 +142,20 @@ "artwork_subject": { "question": "Was zeigt dieses Kunstwerk?", "render": "Das Kunstwerk zeigt {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}" + }, + "doubles_as_bench": { + "mappings": { + "0": { + "then": "Dieses Kunstwerk dient auch als Sitzbank" + }, + "1": { + "then": "Dieses Kunstwerk dient nicht als Sitzbank" + }, + "2": { + "then": "Dieses Kunstwerk dient nicht als Sitzbank" + } + }, + "question": "Dient dieses Kunstwerk auch als Sitzbank?" } }, "title": { @@ -334,15 +348,81 @@ }, "bench-seats": { "question": "Wie viele Sitzplätze hat diese Bank?", - "render": "Die Sitzbank hat {seats} Sitzplätze" + "render": "Die Sitzbank hat {seats} Sitzplätze", + "mappings": { + "0": { + "then": "Diese Bank hat keine getrennten Sitze" + } + } }, "bench-survey:date": { "question": "Wann wurde diese Bank zuletzt überprüft?", - "render": "Diese Bank wurde zuletzt überprüft am {survey:date}" + "render": "Diese Bank wurde zuletzt überprüft am {survey:date}", + "mappings": { + "0": { + "then": "Heute geprüft!" + } + } + }, + "bench-memorial": { + "mappings": { + "0": { + "then": "Diese Bank ist ein Denkmal für jemanden oder etwas" + }, + "1": { + "then": "Diese Bank ist kein Denkmal für jemanden oder etwas" + } + }, + "question": "Dient diese Bank als Denkmal für jemanden oder etwas?" + }, + "bench-artwork": { + "mappings": { + "0": { + "then": "Diese Bank hat ein integriertes Kunstwerk" + }, + "1": { + "then": "Diese Bank hat kein integriertes Kunstwerk" + } + }, + "question": "Hat diese Bank ein künstlerisches Element?
Z.B. hat es ein integriertes Gemälde, eine Statue oder eine andere nicht triviale, kreative Arbeit
" + }, + "bench-inscription": { + "render": "Diese Bank hat folgende Inschrift:

{inscription}

", + "mappings": { + "0": { + "then": "Diese Bank hat keine Inschrift" + }, + "1": { + "then": "Diese Bank hat (wahrscheinlich) keine Inschrift" + } + }, + "question": "Hat diese Bank eine Inschrift?
Z.B. auf einer angebrachten Plakette, in der Rückenlehne, ...
" } }, "title": { "render": "Sitzbank" + }, + "filter": { + "1": { + "options": { + "2": { + "question": "Hat keine Rückenlehne" + }, + "1": { + "question": "Hat eine Rückenlehne" + }, + "0": { + "question": "Mit und ohne Rückenlehne" + } + } + }, + "0": { + "options": { + "0": { + "question": "ist ein Denkmal" + } + } + } } }, "bench_at_pt": { @@ -377,6 +457,18 @@ } }, "render": "Sitzbank" + }, + "deletion": { + "extraDeleteReasons": { + "0": { + "explanation": "Diese Bushaltestelle wird nicht mehr genutzt" + } + }, + "nonDeleteMappings": { + "0": { + "then": "Diese Bushaltestelle hat keine Bank (es gab nie eine oder sie wurde entfernt)" + } + } } }, "bicycle_library": { @@ -3710,6 +3802,9 @@ }, "2": { "question": "Hat wahrscheinlich kein Bild" + }, + "0": { + "question": "Mit und ohne Bilder" } } }, @@ -6855,6 +6950,12 @@ "render_single_language": "Die Treppe hat taktile Schrift in {language():font-bold}" } } + }, + "multilevels": { + "override": { + "question": "Welchen Ebenen verbindet diese Treppe?", + "render": "Diese Treppe verbindet die Ebenen {level}" + } } }, "title": { @@ -7445,6 +7546,11 @@ "wheelchair-door-width": { "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?", "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit" + }, + "opening_hours": { + "override": { + "question": "Wann ist die Einrichtung, in der sich die Toilette befindet, geöffnet?" + } } }, "title": { @@ -8111,5 +8217,159 @@ } } } + }, + "car_rental": { + "description": "Orte, an denen Sie ein Auto mieten können", + "name": "Autovermietung", + "presets": { + "0": { + "description": "Ein Ort, an dem Sie ein Auto mieten können", + "title": "eine Autovermietung" + } + }, + "tagRenderings": { + "name": { + "question": "Wie lautet der Name dieser Autovermietung?", + "render": "Der Name der Autovermietung lautet {name}", + "freeform": { + "placeholder": "Name der Autovermietung" + }, + "mappings": { + "0": { + "then": "Diese Autovermietung hat keinen Namen" + } + } + } + }, + "title": { + "render": "Autovermietung" + } + }, + "railway_platforms": { + "tagRenderings": { + "ref": { + "freeform": { + "placeholder": "Bahnsteignummer" + }, + "question": "Wie lautet die Nummer dieses Bahnsteigs?", + "render": "Bahnsteig {ref}" + } + }, + "title": { + "mappings": { + "0": { + "then": "Bahnsteig {ref}" + } + }, + "render": "Bahnsteig" + }, + "description": "Finden Sie alle Bahnsteige im Bahnhof und die Zugstrecken, die sie benutzen.", + "name": "Bahnsteige" + }, + "ticket_machine": { + "presets": { + "0": { + "title": "einen Fahrkartenautomat" + } + }, + "description": "Fahrkartenautomaten für ÖPNV-Tickets finden", + "name": "Fahrkartenautomaten", + "tagRenderings": { + "operator": { + "freeform": { + "placeholder": "Name des Betreibers" + }, + "mappings": { + "0": { + "then": "Niederländische Eisenbahn (NS)" + } + }, + "question": "Wer ist der Betreiber dieses Fahrkartenautomaten?", + "render": "Dieser Fahrkartenautomat wird betrieben von {operator}" + } + }, + "title": { + "render": "Fahrkartenautomat" + } + }, + "ticket_validator": { + "tagRenderings": { + "validator-operator": { + "freeform": { + "placeholder": "Name des Betreibers" + }, + "question": "Wer ist der Betreiber dieses Fahrkartenentwerters?", + "render": "Dieser Fahrkartenentwerter wird betrieben von {operator}" + }, + "barrier": { + "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}", + "mappings": { + "0": { + "then": "Dieser Fahrscheinentwerter ist Teil einer Zugangsbarriere" + } + } + }, + "payment-options": { + "override": { + "mappings+": { + "0": { + "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" + }, + "1": { + "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" + } + } + } + } + }, + "description": "Finden Sie Fahrkartenentwerter, um Tickets für den öffentlichen Nahverkehr zu entwerten", + "name": "Fahrkartenentwerter", + "presets": { + "0": { + "title": "einen Fahrkartenentwerter" + } + }, + "title": { + "render": "Fahrkartenentwerter" + } + }, + "atm": { + "tagRenderings": { + "operator": { + "question": "Welches Unternehmen betreibt den Geldautomaten?", + "freeform": { + "placeholder": "Betreiber" + }, + "render": "Der Geldautomat wird von {operator} betrieben" + }, + "brand": { + "freeform": { + "placeholder": "Markenname" + }, + "question": "Von welcher Marke ist dieser Geldautomat?", + "render": "Die Marke dieses Geldautomaten ist {brand}" + }, + "name": { + "render": "Der Name dieses Geldautomaten ist {name}" + } + }, + "name": "Geldautomaten", + "title": { + "render": "Geldautomat", + "mappings": { + "0": { + "then": "{brand} Geldautomat" + } + } + }, + "description": "Geldautomaten zum Geld abheben", + "presets": { + "0": { + "title": "ein Geldautomat" + } + } + }, + "selected_element": { + "description": "Hebt das aktuell ausgewählte Element hervor. Überschreiben Sie diese Ebene, um unterschiedliche Farben zu erhalten" } -} \ No newline at end of file +} From 60c7c7878531983823598ffdae9afcae14cd21b9 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 17 Dec 2022 10:17:42 +0000 Subject: [PATCH 10/29] Translated using Weblate (Dutch) Currently translated at 92.2% (2348 of 2546 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/nl/ --- langs/layers/nl.json | 74 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/langs/layers/nl.json b/langs/layers/nl.json index c58590e9ba..c9f7c4bb38 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2538,7 +2538,6 @@ }, "title": { "mappings": { - "0": {}, "1": { "then": "Klimsite {name}" }, @@ -6586,6 +6585,26 @@ } }, "question": "Is er een helling bij deze trap?" + }, + "tactile_writing": { + "question": "Heeft deze trap voelbaar schrift op de leuning?", + "mappings": { + "0": { + "then": "Er is voelbaar schrift op de leuning" + }, + "1": { + "then": "Er is geen voelbaar schrift op de leuning" + } + } + }, + "tactile_writing_language": { + "render": { + "special": { + "render_list_item": "Deze trap heeft voelbaar schrijft in {language():font-bold}", + "render_single_language": "Deze trap heeft voelbaar schrijft in {language():font-bold}", + "question": "In welke talen is er voelbaar schrift (braille) voor navigatie? " + } + } } }, "title": { @@ -6595,7 +6614,8 @@ } }, "render": "Trap" - } + }, + "description": "Laag met trappen en roltrappen" }, "street_lamps": { "description": "Een laag die alle straatlantaarns toont", @@ -6923,8 +6943,23 @@ "0": { "then": "Nederlandse Spoorwegen (NS)" } - } + }, + "freeform": { + "placeholder": "Naam van de beheerder" + }, + "question": "Wie is de beheerder van deze kaartautomaat?", + "render": "Deze kaartautomaat wordt beheerd door {operator}" } + }, + "name": "Kaartautomaten", + "description": "Zoek kaartautomaten voor het openbaar vervoer", + "presets": { + "0": { + "title": "een kaartautomaat" + } + }, + "title": { + "render": "Kaartautomaat" } }, "toilet": { @@ -7587,6 +7622,16 @@ "render": { "special": { "tagrendering": "Een ingang van {canonical(width)}" + }, + "after": "{_entrances_count_without_width_count} ingangen hebben nog geen informatie over de breedte", + "before": "

Ingangen

Dit gebouw heeft {_entrances_count} ingangen:" + }, + "mappings": { + "0": { + "then": "Geen ingang is gemarkeerd" + }, + "1": { + "then": "Geen van de {_entrance_count ingangen hebben al informatie over de breedte" } } } @@ -7871,5 +7916,26 @@ } } } + }, + "railway_platforms": { + "tagRenderings": { + "ref": { + "freeform": { + "placeholder": "Perronnummer" + }, + "question": "Wat is het nummer van dit perron?", + "render": "Perron {ref}" + } + }, + "title": { + "mappings": { + "0": { + "then": "Perron {ref}" + } + }, + "render": "Perron" + }, + "description": "Vind elk perron in het station, en de routes die ze gebruiken.", + "name": "Treinperrons" } -} \ No newline at end of file +} From 95e720e28cd2945ba933f7ef4523654979bbd6fb Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 18 Dec 2022 18:19:37 +0000 Subject: [PATCH 11/29] Translated using Weblate (Dutch) Currently translated at 92.2% (2348 of 2546 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/nl/ --- langs/layers/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/layers/nl.json b/langs/layers/nl.json index c9f7c4bb38..7467575f8f 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -7631,7 +7631,7 @@ "then": "Geen ingang is gemarkeerd" }, "1": { - "then": "Geen van de {_entrance_count ingangen hebben al informatie over de breedte" + "then": "Geen van de {_entrance_count} ingangen hebben al informatie over de breedte" } } } From 18068a44806433725125b6fda690b94182544386 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 19 Dec 2022 11:53:35 +0000 Subject: [PATCH 12/29] Translated using Weblate (Dutch) Currently translated at 92.8% (2364 of 2546 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/nl/ --- langs/layers/nl.json | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 7467575f8f..eb4639ec02 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3495,6 +3495,15 @@ } }, "question": "Werkt deze lift?" + }, + "tactile_writing_language": { + "render": { + "special": { + "render_list_item": "Deze lift heeft voelbaar schrift in het {language():font-bold}", + "question": "In welke talen heeft deze lift voelbaar schrift (braille)?", + "render_single_language": "Deze lift heeft voelbaar schrift in het {language():font-bold}" + } + } } }, "title": { @@ -7937,5 +7946,50 @@ }, "description": "Vind elk perron in het station, en de routes die ze gebruiken.", "name": "Treinperrons" + }, + "atm": { + "tagRenderings": { + "operator": { + "render": "Deze geldautomaat wordt beheerd door {operator}", + "question": "Welk bedrijf beheert deze geldautomaat?", + "freeform": { + "placeholder": "Beheerder" + } + }, + "name": { + "render": "De naam van deze geldautomaat is {name}" + }, + "brand": { + "question": "Van welk merk is deze geldautomaat?", + "render": "Het merk van deze geldautomaat is {brand}", + "freeform": { + "placeholder": "Merknaam" + } + } + }, + "title": { + "render": "Geldautomaat", + "mappings": { + "0": { + "then": "{brand} Geldautomaat" + } + } + }, + "presets": { + "0": { + "title": "een geldautomaat" + } + }, + "name": "Geldautomaten", + "description": "Geldautomaten om geld op te nemen" + }, + "ticket_validator": { + "tagRenderings": { + "validator-operator": { + "freeform": { + "placeholder": "Naam van de beheerder" + } + } + } } } From 7e010c04740808495b7f8c279118e8d690f30e24 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 20 Dec 2022 20:17:17 +0100 Subject: [PATCH 13/29] Remove unneeded console.log --- Logic/Osm/OsmObject.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/Logic/Osm/OsmObject.ts b/Logic/Osm/OsmObject.ts index e50603961e..20c76f0abd 100644 --- a/Logic/Osm/OsmObject.ts +++ b/Logic/Osm/OsmObject.ts @@ -70,7 +70,6 @@ export abstract class OsmObject { const url = `${OsmObject.backendURL}api/0.6/${id}` const rawData = await Utils.downloadJsonCachedAdvanced(url, 1000) - console.log(rawData) if (rawData["error"] !== undefined && rawData["statuscode"] === 410) { return "deleted" } From 9f500858c77f93ce8948297be67d3e18d4b77568 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 20 Dec 2022 20:35:44 +0100 Subject: [PATCH 14/29] Add tree height and circumference to tree theme --- assets/layers/tree_node/tree_node.json | 68 +++++++++++--------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index 634ca7e6e5..33f888ac55 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -70,44 +70,6 @@ }, "tagRenderings": [ "images", - { - "id": "tree-height", - "render": { - "nl": "Hoogte: {height}", - "en": "Height: {height}", - "it": "Altezza: {height}", - "ru": "Высота: {height}", - "fr": "Hauteur : {height}", - "de": "Höhe: {height}", - "es": "Altura: {height}", - "id": "Tinggi: {height}", - "da": "Højde: {height}" - }, - "condition": { - "and": [ - "height~*" - ] - }, - "mappings": [ - { - "if": { - "and": [ - "height~^[0-9.]+$" - ] - }, - "then": { - "nl": "Hoogte: {height} m", - "en": "Height: {height} m", - "it": "Altezza: {height} m", - "ru": "Высота: {height} м", - "fr": "Hauteur : {height} m", - "de": "Höhe: {height} m", - "es": "Altura: {height} m", - "da": "Højde: {height} m" - } - } - ] - }, { "id": "plantnet", "render": "{plantnet_detection()}", @@ -154,6 +116,34 @@ ] } }, + { + "id": "circumference", + "question": { + "en": "What is the circumference of the tree trunk?

This is measured at a height of 1.30m

" + }, + "render": { + "en": "The tree trunk has a circumference of {circumference} meter" + }, + "freeform": { + "key": "circumference", + "inline": true, + "type": "pfloat" + } + }, + { + "id": "height", + "question": { + "en": "What is the height of this tree?" + }, + "freeform": { + "key": "height", + "type": "pfloat", + "inline": true + }, + "render": { + "en": "This tree is {height} meter high" + } + }, { "id": "tree-denotation", "question": { @@ -811,4 +801,4 @@ "fr": "Une couche montrant les arbres", "da": "Et lag, der viser træer" } -} \ No newline at end of file +} From 1e36bdfc5621d86b4f3f3bfd0a94711691af85cb Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 18 Dec 2022 23:30:27 +0000 Subject: [PATCH 15/29] Translated using Weblate (English) Currently translated at 100.0% (753 of 753 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/en/ --- langs/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/en.json b/langs/en.json index 054c0b541a..881ca2066e 100644 --- a/langs/en.json +++ b/langs/en.json @@ -913,7 +913,7 @@ "inviteToSplit": "Split this road in smaller segments. This allows to give different properties to parts of the road.", "loginToSplit": "You must be logged in to split a road", "split": "Split", - "splitTitle": "Choose on the map where to split this road" + "splitTitle": "Choose on the map where the properties of this road change" }, "translations": { "activateButton": "Help translate MapComplete", From faa36ff43dacfc2f668161607b6b522544d7f1ba Mon Sep 17 00:00:00 2001 From: mcliquid Date: Mon, 19 Dec 2022 05:46:32 +0000 Subject: [PATCH 16/29] Translated using Weblate (German) Currently translated at 100.0% (753 of 753 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/de/ --- langs/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/de.json b/langs/de.json index 40479dda7f..95f2fb7197 100644 --- a/langs/de.json +++ b/langs/de.json @@ -913,7 +913,7 @@ "inviteToSplit": "Die Straße in Abschnitte teilen. Dadurch können je Abschnitt unterschiedliche Eigenschaften angegeben werden.", "loginToSplit": "Anmeldung erforderlich, um Straßen zu teilen", "split": "Teilen", - "splitTitle": "Auf der Karte auswählen, wo die Straße geteilt werden soll" + "splitTitle": "Wähle auf der Karte aus, wo sich die Eigenschaften dieser Straße ändern" }, "translations": { "activateButton": "MapComplete übersetzen", From 6fc97dc7b859ae1fb25fb3463845a82e929e93e8 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 18 Dec 2022 23:30:46 +0000 Subject: [PATCH 17/29] Translated using Weblate (Dutch) Currently translated at 96.8% (729 of 753 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/nl/ --- langs/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/nl.json b/langs/nl.json index eb624a1e52..c0b62e676d 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -890,7 +890,7 @@ "inviteToSplit": "Knip deze weg in kleinere segmenten (om andere eigenschappen per segment toe te kennen)", "loginToSplit": "Je moet aangemeld zijn om een weg te knippen", "split": "Knip weg", - "splitTitle": "Duid op de kaart aan waar de weg geknipt moet worden" + "splitTitle": "Duid op de kaart aan waar de eigenschappen van de weg veranderen" }, "translations": { "activateButton": "Help met het vertalen van MapComplete", From 3a5fb542f015daef3069b789c4f3486d348f9687 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 19 Dec 2022 11:57:17 +0000 Subject: [PATCH 18/29] Translated using Weblate (Dutch) Currently translated at 94.7% (72 of 76 strings) Translation: MapComplete/shared-questions Translate-URL: https://hosted.weblate.org/projects/mapcomplete/shared-questions/nl/ --- langs/shared-questions/nl.json | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json index 3fb7c0349a..a01a20a7bb 100644 --- a/langs/shared-questions/nl.json +++ b/langs/shared-questions/nl.json @@ -224,7 +224,33 @@ "question": "Welk Wikipedia-artikel beschrijft dit object?" }, "denominations-coins": { - "question": "Met welke munten kan je hier betalen?" + "question": "Met welke munten kan je hier betalen?", + "mappings": { + "0": { + "then": "Munten van 1 cent worden geaccepteerd" + }, + "5": { + "then": "Munten van 50 cent worden geaccepteerd" + }, + "1": { + "then": "Munten van 2 cent worden geaccepteerd" + }, + "2": { + "then": "Munten van 5 cent worden geaccepteerd" + }, + "3": { + "then": "Munten van 10 cent worden geaccepteerd" + }, + "4": { + "then": "Munten van 20 cent worden geaccepteerd" + }, + "6": { + "then": "Munten van 1 euro worden geaccepteerd" + }, + "7": { + "then": "Munten van 2 euro worden geaccepteerd" + } + } } } } From 89dd0697542362b5f444f06298b3ebdddcf68311 Mon Sep 17 00:00:00 2001 From: aleksej0R Date: Tue, 20 Dec 2022 18:12:15 +0000 Subject: [PATCH 19/29] Translated using Weblate (French) Currently translated at 55.6% (1430 of 2571 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/fr/ --- langs/layers/fr.json | 224 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 221 insertions(+), 3 deletions(-) diff --git a/langs/layers/fr.json b/langs/layers/fr.json index ab7978bfc5..412a42c0d6 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -123,6 +123,9 @@ }, "11": { "then": "Carrelage" + }, + "12": { + "then": "Sculpture sur bois" } }, "question": "Quel est le type de cette œuvre d'art ?", @@ -131,6 +134,26 @@ "artwork-website": { "question": "Existe-t-il un site web où trouver plus d'informations sur cette œuvre d'art ?", "render": "Plus d'info sûr ce site web" + }, + "doubles_as_bench": { + "question": "Cette oeuvre d'art sert-elle de banc ?", + "mappings": { + "0": { + "then": "Cette oeuvre d'art sert aussi de banc" + }, + "1": { + "then": "Cette oeuvre d'art ne sert pas de banc" + }, + "2": { + "then": "Cette oeuvre d'art ne sert pas de banc" + } + } + }, + "artwork-artist-wikidata": { + "question": "Qui a fait cette oeuvre d'art ?" + }, + "artwork_subject": { + "question": "Que représente cette oeuvre d'art ?" } }, "title": { @@ -323,15 +346,80 @@ }, "bench-seats": { "question": "De combien de places dispose ce banc ?", - "render": "{seats} places" + "render": "{seats} places", + "mappings": { + "0": { + "then": "Ce banc n'a pas de sièges séparés" + } + } }, "bench-survey:date": { "question": "Quand ce banc a-t-il été contrôlé pour la dernière fois ?", - "render": "Ce banc a été contrôlé pour la dernière fois le {survey:date}" + "render": "Ce banc a été contrôlé pour la dernière fois le {survey:date}", + "mappings": { + "0": { + "then": "Vérifié sur le terrain aujourd'hui !" + } + } + }, + "bench-inscription": { + "mappings": { + "0": { + "then": "Ce banc n'a pas d'inscription" + }, + "1": { + "then": "Ce banc n'a(probablement) pas d'inscription" + } + }, + "question": "Est-ce que ce banc possède une inscription ?
Par exemple, sur une plaque accrochée, sur le dossier, ...
", + "render": "Ce banc a l'inscription suivante :

{inscription}

" + }, + "bench-artwork": { + "mappings": { + "0": { + "then": "Une oeuvre d'art est intégrée à ce banc" + }, + "1": { + "then": "Ce banc n'a pas d'oeuvre d'art intégrée" + } + } + }, + "bench-memorial": { + "mappings": { + "0": { + "then": "Ce banc est un mémorial pour quelqu'un ou quelque chose" + }, + "1": { + "then": "Ce banc n'est pas un mémorial pour quelqu'un ou quelque chose" + } + }, + "question": "Ce banc sert-il de mémorial pour quelqu'un ou quelque chose ?" } }, "title": { "render": "Banc" + }, + "filter": { + "1": { + "options": { + "0": { + "question": "Avec et sans dossier" + }, + "1": { + "question": "A un dossier" + }, + "2": { + "question": "N'a pas de dossier" + } + } + }, + "0": { + "options": { + "0": { + "question": "est un mémorial" + } + } + } } }, "bench_at_pt": { @@ -366,6 +454,18 @@ } }, "render": "Banc" + }, + "deletion": { + "extraDeleteReasons": { + "0": { + "explanation": "Cette station de bus n'est plus utilisée" + } + }, + "nonDeleteMappings": { + "0": { + "then": "Cette station de bus n'a pas de banc (il n'y en a jamais eu ou il a été retiré)" + } + } } }, "bicycle_library": { @@ -1357,6 +1457,10 @@ } }, "question": "Doit-on payer des frais de stationnement pendant la recharge ?" + }, + "phone": { + "question": "Quel numéro peut on appeler s'il y a un problème avec cette station de charge ?", + "render": "En cas de problèmes, appelez le {phone}" } } }, @@ -1625,6 +1729,57 @@ } }, "render": "Traversée" + }, + "tagRenderings": { + "crossing-has-island": { + "mappings": { + "0": { + "then": "Ce passage a une île au milieu" + }, + "1": { + "then": "Ce passage n'a pas d'île au milieu" + } + }, + "question": "Est-ce que ce passage a une île au milieu ?" + }, + "crossing-is-zebra": { + "mappings": { + "0": { + "then": "C'est un passage piéton" + }, + "1": { + "then": "Ce n'est pas un passage piéton" + } + }, + "question": "Est-ce un passage piéton ?" + }, + "crossing-right-turn-through-red": { + "mappings": { + "0": { + "then": "Un cycliste peut tourner à droite si le feu est rouge" + }, + "1": { + "then": "Un cycliste peut tourner à droite si le feu est rouge" + }, + "2": { + "then": "Un cycliste ne peut pas tourner à droite si le feu est rouge" + } + }, + "question": "Un cycliste peut-il tourner à droite quand le feu est rouge ?" + }, + "crossing-sound": { + "mappings": { + "0": { + "then": "Ce feu de signalisation a une alarme sonore pour aider à traverser, à la fois pour trouver le passage piéton, et pour traverser." + }, + "1": { + "then": "Ce feu de signalisation n'a pas de signal sonore pour aider à traverser." + } + } + }, + "crossing-continue-through-red": { + "question": "Est-ce qu'un cycliste peut aller tout droit quand le feu est rouge ?" + } } }, "cycleways_and_roads": { @@ -4531,5 +4686,68 @@ } } } + }, + "atm": { + "tagRenderings": { + "brand": { + "freeform": { + "placeholder": "Nom de marque" + }, + "question": "De quelle marque est ce DAB ?", + "render": "La marque de ce DAB est {brand}" + }, + "name": { + "render": "Le nom de ce DAB est {name}" + }, + "operator": { + "question": "Quelle société exploite ce DAB ?", + "freeform": { + "placeholder": "Opérateur" + }, + "render": "Ce DAB est exploité par {operator}" + } + }, + "title": { + "mappings": { + "0": { + "then": "DAB {brand}" + } + }, + "render": "DAB" + }, + "description": "DAB pour retirer de l'argent", + "name": "DABs", + "presets": { + "0": { + "title": "un DAB" + } + } + }, + "car_rental": { + "presets": { + "0": { + "description": "Un lieu où vous pouvez louer une voiture", + "title": "Une société de location de véhicules" + } + }, + "tagRenderings": { + "name": { + "freeform": { + "placeholder": "Nom de la société de location de véhicules" + }, + "render": "Cette société de location de véhicules est appelée {name}", + "mappings": { + "0": { + "then": "Cette société de location de véhicules n'a pas de nom" + } + }, + "question": "Quel est le nom de cette société de location de véhicules ?" + } + }, + "name": "Société de location de véhicules", + "title": { + "render": "Société de location de véhicules" + }, + "description": "Lieu où vous pouvez louer une voiture" } -} \ No newline at end of file +} From c0fab792c3d5a3741038f2b6124540ed352c37fc Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 20 Dec 2022 20:42:32 +0100 Subject: [PATCH 20/29] Housekeeping... --- Docs/BuiltinQuestions.md | 2 +- Docs/Layers/ticket_machine.md | 2 +- Docs/Layers/tree_node.md | 48 +- Docs/TagInfo/mapcomplete_personal.json | 12 +- Docs/TagInfo/mapcomplete_trees.json | 12 +- Docs/Themes/atm.md | 1 + Docs/Themes/stations.md | 2 + Docs/wikiIndex.txt | 2 +- UI/DefaultGUI.ts | 13 +- assets/contributors.json | 4 +- assets/layers/artwork/artwork.json | 25 +- assets/layers/atm/atm.json | 60 ++- assets/layers/bench/bench.json | 63 ++- assets/layers/bench_at_pt/bench_at_pt.json | 8 +- assets/layers/car_rental/car_rental.json | 36 +- .../charging_station/charging_station.json | 6 +- assets/layers/crossings/crossings.json | 39 +- assets/layers/elevator/elevator.json | 9 +- assets/layers/filters/filters.json | 3 +- .../railway_platforms/railway_platforms.json | 28 +- .../selected_element/selected_element.json | 3 +- assets/layers/stairs/stairs.json | 21 +- .../layers/ticket_machine/ticket_machine.json | 31 +- .../ticket_validator/ticket_validator.json | 28 +- assets/layers/tree_node/tree_node.json | 4 +- .../walls_and_buildings.json | 12 +- assets/tagRenderings/questions.json | 48 +- assets/themes/atm/atm.json | 6 +- assets/themes/stations/stations.json | 56 ++- assets/translators.json | 18 +- langs/de.json | 18 +- langs/layers/da.json | 8 - langs/layers/de.json | 453 ++++++++---------- langs/layers/en.json | 16 +- langs/layers/es.json | 8 - langs/layers/fr.json | 328 +++++++------ langs/layers/id.json | 3 - langs/layers/it.json | 8 - langs/layers/nl.json | 201 ++++---- langs/layers/ru.json | 8 - langs/nl.json | 18 +- langs/shared-questions/de.json | 96 ++-- langs/shared-questions/en.json | 2 +- langs/shared-questions/nl.json | 60 +-- langs/themes/de.json | 94 ++-- langs/themes/nl.json | 86 ++-- 46 files changed, 1089 insertions(+), 920 deletions(-) diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index 3f2dec585c..cd54d7d1e5 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -366,7 +366,7 @@ Which methods of payment are accepted here? -Whith what coins can you pay here? +With what coins can you pay here? diff --git a/Docs/Layers/ticket_machine.md b/Docs/Layers/ticket_machine.md index de7eb86cb6..d57e566f9b 100644 --- a/Docs/Layers/ticket_machine.md +++ b/Docs/Layers/ticket_machine.md @@ -144,7 +144,7 @@ The question is *Which methods of payment are accepted here?* -The question is *Whith what coins can you pay here?* +The question is *With what coins can you pay here?* diff --git a/Docs/Layers/tree_node.md b/Docs/Layers/tree_node.md index a9021c4387..e892b2c292 100644 --- a/Docs/Layers/tree_node.md +++ b/Docs/Layers/tree_node.md @@ -60,8 +60,9 @@ this quick overview is incomplete attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ -[](https://taginfo.openstreetmap.org/keys/height#values) [height](https://wiki.openstreetmap.org/wiki/Key:height) | Multiple choice | [](https://taginfo.openstreetmap.org/keys/species:wikidata#values) [species:wikidata](https://wiki.openstreetmap.org/wiki/Key:species:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | +[](https://taginfo.openstreetmap.org/keys/circumference#values) [circumference](https://wiki.openstreetmap.org/wiki/Key:circumference) | [pfloat](../SpecialInputElements.md#pfloat) | +[](https://taginfo.openstreetmap.org/keys/height#values) [height](https://wiki.openstreetmap.org/wiki/Key:height) | [pfloat](../SpecialInputElements.md#pfloat) | [](https://taginfo.openstreetmap.org/keys/denotation#values) [denotation](https://wiki.openstreetmap.org/wiki/Key:denotation) | Multiple choice | [landmark](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dlandmark) [natural_monument](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnatural_monument) [agricultural](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dagricultural) [park](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dpark) [garden](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dgarden) [avenue](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Davenue) [urban](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Durban) [none](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnone) [](https://taginfo.openstreetmap.org/keys/leaf_type#values) [leaf_type](https://wiki.openstreetmap.org/wiki/Key:leaf_type) | Multiple choice | [broadleaved](https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dbroadleaved) [needleleaved](https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dneedleleaved) [](https://taginfo.openstreetmap.org/keys/leaf_cycle#values) [leaf_cycle](https://wiki.openstreetmap.org/wiki/Key:leaf_cycle) | Multiple choice | [deciduous](https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Ddeciduous) [evergreen](https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Devergreen) @@ -85,23 +86,6 @@ This tagrendering has no question and is thus read-only -### tree-height - - - -This tagrendering has no question and is thus read-only - - - - - - - *Height: {height} m* corresponds with `height~^(^[0-9.]+$)$` - - -This tagrendering is only visible in the popup if the following condition is met: `height~.+` - - - ### plantnet @@ -138,6 +122,34 @@ This tagrendering is only visible in the popup if the following condition is met +### circumference + + + +The question is *What is the circumference of the tree trunk?

This is measured at a height of 1.30m

* + +This rendering asks information about the property [circumference](https://wiki.openstreetmap.org/wiki/Key:circumference) + +This is rendered with `The tree trunk has a circumference of {circumference} meter` + + + + + +### height + + + +The question is *What is the height of this tree?* + +This rendering asks information about the property [height](https://wiki.openstreetmap.org/wiki/Key:height) + +This is rendered with `This tree is {height} meter high` + + + + + ### tree-denotation diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index 12add32581..4fdb79d7c5 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -11531,14 +11531,18 @@ "key": "wikipedia", "description": "The layer 'Tree allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" }, - { - "key": "height", - "description": "Layer 'Tree' shows height~^(^[0-9.]+$)$ with a fixed text, namely 'Height: {height} m' (in the MapComplete.osm.be theme 'Personal theme')" - }, { "key": "species:wikidata", "description": "Layer 'Tree' shows and asks freeform values for key 'species:wikidata' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "circumference", + "description": "Layer 'Tree' shows and asks freeform values for key 'circumference' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "height", + "description": "Layer 'Tree' shows and asks freeform values for key 'height' (in the MapComplete.osm.be theme 'Personal theme')" + }, { "key": "denotation", "description": "Layer 'Tree' shows denotation=landmark with a fixed text, namely 'The tree is remarkable due to its size or prominent location. It is useful for navigation.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", diff --git a/Docs/TagInfo/mapcomplete_trees.json b/Docs/TagInfo/mapcomplete_trees.json index 80384008ad..6327c6c3e0 100644 --- a/Docs/TagInfo/mapcomplete_trees.json +++ b/Docs/TagInfo/mapcomplete_trees.json @@ -31,14 +31,18 @@ "key": "wikipedia", "description": "The layer 'Tree allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" }, - { - "key": "height", - "description": "Layer 'Tree' shows height~^(^[0-9.]+$)$ with a fixed text, namely 'Height: {height} m' (in the MapComplete.osm.be theme 'Trees')" - }, { "key": "species:wikidata", "description": "Layer 'Tree' shows and asks freeform values for key 'species:wikidata' (in the MapComplete.osm.be theme 'Trees')" }, + { + "key": "circumference", + "description": "Layer 'Tree' shows and asks freeform values for key 'circumference' (in the MapComplete.osm.be theme 'Trees')" + }, + { + "key": "height", + "description": "Layer 'Tree' shows and asks freeform values for key 'height' (in the MapComplete.osm.be theme 'Trees')" + }, { "key": "denotation", "description": "Layer 'Tree' shows denotation=landmark with a fixed text, namely 'The tree is remarkable due to its size or prominent location. It is useful for navigation.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees')", diff --git a/Docs/Themes/atm.md b/Docs/Themes/atm.md index 3ebecc4823..5ea4604fc6 100644 --- a/Docs/Themes/atm.md +++ b/Docs/Themes/atm.md @@ -24,6 +24,7 @@ Available languages: - en + - de This document is autogenerated from [assets/themes/atm/atm.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/atm/atm.json) \ No newline at end of file diff --git a/Docs/Themes/stations.md b/Docs/Themes/stations.md index 6eeb4dfc64..6e0b2cb9d2 100644 --- a/Docs/Themes/stations.md +++ b/Docs/Themes/stations.md @@ -44,6 +44,8 @@ Available languages: - en + - de + - nl This document is autogenerated from [assets/themes/stations/stations.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/stations/stations.json) \ No newline at end of file diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt index d9909239f0..a76dd5381c 100644 --- a/Docs/wikiIndex.txt +++ b/Docs/wikiIndex.txt @@ -112,7 +112,7 @@ {{service_item |name= [https://mapcomplete.osm.be/atm atm] |region= Worldwide -|lang= {{#language:en|en}}, {{#language:_context|en}} +|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:_context|en}} |descr= A MapComplete theme: This map shows ATMs to withdraw or deposit money |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png diff --git a/UI/DefaultGUI.ts b/UI/DefaultGUI.ts index 4071797fab..bb27fd8f94 100644 --- a/UI/DefaultGUI.ts +++ b/UI/DefaultGUI.ts @@ -231,12 +231,13 @@ export default class DefaultGUI { .SetClass("flex items-center justify-center normal-background h-full") .AttachTo("on-small-screen") - new Combine([Toggle.If(state.featureSwitchSearch, () => - new SearchAndGo(state).SetClass( - "shadow rounded-full h-min w-full overflow-hidden sm:max-w-sm pointer-events-auto" - ) - )]) - .AttachTo("top-right") + new Combine([ + Toggle.If(state.featureSwitchSearch, () => + new SearchAndGo(state).SetClass( + "shadow rounded-full h-min w-full overflow-hidden sm:max-w-sm pointer-events-auto" + ) + ), + ]).AttachTo("top-right") new LeftControls(state, guiState).AttachTo("bottom-left") new RightControls(state).AttachTo("bottom-right") diff --git a/assets/contributors.json b/assets/contributors.json index 9553d4ab40..c861b131ef 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 4735, + "commits": 4747, "contributor": "Pieter Vander Vennet" }, { - "commits": 300, + "commits": 302, "contributor": "Robin van der Linde" }, { diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index 3b2b4af579..1c2f311d36 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -443,7 +443,8 @@ "en": "Woodcarving", "de": "Holzschnitzerei", "cs": "Dřevořezba", - "pt": "Entalhe em madeira" + "pt": "Entalhe em madeira", + "fr": "Sculpture sur bois" } } ], @@ -468,7 +469,8 @@ "nl": "Wie heeft dit kunstwerk gemaakt?", "cs": "Kdo je autorem tohoto díla?", "pt": "Quem fez essa obra de arte?", - "es": "¿Quién creó esta obra de arte?" + "es": "¿Quién creó esta obra de arte?", + "fr": "Qui a fait cette oeuvre d'art ?" }, "freeform": { "key": "artist:wikidata", @@ -585,7 +587,8 @@ "nl": "Wat beeldt dit kunstwerk af?", "cs": "Co zobrazuje toto umělecké dílo?", "pt": "O que esta obra de arte representa?", - "es": "¿Qué representa esta obra de arte?" + "es": "¿Qué representa esta obra de arte?", + "fr": "Que représente cette oeuvre d'art ?" }, "freeform": { "key": "subject:wikidata", @@ -606,25 +609,33 @@ { "id": "doubles_as_bench", "question": { - "en": "Does this artwork serve as a bench?" + "en": "Does this artwork serve as a bench?", + "de": "Dient dieses Kunstwerk auch als Sitzbank?", + "fr": "Cette oeuvre d'art sert-elle de banc ?" }, "mappings": [ { "if": "amenity=bench", "then": { - "en": "This artwork also serves as a bench" + "en": "This artwork also serves as a bench", + "de": "Dieses Kunstwerk dient auch als Sitzbank", + "fr": "Cette oeuvre d'art sert aussi de banc" } }, { "if": "amenity=", "then": { - "en": "This artwork does not serve as a bench" + "en": "This artwork does not serve as a bench", + "de": "Dieses Kunstwerk dient nicht als Sitzbank", + "fr": "Cette oeuvre d'art ne sert pas de banc" } }, { "if": "amenity!=bench", "then": { - "en": "This artwork does not serve as a bench" + "en": "This artwork does not serve as a bench", + "de": "Dieses Kunstwerk dient nicht als Sitzbank", + "fr": "Cette oeuvre d'art ne sert pas de banc" }, "hideInAnswer": true } diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index d38c727779..c77bee920f 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -1,20 +1,32 @@ { "id": "atm", "name": { - "en": "ATMs" + "en": "ATMs", + "de": "Geldautomaten", + "fr": "DABs", + "nl": "Geldautomaten" }, "description": { - "en": "ATMS to withdraw money" + "en": "ATMS to withdraw money", + "de": "Geldautomaten zum Geld abheben", + "fr": "DAB pour retirer de l'argent", + "nl": "Geldautomaten om geld op te nemen" }, "title": { "render": { - "en": "ATM" + "en": "ATM", + "de": "Geldautomat", + "fr": "DAB", + "nl": "Geldautomaat" }, "mappings": [ { "if": "brand~*", "then": { - "en": "{brand} ATM" + "en": "{brand} ATM", + "de": "{brand} Geldautomat", + "fr": "DAB {brand}", + "nl": "{brand} Geldautomaat" } } ] @@ -29,7 +41,10 @@ "amenity=atm" ], "title": { - "en": "an ATM" + "en": "an ATM", + "de": "ein Geldautomat", + "fr": "un DAB", + "nl": "een geldautomaat" } } ], @@ -37,40 +52,61 @@ { "id": "name", "render": { - "en": "The name of this ATM is {name}" + "en": "The name of this ATM is {name}", + "de": "Der Name dieses Geldautomaten ist {name}", + "fr": "Le nom de ce DAB est {name}", + "nl": "De naam van deze geldautomaat is {name}" }, "condition": "name~*" }, { "id": "brand", "question": { - "en": "What brand is this ATM?" + "en": "What brand is this ATM?", + "de": "Von welcher Marke ist dieser Geldautomat?", + "fr": "De quelle marque est ce DAB ?", + "nl": "Van welk merk is deze geldautomaat?" }, "freeform": { "key": "brand", "type": "string", "placeholder": { - "en": "Brand name" + "en": "Brand name", + "de": "Markenname", + "fr": "Nom de marque", + "nl": "Merknaam" } }, "render": { - "en": "The brand of this ATM is {brand}" + "en": "The brand of this ATM is {brand}", + "de": "Die Marke dieses Geldautomaten ist {brand}", + "fr": "La marque de ce DAB est {brand}", + "nl": "Het merk van deze geldautomaat is {brand}" } }, { "id": "operator", "question": { - "en": "What company operates this ATM?" + "en": "What company operates this ATM?", + "de": "Welches Unternehmen betreibt den Geldautomaten?", + "fr": "Quelle société exploite ce DAB ?", + "nl": "Welk bedrijf beheert deze geldautomaat?" }, "freeform": { "key": "operator", "type": "string", "placeholder": { - "en": "Operator" + "en": "Operator", + "de": "Betreiber", + "fr": "Opérateur", + "nl": "Beheerder" } }, "render": { - "en": "The ATM is operated by {operator}" + "en": "The ATM is operated by {operator}", + "de": "Der Geldautomat wird von {operator} betrieben", + "fr": "Ce DAB est exploité par {operator}", + "nl": "Deze geldautomaat wordt beheerd door {operator}" } }, "opening_hours" diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json index 76f5549815..51cff28091 100644 --- a/assets/layers/bench/bench.json +++ b/assets/layers/bench/bench.json @@ -188,7 +188,9 @@ "if": "seats:separated=no", "then": { "en": "This bench does not have separated seats", - "nl": "Deze bank is niet ingedeeld in aparte zitplaatsen" + "nl": "Deze bank is niet ingedeeld in aparte zitplaatsen", + "de": "Diese Bank hat keine getrennten Sitze", + "fr": "Ce banc n'a pas de sièges séparés" } } ] @@ -715,7 +717,9 @@ "if": "survey:date:={_now:date}", "then": { "en": "Surveyed today!", - "nl": "Vandaag nagekeken!" + "nl": "Vandaag nagekeken!", + "de": "Heute geprüft!", + "fr": "Vérifié sur le terrain aujourd'hui !" } } ], @@ -731,11 +735,15 @@ ], "render": { "en": "This bench does have the following inscription:

{inscription}

", - "nl": "Deze bank heeft een inscriptie:

{inscription}

" + "nl": "Deze bank heeft een inscriptie:

{inscription}

", + "de": "Diese Bank hat folgende Inschrift:

{inscription}

", + "fr": "Ce banc a l'inscription suivante :

{inscription}

" }, "question": { "en": "Does this bench have an inscription?
E.g. on a mounted plaque, in the backrest, ...
", - "nl": "Heeft deze bank een inscriptie?
Bijvoorbeeld op een aangebracht plakkaat, ingesneden in de rugleuning, ...
" + "nl": "Heeft deze bank een inscriptie?
Bijvoorbeeld op een aangebracht plakkaat, ingesneden in de rugleuning, ...
", + "de": "Hat diese Bank eine Inschrift?
Z.B. auf einer angebrachten Plakette, in der Rückenlehne, ...
", + "fr": "Est-ce que ce banc possède une inscription ?
Par exemple, sur une plaque accrochée, sur le dossier, ...
" }, "freeform": { "key": "inscription", @@ -749,7 +757,9 @@ "if": "not:inscription=yes", "then": { "en": "This bench does not have an inscription", - "nl": "Deze bank heeft geen inscriptie" + "nl": "Deze bank heeft geen inscriptie", + "de": "Diese Bank hat keine Inschrift", + "fr": "Ce banc n'a pas d'inscription" }, "addExtraTags": [ "inscription=" @@ -759,7 +769,9 @@ "if": "inscription=", "then": { "en": "This bench does (probably) not have an inscription", - "nl": "Deze bank heeft (waarschijnlijk) geen inscriptie" + "nl": "Deze bank heeft (waarschijnlijk) geen inscriptie", + "de": "Diese Bank hat (wahrscheinlich) keine Inschrift", + "fr": "Ce banc n'a(probablement) pas d'inscription" }, "hideInAnswer": true } @@ -769,21 +781,26 @@ "id": "bench-artwork", "question": { "en": "Does this bench have an artistic element?
E.g. it has an integrated painting, statue or other non-trivial, creative work
", - "nl": "Heeft deze bank een geïntegreerd kunstwerk?
Bijvoorbeeld een standbeeld, schildering of ander, niet-triviaal kunstwerk
" + "nl": "Heeft deze bank een geïntegreerd kunstwerk?
Bijvoorbeeld een standbeeld, schildering of ander, niet-triviaal kunstwerk
", + "de": "Hat diese Bank ein künstlerisches Element?
Z.B. hat es ein integriertes Gemälde, eine Statue oder eine andere nicht triviale, kreative Arbeit
" }, "mappings": [ { "if": "tourism=artwork", "then": { "en": "This bench has an integrated artwork", - "nl": "Deze bank heeft een geïntegreerd kunstwerk" + "nl": "Deze bank heeft een geïntegreerd kunstwerk", + "de": "Diese Bank hat ein integriertes Kunstwerk", + "fr": "Une oeuvre d'art est intégrée à ce banc" } }, { "if": "tourism=", "then": { "en": "This bench does not have an integrated artwork", - "nl": "Deze bank heeft geen geïntegreerd kunstwerk" + "nl": "Deze bank heeft geen geïntegreerd kunstwerk", + "de": "Diese Bank hat kein integriertes Kunstwerk", + "fr": "Ce banc n'a pas d'oeuvre d'art intégrée" } } ] @@ -803,14 +820,18 @@ }, "question": { "en": "Does this bench act as memorial for someone or something?", - "nl": "Is deze bank een gedenkteken voor iemand of iets?" + "nl": "Is deze bank een gedenkteken voor iemand of iets?", + "de": "Dient diese Bank als Denkmal für jemanden oder etwas?", + "fr": "Ce banc sert-il de mémorial pour quelqu'un ou quelque chose ?" }, "mappings": [ { "if": "historic=memorial", "then": { "en": "This bench is a memorial for someone or something", - "nl": "Deze bank is een gedenkteken aan iemand of iets" + "nl": "Deze bank is een gedenkteken aan iemand of iets", + "de": "Diese Bank ist ein Denkmal für jemanden oder etwas", + "fr": "Ce banc est un mémorial pour quelqu'un ou quelque chose" }, "addExtraTags": [ "memorial=bench" @@ -825,7 +846,9 @@ }, "then": { "en": "This bench is a not a memorial for someone or something", - "nl": "Deze bank is geen gedenkteken aan iemand of iets" + "nl": "Deze bank is geen gedenkteken aan iemand of iets", + "de": "Diese Bank ist kein Denkmal für jemanden oder etwas", + "fr": "Ce banc n'est pas un mémorial pour quelqu'un ou quelque chose" }, "addExtraTags": [ "memorial=" @@ -910,7 +933,9 @@ }, "question": { "en": "is a memorial", - "nl": "is een gedenkteken" + "nl": "is een gedenkteken", + "de": "ist ein Denkmal", + "fr": "est un mémorial" } } ] @@ -921,21 +946,27 @@ { "question": { "en": "With and without backrest", - "nl": "Met en zonder rugleuning" + "nl": "Met en zonder rugleuning", + "de": "Mit und ohne Rückenlehne", + "fr": "Avec et sans dossier" } }, { "osmTags": "backrest=yes", "question": { "en": "Has a backrest", - "nl": "Heeft een rugleuning" + "nl": "Heeft een rugleuning", + "de": "Hat eine Rückenlehne", + "fr": "A un dossier" } }, { "osmTags": "backrest=no", "question": { "en": "Has no backrest", - "nl": "Heeft geen rugleuning" + "nl": "Heeft geen rugleuning", + "de": "Hat keine Rückenlehne", + "fr": "N'a pas de dossier" } } ] diff --git a/assets/layers/bench_at_pt/bench_at_pt.json b/assets/layers/bench_at_pt/bench_at_pt.json index f36acc7e38..5c42368790 100644 --- a/assets/layers/bench_at_pt/bench_at_pt.json +++ b/assets/layers/bench_at_pt/bench_at_pt.json @@ -220,7 +220,9 @@ { "if": "bench=no", "then": { - "en": "This bus stop does not have a bench (there never was one or it has been removed)" + "en": "This bus stop does not have a bench (there never was one or it has been removed)", + "de": "Diese Bushaltestelle hat keine Bank (es gab nie eine oder sie wurde entfernt)", + "fr": "Cette station de bus n'a pas de banc (il n'y en a jamais eu ou il a été retiré)" } } ], @@ -228,7 +230,9 @@ { "changesetMessage": "discontinued", "explanation": { - "en": "This bus stop is not used anymore" + "en": "This bus stop is not used anymore", + "de": "Diese Bushaltestelle wird nicht mehr genutzt", + "fr": "Cette station de bus n'est plus utilisée" } } ], diff --git a/assets/layers/car_rental/car_rental.json b/assets/layers/car_rental/car_rental.json index 18da669108..f8a214c08b 100644 --- a/assets/layers/car_rental/car_rental.json +++ b/assets/layers/car_rental/car_rental.json @@ -2,7 +2,9 @@ "id": "car_rental", "name": { "en": "Car Rental", - "nl": "Autoverhuur" + "nl": "Autoverhuur", + "de": "Autovermietung", + "fr": "Société de location de véhicules" }, "source": { "osmTags": "amenity=car_rental" @@ -11,7 +13,9 @@ "title": { "render": { "en": "Car Rental", - "nl": "Autoverhuur" + "nl": "Autoverhuur", + "de": "Autovermietung", + "fr": "Société de location de véhicules" }, "mappings": [ { @@ -22,7 +26,9 @@ }, "description": { "en": "Places where you can rent a car", - "nl": "Plaatsen waar je een auto kunt huren" + "nl": "Plaatsen waar je een auto kunt huren", + "de": "Orte, an denen Sie ein Auto mieten können", + "fr": "Lieu où vous pouvez louer une voiture" }, "tagRenderings": [ "images", @@ -33,25 +39,33 @@ "type": "string", "placeholder": { "en": "Name of the car rental", - "nl": "Naam van de autoverhuur" + "nl": "Naam van de autoverhuur", + "de": "Name der Autovermietung", + "fr": "Nom de la société de location de véhicules" } }, "question": { "en": "What is the name of this car rental?", - "nl": "Wat is de naam van deze autoverhuur?" + "nl": "Wat is de naam van deze autoverhuur?", + "de": "Wie lautet der Name dieser Autovermietung?", + "fr": "Quel est le nom de cette société de location de véhicules ?" }, "mappings": [ { "if": "noname=yes", "then": { "en": "This car rental has no name", - "nl": "Deze autoverhuur heeft geen naam" + "nl": "Deze autoverhuur heeft geen naam", + "de": "Diese Autovermietung hat keinen Namen", + "fr": "Cette société de location de véhicules n'a pas de nom" } } ], "render": { "en": "This car rental is called {name}", - "nl": "Deze autoverhuur heet {name}" + "nl": "Deze autoverhuur heet {name}", + "de": "Der Name der Autovermietung lautet {name}", + "fr": "Cette société de location de véhicules est appelée {name}" } }, "website", @@ -66,11 +80,15 @@ ], "title": { "en": "a car rental", - "nl": "een autoverhuur" + "nl": "een autoverhuur", + "de": "eine Autovermietung", + "fr": "Une société de location de véhicules" }, "description": { "en": "A place where you can rent a car", - "nl": "Een plaats waar je een auto kunt huren" + "nl": "Een plaats waar je een auto kunt huren", + "de": "Ein Ort, an dem Sie ein Auto mieten können", + "fr": "Un lieu où vous pouvez louer une voiture" } } ], diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 1b53d92b9f..bf61c9143e 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -4207,14 +4207,16 @@ "nl": "Wat is het telefoonnummer van de beheerder van dit oplaadpunt?", "da": "Hvilket nummer kan man ringe til, hvis der er et problem med denne ladestation?", "de": "Welche Nummer kann man anrufen, wenn es ein Problem mit dieser Ladestation gibt?", - "es": "¿A qué número se puede llamar si hay un problema con esta estación de carga?" + "es": "¿A qué número se puede llamar si hay un problema con esta estación de carga?", + "fr": "Quel numéro peut on appeler s'il y a un problème avec cette station de charge ?" }, "render": { "en": "In case of problems, call {phone}", "nl": "Bij problemen, bel naar {phone}", "da": "I tilfælde af problemer, ring til {phone}", "de": "Bei Problemen, anrufen unter {phone}", - "es": "En caso de problemas, llama a {phone}" + "es": "En caso de problemas, llama a {phone}", + "fr": "En cas de problèmes, appelez le {phone}" }, "freeform": { "key": "phone", diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index 1afbd161ff..e5b717d9ed 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -180,7 +180,8 @@ "en": "Is this is a zebra crossing?", "nl": "Is dit een zebrapad?", "de": "Ist das ein Zebrastreifen?", - "es": "¿Esto es un paso de cebra?" + "es": "¿Esto es un paso de cebra?", + "fr": "Est-ce un passage piéton ?" }, "condition": "crossing=uncontrolled", "mappings": [ @@ -190,7 +191,8 @@ "en": "This is a zebra crossing", "nl": "Dit is een zebrapad", "de": "Dies ist ein Zebrastreifen", - "es": "Esto es un paso de cebra" + "es": "Esto es un paso de cebra", + "fr": "C'est un passage piéton" } }, { @@ -199,7 +201,8 @@ "en": "This is not a zebra crossing", "nl": "Dit is geen zebrapad", "de": "Dies ist kein Zebrastreifen", - "es": "Esto no es un paso de cebra" + "es": "Esto no es un paso de cebra", + "fr": "Ce n'est pas un passage piéton" } } ] @@ -243,7 +246,8 @@ "en": "Does this crossing have an island in the middle?", "nl": "Heeft deze oversteekplaats een verkeerseiland in het midden?", "de": "Gibt es an diesem Übergang eine Verkehrsinsel?", - "es": "¿Tiene una isla en el medio este cruce?" + "es": "¿Tiene una isla en el medio este cruce?", + "fr": "Est-ce que ce passage a une île au milieu ?" }, "condition": "highway=crossing", "mappings": [ @@ -253,7 +257,8 @@ "en": "This crossing has an island in the middle", "nl": "Deze oversteekplaats heeft een verkeerseiland in het midden", "de": "Der Übergang hat eine Verkehrsinsel", - "es": "Este cruce tiene una isla en el medio" + "es": "Este cruce tiene una isla en el medio", + "fr": "Ce passage a une île au milieu" } }, { @@ -262,7 +267,8 @@ "en": "This crossing does not have an island in the middle", "nl": "Deze oversteekplaats heeft geen verkeerseiland in het midden", "de": "Diese Ampel hat eine Taste, um ein grünes Signal anzufordern", - "es": "Este cruce no tiene una isla en el medio" + "es": "Este cruce no tiene una isla en el medio", + "fr": "Ce passage n'a pas d'île au milieu" } } ] @@ -354,14 +360,16 @@ "if": "traffic_signals:sound=yes", "then": { "en": "This traffic light has sound signals to help crossing, both for finding the crossing and for crossing.", - "de": "Die Ampel gibt akustische Signale, um das Auffinden und Überqueren der Kreuzung zu erleichtern." + "de": "Die Ampel gibt akustische Signale, um das Auffinden und Überqueren der Kreuzung zu erleichtern.", + "fr": "Ce feu de signalisation a une alarme sonore pour aider à traverser, à la fois pour trouver le passage piéton, et pour traverser." } }, { "if": "traffic_signals:sound=no", "then": { "en": "This traffic light does not have sound signals to help crossing.", - "de": "Die Ampel gibt keine akustischen Signale, um das Überqueren zu erleichtern." + "de": "Die Ampel gibt keine akustischen Signale, um das Überqueren zu erleichtern.", + "fr": "Ce feu de signalisation n'a pas de signal sonore pour aider à traverser." } }, { @@ -471,7 +479,8 @@ "en": "Can a cyclist turn right when the light is red?", "nl": "Mag een fietser rechtsaf slaan als het licht rood is?", "de": "Dürfen Radfahrer bei roter Ampel rechts abbiegen?", - "es": "¿Puede girar a la derecha un ciclista cuando la luz está roja?" + "es": "¿Puede girar a la derecha un ciclista cuando la luz está roja?", + "fr": "Un cycliste peut-il tourner à droite quand le feu est rouge ?" }, "condition": "highway=traffic_signals", "mappings": [ @@ -481,7 +490,8 @@ "en": "A cyclist can turn right if the light is red", "nl": "Een fietser mag wel rechtsaf slaan als het licht rood is", "de": "Ein Radfahrer kann bei roter Ampel rechts abbiegen", - "es": "Un ciclista puede girar a la derecha si la luz está roja" + "es": "Un ciclista puede girar a la derecha si la luz está roja", + "fr": "Un cycliste peut tourner à droite si le feu est rouge" }, "hideInAnswer": "_country!=be", "icon": { @@ -495,7 +505,8 @@ "en": "A cyclist can turn right if the light is red", "nl": "Een fietser mag wel rechtsaf slaan als het licht rood is", "de": "Radfahrer dürfen bei roter Ampel rechts abbiegen", - "es": "Un ciclista puede girar a la derecha si la luz está roja" + "es": "Un ciclista puede girar a la derecha si la luz está roja", + "fr": "Un cycliste peut tourner à droite si le feu est rouge" }, "hideInAnswer": "_country=be" }, @@ -505,7 +516,8 @@ "en": "A cyclist can not turn right if the light is red", "nl": "Een fietser mag niet rechtsaf slaan als het licht rood is", "de": "Radfahrer dürfen bei roter Ampel nicht rechts abbiegen", - "es": "Un ciclista no puede girar a la derecha si la luz está roja" + "es": "Un ciclista no puede girar a la derecha si la luz está roja", + "fr": "Un cycliste ne peut pas tourner à droite si le feu est rouge" } } ] @@ -516,7 +528,8 @@ "en": "Can a cyclist go straight on when the light is red?", "nl": "Mag een fietser rechtdoor gaan als het licht rood is?", "de": "Dürfen Radfahrer bei roter Ampel geradeaus fahren?", - "es": "¿Puede ir de frente un ciclista cuando la luz está roja?" + "es": "¿Puede ir de frente un ciclista cuando la luz está roja?", + "fr": "Est-ce qu'un cycliste peut aller tout droit quand le feu est rouge ?" }, "condition": "highway=traffic_signals", "mappings": [ diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 29515e0ebb..620ae73ac6 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -145,15 +145,18 @@ "key": "tactile_writing:braille", "question": { "en": "In which languages does this elevator have tactile writing (braille)?", - "de": "In welchen Sprachen hat der Aufzug taktile Schrift (Braille)?" + "de": "In welchen Sprachen hat der Aufzug taktile Schrift (Braille)?", + "nl": "In welke talen heeft deze lift voelbaar schrift (braille)?" }, "render_list_item": { "en": "This elevator has tactile writing in {language():font-bold}", - "de": "Der Aufzug hat taktile Schrift in {language():font-bold}" + "de": "Der Aufzug hat taktile Schrift in {language():font-bold}", + "nl": "Deze lift heeft voelbaar schrift in het {language():font-bold}" }, "render_single_language": { "en": "This elevator has tactile writing in {language():font-bold}", - "de": "Der Aufzug hat taktile Schrift in {language():font-bold}" + "de": "Der Aufzug hat taktile Schrift in {language():font-bold}", + "nl": "Deze lift heeft voelbaar schrift in het {language():font-bold}" } } } diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json index 91f6231ab0..899121e622 100644 --- a/assets/layers/filters/filters.json +++ b/assets/layers/filters/filters.json @@ -63,7 +63,8 @@ { "question": { "en": "With and without images", - "nl": "Met en zonder afbeelding" + "nl": "Met en zonder afbeelding", + "de": "Mit und ohne Bilder" } }, { diff --git a/assets/layers/railway_platforms/railway_platforms.json b/assets/layers/railway_platforms/railway_platforms.json index e0d6fad204..1fbd793d05 100644 --- a/assets/layers/railway_platforms/railway_platforms.json +++ b/assets/layers/railway_platforms/railway_platforms.json @@ -1,20 +1,28 @@ { "id": "railway_platforms", "name": { - "en": "Railway Platforms" + "en": "Railway Platforms", + "de": "Bahnsteige", + "nl": "Treinperrons" }, "description": { - "en": "Find every platform in the station, and the train routes that use them." + "en": "Find every platform in the station, and the train routes that use them.", + "de": "Finden Sie alle Bahnsteige im Bahnhof und die Zugstrecken, die sie benutzen.", + "nl": "Vind elk perron in het station, en de routes die ze gebruiken." }, "title": { "render": { - "en": "Platform" + "en": "Platform", + "de": "Bahnsteig", + "nl": "Perron" }, "mappings": [ { "if": "ref~*", "then": { - "en": "Platform {ref}" + "en": "Platform {ref}", + "de": "Bahnsteig {ref}", + "nl": "Perron {ref}" } } ] @@ -31,17 +39,23 @@ { "id": "ref", "question": { - "en": "What is the number for this platform?" + "en": "What is the number for this platform?", + "de": "Wie lautet die Nummer dieses Bahnsteigs?", + "nl": "Wat is het nummer van dit perron?" }, "freeform": { "key": "ref", "type": "string", "placeholder": { - "en": "Platform number" + "en": "Platform number", + "de": "Bahnsteignummer", + "nl": "Perronnummer" } }, "render": { - "en": "Platform {ref}" + "en": "Platform {ref}", + "de": "Bahnsteig {ref}", + "nl": "Perron {ref}" } }, "level" diff --git a/assets/layers/selected_element/selected_element.json b/assets/layers/selected_element/selected_element.json index f322b58631..6017d45b71 100644 --- a/assets/layers/selected_element/selected_element.json +++ b/assets/layers/selected_element/selected_element.json @@ -2,7 +2,8 @@ "id": "selected_element", "description": { "en": "Highlights the currently selected element. Override this layer to have different colors", - "nl": "Toont het geselecteerde element" + "nl": "Toont het geselecteerde element", + "de": "Hebt das aktuell ausgewählte Element hervor. Überschreiben Sie diese Ebene, um unterschiedliche Farben zu erhalten" }, "source": { "osmTags": "selected=yes", diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index 7f9fbc1fba..f88a625315 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -7,7 +7,8 @@ }, "description": { "en": "Layer showing stairs and escalators", - "de": "Ebene mit Treppen und Rolltreppen" + "de": "Ebene mit Treppen und Rolltreppen", + "nl": "Laag met trappen en roltrappen" }, "title": { "render": { @@ -76,21 +77,24 @@ "condition": "handrail=yes", "question": { "en": "Do these stairs have tactile writing on the handrail?", - "de": "Hat die Treppe eine taktile Schrift am Handlauf?" + "de": "Hat die Treppe eine taktile Schrift am Handlauf?", + "nl": "Heeft deze trap voelbaar schrift op de leuning?" }, "mappings": [ { "if": "tactile_writing=yes", "then": { "en": "There is tactile writing on the handrail", - "de": "Am Handlauf gibt es taktile Schrift" + "de": "Am Handlauf gibt es taktile Schrift", + "nl": "Er is voelbaar schrift op de leuning" } }, { "if": "tactile_writing=no", "then": { "en": "There is no tactile writing on the handrail", - "de": "Am Handlauf gibt es keine taktile Schrift" + "de": "Am Handlauf gibt es keine taktile Schrift", + "nl": "Er is geen voelbaar schrift op de leuning" } } ] @@ -104,15 +108,18 @@ "key": "tactile_writing:braille", "question": { "en": "In which languages is there tactile writing (braille) for navigation? ", - "de": "In welchen Sprachen gibt es taktile Schrift (Braille) für die Navigation? " + "de": "In welchen Sprachen gibt es taktile Schrift (Braille) für die Navigation? ", + "nl": "In welke talen is er voelbaar schrift (braille) voor navigatie? " }, "render_list_item": { "en": "These stairs have tactile writing in {language():font-bold}", - "de": "Die Treppe hat taktile Schrift in {language():font-bold}" + "de": "Die Treppe hat taktile Schrift in {language():font-bold}", + "nl": "Deze trap heeft voelbaar schrijft in {language():font-bold}" }, "render_single_language": { "en": "These stairs have tactile writing in {language():font-bold}", - "de": "Die Treppe hat taktile Schrift in {language():font-bold}" + "de": "Die Treppe hat taktile Schrift in {language():font-bold}", + "nl": "Deze trap heeft voelbaar schrijft in {language():font-bold}" } } } diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json index 673bd06257..7c84231d3f 100644 --- a/assets/layers/ticket_machine/ticket_machine.json +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -1,10 +1,14 @@ { "id": "ticket_machine", "name": { - "en": "Ticket Machines" + "en": "Ticket Machines", + "de": "Fahrkartenautomaten", + "nl": "Kaartautomaten" }, "description": { - "en": "Find ticket machines for public transport tickets" + "en": "Find ticket machines for public transport tickets", + "de": "Fahrkartenautomaten für ÖPNV-Tickets finden", + "nl": "Zoek kaartautomaten voor het openbaar vervoer" }, "source": { "osmTags": { @@ -17,7 +21,9 @@ "minzoom": 19, "title": { "render": { - "en": "Ticket Machine" + "en": "Ticket Machine", + "de": "Fahrkartenautomat", + "nl": "Kaartautomaat" } }, "tagRenderings": [ @@ -26,16 +32,22 @@ { "id": "operator", "question": { - "en": "Who is the operator of this ticket machine?" + "en": "Who is the operator of this ticket machine?", + "de": "Wer ist der Betreiber dieses Fahrkartenautomaten?", + "nl": "Wie is de beheerder van deze kaartautomaat?" }, "render": { - "en": "This ticket machine is operated by {operator}" + "en": "This ticket machine is operated by {operator}", + "de": "Dieser Fahrkartenautomat wird betrieben von {operator}", + "nl": "Deze kaartautomaat wordt beheerd door {operator}" }, "freeform": { "key": "operator", "type": "string", "placeholder": { - "en": "Name of the operator" + "en": "Name of the operator", + "de": "Name des Betreibers", + "nl": "Naam van de beheerder" } }, "mappings": [ @@ -43,7 +55,8 @@ "if": "operator=Nederlandse Spoorwegen", "then": { "en": "Dutch Railways (NS)", - "nl": "Nederlandse Spoorwegen (NS)" + "nl": "Nederlandse Spoorwegen (NS)", + "de": "Niederländische Eisenbahn (NS)" }, "addExtraTags": [ "operator:wikidata=Q23076" @@ -62,7 +75,9 @@ "vending=public_transport_tickets" ], "title": { - "en": "a ticket machine" + "en": "a ticket machine", + "de": "einen Fahrkartenautomat", + "nl": "een kaartautomaat" } } ], diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json index 3c6312db03..b40331da16 100644 --- a/assets/layers/ticket_validator/ticket_validator.json +++ b/assets/layers/ticket_validator/ticket_validator.json @@ -1,10 +1,12 @@ { "id": "ticket_validator", "name": { - "en": "Ticket Validators" + "en": "Ticket Validators", + "de": "Fahrkartenentwerter" }, "description": { - "en": "Find ticket validators to validate public transport tickets" + "en": "Find ticket validators to validate public transport tickets", + "de": "Finden Sie Fahrkartenentwerter, um Tickets für den öffentlichen Nahverkehr zu entwerten" }, "source": { "osmTags": "amenity=ticket_validator" @@ -12,7 +14,8 @@ "minzoom": 19, "title": { "render": { - "en": "Ticket Validator" + "en": "Ticket Validator", + "de": "Fahrkartenentwerter" } }, "tagRenderings": [ @@ -22,13 +25,15 @@ "id": "barrier", "condition": "barrier~*", "render": { - "en": "This ticket validator is part of a barrier of type {barrier}" + "en": "This ticket validator is part of a barrier of type {barrier}", + "de": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}" }, "mappings": [ { "if": "barrier=gate", "then": { - "en": "This ticket validator is part of a gate" + "en": "This ticket validator is part of a gate", + "de": "Dieser Fahrscheinentwerter ist Teil einer Zugangsbarriere" } } ] @@ -36,16 +41,20 @@ { "id": "validator-operator", "question": { - "en": "Who is the operator of this ticket validator?" + "en": "Who is the operator of this ticket validator?", + "de": "Wer ist der Betreiber dieses Fahrkartenentwerters?" }, "render": { - "en": "This ticket validator is operated by {operator}" + "en": "This ticket validator is operated by {operator}", + "de": "Dieser Fahrkartenentwerter wird betrieben von {operator}" }, "freeform": { "key": "operator", "type": "string", "placeholder": { - "en": "Name of the operator" + "en": "Name of the operator", + "de": "Name des Betreibers", + "nl": "Naam van de beheerder" } } }, @@ -79,7 +88,8 @@ "amenity=ticket_validator" ], "title": { - "en": "a ticket validator" + "en": "a ticket validator", + "de": "einen Fahrkartenentwerter" } } ], diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index 33f888ac55..58b2028d4f 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -142,7 +142,7 @@ }, "render": { "en": "This tree is {height} meter high" - } + } }, { "id": "tree-denotation", @@ -801,4 +801,4 @@ "fr": "Une couche montrant les arbres", "da": "Et lag, der viser træer" } -} +} \ No newline at end of file diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index e21df55c24..86461de309 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -103,12 +103,14 @@ "before": { "en": "

Entrances

This building has {_entrances_count} entrances:", "de": "

Eingänge

Das Gebäude hat {_entrances_count} Eingänge:", - "da": "

Indgange

Denne bygning har {_entrances_count} indgange:" + "da": "

Indgange

Denne bygning har {_entrances_count} indgange:", + "nl": "

Ingangen

Dit gebouw heeft {_entrances_count} ingangen:" }, "after": { "en": "{_entrances_count_without_width_count} entrances don't have width information yet", "de": "{_entrances_count_without_width_count} Eingänge haben keine Angaben zur Breite", - "da": "{_entrances_count_without_width_count} indgange har endnu ikke oplysninger om bredde" + "da": "{_entrances_count_without_width_count} indgange har endnu ikke oplysninger om bredde", + "nl": "{_entrances_count_without_width_count} ingangen hebben nog geen informatie over de breedte" }, "special": { "type": "multi", @@ -127,7 +129,8 @@ "then": { "en": "No entrance has been marked", "de": "Es wurde kein Eingang markiert", - "da": "Der er ikke markeret nogen indgang" + "da": "Der er ikke markeret nogen indgang", + "nl": "Geen ingang is gemarkeerd" } }, { @@ -135,7 +138,8 @@ "then": { "en": "None of the {_entrance_count} entrances have width information yet", "de": "Keiner der {_entrance_count} Eingänge hat bisher Angaben zur Breite", - "da": "Ingen af {_entrance_count}-indgangene har oplysninger om bredde endnu" + "da": "Ingen af {_entrance_count}-indgangene har oplysninger om bredde endnu", + "nl": "Geen van de {_entrance_count} ingangen hebben al informatie over de breedte" } } ] diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 5756feaca8..55c781e120 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -918,7 +918,8 @@ "ifnot": "payment:coins=no", "icon": "./assets/tagRenderings/coins.svg", "then": { - "en": "Coins are accepted here" + "en": "Coins are accepted here", + "de": "Münzen werden hier akzeptiert" } }, { @@ -926,7 +927,8 @@ "ifnot": "payment:notes=no", "icon": "./assets/tagRenderings/notes.svg", "then": { - "en": "Bank notes are accepted here" + "en": "Bank notes are accepted here", + "de": "Geldscheine werden hier akzeptiert" } }, { @@ -934,7 +936,8 @@ "ifnot": "payment_debit_cards=no", "icon": "./assets/tagRenderings/payment_card.svg", "then": { - "en": "Debit cards are accepted here" + "en": "Debit cards are accepted here", + "de": "Debitkarten werden hier akzeptiert" } }, { @@ -942,7 +945,8 @@ "ifnot": "payment:credit_cards=no", "icon": "./assets/tagRenderings/payment_card.svg", "then": { - "en": "Credit cards are accepted here" + "en": "Credit cards are accepted here", + "de": "Kreditkarten werden hier akzeptiert" } } ] @@ -1038,7 +1042,9 @@ ] }, "question": { - "en": "Whith what coins can you pay here?" + "en": "With what coins can you pay here?", + "de": "Mit welchen Münzen kann man hier bezahlen?", + "nl": "Met welke munten kan je hier betalen?" }, "multiAnswer": true, "mappings": [ @@ -1046,56 +1052,72 @@ "if": "payment:coins:denominations=0.01 EUR", "icon": "./assets/tagRenderings/1cent.svg", "then": { - "en": "1 cent coins are accepted" + "en": "1 cent coins are accepted", + "de": "1-Cent-Münzen werden akzeptiert", + "nl": "Munten van 1 cent worden geaccepteerd" } }, { "if": "payment:coins:denominations=0.02 EUR", "icon": "./assets/tagRenderings/2cent.svg", "then": { - "en": "2 cent coins are accepted" + "en": "2 cent coins are accepted", + "de": "2-Cent-Münzen werden akzeptiert", + "nl": "Munten van 2 cent worden geaccepteerd" } }, { "if": "payment:coins:denominations=0.05 EUR", "icon": "./assets/tagRenderings/5cent.svg", "then": { - "en": "5 cent coins are accepted" + "en": "5 cent coins are accepted", + "de": "5-Cent-Münzen werden akzeptiert", + "nl": "Munten van 5 cent worden geaccepteerd" } }, { "if": "payment:coins:denominations=0.10 EUR", "icon": "./assets/tagRenderings/10cent.svg", "then": { - "en": "10 cent coins are accepted" + "en": "10 cent coins are accepted", + "de": "10-Cent-Münzen werden akzeptiert", + "nl": "Munten van 10 cent worden geaccepteerd" } }, { "if": "payment:coins:denominations=0.20 EUR", "icon": "./assets/tagRenderings/20cent.svg", "then": { - "en": "20 cent coins are accepted" + "en": "20 cent coins are accepted", + "de": "20-Cent-Münzen werden akzeptiert", + "nl": "Munten van 20 cent worden geaccepteerd" } }, { "if": "payment:coins:denominations=0.50 EUR", "icon": "./assets/tagRenderings/50cent.svg", "then": { - "en": "50 cent coins are accepted" + "en": "50 cent coins are accepted", + "de": "50-Cent-Münzen werden akzeptiert", + "nl": "Munten van 50 cent worden geaccepteerd" } }, { "if": "payment:coins:denominations=1 EUR", "icon": "./assets/tagRenderings/1euro.svg", "then": { - "en": "1 euro coins are accepted" + "en": "1 euro coins are accepted", + "de": "1-Euro-Münzen werden akzeptiert", + "nl": "Munten van 1 euro worden geaccepteerd" } }, { "if": "payment:coins:denominations=2 EUR", "icon": "./assets/tagRenderings/2euro.svg", "then": { - "en": "2 euro coins are accepted" + "en": "2 euro coins are accepted", + "de": "2-Euro-Münzen werden akzeptiert", + "nl": "Munten van 2 euro worden geaccepteerd" } } ] diff --git a/assets/themes/atm/atm.json b/assets/themes/atm/atm.json index c2b0dac81d..32da0a1b37 100644 --- a/assets/themes/atm/atm.json +++ b/assets/themes/atm/atm.json @@ -1,10 +1,12 @@ { "id": "atm", "title": { - "en": "ATM Machines" + "en": "ATM Machines", + "de": "Geldautomaten" }, "description": { - "en": "This map shows ATMs to withdraw or deposit money" + "en": "This map shows ATMs to withdraw or deposit money", + "de": "Diese Karte zeigt Geldautomaten zum Abheben oder Einzahlen von Geld" }, "icon": "./assets/themes/atm/logo.svg", "startLat": 0, diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index c51b09d25e..2c61b4ab77 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -1,10 +1,14 @@ { "id": "stations", "title": { - "en": "Train Stations" + "en": "Train Stations", + "de": "Bahnhöfe", + "nl": "Treinstations" }, "description": { - "en": "View, edit and add details to a train station" + "en": "View, edit and add details to a train station", + "de": "Bahnhofsdetails ansehen, bearbeiten und hinzufügen", + "nl": "Bekijk, bewerk en voeg details to aan een treinstation" }, "icon": "./assets/themes/stations/rail-light.svg", "startLat": 0, @@ -58,10 +62,14 @@ } }, "name": { - "en": "Train Stations" + "en": "Train Stations", + "de": "Bahnhöfe", + "nl": "Treinstations" }, "description": { - "en": "Layer showing train stations" + "en": "Layer showing train stations", + "de": "Ebene mit Bahnhöfen", + "nl": "Laag met treinstations" }, "mapRendering": [ { @@ -225,14 +233,20 @@ { "id": "departures_board", "name": { - "en": "Departures boards" + "en": "Departures boards", + "de": "Abfahrtstafeln", + "nl": "Vertrektijdenborden" }, "description": { - "en": "Displays showing the trains that will leave from this station" + "en": "Displays showing the trains that will leave from this station", + "de": "Anzeigen der Züge, die von diesem Bahnhof abfahren", + "nl": "Schermen die treinen tonen die van dit station vertrekken" }, "title": { "render": { - "en": "Departures board" + "en": "Departures board", + "de": "Abfahrtstafel", + "nl": "Vertrektijdenbord" } }, "minzoom": 19, @@ -249,31 +263,41 @@ { "id": "type", "question": { - "en": "What kind of departures board is this?" + "en": "What kind of departures board is this?", + "de": "Was ist das für eine Abfahrtstafel?", + "nl": "Wat voor vertrektijdenbord is dit?" }, "mappings": [ { "if": "departures_board=yes", "then": { - "en": "This is a departures board of an unknown type" + "en": "This is a departures board of an unknown type", + "de": "Dies ist eine Abfahrtstafel eines unbekannten Typs", + "nl": "Dit is een vertrektijdenbord van een onbekend type" } }, { "if": "departures_board=realtime", "then": { - "en": "This is an electronic board, showing the next departures in realtime" + "en": "This is an electronic board, showing the next departures in realtime", + "de": "Dies ist eine elektronische Tafel, die nächste Abfahrten in Echtzeit anzeigt", + "nl": "Dit is een elektronisch bord, met realtime vertrektijden" } }, { "if": "departures_board=timetable", "then": { - "en": "This is a paper timetable" + "en": "This is a paper timetable", + "de": "Dies ist ein Papierfahrplan", + "nl": "Dit is een papieren vertrekstaat" } }, { "if": "departures_board=delay", "then": { - "en": "There is a sign showing the frequency of the trains" + "en": "There is a sign showing the frequency of the trains", + "de": "Es gibt ein Schild, das den Takt der Züge anzeigt", + "nl": "Er is een bord met de tijden tussen treinen" } } ] @@ -286,10 +310,14 @@ "departures_board=yes" ], "title": { - "en": "a departures board" + "en": "a departures board", + "de": "eine Abfahrtstafel", + "nl": "een vertrektijdenbord" }, "description": { - "en": "Add a board showing departures, either electronic or paper" + "en": "Add a board showing departures, either electronic or paper", + "de": "Fügen Sie eine Tafel hinzu, auf der Abfahrten angezeigt werden, entweder elektronisch oder in Papierform", + "nl": "Voeg een bord met vertrektijden toe, elektronisch of op papier" } } ], diff --git a/assets/translators.json b/assets/translators.json index d81b7d13ee..4beeffbace 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 214, + "commits": 216, "contributor": "Pieter Vander Vennet" }, { - "commits": 191, + "commits": 195, "contributor": "kjon" }, { @@ -17,7 +17,7 @@ "contributor": "danieldegroot2" }, { - "commits": 48, + "commits": 57, "contributor": "Robin van der Linde" }, { @@ -208,6 +208,10 @@ "commits": 4, "contributor": "Fabio Bettani" }, + { + "commits": 3, + "contributor": "mcliquid" + }, { "commits": 3, "contributor": "Jaime Marquínez Ferrándiz" @@ -256,10 +260,6 @@ "commits": 3, "contributor": "SiegbjornSitumeang" }, - { - "commits": 2, - "contributor": "mcliquid" - }, { "commits": 2, "contributor": "Tarcila Cataldi" @@ -328,6 +328,10 @@ "commits": 2, "contributor": "Leo Alcaraz" }, + { + "commits": 1, + "contributor": "aleksej0R" + }, { "commits": 1, "contributor": "Lucas" diff --git a/langs/de.json b/langs/de.json index 95f2fb7197..1821515dbb 100644 --- a/langs/de.json +++ b/langs/de.json @@ -925,6 +925,15 @@ "missing": "{count} nicht übersetzte Zeichenfolgen", "notImmediate": "Die Übersetzung wird nicht direkt aktualisiert. Dies dauert in der Regel ein paar Tage" }, + "userinfo": { + "gotoInbox": "Öffnen Sie Ihren Posteingang", + "gotoSettings": "Gehen Sie zu Ihren Einstellungen auf OpenStreetMap.org", + "moveToHome": "Verschieben Sie die Karte an Ihren Heimatstandort", + "newMessages": "Sie haben neue Nachrichten", + "noDescription": "Sie haben noch keine Beschreibung in Ihrem Profil", + "noDescriptionCallToAction": "Eine Profilbeschreibung hinzufügen", + "welcome": "Willkommen {user}" + }, "validation": { "color": { "description": "Farbe oder Hexcode" @@ -984,14 +993,5 @@ "wikidata": { "description": "Eine Wikidata-Kennung" } - }, - "userinfo": { - "gotoInbox": "Öffnen Sie Ihren Posteingang", - "moveToHome": "Verschieben Sie die Karte an Ihren Heimatstandort", - "noDescription": "Sie haben noch keine Beschreibung in Ihrem Profil", - "noDescriptionCallToAction": "Eine Profilbeschreibung hinzufügen", - "gotoSettings": "Gehen Sie zu Ihren Einstellungen auf OpenStreetMap.org", - "newMessages": "Sie haben neue Nachrichten", - "welcome": "Willkommen {user}" } } diff --git a/langs/layers/da.json b/langs/layers/da.json index f35267d900..7a2d3c7191 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -2677,14 +2677,6 @@ }, "question": "Hvor vigtigt er dette træ? Vælg det første svar, der passer." }, - "tree-height": { - "mappings": { - "0": { - "then": "Højde: {height} m" - } - }, - "render": "Højde: {height}" - }, "tree-heritage": { "mappings": { "1": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 0c503bc005..c387e1a4fe 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -167,6 +167,42 @@ "render": "Kunstwerk" } }, + "atm": { + "description": "Geldautomaten zum Geld abheben", + "name": "Geldautomaten", + "presets": { + "0": { + "title": "ein Geldautomat" + } + }, + "tagRenderings": { + "brand": { + "freeform": { + "placeholder": "Markenname" + }, + "question": "Von welcher Marke ist dieser Geldautomat?", + "render": "Die Marke dieses Geldautomaten ist {brand}" + }, + "name": { + "render": "Der Name dieses Geldautomaten ist {name}" + }, + "operator": { + "freeform": { + "placeholder": "Betreiber" + }, + "question": "Welches Unternehmen betreibt den Geldautomaten?", + "render": "Der Geldautomat wird von {operator} betrieben" + } + }, + "title": { + "mappings": { + "0": { + "then": "{brand} Geldautomat" + } + }, + "render": "Geldautomat" + } + }, "barrier": { "description": "Hindernisse beim Fahrradfahren, wie zum Beispiel Poller und Fahrrad Barrieren", "name": "Hindernisse", @@ -270,6 +306,28 @@ }, "bench": { "description": "Diese Karte stellt Sitzbänke aus Holz, Metall, Stein, … dar und stellt ein paar Fragen, um weitere Informationen zu ergänzen.", + "filter": { + "0": { + "options": { + "0": { + "question": "ist ein Denkmal" + } + } + }, + "1": { + "options": { + "0": { + "question": "Mit und ohne Rückenlehne" + }, + "1": { + "question": "Hat eine Rückenlehne" + }, + "2": { + "question": "Hat keine Rückenlehne" + } + } + } + }, "name": "Sitzbänke", "presets": { "0": { @@ -277,6 +335,17 @@ } }, "tagRenderings": { + "bench-artwork": { + "mappings": { + "0": { + "then": "Diese Bank hat ein integriertes Kunstwerk" + }, + "1": { + "then": "Diese Bank hat kein integriertes Kunstwerk" + } + }, + "question": "Hat diese Bank ein künstlerisches Element?
Z.B. hat es ein integriertes Gemälde, eine Statue oder eine andere nicht triviale, kreative Arbeit
" + }, "bench-backrest": { "mappings": { "0": { @@ -322,6 +391,18 @@ "question": "In welche Richtung schaut man, wenn man auf der Bank sitzt?", "render": "Wenn man auf der Bank sitzt, schaut man in Richtung {direction}°." }, + "bench-inscription": { + "mappings": { + "0": { + "then": "Diese Bank hat keine Inschrift" + }, + "1": { + "then": "Diese Bank hat (wahrscheinlich) keine Inschrift" + } + }, + "question": "Hat diese Bank eine Inschrift?
Z.B. auf einer angebrachten Plakette, in der Rückenlehne, ...
", + "render": "Diese Bank hat folgende Inschrift:

{inscription}

" + }, "bench-material": { "mappings": { "0": { @@ -346,24 +427,6 @@ "question": "Aus welchem Material ist die Sitzfläche der Bank?", "render": "Material: {material}" }, - "bench-seats": { - "question": "Wie viele Sitzplätze hat diese Bank?", - "render": "Die Sitzbank hat {seats} Sitzplätze", - "mappings": { - "0": { - "then": "Diese Bank hat keine getrennten Sitze" - } - } - }, - "bench-survey:date": { - "question": "Wann wurde diese Bank zuletzt überprüft?", - "render": "Diese Bank wurde zuletzt überprüft am {survey:date}", - "mappings": { - "0": { - "then": "Heute geprüft!" - } - } - }, "bench-memorial": { "mappings": { "0": { @@ -375,57 +438,42 @@ }, "question": "Dient diese Bank als Denkmal für jemanden oder etwas?" }, - "bench-artwork": { + "bench-seats": { "mappings": { "0": { - "then": "Diese Bank hat ein integriertes Kunstwerk" - }, - "1": { - "then": "Diese Bank hat kein integriertes Kunstwerk" + "then": "Diese Bank hat keine getrennten Sitze" } }, - "question": "Hat diese Bank ein künstlerisches Element?
Z.B. hat es ein integriertes Gemälde, eine Statue oder eine andere nicht triviale, kreative Arbeit
" + "question": "Wie viele Sitzplätze hat diese Bank?", + "render": "Die Sitzbank hat {seats} Sitzplätze" }, - "bench-inscription": { - "render": "Diese Bank hat folgende Inschrift:

{inscription}

", + "bench-survey:date": { "mappings": { "0": { - "then": "Diese Bank hat keine Inschrift" - }, - "1": { - "then": "Diese Bank hat (wahrscheinlich) keine Inschrift" + "then": "Heute geprüft!" } }, - "question": "Hat diese Bank eine Inschrift?
Z.B. auf einer angebrachten Plakette, in der Rückenlehne, ...
" + "question": "Wann wurde diese Bank zuletzt überprüft?", + "render": "Diese Bank wurde zuletzt überprüft am {survey:date}" } }, "title": { "render": "Sitzbank" - }, - "filter": { - "1": { - "options": { - "2": { - "question": "Hat keine Rückenlehne" - }, - "1": { - "question": "Hat eine Rückenlehne" - }, - "0": { - "question": "Mit und ohne Rückenlehne" - } - } - }, - "0": { - "options": { - "0": { - "question": "ist ein Denkmal" - } - } - } } }, "bench_at_pt": { + "deletion": { + "extraDeleteReasons": { + "0": { + "explanation": "Diese Bushaltestelle wird nicht mehr genutzt" + } + }, + "nonDeleteMappings": { + "0": { + "then": "Diese Bushaltestelle hat keine Bank (es gab nie eine oder sie wurde entfernt)" + } + } + }, "description": "Eine Ebene mit allen Haltestellen des öffentlichen Nahverkehrs, die über eine Sitzbank verfügen", "name": "Sitzbänke an Haltestellen", "tagRenderings": { @@ -457,18 +505,6 @@ } }, "render": "Sitzbank" - }, - "deletion": { - "extraDeleteReasons": { - "0": { - "explanation": "Diese Bushaltestelle wird nicht mehr genutzt" - } - }, - "nonDeleteMappings": { - "0": { - "then": "Diese Bushaltestelle hat keine Bank (es gab nie eine oder sie wurde entfernt)" - } - } } }, "bicycle_library": { @@ -1389,6 +1425,33 @@ "render": "Kneipe" } }, + "car_rental": { + "description": "Orte, an denen Sie ein Auto mieten können", + "name": "Autovermietung", + "presets": { + "0": { + "description": "Ein Ort, an dem Sie ein Auto mieten können", + "title": "eine Autovermietung" + } + }, + "tagRenderings": { + "name": { + "freeform": { + "placeholder": "Name der Autovermietung" + }, + "mappings": { + "0": { + "then": "Diese Autovermietung hat keinen Namen" + } + }, + "question": "Wie lautet der Name dieser Autovermietung?", + "render": "Der Name der Autovermietung lautet {name}" + } + }, + "title": { + "render": "Autovermietung" + } + }, "charging_station": { "description": "Eine Ladestation", "filter": { @@ -3797,14 +3860,14 @@ }, "3": { "options": { + "0": { + "question": "Mit und ohne Bilder" + }, "1": { "question": "Hat mindestens ein Bild" }, "2": { "question": "Hat wahrscheinlich kein Bild" - }, - "0": { - "question": "Mit und ohne Bilder" } } }, @@ -6150,6 +6213,27 @@ "render": "Bücherschrank" } }, + "railway_platforms": { + "description": "Finden Sie alle Bahnsteige im Bahnhof und die Zugstrecken, die sie benutzen.", + "name": "Bahnsteige", + "tagRenderings": { + "ref": { + "freeform": { + "placeholder": "Bahnsteignummer" + }, + "question": "Wie lautet die Nummer dieses Bahnsteigs?", + "render": "Bahnsteig {ref}" + } + }, + "title": { + "mappings": { + "0": { + "then": "Bahnsteig {ref}" + } + }, + "render": "Bahnsteig" + } + }, "rainbow_crossings": { "description": "Eine Ebene mit Fußgängerüberwegen in Regenbogenfarben", "name": "Fußgängerüberwege in Regenbogenfarben", @@ -6518,6 +6602,9 @@ "render": "Schule {name}" } }, + "selected_element": { + "description": "Hebt das aktuell ausgewählte Element hervor. Überschreiben Sie diese Ebene, um unterschiedliche Farben zu erhalten" + }, "shelter": { "description": "Eine Ebene, die verschiedene Bauformen von Unterständen zeigt", "name": "Unterstände", @@ -6950,12 +7037,6 @@ "render_single_language": "Die Treppe hat taktile Schrift in {language():font-bold}" } } - }, - "multilevels": { - "override": { - "question": "Welchen Ebenen verbindet diese Treppe?", - "render": "Diese Treppe verbindet die Ebenen {level}" - } } }, "title": { @@ -7286,6 +7367,61 @@ } } }, + "ticket_machine": { + "description": "Fahrkartenautomaten für ÖPNV-Tickets finden", + "name": "Fahrkartenautomaten", + "presets": { + "0": { + "title": "einen Fahrkartenautomat" + } + }, + "tagRenderings": { + "operator": { + "freeform": { + "placeholder": "Name des Betreibers" + }, + "mappings": { + "0": { + "then": "Niederländische Eisenbahn (NS)" + } + }, + "question": "Wer ist der Betreiber dieses Fahrkartenautomaten?", + "render": "Dieser Fahrkartenautomat wird betrieben von {operator}" + } + }, + "title": { + "render": "Fahrkartenautomat" + } + }, + "ticket_validator": { + "description": "Finden Sie Fahrkartenentwerter, um Tickets für den öffentlichen Nahverkehr zu entwerten", + "name": "Fahrkartenentwerter", + "presets": { + "0": { + "title": "einen Fahrkartenentwerter" + } + }, + "tagRenderings": { + "barrier": { + "mappings": { + "0": { + "then": "Dieser Fahrscheinentwerter ist Teil einer Zugangsbarriere" + } + }, + "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}" + }, + "validator-operator": { + "freeform": { + "placeholder": "Name des Betreibers" + }, + "question": "Wer ist der Betreiber dieses Fahrkartenentwerters?", + "render": "Dieser Fahrkartenentwerter wird betrieben von {operator}" + } + }, + "title": { + "render": "Fahrkartenentwerter" + } + }, "toilet": { "description": "Eine Ebene mit (öffentlichen) Toiletten", "filter": { @@ -7546,11 +7682,6 @@ "wheelchair-door-width": { "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?", "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit" - }, - "opening_hours": { - "override": { - "question": "Wann ist die Einrichtung, in der sich die Toilette befindet, geöffnet?" - } } }, "title": { @@ -7845,14 +7976,6 @@ }, "question": "Wie bedeutsam ist dieser Baum? Wählen Sie die erste Antwort, die zutrifft." }, - "tree-height": { - "mappings": { - "0": { - "then": "Höhe: {height} m" - } - }, - "render": "Höhe: {height}" - }, "tree-heritage": { "mappings": { "0": { @@ -8217,159 +8340,5 @@ } } } - }, - "car_rental": { - "description": "Orte, an denen Sie ein Auto mieten können", - "name": "Autovermietung", - "presets": { - "0": { - "description": "Ein Ort, an dem Sie ein Auto mieten können", - "title": "eine Autovermietung" - } - }, - "tagRenderings": { - "name": { - "question": "Wie lautet der Name dieser Autovermietung?", - "render": "Der Name der Autovermietung lautet {name}", - "freeform": { - "placeholder": "Name der Autovermietung" - }, - "mappings": { - "0": { - "then": "Diese Autovermietung hat keinen Namen" - } - } - } - }, - "title": { - "render": "Autovermietung" - } - }, - "railway_platforms": { - "tagRenderings": { - "ref": { - "freeform": { - "placeholder": "Bahnsteignummer" - }, - "question": "Wie lautet die Nummer dieses Bahnsteigs?", - "render": "Bahnsteig {ref}" - } - }, - "title": { - "mappings": { - "0": { - "then": "Bahnsteig {ref}" - } - }, - "render": "Bahnsteig" - }, - "description": "Finden Sie alle Bahnsteige im Bahnhof und die Zugstrecken, die sie benutzen.", - "name": "Bahnsteige" - }, - "ticket_machine": { - "presets": { - "0": { - "title": "einen Fahrkartenautomat" - } - }, - "description": "Fahrkartenautomaten für ÖPNV-Tickets finden", - "name": "Fahrkartenautomaten", - "tagRenderings": { - "operator": { - "freeform": { - "placeholder": "Name des Betreibers" - }, - "mappings": { - "0": { - "then": "Niederländische Eisenbahn (NS)" - } - }, - "question": "Wer ist der Betreiber dieses Fahrkartenautomaten?", - "render": "Dieser Fahrkartenautomat wird betrieben von {operator}" - } - }, - "title": { - "render": "Fahrkartenautomat" - } - }, - "ticket_validator": { - "tagRenderings": { - "validator-operator": { - "freeform": { - "placeholder": "Name des Betreibers" - }, - "question": "Wer ist der Betreiber dieses Fahrkartenentwerters?", - "render": "Dieser Fahrkartenentwerter wird betrieben von {operator}" - }, - "barrier": { - "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}", - "mappings": { - "0": { - "then": "Dieser Fahrscheinentwerter ist Teil einer Zugangsbarriere" - } - } - }, - "payment-options": { - "override": { - "mappings+": { - "0": { - "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" - }, - "1": { - "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" - } - } - } - } - }, - "description": "Finden Sie Fahrkartenentwerter, um Tickets für den öffentlichen Nahverkehr zu entwerten", - "name": "Fahrkartenentwerter", - "presets": { - "0": { - "title": "einen Fahrkartenentwerter" - } - }, - "title": { - "render": "Fahrkartenentwerter" - } - }, - "atm": { - "tagRenderings": { - "operator": { - "question": "Welches Unternehmen betreibt den Geldautomaten?", - "freeform": { - "placeholder": "Betreiber" - }, - "render": "Der Geldautomat wird von {operator} betrieben" - }, - "brand": { - "freeform": { - "placeholder": "Markenname" - }, - "question": "Von welcher Marke ist dieser Geldautomat?", - "render": "Die Marke dieses Geldautomaten ist {brand}" - }, - "name": { - "render": "Der Name dieses Geldautomaten ist {name}" - } - }, - "name": "Geldautomaten", - "title": { - "render": "Geldautomat", - "mappings": { - "0": { - "then": "{brand} Geldautomat" - } - } - }, - "description": "Geldautomaten zum Geld abheben", - "presets": { - "0": { - "title": "ein Geldautomat" - } - } - }, - "selected_element": { - "description": "Hebt das aktuell ausgewählte Element hervor. Überschreiben Sie diese Ebene, um unterschiedliche Farben zu erhalten" } -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 3fd1fa1c04..e2cce64af9 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -7959,6 +7959,14 @@ } }, "tagRenderings": { + "circumference": { + "question": "What is the circumference of the tree trunk?

This is measured at a height of 1.30m

", + "render": "The tree trunk has a circumference of {circumference} meter" + }, + "height": { + "question": "What is the height of this tree?", + "render": "This tree is {height} meter high" + }, "tree-decidouous": { "mappings": { "0": { @@ -7999,14 +8007,6 @@ }, "question": "How significant is this tree? Choose the first answer that applies." }, - "tree-height": { - "mappings": { - "0": { - "then": "Height: {height} m" - } - }, - "render": "Height: {height}" - }, "tree-heritage": { "mappings": { "0": { diff --git a/langs/layers/es.json b/langs/layers/es.json index 93397d7bd7..8cf548f15f 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -3927,14 +3927,6 @@ }, "question": "¿Qué importancia tiene este árbol? Elige la primera respuesta que corresponda." }, - "tree-height": { - "mappings": { - "0": { - "then": "Altura: {height} m" - } - }, - "render": "Altura: {height}" - }, "tree-heritage": { "mappings": { "0": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 412a42c0d6..67bd44a52c 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -82,6 +82,9 @@ } }, "tagRenderings": { + "artwork-artist-wikidata": { + "question": "Qui a fait cette oeuvre d'art ?" + }, "artwork-artist_name": { "question": "Quel artiste a créé cette œuvre ?", "render": "Créé par {artist_name}" @@ -135,8 +138,10 @@ "question": "Existe-t-il un site web où trouver plus d'informations sur cette œuvre d'art ?", "render": "Plus d'info sûr ce site web" }, + "artwork_subject": { + "question": "Que représente cette oeuvre d'art ?" + }, "doubles_as_bench": { - "question": "Cette oeuvre d'art sert-elle de banc ?", "mappings": { "0": { "then": "Cette oeuvre d'art sert aussi de banc" @@ -147,13 +152,8 @@ "2": { "then": "Cette oeuvre d'art ne sert pas de banc" } - } - }, - "artwork-artist-wikidata": { - "question": "Qui a fait cette oeuvre d'art ?" - }, - "artwork_subject": { - "question": "Que représente cette oeuvre d'art ?" + }, + "question": "Cette oeuvre d'art sert-elle de banc ?" } }, "title": { @@ -165,6 +165,42 @@ "render": "Œuvre d'art" } }, + "atm": { + "description": "DAB pour retirer de l'argent", + "name": "DABs", + "presets": { + "0": { + "title": "un DAB" + } + }, + "tagRenderings": { + "brand": { + "freeform": { + "placeholder": "Nom de marque" + }, + "question": "De quelle marque est ce DAB ?", + "render": "La marque de ce DAB est {brand}" + }, + "name": { + "render": "Le nom de ce DAB est {name}" + }, + "operator": { + "freeform": { + "placeholder": "Opérateur" + }, + "question": "Quelle société exploite ce DAB ?", + "render": "Ce DAB est exploité par {operator}" + } + }, + "title": { + "mappings": { + "0": { + "then": "DAB {brand}" + } + }, + "render": "DAB" + } + }, "barrier": { "description": "Obstacles à vélo, tels que des potelets ou des barrières", "name": "Barrières", @@ -268,6 +304,28 @@ }, "bench": { "description": "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.", + "filter": { + "0": { + "options": { + "0": { + "question": "est un mémorial" + } + } + }, + "1": { + "options": { + "0": { + "question": "Avec et sans dossier" + }, + "1": { + "question": "A un dossier" + }, + "2": { + "question": "N'a pas de dossier" + } + } + } + }, "name": "Bancs", "presets": { "0": { @@ -275,6 +333,16 @@ } }, "tagRenderings": { + "bench-artwork": { + "mappings": { + "0": { + "then": "Une oeuvre d'art est intégrée à ce banc" + }, + "1": { + "then": "Ce banc n'a pas d'oeuvre d'art intégrée" + } + } + }, "bench-backrest": { "mappings": { "0": { @@ -320,6 +388,18 @@ "question": "Dans quelle direction regardez-vous quand vous êtes assis sur le banc ?", "render": "Assis sur le banc, on regarde vers {direction}°." }, + "bench-inscription": { + "mappings": { + "0": { + "then": "Ce banc n'a pas d'inscription" + }, + "1": { + "then": "Ce banc n'a(probablement) pas d'inscription" + } + }, + "question": "Est-ce que ce banc possède une inscription ?
Par exemple, sur une plaque accrochée, sur le dossier, ...
", + "render": "Ce banc a l'inscription suivante :

{inscription}

" + }, "bench-material": { "mappings": { "0": { @@ -344,46 +424,6 @@ "question": "De quel matériau ce banc est-il fait ?", "render": "Matériau : {material}" }, - "bench-seats": { - "question": "De combien de places dispose ce banc ?", - "render": "{seats} places", - "mappings": { - "0": { - "then": "Ce banc n'a pas de sièges séparés" - } - } - }, - "bench-survey:date": { - "question": "Quand ce banc a-t-il été contrôlé pour la dernière fois ?", - "render": "Ce banc a été contrôlé pour la dernière fois le {survey:date}", - "mappings": { - "0": { - "then": "Vérifié sur le terrain aujourd'hui !" - } - } - }, - "bench-inscription": { - "mappings": { - "0": { - "then": "Ce banc n'a pas d'inscription" - }, - "1": { - "then": "Ce banc n'a(probablement) pas d'inscription" - } - }, - "question": "Est-ce que ce banc possède une inscription ?
Par exemple, sur une plaque accrochée, sur le dossier, ...
", - "render": "Ce banc a l'inscription suivante :

{inscription}

" - }, - "bench-artwork": { - "mappings": { - "0": { - "then": "Une oeuvre d'art est intégrée à ce banc" - }, - "1": { - "then": "Ce banc n'a pas d'oeuvre d'art intégrée" - } - } - }, "bench-memorial": { "mappings": { "0": { @@ -394,35 +434,43 @@ } }, "question": "Ce banc sert-il de mémorial pour quelqu'un ou quelque chose ?" + }, + "bench-seats": { + "mappings": { + "0": { + "then": "Ce banc n'a pas de sièges séparés" + } + }, + "question": "De combien de places dispose ce banc ?", + "render": "{seats} places" + }, + "bench-survey:date": { + "mappings": { + "0": { + "then": "Vérifié sur le terrain aujourd'hui !" + } + }, + "question": "Quand ce banc a-t-il été contrôlé pour la dernière fois ?", + "render": "Ce banc a été contrôlé pour la dernière fois le {survey:date}" } }, "title": { "render": "Banc" - }, - "filter": { - "1": { - "options": { - "0": { - "question": "Avec et sans dossier" - }, - "1": { - "question": "A un dossier" - }, - "2": { - "question": "N'a pas de dossier" - } - } - }, - "0": { - "options": { - "0": { - "question": "est un mémorial" - } - } - } } }, "bench_at_pt": { + "deletion": { + "extraDeleteReasons": { + "0": { + "explanation": "Cette station de bus n'est plus utilisée" + } + }, + "nonDeleteMappings": { + "0": { + "then": "Cette station de bus n'a pas de banc (il n'y en a jamais eu ou il a été retiré)" + } + } + }, "description": "Une couche montrant tous les arrêts de transports publics qui ont un banc", "name": "Bancs des arrêts de transport en commun", "tagRenderings": { @@ -454,18 +502,6 @@ } }, "render": "Banc" - }, - "deletion": { - "extraDeleteReasons": { - "0": { - "explanation": "Cette station de bus n'est plus utilisée" - } - }, - "nonDeleteMappings": { - "0": { - "then": "Cette station de bus n'a pas de banc (il n'y en a jamais eu ou il a été retiré)" - } - } } }, "bicycle_library": { @@ -1386,6 +1422,33 @@ "render": "Bar" } }, + "car_rental": { + "description": "Lieu où vous pouvez louer une voiture", + "name": "Société de location de véhicules", + "presets": { + "0": { + "description": "Un lieu où vous pouvez louer une voiture", + "title": "Une société de location de véhicules" + } + }, + "tagRenderings": { + "name": { + "freeform": { + "placeholder": "Nom de la société de location de véhicules" + }, + "mappings": { + "0": { + "then": "Cette société de location de véhicules n'a pas de nom" + } + }, + "question": "Quel est le nom de cette société de location de véhicules ?", + "render": "Cette société de location de véhicules est appelée {name}" + } + }, + "title": { + "render": "Société de location de véhicules" + } + }, "charging_station": { "description": "Une station de recharge", "filter": { @@ -1719,18 +1782,10 @@ "title": "une feu de signalisation" } }, - "title": { - "mappings": { - "0": { - "then": "Feu de signalisation" - }, - "1": { - "then": "Traversée avec feu de signalisation" - } - }, - "render": "Traversée" - }, "tagRenderings": { + "crossing-continue-through-red": { + "question": "Est-ce qu'un cycliste peut aller tout droit quand le feu est rouge ?" + }, "crossing-has-island": { "mappings": { "0": { @@ -1776,10 +1831,18 @@ "then": "Ce feu de signalisation n'a pas de signal sonore pour aider à traverser." } } - }, - "crossing-continue-through-red": { - "question": "Est-ce qu'un cycliste peut aller tout droit quand le feu est rouge ?" } + }, + "title": { + "mappings": { + "0": { + "then": "Feu de signalisation" + }, + "1": { + "then": "Traversée avec feu de signalisation" + } + }, + "render": "Traversée" } }, "cycleways_and_roads": { @@ -4506,14 +4569,6 @@ }, "question": "Quelle est l'importance de cet arbre ? Choisissez la première réponse qui s'applique." }, - "tree-height": { - "mappings": { - "0": { - "then": "Hauteur : {height} m" - } - }, - "render": "Hauteur : {height}" - }, "tree-heritage": { "mappings": { "0": { @@ -4686,68 +4741,5 @@ } } } - }, - "atm": { - "tagRenderings": { - "brand": { - "freeform": { - "placeholder": "Nom de marque" - }, - "question": "De quelle marque est ce DAB ?", - "render": "La marque de ce DAB est {brand}" - }, - "name": { - "render": "Le nom de ce DAB est {name}" - }, - "operator": { - "question": "Quelle société exploite ce DAB ?", - "freeform": { - "placeholder": "Opérateur" - }, - "render": "Ce DAB est exploité par {operator}" - } - }, - "title": { - "mappings": { - "0": { - "then": "DAB {brand}" - } - }, - "render": "DAB" - }, - "description": "DAB pour retirer de l'argent", - "name": "DABs", - "presets": { - "0": { - "title": "un DAB" - } - } - }, - "car_rental": { - "presets": { - "0": { - "description": "Un lieu où vous pouvez louer une voiture", - "title": "Une société de location de véhicules" - } - }, - "tagRenderings": { - "name": { - "freeform": { - "placeholder": "Nom de la société de location de véhicules" - }, - "render": "Cette société de location de véhicules est appelée {name}", - "mappings": { - "0": { - "then": "Cette société de location de véhicules n'a pas de nom" - } - }, - "question": "Quel est le nom de cette société de location de véhicules ?" - } - }, - "name": "Société de location de véhicules", - "title": { - "render": "Société de location de véhicules" - }, - "description": "Lieu où vous pouvez louer une voiture" } -} +} \ No newline at end of file diff --git a/langs/layers/id.json b/langs/layers/id.json index 128615d6c6..13b48c1ddb 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -411,9 +411,6 @@ } }, "tagRenderings": { - "tree-height": { - "render": "Tinggi: {height}" - }, "tree-heritage": { "mappings": { "0": { diff --git a/langs/layers/it.json b/langs/layers/it.json index 5bb2a1722d..4ef54ac4ff 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -2411,14 +2411,6 @@ }, "question": "Quanto significativo è questo albero? Scegli la prima risposta che corrisponde." }, - "tree-height": { - "mappings": { - "0": { - "then": "Altezza: {height} m" - } - }, - "render": "Altezza: {height}" - }, "tree-heritage": { "mappings": { "0": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index eb4639ec02..dd2e50958e 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -153,6 +153,42 @@ "render": "Kunstwerk" } }, + "atm": { + "description": "Geldautomaten om geld op te nemen", + "name": "Geldautomaten", + "presets": { + "0": { + "title": "een geldautomaat" + } + }, + "tagRenderings": { + "brand": { + "freeform": { + "placeholder": "Merknaam" + }, + "question": "Van welk merk is deze geldautomaat?", + "render": "Het merk van deze geldautomaat is {brand}" + }, + "name": { + "render": "De naam van deze geldautomaat is {name}" + }, + "operator": { + "freeform": { + "placeholder": "Beheerder" + }, + "question": "Welk bedrijf beheert deze geldautomaat?", + "render": "Deze geldautomaat wordt beheerd door {operator}" + } + }, + "title": { + "mappings": { + "0": { + "then": "{brand} Geldautomaat" + } + }, + "render": "Geldautomaat" + } + }, "barrier": { "description": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes", "name": "Barrières", @@ -2538,6 +2574,7 @@ }, "title": { "mappings": { + "0": {}, "1": { "then": "Klimsite {name}" }, @@ -3499,8 +3536,8 @@ "tactile_writing_language": { "render": { "special": { - "render_list_item": "Deze lift heeft voelbaar schrift in het {language():font-bold}", "question": "In welke talen heeft deze lift voelbaar schrift (braille)?", + "render_list_item": "Deze lift heeft voelbaar schrift in het {language():font-bold}", "render_single_language": "Deze lift heeft voelbaar schrift in het {language():font-bold}" } } @@ -5878,6 +5915,27 @@ "render": "Boekenruilkast" } }, + "railway_platforms": { + "description": "Vind elk perron in het station, en de routes die ze gebruiken.", + "name": "Treinperrons", + "tagRenderings": { + "ref": { + "freeform": { + "placeholder": "Perronnummer" + }, + "question": "Wat is het nummer van dit perron?", + "render": "Perron {ref}" + } + }, + "title": { + "mappings": { + "0": { + "then": "Perron {ref}" + } + }, + "render": "Perron" + } + }, "rainbow_crossings": { "presets": { "0": { @@ -6543,6 +6601,7 @@ } }, "stairs": { + "description": "Laag met trappen en roltrappen", "name": "Trappen", "tagRenderings": { "conveying": { @@ -6596,7 +6655,6 @@ "question": "Is er een helling bij deze trap?" }, "tactile_writing": { - "question": "Heeft deze trap voelbaar schrift op de leuning?", "mappings": { "0": { "then": "Er is voelbaar schrift op de leuning" @@ -6604,14 +6662,15 @@ "1": { "then": "Er is geen voelbaar schrift op de leuning" } - } + }, + "question": "Heeft deze trap voelbaar schrift op de leuning?" }, "tactile_writing_language": { "render": { "special": { + "question": "In welke talen is er voelbaar schrift (braille) voor navigatie? ", "render_list_item": "Deze trap heeft voelbaar schrijft in {language():font-bold}", - "render_single_language": "Deze trap heeft voelbaar schrijft in {language():font-bold}", - "question": "In welke talen is er voelbaar schrift (braille) voor navigatie? " + "render_single_language": "Deze trap heeft voelbaar schrijft in {language():font-bold}" } } } @@ -6623,8 +6682,7 @@ } }, "render": "Trap" - }, - "description": "Laag met trappen en roltrappen" + } }, "street_lamps": { "description": "Een laag die alle straatlantaarns toont", @@ -6946,31 +7004,40 @@ } }, "ticket_machine": { - "tagRenderings": { - "operator": { - "mappings": { - "0": { - "then": "Nederlandse Spoorwegen (NS)" - } - }, - "freeform": { - "placeholder": "Naam van de beheerder" - }, - "question": "Wie is de beheerder van deze kaartautomaat?", - "render": "Deze kaartautomaat wordt beheerd door {operator}" - } - }, - "name": "Kaartautomaten", "description": "Zoek kaartautomaten voor het openbaar vervoer", + "name": "Kaartautomaten", "presets": { "0": { "title": "een kaartautomaat" } }, + "tagRenderings": { + "operator": { + "freeform": { + "placeholder": "Naam van de beheerder" + }, + "mappings": { + "0": { + "then": "Nederlandse Spoorwegen (NS)" + } + }, + "question": "Wie is de beheerder van deze kaartautomaat?", + "render": "Deze kaartautomaat wordt beheerd door {operator}" + } + }, "title": { "render": "Kaartautomaat" } }, + "ticket_validator": { + "tagRenderings": { + "validator-operator": { + "freeform": { + "placeholder": "Naam van de beheerder" + } + } + } + }, "toilet": { "description": "Een laag die publieke toiletten toont", "filter": { @@ -7495,14 +7562,6 @@ }, "question": "Hoe significant is deze boom? Kies het eerste antwoord dat van toepassing is." }, - "tree-height": { - "mappings": { - "0": { - "then": "Hoogte: {height} m" - } - }, - "render": "Hoogte: {height}" - }, "tree-heritage": { "mappings": { "0": { @@ -7628,13 +7687,6 @@ "description": "Speciale ingebouwde laag voor alle muren en gebouwen. Deze laag is nuttig in voorkeuzen voor objecten die tegen muren geplaatst kunnen worden (bv. AEDs, brievenbussen, ingangen, adressen, beveiligingscamera's,…). Deze laag is standaard onzichtbaar en niet in te schakelen door de gebruiker.", "tagRenderings": { "entrance_info": { - "render": { - "special": { - "tagrendering": "Een ingang van {canonical(width)}" - }, - "after": "{_entrances_count_without_width_count} ingangen hebben nog geen informatie over de breedte", - "before": "

Ingangen

Dit gebouw heeft {_entrances_count} ingangen:" - }, "mappings": { "0": { "then": "Geen ingang is gemarkeerd" @@ -7642,6 +7694,13 @@ "1": { "then": "Geen van de {_entrance_count} ingangen hebben al informatie over de breedte" } + }, + "render": { + "after": "{_entrances_count_without_width_count} ingangen hebben nog geen informatie over de breedte", + "before": "

Ingangen

Dit gebouw heeft {_entrances_count} ingangen:", + "special": { + "tagrendering": "Een ingang van {canonical(width)}" + } } } }, @@ -7925,71 +7984,5 @@ } } } - }, - "railway_platforms": { - "tagRenderings": { - "ref": { - "freeform": { - "placeholder": "Perronnummer" - }, - "question": "Wat is het nummer van dit perron?", - "render": "Perron {ref}" - } - }, - "title": { - "mappings": { - "0": { - "then": "Perron {ref}" - } - }, - "render": "Perron" - }, - "description": "Vind elk perron in het station, en de routes die ze gebruiken.", - "name": "Treinperrons" - }, - "atm": { - "tagRenderings": { - "operator": { - "render": "Deze geldautomaat wordt beheerd door {operator}", - "question": "Welk bedrijf beheert deze geldautomaat?", - "freeform": { - "placeholder": "Beheerder" - } - }, - "name": { - "render": "De naam van deze geldautomaat is {name}" - }, - "brand": { - "question": "Van welk merk is deze geldautomaat?", - "render": "Het merk van deze geldautomaat is {brand}", - "freeform": { - "placeholder": "Merknaam" - } - } - }, - "title": { - "render": "Geldautomaat", - "mappings": { - "0": { - "then": "{brand} Geldautomaat" - } - } - }, - "presets": { - "0": { - "title": "een geldautomaat" - } - }, - "name": "Geldautomaten", - "description": "Geldautomaten om geld op te nemen" - }, - "ticket_validator": { - "tagRenderings": { - "validator-operator": { - "freeform": { - "placeholder": "Naam van de beheerder" - } - } - } } -} +} \ No newline at end of file diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 24eb173d7e..c3d314ae22 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1621,14 +1621,6 @@ }, "question": "Это дерево вечнозелёное или листопадное?" }, - "tree-height": { - "mappings": { - "0": { - "then": "Высота: {height} м" - } - }, - "render": "Высота: {height}" - }, "tree_node-name": { "mappings": { "0": { diff --git a/langs/nl.json b/langs/nl.json index c0b62e676d..6fb68359db 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -902,6 +902,15 @@ "missing": "{count} niet-vertaalde teksten", "notImmediate": "Vertalingen worden niet onmiddelijk geupdate. Dit duurt gemiddeld enkele dagen" }, + "userinfo": { + "gotoInbox": "Open je inbox", + "gotoSettings": "Ga naar je instellingen op OpenStreetMap.org", + "moveToHome": "Beweeg de kaart naar je thuislocatie", + "newMessages": "je hebt nieuwe berichten", + "noDescription": "Je hebt nog een beschrijving op je profiel", + "noDescriptionCallToAction": "Voeg een profielbeschrijving toe", + "welcome": "Welkom {user}" + }, "validation": { "color": { "description": "Een kleur of hexadecimale code voor een kleur" @@ -961,14 +970,5 @@ "wikidata": { "description": "Een Wikidata-code" } - }, - "userinfo": { - "gotoSettings": "Ga naar je instellingen op OpenStreetMap.org", - "newMessages": "je hebt nieuwe berichten", - "moveToHome": "Beweeg de kaart naar je thuislocatie", - "gotoInbox": "Open je inbox", - "noDescriptionCallToAction": "Voeg een profielbeschrijving toe", - "noDescription": "Je hebt nog een beschrijving op je profiel", - "welcome": "Welkom {user}" } } diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index 8d87386928..b26ba5fcd2 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -1,5 +1,34 @@ { "shared_questions": { + "denominations-coins": { + "mappings": { + "0": { + "then": "1-Cent-Münzen werden akzeptiert" + }, + "1": { + "then": "2-Cent-Münzen werden akzeptiert" + }, + "2": { + "then": "5-Cent-Münzen werden akzeptiert" + }, + "3": { + "then": "10-Cent-Münzen werden akzeptiert" + }, + "4": { + "then": "20-Cent-Münzen werden akzeptiert" + }, + "5": { + "then": "50-Cent-Münzen werden akzeptiert" + }, + "6": { + "then": "1-Euro-Münzen werden akzeptiert" + }, + "7": { + "then": "2-Euro-Münzen werden akzeptiert" + } + }, + "question": "Mit welchen Münzen kann man hier bezahlen?" + }, "description": { "question": "Gibt es noch etwas, das die vorhergehenden Fragen nicht abgedeckt haben? Hier wäre Platz dafür.
Bitte keine bereits erhobenen Informationen." }, @@ -150,6 +179,24 @@ } } }, + "payment-options-split": { + "override": { + "mappings+": { + "0": { + "then": "Münzen werden hier akzeptiert" + }, + "1": { + "then": "Geldscheine werden hier akzeptiert" + }, + "2": { + "then": "Debitkarten werden hier akzeptiert" + }, + "3": { + "then": "Kreditkarten werden hier akzeptiert" + } + } + } + }, "phone": { "question": "Wie lautet die Telefonnummer von {title()}?" }, @@ -222,53 +269,6 @@ } }, "question": "Wie lautet der zugehörige Wikipedia Artikel?" - }, - "denominations-coins": { - "mappings": { - "0": { - "then": "1-Cent-Münzen werden akzeptiert" - }, - "1": { - "then": "2-Cent-Münzen werden akzeptiert" - }, - "2": { - "then": "5-Cent-Münzen werden akzeptiert" - }, - "5": { - "then": "50-Cent-Münzen werden akzeptiert" - }, - "6": { - "then": "1-Euro-Münzen werden akzeptiert" - }, - "3": { - "then": "10-Cent-Münzen werden akzeptiert" - }, - "4": { - "then": "20-Cent-Münzen werden akzeptiert" - }, - "7": { - "then": "2-Euro-Münzen werden akzeptiert" - } - }, - "question": "Mit welchen Münzen kann man hier bezahlen?" - }, - "payment-options-split": { - "override": { - "mappings+": { - "3": { - "then": "Kreditkarten werden hier akzeptiert" - }, - "0": { - "then": "Münzen werden hier akzeptiert" - }, - "2": { - "then": "Debitkarten werden hier akzeptiert" - }, - "1": { - "then": "Geldscheine werden hier akzeptiert" - } - } - } } } -} +} \ No newline at end of file diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index 4681b030bf..db70dd6978 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -271,4 +271,4 @@ "question": "What is the corresponding item on Wikipedia?" } } -} +} \ No newline at end of file diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json index a01a20a7bb..3103ddff90 100644 --- a/langs/shared-questions/nl.json +++ b/langs/shared-questions/nl.json @@ -1,5 +1,34 @@ { "shared_questions": { + "denominations-coins": { + "mappings": { + "0": { + "then": "Munten van 1 cent worden geaccepteerd" + }, + "1": { + "then": "Munten van 2 cent worden geaccepteerd" + }, + "2": { + "then": "Munten van 5 cent worden geaccepteerd" + }, + "3": { + "then": "Munten van 10 cent worden geaccepteerd" + }, + "4": { + "then": "Munten van 20 cent worden geaccepteerd" + }, + "5": { + "then": "Munten van 50 cent worden geaccepteerd" + }, + "6": { + "then": "Munten van 1 euro worden geaccepteerd" + }, + "7": { + "then": "Munten van 2 euro worden geaccepteerd" + } + }, + "question": "Met welke munten kan je hier betalen?" + }, "description": { "question": "Zijn er nog andere relevante zaken die je niet in de bovenstaande vragen kwijt kon? Vul ze hier in.
Herhaal geen antwoorden die je reeds gaf" }, @@ -222,35 +251,6 @@ } }, "question": "Welk Wikipedia-artikel beschrijft dit object?" - }, - "denominations-coins": { - "question": "Met welke munten kan je hier betalen?", - "mappings": { - "0": { - "then": "Munten van 1 cent worden geaccepteerd" - }, - "5": { - "then": "Munten van 50 cent worden geaccepteerd" - }, - "1": { - "then": "Munten van 2 cent worden geaccepteerd" - }, - "2": { - "then": "Munten van 5 cent worden geaccepteerd" - }, - "3": { - "then": "Munten van 10 cent worden geaccepteerd" - }, - "4": { - "then": "Munten van 20 cent worden geaccepteerd" - }, - "6": { - "then": "Munten van 1 euro worden geaccepteerd" - }, - "7": { - "then": "Munten van 2 euro worden geaccepteerd" - } - } } } -} +} \ No newline at end of file diff --git a/langs/themes/de.json b/langs/themes/de.json index 789e319d42..c3a6c77a74 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -7,6 +7,10 @@ "description": "Eine freie Karte mit Statuen, Büsten, Graffitis und anderen Kunstwerken auf der ganzen Welt", "title": "Freie Kunstkarte" }, + "atm": { + "description": "Diese Karte zeigt Geldautomaten zum Abheben oder Einzahlen von Geld", + "title": "Geldautomaten" + }, "bag": { "description": "Dieses Thema hilft beim Importieren von BAG-Daten", "layers": { @@ -1088,6 +1092,48 @@ "shortDescription": "Karte mit Sporteinrichtungen.", "title": "Sport" }, + "stations": { + "description": "Bahnhofsdetails ansehen, bearbeiten und hinzufügen", + "layers": { + "3": { + "description": "Ebene mit Bahnhöfen", + "name": "Bahnhöfe" + }, + "15": { + "description": "Anzeigen der Züge, die von diesem Bahnhof abfahren", + "name": "Abfahrtstafeln", + "presets": { + "0": { + "description": "Fügen Sie eine Tafel hinzu, auf der Abfahrten angezeigt werden, entweder elektronisch oder in Papierform", + "title": "eine Abfahrtstafel" + } + }, + "tagRenderings": { + "type": { + "mappings": { + "0": { + "then": "Dies ist eine Abfahrtstafel eines unbekannten Typs" + }, + "1": { + "then": "Dies ist eine elektronische Tafel, die nächste Abfahrten in Echtzeit anzeigt" + }, + "2": { + "then": "Dies ist ein Papierfahrplan" + }, + "3": { + "then": "Es gibt ein Schild, das den Takt der Züge anzeigt" + } + }, + "question": "Was ist das für eine Abfahrtstafel?" + } + }, + "title": { + "render": "Abfahrtstafel" + } + } + }, + "title": "Bahnhöfe" + }, "street_lighting": { "description": "Eine Karte für alles zum Thema Straßenbeleuchtung", "layers": { @@ -1174,51 +1220,5 @@ "description": "Auf dieser Karte findest Du Abfalleimer in Deiner Nähe. Wenn ein Abfalleimer auf dieser Karte fehlt, kannst du ihn selbst hinzufügen", "shortDescription": "Eine Karte mit Abfalleimern", "title": "Abfalleimer" - }, - "stations": { - "layers": { - "15": { - "presets": { - "0": { - "description": "Fügen Sie eine Tafel hinzu, auf der Abfahrten angezeigt werden, entweder elektronisch oder in Papierform", - "title": "eine Abfahrtstafel" - } - }, - "description": "Anzeigen der Züge, die von diesem Bahnhof abfahren", - "name": "Abfahrtstafeln", - "title": { - "render": "Abfahrtstafel" - }, - "tagRenderings": { - "type": { - "mappings": { - "1": { - "then": "Dies ist eine elektronische Tafel, die nächste Abfahrten in Echtzeit anzeigt" - }, - "0": { - "then": "Dies ist eine Abfahrtstafel eines unbekannten Typs" - }, - "3": { - "then": "Es gibt ein Schild, das den Takt der Züge anzeigt" - }, - "2": { - "then": "Dies ist ein Papierfahrplan" - } - }, - "question": "Was ist das für eine Abfahrtstafel?" - } - } - }, - "3": { - "description": "Ebene mit Bahnhöfen", - "name": "Bahnhöfe" - } - }, - "description": "Bahnhofsdetails ansehen, bearbeiten und hinzufügen", - "title": "Bahnhöfe" - }, - "atm": { - "description": "Diese Karte zeigt Geldautomaten zum Abheben oder Einzahlen von Geld", - "title": "Geldautomaten" } -} +} \ No newline at end of file diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 3b470431cb..87ddcd68dd 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -1265,6 +1265,48 @@ "shortDescription": "Kaart met sportfaciliteiten.", "title": "Sport" }, + "stations": { + "description": "Bekijk, bewerk en voeg details to aan een treinstation", + "layers": { + "3": { + "description": "Laag met treinstations", + "name": "Treinstations" + }, + "15": { + "description": "Schermen die treinen tonen die van dit station vertrekken", + "name": "Vertrektijdenborden", + "presets": { + "0": { + "description": "Voeg een bord met vertrektijden toe, elektronisch of op papier", + "title": "een vertrektijdenbord" + } + }, + "tagRenderings": { + "type": { + "mappings": { + "0": { + "then": "Dit is een vertrektijdenbord van een onbekend type" + }, + "1": { + "then": "Dit is een elektronisch bord, met realtime vertrektijden" + }, + "2": { + "then": "Dit is een papieren vertrekstaat" + }, + "3": { + "then": "Er is een bord met de tijden tussen treinen" + } + }, + "question": "Wat voor vertrektijdenbord is dit?" + } + }, + "title": { + "render": "Vertrektijdenbord" + } + } + }, + "title": "Treinstations" + }, "street_lighting": { "description": "Op deze kaart vind je alles over straatlantaarns", "layers": { @@ -1359,47 +1401,5 @@ "description": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen", "shortDescription": "Een kaart met vuilnisbakken", "title": "Vuilnisbak" - }, - "stations": { - "layers": { - "3": { - "name": "Treinstations", - "description": "Laag met treinstations" - }, - "15": { - "tagRenderings": { - "type": { - "mappings": { - "2": { - "then": "Dit is een papieren vertrekstaat" - }, - "1": { - "then": "Dit is een elektronisch bord, met realtime vertrektijden" - }, - "0": { - "then": "Dit is een vertrektijdenbord van een onbekend type" - }, - "3": { - "then": "Er is een bord met de tijden tussen treinen" - } - }, - "question": "Wat voor vertrektijdenbord is dit?" - } - }, - "presets": { - "0": { - "description": "Voeg een bord met vertrektijden toe, elektronisch of op papier", - "title": "een vertrektijdenbord" - } - }, - "name": "Vertrektijdenborden", - "title": { - "render": "Vertrektijdenbord" - }, - "description": "Schermen die treinen tonen die van dit station vertrekken" - } - }, - "title": "Treinstations", - "description": "Bekijk, bewerk en voeg details to aan een treinstation" } -} +} \ No newline at end of file From 8498754e106d10c6fe5b243333aad398e737e852 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 20 Dec 2022 20:42:50 +0100 Subject: [PATCH 21/29] Formatting --- UI/BigComponents/UserInformation.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/UI/BigComponents/UserInformation.ts b/UI/BigComponents/UserInformation.ts index 1e98315eaf..76aadca9de 100644 --- a/UI/BigComponents/UserInformation.ts +++ b/UI/BigComponents/UserInformation.ts @@ -127,7 +127,9 @@ class UserInformationMainPanel extends Combine { new ImportViewerLinks(osmConnection), new SubtleButton(Svg.logout_svg(), Translations.t.general.logout, { imgSize, - }).onClick(() => {osmConnection.LogOut()}), + }).onClick(() => { + osmConnection.LogOut() + }), ]) }) ).SetClass("flex flex-col"), From cfd47ec30c1f7595a7612ab6799f62ecbdbd32de Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 21 Dec 2022 01:39:16 +0100 Subject: [PATCH 22/29] Fix login button, close on 'move to home location' --- UI/BigComponents/UserInformation.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/UI/BigComponents/UserInformation.ts b/UI/BigComponents/UserInformation.ts index 76aadca9de..5f70fc228d 100644 --- a/UI/BigComponents/UserInformation.ts +++ b/UI/BigComponents/UserInformation.ts @@ -40,7 +40,8 @@ class UserInformationMainPanel extends Combine { constructor( osmConnection: OsmConnection, locationControl: UIEventSource, - layout: LayoutConfig + layout: LayoutConfig, + isOpened: UIEventSource ) { const t = Translations.t.userinfo const imgSize = "h-6 w-6" @@ -50,8 +51,8 @@ class UserInformationMainPanel extends Combine { ud.map((ud) => { if (!ud?.loggedIn) { // Not logged in - return new SubtleButton(Svg.login_svg(), "Login", { imgSize }).onClick( - osmConnection.AttemptLogin + return new SubtleButton(Svg.login_svg(), "Login", { imgSize }).onClick(() => + osmConnection.AttemptLogin() ) } @@ -96,6 +97,7 @@ class UserInformationMainPanel extends Combine { return } locationControl.setData({ ...home, zoom: 16 }) + isOpened.setData(false) }) } @@ -143,7 +145,7 @@ export default class UserInformationPanel extends ScrollableFullScreen { osmConnection: OsmConnection locationControl: UIEventSource }) { - const t = Translations.t.general + const isOpened = new UIEventSource(false) super( () => { return new VariableUiElement( @@ -154,10 +156,12 @@ export default class UserInformationPanel extends ScrollableFullScreen { return new UserInformationMainPanel( state.osmConnection, state.locationControl, - state.layoutToUse + state.layoutToUse, + isOpened ) }, - "userinfo" + "userinfo", + isOpened ) } } From f0d89945f6134905a659757aa2cb3ec40a445966 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 21 Dec 2022 01:43:30 +0100 Subject: [PATCH 23/29] Add ATMS in banks --- assets/layers/atm/atm.json | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index c77bee920f..ff78ad729f 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -32,7 +32,14 @@ ] }, "source": { - "osmTags": "amenity=atm" + "osmTags": { + "or": [ + "amenity=atm", + { + "and": ["amenity=bank","atm=yes"] + } + ] + } }, "minzoom": 13, "presets": [ @@ -49,6 +56,12 @@ } ], "tagRenderings": [ + { + "condition": "amenity=bank", + "render": { + "en": "This ATM is located in or near a bank" + } + }, { "id": "name", "render": { @@ -86,6 +99,7 @@ }, { "id": "operator", + "condition": "amenity!=bank", "question": { "en": "What company operates this ATM?", "de": "Welches Unternehmen betreibt den Geldautomaten?", @@ -109,7 +123,12 @@ "nl": "Deze geldautomaat wordt beheerd door {operator}" } }, - "opening_hours" + { + "builtin": "opening_hours", + "override": { + "condition": "amenity!=bank" + } + } ], "mapRendering": [ { @@ -120,4 +139,4 @@ ] } ] -} \ No newline at end of file +} From 34da44ea16576bfbe58f31df487c9f0942442dc6 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 22 Dec 2022 01:19:21 +0100 Subject: [PATCH 24/29] Fix ATM theme, add some conditions --- assets/layers/atm/atm.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index ff78ad729f..04aa7e4038 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -57,6 +57,19 @@ ], "tagRenderings": [ { + "builtin": "images", + "override": { + "condition": "amenity!=bank" + } + }, + { + "id": "bank-images", + "render": "{image_carousel()}", + "condition": "amenity=bank" + }, + + { + "id": "atm-in-bank-notice", "condition": "amenity=bank", "render": { "en": "This ATM is located in or near a bank" From 917f00d6248033a764b5cf7accb495fb5aa40c71 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 22 Dec 2022 01:19:33 +0100 Subject: [PATCH 25/29] Fix styling issue in climbing theme --- assets/themes/climbing/climbing.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index 0c733a5f08..5584ea44b6 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -99,8 +99,8 @@ "_embedding_feature:access=feat.get('_embedding_features_with_access')?.access", "_embedding_feature:access:description=(feat.get('_embedding_features_with_access')??{})['access:description']", "_embedding_feature:id=feat.get('_embedding_features_with_access')?.id", - "__difficulty_max= feat.properties['climbing:grade:french:max'] ?? feat.properties['_difficulty_max']", - "__difficulty_min= feat.properties['climbing:grade:french:min'] ?? feat.properties['_difficulty_min']", + "__difficulty_max= (feat.properties['climbing:grade:french:max'] ?? feat.properties['_difficulty_max'])?.substring(0,2)?.toUpperCase()", + "__difficulty_min= (feat.properties['climbing:grade:french:min'] ?? feat.properties['_difficulty_min'])?.substring(0,2)?.toUpperCase()", "__difficulty_max:char= feat.properties['__difficulty_max']?.at(0)", "__difficulty_min:char= feat.properties['__difficulty_min']?.at(0)", "__difficulty:char= feat.properties['climbing:grade:french']?.at(0)", @@ -309,4 +309,4 @@ } ], "credits": "Christian Neumann " -} \ No newline at end of file +} From a3935c140ccdbd6a15e25e3ce4ef3874f05dba9e Mon Sep 17 00:00:00 2001 From: mcliquid Date: Wed, 21 Dec 2022 07:05:50 +0000 Subject: [PATCH 26/29] Translated using Weblate (German) Currently translated at 100.0% (2573 of 2573 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/ --- langs/layers/de.json | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index c387e1a4fe..8db767cc38 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -7037,6 +7037,12 @@ "render_single_language": "Die Treppe hat taktile Schrift in {language():font-bold}" } } + }, + "multilevels": { + "override": { + "render": "Diese Treppen befinden sich zwischen den Ebenen {level}", + "question": "Zwischen welchen Ebenen befinden sich diese Treppen?" + } } }, "title": { @@ -7416,6 +7422,18 @@ }, "question": "Wer ist der Betreiber dieses Fahrkartenentwerters?", "render": "Dieser Fahrkartenentwerter wird betrieben von {operator}" + }, + "payment-options": { + "override": { + "mappings+": { + "0": { + "then": "Dieser Ticketentwerter akzeptiert OV-Chipkarten" + }, + "1": { + "then": "Dieser Ticketentwerter akzeptiert OV-Chipkarten" + } + } + } } }, "title": { @@ -7682,6 +7700,11 @@ "wheelchair-door-width": { "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?", "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit" + }, + "opening_hours": { + "override": { + "question": "Wann ist die Einrichtung, in der sich diese Toiletten befinden, geöffnet?" + } } }, "title": { @@ -8029,6 +8052,14 @@ "tree_node-wikidata": { "question": "Was ist das passende Wikidata Element zu diesem Baum?", "render": "\"\"/ Wikidata: {wikidata}" + }, + "circumference": { + "question": "Wie groß ist der Umfang des Baumstammes?

Dies wird in einer Höhe von 1,30 m gemessen

", + "render": "Der Baumstamm hat einen Umfang von {circumference} Meter" + }, + "height": { + "question": "Wie hoch ist dieser Baum?", + "render": "Dieser Baum ist {height} Meter hoch" } }, "title": { @@ -8341,4 +8372,4 @@ } } } -} \ No newline at end of file +} From 20f3f538ca002f27174a82357882352e9aedcf15 Mon Sep 17 00:00:00 2001 From: aleksej0R Date: Wed, 21 Dec 2022 15:09:27 +0000 Subject: [PATCH 27/29] Translated using Weblate (French) Currently translated at 55.8% (1438 of 2573 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/fr/ --- langs/layers/fr.json | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 67bd44a52c..50a36adb99 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -1830,7 +1830,39 @@ "1": { "then": "Ce feu de signalisation n'a pas de signal sonore pour aider à traverser." } - } + }, + "question": "Est-ce que le feu de signalisation a une signalisation sonore pour aider à traverser ?" + }, + "crossing-type": { + "mappings": { + "1": { + "then": "Passage piéton avec des feux de signalisation" + }, + "2": { + "then": "Passage piéton" + }, + "3": { + "then": "Passage piéton sans marquages" + }, + "0": { + "then": "Passage piéton, sans feux de signalisation" + } + }, + "question": "Quel type de passage piéton est-ce ?" + }, + "crossing-tactile": { + "mappings": { + "2": { + "then": "Ce passage piéton a une surface podotactile, mais elle n'est pas adéquate" + }, + "0": { + "then": "Ce passage piéton a une surface podotactile" + }, + "1": { + "then": "Ce passage piéton n'a pas de surface podotactile" + } + }, + "question": "Est-ce que ce passage piéton a une surface podotactile ?" } }, "title": { @@ -4742,4 +4774,4 @@ } } } -} \ No newline at end of file +} From f024c8c20670062d6b9265e85885c3ca0e4695cd Mon Sep 17 00:00:00 2001 From: aleksej0R Date: Fri, 23 Dec 2022 11:22:48 +0000 Subject: [PATCH 28/29] Translated using Weblate (French) Currently translated at 90.6% (359 of 396 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/fr/ --- langs/themes/fr.json | 169 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 167 insertions(+), 2 deletions(-) diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 21cf94d371..d4e57e6fb1 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -422,6 +422,15 @@ }, "6": { "then": "Cette rue n’est pas une rue cyclable" + }, + "1": { + "then": "Cette rue est une piste cyclable" + }, + "2": { + "then": "Cette rue est une piste cyclable (avec une limitation de vitesse a 30 km/h et les véhicules ne sont pas autorisés) (un panneau sera demandé plus tard)" + }, + "5": { + "then": "Cette rue va bientôt devenir une piste cyclable" } }, "question": "La rue {name} est-elle une rue cyclable ?" @@ -429,6 +438,26 @@ "2": { "question": "Quand cette rue deviendra-t-elle cyclable ?", "render": "Cette rue deviendra une rue cyclable le {cyclestreet:start_date}" + }, + "1": { + "mappings": { + "2": { + "then": "Motos autorisées" + }, + "3": { + "then": "Voitures autorisées" + }, + "0": { + "then": "Riverains autorisés" + }, + "1": { + "then": "Véhicules motorisés autorisés" + }, + "4": { + "then": "Il n'y a pas de panneaux supplémentaires à cette piste cyclable." + } + }, + "question": "Quel panneau comporte cette piste cyclable ?" } } }, @@ -647,7 +676,7 @@ "title": "Services de santé" }, "indoors": { - "description": "Cette carte présente les lieux intérieurs accessibles au public", + "description": "Sur cette carte, les lieux intérieurs accessibles au public sont montrés", "title": "Intérieurs" }, "kerbs_and_crossings": { @@ -948,5 +977,141 @@ "description": "Retrouvez les poubelles près de vous. Si une poubelle est manquante, vous pouvez l’ajouter vous même", "shortDescription": "Une carte des poubelles", "title": "Poubelles" + }, + "mapcomplete-changes": { + "layers": { + "0": { + "filter": { + "0": { + "options": { + "0": { + "question": "Nom de thème contenant {search}" + } + } + }, + "5": { + "options": { + "0": { + "question": "Langage utilisateur (code-iso) {search}" + } + } + }, + "6": { + "options": { + "0": { + "question": "Fait par le serveur {search}" + } + } + }, + "3": { + "options": { + "0": { + "question": "Fait avant {search}" + } + } + }, + "4": { + "options": { + "0": { + "question": "Fait après {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Fait par le contributeur {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Non réalisé par le contributeur{search}" + } + } + } + }, + "name": "Centres de modifications de paramètres", + "tagRenderings": { + "host": { + "render": "Changement avec {host}", + "question": "Depuis quel serveur (site web) ce changement a-t-il été fait ?" + }, + "locale": { + "question": "En quelle langue est-ce que ce changement a été fait ?", + "render": "La langue de l'utilisateur est {locale}" + }, + "contributor": { + "question": "Quel contributeur a fait ce changement ?", + "render": "Modification faite par {user}" + } + }, + "description": "Montre tous les changements de MapComplete" + } + }, + "description": "Cette carte montre tous les changements faits avec MapComplete" + }, + "bag": { + "description": "Ce thème aide à l'importation de données depuis BAG", + "layers": { + "0": { + "tagRenderings": { + "Reference": { + "mappings": { + "0": { + "then": "Ce bâtiment n'a pas de référence dans le BAG" + } + }, + "render": "La référence dans le BAG est {ref:bag}" + } + } + }, + "2": { + "description": "Bâtiments du registre BAG", + "tagRenderings": { + "Build year": { + "render": "Le bâtiment a été construit en {_bag_obj:start_date}", + "mappings": { + "0": { + "then": "Le bâtiment a été commencé en {_bag_obj:start_date}" + } + } + }, + "Building type": { + "mappings": { + "0": { + "then": "Le type de bâtiment sera {_bag_obj:construction}" + } + }, + "render": "Le type de bâtiment est {_bag_obj:building}" + }, + "Import button": { + "mappings": { + "0": { + "then": "Les valeurs correctes n'ont pas encore été calculées. Rafraichissez la page" + } + } + }, + "Reference": { + "render": "La référence dans BAG est {_bag_obj:ref:bag}" + } + } + } + }, + "shortDescription": "Outil de facilitation d'import BAG", + "title": "Facilitateur d'import BAG" + }, + "atm": { + "title": "Distributeurs DAB", + "description": "Cette carte montre les DABs pour retirer ou déposer de l'argent" + }, + "hotels": { + "description": "Sur cette carte, vous trouverez les hôtels dans votre zone", + "title": "Hôtels" + }, + "blind_osm": { + "description": "Aidez à cartographier les caractéristiques importantes pour les malvoyants", + "title": "OSM pour les malvoyants" } -} \ No newline at end of file +} From bb0eb85089522ad309b139634df7d401d7c56514 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 23 Dec 2022 14:46:05 +0100 Subject: [PATCH 29/29] Housekeeping... --- Docs/BuiltinIndex.md | 1 + Docs/Layers/atm.md | 40 ++- Docs/TagInfo/mapcomplete_atm.json | 42 +++ Docs/TagInfo/mapcomplete_personal.json | 42 +++ Docs/Themes/atm.md | 1 + Docs/Themes/bag.md | 1 + Docs/Themes/blind_osm.md | 1 + Docs/Themes/hotels.md | 1 + Docs/wikiIndex.txt | 6 +- assets/contributors.json | 2 +- assets/layers/atm/atm.json | 8 +- assets/layers/crossings/crossings.json | 30 +- assets/layers/tree_node/tree_node.json | 12 +- assets/themes/atm/atm.json | 6 +- assets/themes/bag/bag.json | 36 ++- assets/themes/blind_osm/blind_osm.json | 6 +- assets/themes/climbing/climbing.json | 2 +- assets/themes/cyclestreets/cyclestreets.json | 27 +- assets/themes/hotels/hotels.json | 6 +- assets/themes/indoors/indoors.json | 2 +- assets/translators.json | 10 +- langs/layers/de.json | 41 +-- langs/layers/en.json | 3 + langs/layers/fr.json | 36 +-- langs/themes/fr.json | 312 +++++++++---------- 25 files changed, 411 insertions(+), 263 deletions(-) diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 4d79673e17..52e764986e 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -80,6 +80,7 @@ - ambulancestation - artwork + - atm - barrier - bench - bench_at_pt diff --git a/Docs/Layers/atm.md b/Docs/Layers/atm.md index 9448f3bfdd..80e5f2e7ff 100644 --- a/Docs/Layers/atm.md +++ b/Docs/Layers/atm.md @@ -40,10 +40,10 @@ Elements must have the all of following tags to be shown on this layer: - - amenity=atm + - amenity=atm|amenity=bank&atm=yes -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22atm%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22atm%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bank%22%5D%5B%22atm%22%3D%22yes%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) @@ -67,6 +67,42 @@ attribute | type | values which are supported by this layer +### images + + + +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` + +This tagrendering has no question and is thus read-only + + + + + +### bank-images + + + +This tagrendering has no question and is thus read-only + + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bank` + + + +### atm-in-bank-notice + + + +This tagrendering has no question and is thus read-only + + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bank` + + + ### name diff --git a/Docs/TagInfo/mapcomplete_atm.json b/Docs/TagInfo/mapcomplete_atm.json index f4a0dcbea7..9d1ab888fe 100644 --- a/Docs/TagInfo/mapcomplete_atm.json +++ b/Docs/TagInfo/mapcomplete_atm.json @@ -15,6 +15,48 @@ "description": "The MapComplete theme ATM Machines has a layer ATMs showing features with this tag", "value": "atm" }, + { + "key": "amenity", + "description": "The MapComplete theme ATM Machines has a layer ATMs showing features with this tag", + "value": "bank" + }, + { + "key": "atm", + "description": "The MapComplete theme ATM Machines has a layer ATMs showing features with this tag", + "value": "yes" + }, + { + "key": "image", + "description": "The layer 'ATMs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'ATMs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'ATMs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'ATMs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "image", + "description": "The layer 'ATMs shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'ATMs shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'ATMs shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'ATMs shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" + }, { "key": "brand", "description": "Layer 'ATMs' shows and asks freeform values for key 'brand' (in the MapComplete.osm.be theme 'ATM Machines')" diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index 4fdb79d7c5..c15d4c96c9 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -344,6 +344,48 @@ "description": "The MapComplete theme Personal theme has a layer ATMs showing features with this tag", "value": "atm" }, + { + "key": "amenity", + "description": "The MapComplete theme Personal theme has a layer ATMs showing features with this tag", + "value": "bank" + }, + { + "key": "atm", + "description": "The MapComplete theme Personal theme has a layer ATMs showing features with this tag", + "value": "yes" + }, + { + "key": "image", + "description": "The layer 'ATMs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'ATMs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'ATMs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'ATMs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "image", + "description": "The layer 'ATMs shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'ATMs shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'ATMs shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'ATMs shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" + }, { "key": "brand", "description": "Layer 'ATMs' shows and asks freeform values for key 'brand' (in the MapComplete.osm.be theme 'Personal theme')" diff --git a/Docs/Themes/atm.md b/Docs/Themes/atm.md index 5ea4604fc6..a2300c93ac 100644 --- a/Docs/Themes/atm.md +++ b/Docs/Themes/atm.md @@ -25,6 +25,7 @@ Available languages: - en - de + - fr This document is autogenerated from [assets/themes/atm/atm.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/atm/atm.json) \ No newline at end of file diff --git a/Docs/Themes/bag.md b/Docs/Themes/bag.md index d07f90cac9..a0a0fdfeaf 100644 --- a/Docs/Themes/bag.md +++ b/Docs/Themes/bag.md @@ -30,6 +30,7 @@ Available languages: - nl - en - de + - fr This document is autogenerated from [assets/themes/bag/bag.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/bag/bag.json) \ No newline at end of file diff --git a/Docs/Themes/blind_osm.md b/Docs/Themes/blind_osm.md index 0974041374..d8f58f68dd 100644 --- a/Docs/Themes/blind_osm.md +++ b/Docs/Themes/blind_osm.md @@ -31,6 +31,7 @@ Available languages: - en - de - nl + - fr This document is autogenerated from [assets/themes/blind_osm/blind_osm.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/blind_osm/blind_osm.json) \ No newline at end of file diff --git a/Docs/Themes/hotels.md b/Docs/Themes/hotels.md index 2ccaf9eb39..0db174f82e 100644 --- a/Docs/Themes/hotels.md +++ b/Docs/Themes/hotels.md @@ -30,6 +30,7 @@ Available languages: - ca - nl - pa_PK + - fr This document is autogenerated from [assets/themes/hotels/hotels.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/hotels/hotels.json) \ No newline at end of file diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt index a76dd5381c..a6a334bdb6 100644 --- a/Docs/wikiIndex.txt +++ b/Docs/wikiIndex.txt @@ -112,7 +112,7 @@ {{service_item |name= [https://mapcomplete.osm.be/atm atm] |region= Worldwide -|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:_context|en}} +|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:_context|en}} |descr= A MapComplete theme: This map shows ATMs to withdraw or deposit money |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png @@ -157,7 +157,7 @@ {{service_item |name= [https://mapcomplete.osm.be/blind_osm blind_osm] |region= Worldwide -|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:nl|en}}, {{#language:_context|en}} +|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:nl|en}}, {{#language:fr|en}}, {{#language:_context|en}} |descr= A MapComplete theme: Help to map features relevant for the blind |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png @@ -274,7 +274,7 @@ {{service_item |name= [https://mapcomplete.osm.be/hotels hotels] |region= Worldwide -|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:da|en}}, {{#language:nb_NO|en}}, {{#language:nl|en}}, {{#language:_context|en}} +|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:da|en}}, {{#language:nb_NO|en}}, {{#language:nl|en}}, {{#language:fr|en}}, {{#language:_context|en}} |descr= A MapComplete theme: On this map, you'll find hotels in your area |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png diff --git a/assets/contributors.json b/assets/contributors.json index c861b131ef..264d23cfdf 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,7 +1,7 @@ { "contributors": [ { - "commits": 4747, + "commits": 4755, "contributor": "Pieter Vander Vennet" }, { diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index 04aa7e4038..6475ba4647 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -36,7 +36,10 @@ "or": [ "amenity=atm", { - "and": ["amenity=bank","atm=yes"] + "and": [ + "amenity=bank", + "atm=yes" + ] } ] } @@ -67,7 +70,6 @@ "render": "{image_carousel()}", "condition": "amenity=bank" }, - { "id": "atm-in-bank-notice", "condition": "amenity=bank", @@ -152,4 +154,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index e5b717d9ed..05ecce7c45 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -130,7 +130,8 @@ "en": "What kind of crossing is this?", "nl": "Wat voor oversteekplaats is dit?", "de": "Was ist das für eine Kreuzung?", - "es": "¿Qué tipo de cruce es este?" + "es": "¿Qué tipo de cruce es este?", + "fr": "Quel type de passage piéton est-ce ?" }, "condition": "highway=crossing", "mappings": [ @@ -140,7 +141,8 @@ "en": "Crossing, without traffic lights", "nl": "Oversteekplaats, zonder verkeerslichten", "de": "Kreuzungen ohne Ampeln", - "es": "Cruce, sin semáforos" + "es": "Cruce, sin semáforos", + "fr": "Passage piéton, sans feux de signalisation" } }, { @@ -149,7 +151,8 @@ "en": "Crossing with traffic signals", "nl": "Oversteekplaats met verkeerslichten", "de": "Kreuzungen mit Ampeln", - "es": "Cruce con señales de tráfico" + "es": "Cruce con señales de tráfico", + "fr": "Passage piéton avec des feux de signalisation" } }, { @@ -159,7 +162,8 @@ "nl": "Zebrapad", "de": "Zebrastreifen", "ca": "Pas de zebra", - "es": "Paso de cebra" + "es": "Paso de cebra", + "fr": "Passage piéton" }, "hideInAnswer": true }, @@ -169,7 +173,8 @@ "en": "Crossing without crossing markings", "nl": "Oversteekplaats zonder kruispuntmarkeringen", "de": "Kreuzung ohne Kreuzungsmarkierungen", - "es": "Cruce sin marcas de cruce" + "es": "Cruce sin marcas de cruce", + "fr": "Passage piéton sans marquages" } } ] @@ -279,7 +284,8 @@ "en": "Does this crossing have tactile paving?", "nl": "Heeft deze oversteekplaats een geleidelijn?", "de": "Gibt es an dieser Kreuzung ein Blindenleitsystem?", - "es": "¿Tiene pavimento táctil este cruce?" + "es": "¿Tiene pavimento táctil este cruce?", + "fr": "Est-ce que ce passage piéton a une surface podotactile ?" }, "condition": "highway=crossing", "mappings": [ @@ -289,7 +295,8 @@ "en": "This crossing has tactile paving", "nl": "Deze oversteekplaats heeft een geleidelijn", "de": "An dieser Kreuzung gibt es ein Blindenleitsystem", - "es": "Este cruce tiene pavimento táctil" + "es": "Este cruce tiene pavimento táctil", + "fr": "Ce passage piéton a une surface podotactile" } }, { @@ -298,7 +305,8 @@ "en": "This crossing does not have tactile paving", "nl": "Deze oversteekplaats heeft geen geleidelijn", "de": "Diese Kreuzung hat kein Blindenleitsystem", - "es": "Este cruce no tiene pavimento táctil" + "es": "Este cruce no tiene pavimento táctil", + "fr": "Ce passage piéton n'a pas de surface podotactile" } }, { @@ -307,7 +315,8 @@ "en": "This crossing has tactile paving, but is not correct", "nl": "Deze oversteekplaats heeft een geleidelijn, die incorrect is.", "de": "Diese Kreuzung hat taktile Pflasterung, ist aber nicht korrekt", - "es": "Este cruce tiene pavimento táctil, pero no es correcto" + "es": "Este cruce tiene pavimento táctil, pero no es correcto", + "fr": "Ce passage piéton a une surface podotactile, mais elle n'est pas adéquate" }, "hideInAnswer": true } @@ -352,7 +361,8 @@ "id": "crossing-sound", "question": { "en": "Does this traffic light have sound signals to aid crossing?", - "de": "Gibt die Ampel akustische Signale, um das Überqueren zu erleichtern?" + "de": "Gibt die Ampel akustische Signale, um das Überqueren zu erleichtern?", + "fr": "Est-ce que le feu de signalisation a une signalisation sonore pour aider à traverser ?" }, "condition": "crossing=traffic_signals", "mappings": [ diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index 58b2028d4f..c808739b3d 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -119,10 +119,12 @@ { "id": "circumference", "question": { - "en": "What is the circumference of the tree trunk?

This is measured at a height of 1.30m

" + "en": "What is the circumference of the tree trunk?

This is measured at a height of 1.30m

", + "de": "Wie groß ist der Umfang des Baumstammes?

Dies wird in einer Höhe von 1,30 m gemessen

" }, "render": { - "en": "The tree trunk has a circumference of {circumference} meter" + "en": "The tree trunk has a circumference of {circumference} meter", + "de": "Der Baumstamm hat einen Umfang von {circumference} Meter" }, "freeform": { "key": "circumference", @@ -133,7 +135,8 @@ { "id": "height", "question": { - "en": "What is the height of this tree?" + "en": "What is the height of this tree?", + "de": "Wie hoch ist dieser Baum?" }, "freeform": { "key": "height", @@ -141,7 +144,8 @@ "inline": true }, "render": { - "en": "This tree is {height} meter high" + "en": "This tree is {height} meter high", + "de": "Dieser Baum ist {height} Meter hoch" } }, { diff --git a/assets/themes/atm/atm.json b/assets/themes/atm/atm.json index 32da0a1b37..859a83a8fc 100644 --- a/assets/themes/atm/atm.json +++ b/assets/themes/atm/atm.json @@ -2,11 +2,13 @@ "id": "atm", "title": { "en": "ATM Machines", - "de": "Geldautomaten" + "de": "Geldautomaten", + "fr": "Distributeurs DAB" }, "description": { "en": "This map shows ATMs to withdraw or deposit money", - "de": "Diese Karte zeigt Geldautomaten zum Abheben oder Einzahlen von Geld" + "de": "Diese Karte zeigt Geldautomaten zum Abheben oder Einzahlen von Geld", + "fr": "Cette carte montre les DABs pour retirer ou déposer de l'argent" }, "icon": "./assets/themes/atm/logo.svg", "startLat": 0, diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json index 770765b6dc..1b698aa175 100644 --- a/assets/themes/bag/bag.json +++ b/assets/themes/bag/bag.json @@ -3,18 +3,21 @@ "title": { "nl": "BAG import helper", "en": "BAG import helper", - "de": "BAG-Importhilfe" + "de": "BAG-Importhilfe", + "fr": "Facilitateur d'import BAG" }, "shortDescription": { "nl": "BAG import helper tool", "en": "BAG import helper tool", - "de": "BAG-Import-Hilfswerkzeug" + "de": "BAG-Import-Hilfswerkzeug", + "fr": "Outil de facilitation d'import BAG" }, "description": { "nl": "Dit thema helpt het importeren van BAG data", "en": "This theme helps with importing data from BAG", "cs": "Toto téma pomáhá s importem dat ze systému BAG", - "de": "Dieses Thema hilft beim Importieren von BAG-Daten" + "de": "Dieses Thema hilft beim Importieren von BAG-Daten", + "fr": "Ce thème aide à l'importation de données depuis BAG" }, "credits": "Wouter van der Wal", "icon": "./assets/themes/bag/logo.svg", @@ -84,7 +87,8 @@ "render": { "en": "The reference in BAG is {ref:bag}", "de": "Die Referenz in BAG ist {ref:bag}", - "nl": "De referentie in BAG is {ref:bag}" + "nl": "De referentie in BAG is {ref:bag}", + "fr": "La référence dans le BAG est {ref:bag}" }, "mappings": [ { @@ -93,7 +97,8 @@ "en": "This building has no reference in the BAG", "cs": "Tato budova nemá v BAG žádný odkaz", "de": "Dieses Gebäude hat keinen Verweis im BAG", - "nl": "Dit gebouw heeft geen referentie in de BAG" + "nl": "Dit gebouw heeft geen referentie in de BAG", + "fr": "Ce bâtiment n'a pas de référence dans le BAG" } } ] @@ -155,7 +160,8 @@ "description": { "en": "Buildings from BAG register", "de": "Gebäude aus dem BAG-Register", - "nl": "Gebouw uit de BAG" + "nl": "Gebouw uit de BAG", + "fr": "Bâtiments du registre BAG" }, "source": { "geoJson": "https://service.pdok.nl/lv/bag/wfs/v2_0?request=GetFeature&service=WFS&version=2.0.0&outputFormat=application%2Fjson%3B%20subtype%3Dgeojson&typeName=bag%3Apand&bbox={x_min}%2C{y_min}%2C{x_max}%2C{y_max}%2CCRS84&srsName=EPSG%3A4326", @@ -218,7 +224,8 @@ "then": { "en": "Didn't calculate the correct values yet. Refresh this page", "de": "Richtige Werte noch nicht berechnet. Aktualisieren Sie diese Seite", - "nl": "Correcte waarden nog niet berekend. Herlaad deze pagina" + "nl": "Correcte waarden nog niet berekend. Herlaad deze pagina", + "fr": "Les valeurs correctes n'ont pas encore été calculées. Rafraichissez la page" } }, { @@ -242,7 +249,8 @@ "render": { "en": "The reference in BAG is {_bag_obj:ref:bag}", "de": "Die Referenz in BAG ist {_bag_obj:ref:bag}", - "nl": "De referentie in BAG is {_bag_obj:ref:bag}" + "nl": "De referentie in BAG is {_bag_obj:ref:bag}", + "fr": "La référence dans BAG est {_bag_obj:ref:bag}" } }, { @@ -251,7 +259,8 @@ "en": "This building was built in {_bag_obj:start_date}", "de": "Dieses Gebäude wurde gebaut in {_bag_obj:start_date}", "pt_BR": "Esta construção é de {_bag_obj:start_date}", - "nl": "Dit gebouw is gebouwd in {_bag_obj:start_date}" + "nl": "Dit gebouw is gebouwd in {_bag_obj:start_date}", + "fr": "Le bâtiment a été construit en {_bag_obj:start_date}" }, "mappings": [ { @@ -259,7 +268,8 @@ "then": { "en": "The building was started in {_bag_obj:start_date}", "de": "Der Bau wurde in {_bag_obj:start_date} begonnen", - "nl": "De bouw van dit gebouw is gestart in {_bag_obj:start_date}" + "nl": "De bouw van dit gebouw is gestart in {_bag_obj:start_date}", + "fr": "Le bâtiment a été commencé en {_bag_obj:start_date}" } } ] @@ -269,7 +279,8 @@ "render": { "en": "The building type is a {_bag_obj:building}", "de": "Der Gebäudetyp ist ein {_bag_obj:building}", - "nl": "Het gebouwtype is {_bag_obj:building}" + "nl": "Het gebouwtype is {_bag_obj:building}", + "fr": "Le type de bâtiment est {_bag_obj:building}" }, "mappings": [ { @@ -277,7 +288,8 @@ "then": { "en": "The building type will be a {_bag_obj:construction}", "de": "Der Gebäudetyp ist ein {_bag_obj:construction}", - "nl": "Het gebouwtype wordt {_bag_obj:construction}" + "nl": "Het gebouwtype wordt {_bag_obj:construction}", + "fr": "Le type de bâtiment sera {_bag_obj:construction}" } } ] diff --git a/assets/themes/blind_osm/blind_osm.json b/assets/themes/blind_osm/blind_osm.json index 4009fd570d..1215be7853 100644 --- a/assets/themes/blind_osm/blind_osm.json +++ b/assets/themes/blind_osm/blind_osm.json @@ -3,12 +3,14 @@ "title": { "en": "OSM for the blind", "de": "OSM für Blinde", - "nl": "OSM voor blinden" + "nl": "OSM voor blinden", + "fr": "OSM pour les malvoyants" }, "description": { "en": "Help to map features relevant for the blind", "de": "Hilfe zur Kartierung blindenrelevanter Merkmale", - "nl": "Help zaken die relevant zijn voor blinden in kaart te brengen" + "nl": "Help zaken die relevant zijn voor blinden in kaart te brengen", + "fr": "Aidez à cartographier les caractéristiques importantes pour les malvoyants" }, "icon": "./assets/themes/blind_osm/Blindicon.svg", "startLat": 52.99238, diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index 5584ea44b6..e4f336690c 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -309,4 +309,4 @@ } ], "credits": "Christian Neumann " -} +} \ No newline at end of file diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json index f35a423447..9bb453c5ee 100644 --- a/assets/themes/cyclestreets/cyclestreets.json +++ b/assets/themes/cyclestreets/cyclestreets.json @@ -405,7 +405,8 @@ "then": { "en": "This street is a bicycle road", "de": "Diese Straße ist eine Fahrradstraße", - "nl": "Deze straat is een fietsstraat" + "nl": "Deze straat is een fietsstraat", + "fr": "Cette rue est une piste cyclable" }, "hideInAnswer": true }, @@ -423,7 +424,8 @@ "then": { "en": "This street is a bicycle road (has a speed limit of 30 km/h and vehicles are not allowed) (sign will be asked later)", "de": "Diese Straße ist eine Fahrradstraße (hat eine Geschwindigkeitsbegrenzung von 30 km/h und Fahrzeuge sind nicht erlaubt) (Schild wird später abgefragt)", - "nl": "Deze straat is een fietsstraat (snelheid van 30 km/h en voertuigen niet toegestaan) (bord wordt later gevraagd)" + "nl": "Deze straat is een fietsstraat (snelheid van 30 km/h en voertuigen niet toegestaan) (bord wordt later gevraagd)", + "fr": "Cette rue est une piste cyclable (avec une limitation de vitesse a 30 km/h et les véhicules ne sont pas autorisés) (un panneau sera demandé plus tard)" }, "hideInAnswer": "_country!=de" }, @@ -486,7 +488,8 @@ "then": { "en": "This street will become a bicycle road soon", "de": "Diese Straße wird bald zu einer Fahrradstraße", - "nl": "Deze straat wordt binnenkort een fietsstraat" + "nl": "Deze straat wordt binnenkort een fietsstraat", + "fr": "Cette rue va bientôt devenir une piste cyclable" }, "hideInAnswer": "_country!=de" }, @@ -526,7 +529,8 @@ "question": { "en": "What sign does this bicycle road have?", "de": "Welches Schild hat diese Fahrradstraße?", - "nl": "Welk bord heeft deze fietsstraat?" + "nl": "Welk bord heeft deze fietsstraat?", + "fr": "Quel panneau comporte cette piste cyclable ?" }, "mappings": [ { @@ -534,7 +538,8 @@ "then": { "en": "Residents allowed", "de": "Anlieger frei", - "nl": "Aanwonenden toegestaan" + "nl": "Aanwonenden toegestaan", + "fr": "Riverains autorisés" }, "icon": { "path": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg", @@ -552,7 +557,8 @@ "then": { "en": "Motor vehicles allowed", "de": "KFZ frei", - "nl": "Motorvoertuigen toegestaan" + "nl": "Motorvoertuigen toegestaan", + "fr": "Véhicules motorisés autorisés" }, "icon": { "path": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg", @@ -571,7 +577,8 @@ "en": "Motorcycles allowed", "de": "Motorräder frei", "pa_PK": "موٹرسائیکلاں دی اِجازت اے", - "nl": "Motoren toegestaan" + "nl": "Motoren toegestaan", + "fr": "Motos autorisées" }, "icon": { "path": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg", @@ -590,7 +597,8 @@ "en": "Cars allowed", "de": "Autos erlaubt", "pa_PK": "موٹرکاراں دی اِجازت اے", - "nl": "Auto's toegestaan" + "nl": "Auto's toegestaan", + "fr": "Voitures autorisées" }, "icon": { "path": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg", @@ -608,7 +616,8 @@ "then": { "en": "There are no supplementary signs at this bicycle road.", "de": "An dieser Fahrradstraße gibt es keine zusätzlichen Schilder.", - "nl": "Er zijn geen onderborden bij deze fietsstraat." + "nl": "Er zijn geen onderborden bij deze fietsstraat.", + "fr": "Il n'y a pas de panneaux supplémentaires à cette piste cyclable." }, "icon": { "path": "./assets/themes/cyclestreets/Zeichen_244.svg", diff --git a/assets/themes/hotels/hotels.json b/assets/themes/hotels/hotels.json index 9f2736a810..8109da433b 100644 --- a/assets/themes/hotels/hotels.json +++ b/assets/themes/hotels/hotels.json @@ -7,14 +7,16 @@ "nb_NO": "Hoteller", "ca": "Hotels", "nl": "Hotels", - "pa_PK": "ہوٹیل" + "pa_PK": "ہوٹیل", + "fr": "Hôtels" }, "description": { "en": "On this map, you'll find hotels in your area", "de": "Auf dieser Karte finden Sie Hotels in Ihrer Nähe", "da": "På dette kort finder du hoteller i dit område", "nb_NO": "På dette kartet finner du hoteller der du er", - "nl": "Op deze kaart vind je hotels in je omgeving" + "nl": "Op deze kaart vind je hotels in je omgeving", + "fr": "Sur cette carte, vous trouverez les hôtels dans votre zone" }, "icon": "./assets/layers/hotel/hotel.svg", "startLat": 50.8552, diff --git a/assets/themes/indoors/indoors.json b/assets/themes/indoors/indoors.json index bb50865629..518c09834f 100644 --- a/assets/themes/indoors/indoors.json +++ b/assets/themes/indoors/indoors.json @@ -13,7 +13,7 @@ "description": { "en": "On this map, publicly accessible indoor places are shown", "de": "Diese Karte zeigt öffentlich zugängliche Innenräume", - "fr": "Cette carte présente les lieux intérieurs accessibles au public", + "fr": "Sur cette carte, les lieux intérieurs accessibles au public sont montrés", "da": "På dette kort er offentligt tilgængelige indendørs steder vist", "nl": "Op deze kaart worden publiek toegankelijke binnenruimtes getoond" }, diff --git a/assets/translators.json b/assets/translators.json index 4beeffbace..05d2453f9e 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -184,6 +184,10 @@ "commits": 5, "contributor": "Alexey Shabanov" }, + { + "commits": 4, + "contributor": "mcliquid" + }, { "commits": 4, "contributor": "Hiroshi Miura" @@ -210,7 +214,7 @@ }, { "commits": 3, - "contributor": "mcliquid" + "contributor": "aleksej0R" }, { "commits": 3, @@ -328,10 +332,6 @@ "commits": 2, "contributor": "Leo Alcaraz" }, - { - "commits": 1, - "contributor": "aleksej0R" - }, { "commits": 1, "contributor": "Lucas" diff --git a/langs/layers/de.json b/langs/layers/de.json index 8db767cc38..e9d0d91373 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -7037,12 +7037,6 @@ "render_single_language": "Die Treppe hat taktile Schrift in {language():font-bold}" } } - }, - "multilevels": { - "override": { - "render": "Diese Treppen befinden sich zwischen den Ebenen {level}", - "question": "Zwischen welchen Ebenen befinden sich diese Treppen?" - } } }, "title": { @@ -7422,18 +7416,6 @@ }, "question": "Wer ist der Betreiber dieses Fahrkartenentwerters?", "render": "Dieser Fahrkartenentwerter wird betrieben von {operator}" - }, - "payment-options": { - "override": { - "mappings+": { - "0": { - "then": "Dieser Ticketentwerter akzeptiert OV-Chipkarten" - }, - "1": { - "then": "Dieser Ticketentwerter akzeptiert OV-Chipkarten" - } - } - } } }, "title": { @@ -7700,11 +7682,6 @@ "wheelchair-door-width": { "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?", "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit" - }, - "opening_hours": { - "override": { - "question": "Wann ist die Einrichtung, in der sich diese Toiletten befinden, geöffnet?" - } } }, "title": { @@ -7959,6 +7936,14 @@ } }, "tagRenderings": { + "circumference": { + "question": "Wie groß ist der Umfang des Baumstammes?

Dies wird in einer Höhe von 1,30 m gemessen

", + "render": "Der Baumstamm hat einen Umfang von {circumference} Meter" + }, + "height": { + "question": "Wie hoch ist dieser Baum?", + "render": "Dieser Baum ist {height} Meter hoch" + }, "tree-decidouous": { "mappings": { "0": { @@ -8052,14 +8037,6 @@ "tree_node-wikidata": { "question": "Was ist das passende Wikidata Element zu diesem Baum?", "render": "\"\"/ Wikidata: {wikidata}" - }, - "circumference": { - "question": "Wie groß ist der Umfang des Baumstammes?

Dies wird in einer Höhe von 1,30 m gemessen

", - "render": "Der Baumstamm hat einen Umfang von {circumference} Meter" - }, - "height": { - "question": "Wie hoch ist dieser Baum?", - "render": "Dieser Baum ist {height} Meter hoch" } }, "title": { @@ -8372,4 +8349,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index e2cce64af9..39168d3b02 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -176,6 +176,9 @@ } }, "tagRenderings": { + "atm-in-bank-notice": { + "render": "This ATM is located in or near a bank" + }, "brand": { "freeform": { "placeholder": "Brand name" diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 50a36adb99..1bed0bb954 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -1833,8 +1833,25 @@ }, "question": "Est-ce que le feu de signalisation a une signalisation sonore pour aider à traverser ?" }, + "crossing-tactile": { + "mappings": { + "0": { + "then": "Ce passage piéton a une surface podotactile" + }, + "1": { + "then": "Ce passage piéton n'a pas de surface podotactile" + }, + "2": { + "then": "Ce passage piéton a une surface podotactile, mais elle n'est pas adéquate" + } + }, + "question": "Est-ce que ce passage piéton a une surface podotactile ?" + }, "crossing-type": { "mappings": { + "0": { + "then": "Passage piéton, sans feux de signalisation" + }, "1": { "then": "Passage piéton avec des feux de signalisation" }, @@ -1843,26 +1860,9 @@ }, "3": { "then": "Passage piéton sans marquages" - }, - "0": { - "then": "Passage piéton, sans feux de signalisation" } }, "question": "Quel type de passage piéton est-ce ?" - }, - "crossing-tactile": { - "mappings": { - "2": { - "then": "Ce passage piéton a une surface podotactile, mais elle n'est pas adéquate" - }, - "0": { - "then": "Ce passage piéton a une surface podotactile" - }, - "1": { - "then": "Ce passage piéton n'a pas de surface podotactile" - } - }, - "question": "Est-ce que ce passage piéton a une surface podotactile ?" } }, "title": { @@ -4774,4 +4774,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/themes/fr.json b/langs/themes/fr.json index d4e57e6fb1..dc9fb5be13 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -7,6 +7,60 @@ "description": "Une carte ouverte de statues, bustes, graffitis et autres œuvres d'art de par le monde", "title": "Carte ouverte des œuvres d'art" }, + "atm": { + "description": "Cette carte montre les DABs pour retirer ou déposer de l'argent", + "title": "Distributeurs DAB" + }, + "bag": { + "description": "Ce thème aide à l'importation de données depuis BAG", + "layers": { + "0": { + "tagRenderings": { + "Reference": { + "mappings": { + "0": { + "then": "Ce bâtiment n'a pas de référence dans le BAG" + } + }, + "render": "La référence dans le BAG est {ref:bag}" + } + } + }, + "2": { + "description": "Bâtiments du registre BAG", + "tagRenderings": { + "Build year": { + "mappings": { + "0": { + "then": "Le bâtiment a été commencé en {_bag_obj:start_date}" + } + }, + "render": "Le bâtiment a été construit en {_bag_obj:start_date}" + }, + "Building type": { + "mappings": { + "0": { + "then": "Le type de bâtiment sera {_bag_obj:construction}" + } + }, + "render": "Le type de bâtiment est {_bag_obj:building}" + }, + "Import button": { + "mappings": { + "0": { + "then": "Les valeurs correctes n'ont pas encore été calculées. Rafraichissez la page" + } + } + }, + "Reference": { + "render": "La référence dans BAG est {_bag_obj:ref:bag}" + } + } + } + }, + "shortDescription": "Outil de facilitation d'import BAG", + "title": "Facilitateur d'import BAG" + }, "benches": { "description": "Cette carte affiche les bancs cartographiés dans OpenStreetMap, entre autres : bancs des transports en commun, bancs publics, etc. À l'aide de votre compte OpenStreetMap, vous pourrez ajouter de nouveaux bancs ou modifier les bancs existants.", "shortDescription": "Carte des bancs", @@ -26,6 +80,10 @@ "shortDescription": "Une carte de jumelles panoramiques", "title": "Jumelles" }, + "blind_osm": { + "description": "Aidez à cartographier les caractéristiques importantes pour les malvoyants", + "title": "OSM pour les malvoyants" + }, "bookcases": { "description": "Une microbibliothèques, également appelée boite à livre, est un élément de mobilier urbain (étagère, armoire, etc) dans lequel sont stockés des livres et autres objets en accès libre. Découvrez les boites à livres prêt de chez vous, ou ajouter en une nouvelle à l'aide de votre compte OpenStreetMap.", "title": "Carte des microbibliothèques" @@ -414,50 +472,50 @@ "0": { "then": "Cette rue est une rue cyclable (et est limitée à 30 km/h)" }, - "3": { - "then": "Cette rue est une rue cyclable" - }, - "4": { - "then": "Cette rue sera bientôt une rue cyclable" - }, - "6": { - "then": "Cette rue n’est pas une rue cyclable" - }, "1": { "then": "Cette rue est une piste cyclable" }, "2": { "then": "Cette rue est une piste cyclable (avec une limitation de vitesse a 30 km/h et les véhicules ne sont pas autorisés) (un panneau sera demandé plus tard)" }, + "3": { + "then": "Cette rue est une rue cyclable" + }, + "4": { + "then": "Cette rue sera bientôt une rue cyclable" + }, "5": { "then": "Cette rue va bientôt devenir une piste cyclable" + }, + "6": { + "then": "Cette rue n’est pas une rue cyclable" } }, "question": "La rue {name} est-elle une rue cyclable ?" }, - "2": { - "question": "Quand cette rue deviendra-t-elle cyclable ?", - "render": "Cette rue deviendra une rue cyclable le {cyclestreet:start_date}" - }, "1": { "mappings": { - "2": { - "then": "Motos autorisées" - }, - "3": { - "then": "Voitures autorisées" - }, "0": { "then": "Riverains autorisés" }, "1": { "then": "Véhicules motorisés autorisés" }, + "2": { + "then": "Motos autorisées" + }, + "3": { + "then": "Voitures autorisées" + }, "4": { "then": "Il n'y a pas de panneaux supplémentaires à cette piste cyclable." } }, "question": "Quel panneau comporte cette piste cyclable ?" + }, + "2": { + "question": "Quand cette rue deviendra-t-elle cyclable ?", + "render": "Cette rue deviendra une rue cyclable le {cyclestreet:start_date}" } } }, @@ -675,6 +733,10 @@ "description": "Cette carte affiche différents éléments liés à la santé", "title": "Services de santé" }, + "hotels": { + "description": "Sur cette carte, vous trouverez les hôtels dans votre zone", + "title": "Hôtels" + }, "indoors": { "description": "Sur cette carte, les lieux intérieurs accessibles au public sont montrés", "title": "Intérieurs" @@ -683,6 +745,80 @@ "description": "Une carte affichant les ressauts et traversées.", "title": "Ressauts et traversées" }, + "mapcomplete-changes": { + "description": "Cette carte montre tous les changements faits avec MapComplete", + "layers": { + "0": { + "description": "Montre tous les changements de MapComplete", + "filter": { + "0": { + "options": { + "0": { + "question": "Nom de thème contenant {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Fait par le contributeur {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Non réalisé par le contributeur{search}" + } + } + }, + "3": { + "options": { + "0": { + "question": "Fait avant {search}" + } + } + }, + "4": { + "options": { + "0": { + "question": "Fait après {search}" + } + } + }, + "5": { + "options": { + "0": { + "question": "Langage utilisateur (code-iso) {search}" + } + } + }, + "6": { + "options": { + "0": { + "question": "Fait par le serveur {search}" + } + } + } + }, + "name": "Centres de modifications de paramètres", + "tagRenderings": { + "contributor": { + "question": "Quel contributeur a fait ce changement ?", + "render": "Modification faite par {user}" + }, + "host": { + "question": "Depuis quel serveur (site web) ce changement a-t-il été fait ?", + "render": "Changement avec {host}" + }, + "locale": { + "question": "En quelle langue est-ce que ce changement a été fait ?", + "render": "La langue de l'utilisateur est {locale}" + } + } + } + } + }, "maproulette": { "description": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.", "title": "Tâches MapRoulette" @@ -977,141 +1113,5 @@ "description": "Retrouvez les poubelles près de vous. Si une poubelle est manquante, vous pouvez l’ajouter vous même", "shortDescription": "Une carte des poubelles", "title": "Poubelles" - }, - "mapcomplete-changes": { - "layers": { - "0": { - "filter": { - "0": { - "options": { - "0": { - "question": "Nom de thème contenant {search}" - } - } - }, - "5": { - "options": { - "0": { - "question": "Langage utilisateur (code-iso) {search}" - } - } - }, - "6": { - "options": { - "0": { - "question": "Fait par le serveur {search}" - } - } - }, - "3": { - "options": { - "0": { - "question": "Fait avant {search}" - } - } - }, - "4": { - "options": { - "0": { - "question": "Fait après {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Fait par le contributeur {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Non réalisé par le contributeur{search}" - } - } - } - }, - "name": "Centres de modifications de paramètres", - "tagRenderings": { - "host": { - "render": "Changement avec {host}", - "question": "Depuis quel serveur (site web) ce changement a-t-il été fait ?" - }, - "locale": { - "question": "En quelle langue est-ce que ce changement a été fait ?", - "render": "La langue de l'utilisateur est {locale}" - }, - "contributor": { - "question": "Quel contributeur a fait ce changement ?", - "render": "Modification faite par {user}" - } - }, - "description": "Montre tous les changements de MapComplete" - } - }, - "description": "Cette carte montre tous les changements faits avec MapComplete" - }, - "bag": { - "description": "Ce thème aide à l'importation de données depuis BAG", - "layers": { - "0": { - "tagRenderings": { - "Reference": { - "mappings": { - "0": { - "then": "Ce bâtiment n'a pas de référence dans le BAG" - } - }, - "render": "La référence dans le BAG est {ref:bag}" - } - } - }, - "2": { - "description": "Bâtiments du registre BAG", - "tagRenderings": { - "Build year": { - "render": "Le bâtiment a été construit en {_bag_obj:start_date}", - "mappings": { - "0": { - "then": "Le bâtiment a été commencé en {_bag_obj:start_date}" - } - } - }, - "Building type": { - "mappings": { - "0": { - "then": "Le type de bâtiment sera {_bag_obj:construction}" - } - }, - "render": "Le type de bâtiment est {_bag_obj:building}" - }, - "Import button": { - "mappings": { - "0": { - "then": "Les valeurs correctes n'ont pas encore été calculées. Rafraichissez la page" - } - } - }, - "Reference": { - "render": "La référence dans BAG est {_bag_obj:ref:bag}" - } - } - } - }, - "shortDescription": "Outil de facilitation d'import BAG", - "title": "Facilitateur d'import BAG" - }, - "atm": { - "title": "Distributeurs DAB", - "description": "Cette carte montre les DABs pour retirer ou déposer de l'argent" - }, - "hotels": { - "description": "Sur cette carte, vous trouverez les hôtels dans votre zone", - "title": "Hôtels" - }, - "blind_osm": { - "description": "Aidez à cartographier les caractéristiques importantes pour les malvoyants", - "title": "OSM pour les malvoyants" } -} +} \ No newline at end of file