From 14e0cdf250e17a37c752aebec68bc942c17111fb Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 8 Mar 2023 17:29:30 +0100 Subject: [PATCH 1/8] chore: fix typing error --- UI/BigComponents/CopyrightPanel.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/UI/BigComponents/CopyrightPanel.ts b/UI/BigComponents/CopyrightPanel.ts index 2cdadec7e..9f55ce994 100644 --- a/UI/BigComponents/CopyrightPanel.ts +++ b/UI/BigComponents/CopyrightPanel.ts @@ -118,7 +118,6 @@ export default class CopyrightPanel extends Combine { currentBounds: Store locationControl: UIEventSource osmConnection: OsmConnection - isTranslator: Store }) { const t = Translations.t.general.attribution const layoutToUse = state.layoutToUse From 54729b3c33f8545ece6f34d3950ca83adc06c22c Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 8 Mar 2023 18:16:05 +0100 Subject: [PATCH 2/8] chore: automated housekeeping... --- Docs/BuiltinQuestions.md | 2 +- Docs/Layers/artwork.md | 2 +- Docs/Layers/bench.md | 4 +- Docs/Layers/bicycle_library.md | 2 +- Docs/Layers/bike_shop.md | 2 +- Docs/Layers/bike_themed_object.md | 2 +- Docs/Layers/climbing_route.md | 2 +- Docs/Layers/entrance.md | 2 +- Docs/Layers/sport_pitch.md | 18 ++ Docs/Layers/toilet.md | 2 +- Docs/Layers/toilet_at_amenity.md | 2 +- Docs/Layers/usersettings.md | 17 ++ Docs/SpecialInputElements.md | 9 +- assets/contributors.json | 8 +- .../mapcomplete-changes.json | 179 +++--------------- assets/themes/uk_addresses/uk_addresses.json | 2 +- assets/themes/waste_assen/waste_assen.json | 2 +- 17 files changed, 81 insertions(+), 176 deletions(-) diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index 907d16c18..5d496085d 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -253,7 +253,7 @@ Are dogs allowed in this business? {description} -Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts +Is there still something relevant you couldn't give in the previous questions? Add it here. diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md index 30edeb27c..f83d13c86 100644 --- a/Docs/Layers/artwork.md +++ b/Docs/Layers/artwork.md @@ -378,7 +378,7 @@ This tagrendering has labels `bench-questions` -The question is *Does this bench have an inscription?
E.g. on a mounted plaque, in the backrest, ...
* +The question is *Does this bench have an inscription?* This rendering asks information about the property [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) diff --git a/Docs/Layers/bench.md b/Docs/Layers/bench.md index 492b54da4..f9dfc60ea 100644 --- a/Docs/Layers/bench.md +++ b/Docs/Layers/bench.md @@ -225,7 +225,7 @@ This tagrendering has labels `bench-questions` -The question is *Does this bench have an inscription?
E.g. on a mounted plaque, in the backrest, ...
* +The question is *Does this bench have an inscription?* This rendering asks information about the property [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) @@ -248,7 +248,7 @@ This tagrendering has labels `bench-questions` -The question is *Does this bench have an artistic element?
E.g. it has an integrated painting, statue or other non-trivial, creative work
* +The question is *Does this bench have an artistic element?* diff --git a/Docs/Layers/bicycle_library.md b/Docs/Layers/bicycle_library.md index a5ed32cb6..a730f4076 100644 --- a/Docs/Layers/bicycle_library.md +++ b/Docs/Layers/bicycle_library.md @@ -214,7 +214,7 @@ The question is *Who can loan bicycles here?* -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md index bc5e447ba..5ca275fcf 100644 --- a/Docs/Layers/bike_shop.md +++ b/Docs/Layers/bike_shop.md @@ -518,7 +518,7 @@ This is rendered with `Using the cleaning service costs {service:bicycle:cleani -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/bike_themed_object.md b/Docs/Layers/bike_themed_object.md index ddd0e9ee5..2db33554a 100644 --- a/Docs/Layers/bike_themed_object.md +++ b/Docs/Layers/bike_themed_object.md @@ -85,7 +85,7 @@ This tagrendering has no question and is thus read-only -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/climbing_route.md b/Docs/Layers/climbing_route.md index d4bad7baf..a453fbe35 100644 --- a/Docs/Layers/climbing_route.md +++ b/Docs/Layers/climbing_route.md @@ -153,7 +153,7 @@ This is rendered with `This route has {climbing:bolts} bolts
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/entrance.md b/Docs/Layers/entrance.md index e9687b296..3e2d67c48 100644 --- a/Docs/Layers/entrance.md +++ b/Docs/Layers/entrance.md @@ -140,7 +140,7 @@ The question is *What type of entrance is this?* -The question is *What is the type of this door?
Wether or not the door is automated is asked in the next question* +The question is *What is the type of this door?* diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md index 442022688..14b8f1b80 100644 --- a/Docs/Layers/sport_pitch.md +++ b/Docs/Layers/sport_pitch.md @@ -247,6 +247,24 @@ This tagrendering has no question and is thus read-only +id | question | osmTags +---- | ---------- | --------- +accessibility.0 | Publicly accessible | access=yes\|access=public| + + + + +id | question | osmTags +---- | ---------- | --------- +available_sports.0 | All sports (default) | +available_sports.1 | Basketball fields | sport=basketball +available_sports.2 | Soccer fields | sport=soccer +available_sports.3 | Ping-pong table | sport=table_tennis +available_sports.4 | Tennis field | sport=tennis + + + + id | question | osmTags ---- | ---------- | --------- open_now.0 | Opened now | _isOpen=yes diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md index 72ff4784d..130ff8482 100644 --- a/Docs/Layers/toilet.md +++ b/Docs/Layers/toilet.md @@ -348,7 +348,7 @@ The question is *Does one have to bring their own toilet paper to this toilet?* -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/toilet_at_amenity.md b/Docs/Layers/toilet_at_amenity.md index e79ed9e92..df443602c 100644 --- a/Docs/Layers/toilet_at_amenity.md +++ b/Docs/Layers/toilet_at_amenity.md @@ -311,7 +311,7 @@ The question is *Does one have to bring their own toilet paper to this toilet?* -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [toilets:description](https://wiki.openstreetmap.org/wiki/Key:toilets:description) diff --git a/Docs/Layers/usersettings.md b/Docs/Layers/usersettings.md index aaba87fce..ba823c070 100644 --- a/Docs/Layers/usersettings.md +++ b/Docs/Layers/usersettings.md @@ -52,6 +52,7 @@ this quick overview is incomplete attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/mapcomplete-pictures-license#values) [mapcomplete-pictures-license](https://wiki.openstreetmap.org/wiki/Key:mapcomplete-pictures-license) | Multiple choice | [CC0](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-pictures-license%3DCC0) [CC-BY 4.0](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-pictures-license%3DCC-BY 4.0) [CC-BY-SA 4.0](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-pictures-license%3DCC-BY-SA 4.0) +[](https://taginfo.openstreetmap.org/keys/mapcomplete-show-all-questions#values) [mapcomplete-show-all-questions](https://wiki.openstreetmap.org/wiki/Key:mapcomplete-show-all-questions) | Multiple choice | [true](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-show-all-questions%3Dtrue) [false](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-show-all-questions%3Dfalse) [](https://taginfo.openstreetmap.org/keys/mapcomplete-translation-mode#values) [mapcomplete-translation-mode](https://wiki.openstreetmap.org/wiki/Key:mapcomplete-translation-mode) | Multiple choice | [false](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-translation-mode%3Dfalse) [true](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-translation-mode%3Dtrue) [mobile](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-translation-mode%3Dmobile) [](https://taginfo.openstreetmap.org/keys/mapcomplete-translation-mode#values) [mapcomplete-translation-mode](https://wiki.openstreetmap.org/wiki/Key:mapcomplete-translation-mode) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-translation-mode%3Dyes) [](https://taginfo.openstreetmap.org/keys/_translation_percentage#values) [_translation_percentage](https://wiki.openstreetmap.org/wiki/Key:_translation_percentage) | Multiple choice | [100](https://wiki.openstreetmap.org/wiki/Tag:_translation_percentage%3D100) @@ -81,6 +82,22 @@ The question is *Under what license do you want to publish your pictures?* +### all-questions-at-once + + + +The question is *Should questions for unknown data fields appear one-by-one or together?* + + + + + + - *Show all questions in the infobox together* corresponds with `mapcomplete-show-all-questions=true` + - *Show questions one-by-one* corresponds with `mapcomplete-show-all-questions=false` + + + + ### translations-title diff --git a/Docs/SpecialInputElements.md b/Docs/SpecialInputElements.md index 525bc52ad..ed4c9b0f4 100644 --- a/Docs/SpecialInputElements.md +++ b/Docs/SpecialInputElements.md @@ -104,8 +104,8 @@ options | A JSON-object of type `{ removePrefixes: string[], removePostfixes: st subarg \| doc -------- | ----- -removePrefixes | remove these snippets of text from the start of the passed string to search. This is either a list OR a hash of languages to a list -removePostfixes | remove these snippets of text from the end of the passed string to search. This is either a list OR a hash of languages to a list +removePrefixes | remove these snippets of text from the start of the passed string to search. This is either a list OR a hash of languages to a list. The individual strings are interpreted as case ignoring regexes +removePostfixes | remove these snippets of text from the end of the passed string to search. This is either a list OR a hash of languages to a list. The individual strings are interpreted as case ignoring regexes. instanceOf | A list of Q-identifier which indicates that the search results _must_ be an entity of this type, e.g. [`Q5`](https://www.wikidata.org/wiki/Q5) for humans notInstanceof | A list of Q-identifiers which indicates that the search results _must not_ be an entity of this type, e.g. [`Q79007`](https://www.wikidata.org/wiki/Q79007) to filter away all streets from the search results @@ -129,7 +129,8 @@ notInstanceof | A list of Q-identifiers which indicates that the search results "square", "plaza", ], - "nl": ["straat","plein","pad","weg",laan"] + "nl": ["straat","plein","pad","weg",laan"], + "fr":["route (de|de la|de l'| de le)"] }, "#": "Remove streets and parks from the search results:" @@ -221,7 +222,7 @@ options | A JSON-object of type `{ prefix: string, postfix: string }`. subarg \| doc -------- | ----- -prefix | Piece of text that will always be added to the front of the generated opening hours. If the OSM-data does not start with this, it will fail to parse +prefix | Piece of text that will always be added to the front of the generated opening hours. If the OSM-data does not start with this, it will fail to parse. postfix | Piece of text that will always be added to the end of the generated opening hours diff --git a/assets/contributors.json b/assets/contributors.json index cd618c19e..8ba315025 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,7 +1,7 @@ { "contributors": [ { - "commits": 5071, + "commits": 5094, "contributor": "Pieter Vander Vennet" }, { @@ -145,12 +145,12 @@ "contributor": "pelderson" }, { - "commits": 4, - "contributor": "Nadhem" + "commits": 5, + "contributor": "Codain" }, { "commits": 4, - "contributor": "Codain" + "contributor": "Nadhem" }, { "commits": 4, diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 4efcfd4a8..b6b71d1cb 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,30 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "cs": "Změny provedené pomocí MapComplete", - "de": "Mit MapComplete vorgenommene Änderungen", - "es": "Cambios realizados por MapComplete", - "fr": "Changements faits avec MapComplete", - "nb_NO": "Endringer laget med MapComplete", - "nl": "Wijzigingen gemaakt met MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "cs": "Zobrazuje změny provedené pomocí MapComplete", - "de": "Zeigt Änderungen, die von MapComplete vorgenommen wurden", - "es": "Muestra los cambios realizados por MapComplete", - "nb_NO": "Vis endringer laget med MapComplete", - "nl": "Toont wijzigingen gemaakt met MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This map shows all the changes made with MapComplete", - "ca": "Aquest mapa mostra tots els canvis fets amb MapComplete", - "cs": "Tato mapa zobrazuje všechny změny provedené pomocí MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "es": "Este mapa muestra todos los cambios realizados con MapComplete", - "fr": "Cette carte montre tous les changements faits avec MapComplete", - "nl": "Deze kaart toont alle wijzigingen gemaakt met MapComplete" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -37,12 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "ca": "Centres del conjunt de canvis", - "de": "Zentrum der Änderungssätze", - "es": "Centros de cambios", - "fr": "Centres de modifications de paramètres", - "nl": "Middelpunt van de wijzigingenset" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -53,78 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}", - "es": "Conjunto de cambios para {theme}", - "fr": "Groupe de modifications pour {theme}", - "nb_NO": "Endringssett for {theme}", - "nl": "Changeset voor {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "cs": "Zobrazuje všechny změny MapComplete", - "de": "Zeigt alle MapComplete-Änderungen", - "es": "Muestra todos los cambios de MapComplete", - "fr": "Montre tous les changements de MapComplete", - "nb_NO": "Viser alle MapComplete-endringer", - "nl": "Toon alle MapComplete wijzigingen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}", - "es": "Conjunto de cambios {id}", - "fr": "Groupe de modifications {id}", - "nb_NO": "Endringssett {id}", - "nl": "Wijzigingenset {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?", - "cs": "Jaký přispěvatel provedl tuto změnu?", - "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", - "es": "¿Qué colaborador realizó este cambio?", - "fr": "Quel contributeur a fait ce changement ?", - "nl": "Welke bijdrager maakte deze wijziging?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "cs": "Změna byla provedena uživatelem {user}", - "de": "Änderung vorgenommen von {user}", - "es": "Cambio realizado por {user}", - "fr": "Modification faite par {user}", - "nb_NO": "Endring gjort av {user}", - "nl": "Wijziging gemaakt door {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "de": "Welches Thema wurde für diese Änderung verwendet?", - "es": "¿Qué tema se utilizó para realizar este cambio?", - "fr": "Quel thème a été utilisé pour faire cette modification ?", - "nb_NO": "Hvilket tema ble brukt for å utføre denne denne endringen?", - "nl": "Welk thema is gebruikt voor deze wijziging?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}", - "es": "Cambio con tema {theme}", - "fr": "Modifié avec le thème {theme}", - "nb_NO": "Endre med temaet {theme}", - "nl": "Wijziging met thema {theme}" + "en": "Change with theme {theme}" } }, { @@ -133,39 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "cs": "V jakém prostředí (jazyce) byla tato změna provedena?", - "de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?", - "es": "¿En qué configuración regional (idioma) se realizó este cambio?", - "fr": "En quelle langue est-ce que ce changement a été fait ?", - "nl": "In welke taal (en cultuur) werd deze wijziging gemaakt?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "cs": "Uživatelské prostředí je {locale}", - "de": "Benutzergebietsschema ist {locale}", - "es": "La configuración regional del usuario es {locale}", - "fr": "La langue de l'utilisateur est {locale}", - "nl": "De locale van de bijdrager is {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change with {host}", - "ca": "Canvi amb {host}", - "cs": "Změnit s {host}", - "de": "Geändert über {host}", - "es": "Cambio con {host}", - "fr": "Changement avec {host}", - "nl": "Wijziging met {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?", - "es": "¿En qué host (sitio web) se realizó este cambio?", - "fr": "Depuis quel serveur (site web) ce changement a-t-il été fait ?", - "nl": "Op welk webadres werd deze wijziging gemaakt?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -510,13 +431,7 @@ } ], "question": { - "en": "Themename contains {search}", - "ca": "Nom del tema conté {search}", - "de": "Themename enthält {search}", - "es": "El nombre contiene {search}", - "fr": "Nom de thème contenant {search}", - "nb_NO": "Temanavn inneholder {search}", - "nl": "Themanaam bevat {search}" + "en": "Themename contains {search}" } } ] @@ -532,13 +447,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "cs": "Vytvořil přispěvatel {search}", - "de": "Erstellt vom Mitwirkenden {search}", - "es": "Hecho por colaborador {search}", - "fr": "Fait par le contributeur {search}", - "nb_NO": "Laget av bidragsyter {search}", - "nl": "Gemaakt door {search}" + "en": "Made by contributor {search}" } } ] @@ -554,13 +463,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "cs": "Nevytvořil přispěvatel {search}", - "de": "Nicht von Mitwirkendem {search}", - "es": "No hecho por colaborador {search}", - "fr": "Non réalisé par le contributeur{search}", - "nb_NO": "Ikke laget av bidragsyter {search}", - "nl": "Niet gemaakt door {search}" + "en": "Not made by contributor {search}" } } ] @@ -577,13 +480,7 @@ } ], "question": { - "en": "Made before {search}", - "cs": "Vytvořeno před {search}", - "de": "Erstellt vor {search}", - "es": "Hecho antes de {search}", - "fr": "Fait avant {search}", - "nb_NO": "Laget før {search}", - "nl": "Gemaakt voor {search}" + "en": "Made before {search}" } } ] @@ -600,13 +497,7 @@ } ], "question": { - "en": "Made after {search}", - "cs": "Vytvořeno po {search}", - "de": "Erstellt nach {search}", - "es": "Hecho después de {search}", - "fr": "Fait après {search}", - "nb_NO": "Laget etter {search}", - "nl": "Gemaakt na {search}" + "en": "Made after {search}" } } ] @@ -622,13 +513,7 @@ } ], "question": { - "en": "User language (ISO-code) {search}", - "ca": "Idioma de l'usuari (ISO-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "es": "Use lenguaje (ISO-code) {search}", - "fr": "Langage utilisateur (code-ISO) {search}", - "nb_NO": "Brukerspråk (ISO-kode) {search}", - "nl": "Gebruikerstaal (ISO-code) {search}" + "en": "User language (iso-code) {search}" } } ] @@ -644,12 +529,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit host {search}", - "es": "Hecho con host {search}", - "fr": "Fait par le serveur {search}", - "nb_NO": "Laget med vert {search}", - "nl": "Gemaakt met host {search}" + "en": "Made with host {search}" } } ] @@ -660,12 +540,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt", - "es": "Conjunto de cambios ha añadido al menos una imagen", - "fr": "Le groupe de modifications a ajouté au moins une image", - "nb_NO": "Endringssett la til minst ett bilde", - "nl": "Changeset die een of meerdere afbeeldingen toevoegt" + "en": "Changeset added at least one image" } } ] @@ -680,13 +555,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "cs": "Další statistiky najdete na .", - "de": "Weitere Statistiken hier", - "es": "Más estadísticas en aquí", - "fr": "D’autres statistiques sont disponibles ici", - "nb_NO": "Mer statistikk å finne her", - "nl": "Meer statistieken zijn hier te vinden" + "en": "More statistics can be found here" } }, { diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json index 49c1d8c67..493e614a5 100644 --- a/assets/themes/uk_addresses/uk_addresses.json +++ b/assets/themes/uk_addresses/uk_addresses.json @@ -695,4 +695,4 @@ "enableShareScreen": false, "enableMoreQuests": false, "credits": "Pieter Vander Vennet, Rob Nickerson, Russ Garrett" -} +} \ No newline at end of file diff --git a/assets/themes/waste_assen/waste_assen.json b/assets/themes/waste_assen/waste_assen.json index 6e4c036a3..feea148b1 100644 --- a/assets/themes/waste_assen/waste_assen.json +++ b/assets/themes/waste_assen/waste_assen.json @@ -103,4 +103,4 @@ ], "hideFromOverview": true, "credits": "Robin van der Linde" -} +} \ No newline at end of file From 6fa75505def890f5ff1937a0d9a358493d67fcb3 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 8 Mar 2023 18:37:32 +0100 Subject: [PATCH 3/8] chore: fix small typing issues, formatting --- UI/BigComponents/ActionButtons.ts | 1 - UI/BigComponents/ThemeIntroductionPanel.ts | 1 - UI/BigComponents/UserInformation.ts | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/UI/BigComponents/ActionButtons.ts b/UI/BigComponents/ActionButtons.ts index 238279179..1946ea893 100644 --- a/UI/BigComponents/ActionButtons.ts +++ b/UI/BigComponents/ActionButtons.ts @@ -41,7 +41,6 @@ export class ActionButtons extends Combine { readonly currentBounds: Store readonly locationControl: Store readonly osmConnection: OsmConnection - readonly isTranslator: Store readonly featureSwitchMoreQuests: Store }) { const imgSize = "h-6 w-6" diff --git a/UI/BigComponents/ThemeIntroductionPanel.ts b/UI/BigComponents/ThemeIntroductionPanel.ts index 1fc2f35ab..02dc660c6 100644 --- a/UI/BigComponents/ThemeIntroductionPanel.ts +++ b/UI/BigComponents/ThemeIntroductionPanel.ts @@ -24,7 +24,6 @@ export default class ThemeIntroductionPanel extends Combine { osmConnection: OsmConnection currentBounds: Store locationControl: UIEventSource - isTranslator: Store }, guistate?: { userInfoIsOpened: UIEventSource } ) { diff --git a/UI/BigComponents/UserInformation.ts b/UI/BigComponents/UserInformation.ts index 2b5ce8ed2..bba7a279a 100644 --- a/UI/BigComponents/UserInformation.ts +++ b/UI/BigComponents/UserInformation.ts @@ -74,7 +74,7 @@ class SingleUserSettingsPanel extends EditableTagRendering { if (kv.k.startsWith("_")) { continue } - osmConnection.GetPreference(kv.k, "", {prefix: ""}).setData(kv.v) + osmConnection.GetPreference(kv.k, "", { prefix: "" }).setData(kv.v) } editMode.setData(false) From 3617cebbf94a6c2e065371758214053455b39520 Mon Sep 17 00:00:00 2001 From: kjon Date: Wed, 8 Mar 2023 12:28:20 +0000 Subject: [PATCH 4/8] Translated using Weblate (English) Currently translated at 100.0% (2718 of 2718 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/en/ --- langs/layers/en.json | 392 +++++++++++++++++++++---------------------- 1 file changed, 196 insertions(+), 196 deletions(-) diff --git a/langs/layers/en.json b/langs/layers/en.json index 3c78496bb..d1279849c 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -98,6 +98,15 @@ "1": { "then": "Mural" }, + "10": { + "then": "Azulejo (Spanish decorative tilework)" + }, + "11": { + "then": "Tilework" + }, + "12": { + "then": "Woodcarving" + }, "2": { "then": "Painting" }, @@ -121,15 +130,6 @@ }, "9": { "then": "Relief" - }, - "10": { - "then": "Azulejo (Spanish decorative tilework)" - }, - "11": { - "then": "Tilework" - }, - "12": { - "then": "Woodcarving" } }, "question": "What is the type of this artwork?", @@ -1571,6 +1571,27 @@ "1": { "question": "Has a
Schuko wall plug without ground pin (CEE7/4 type F)
connector" }, + "10": { + "question": "Has a
Type 2 with cable (mennekes)
connector" + }, + "11": { + "question": "Has a
Tesla Supercharger CCS (a branded type2_css)
connector" + }, + "12": { + "question": "Has a
Tesla Supercharger (destination)
connector" + }, + "13": { + "question": "Has a
Tesla Supercharger (Destination) (A Type 2 with cable branded as tesla)
connector" + }, + "14": { + "question": "Has a
USB to charge phones and small electronics
connector" + }, + "15": { + "question": "Has a
Bosch Active Connect with 3 pins and cable
connector" + }, + "16": { + "question": "Has a
Bosch Active Connect with 5 pins and cable
connector" + }, "2": { "question": "Has a
European wall plug with ground pin (CEE7/4 type E)
connector" }, @@ -1594,27 +1615,6 @@ }, "9": { "question": "Has a
Type 2 CCS (mennekes)
connector" - }, - "10": { - "question": "Has a
Type 2 with cable (mennekes)
connector" - }, - "11": { - "question": "Has a
Tesla Supercharger CCS (a branded type2_css)
connector" - }, - "12": { - "question": "Has a
Tesla Supercharger (destination)
connector" - }, - "13": { - "question": "Has a
Tesla Supercharger (Destination) (A Type 2 with cable branded as tesla)
connector" - }, - "14": { - "question": "Has a
USB to charge phones and small electronics
connector" - }, - "15": { - "question": "Has a
Bosch Active Connect with 3 pins and cable
connector" - }, - "16": { - "question": "Has a
Bosch Active Connect with 5 pins and cable
connector" } } } @@ -1670,30 +1670,6 @@ "1": { "then": "Schuko wall plug without ground pin (CEE7/4 type F)" }, - "2": { - "then": "European wall plug with ground pin (CEE7/4 type E)" - }, - "3": { - "then": "European wall plug with ground pin (CEE7/4 type E)" - }, - "4": { - "then": "Chademo" - }, - "5": { - "then": "Chademo" - }, - "6": { - "then": "Type 1 with cable (J1772)" - }, - "7": { - "then": "Type 1 with cable (J1772)" - }, - "8": { - "then": "Type 1 without cable (J1772)" - }, - "9": { - "then": "Type 1 without cable (J1772)" - }, "10": { "then": "Type 1 CCS (aka Type 1 Combo)" }, @@ -1724,6 +1700,9 @@ "19": { "then": "Type 2 with cable (mennekes)" }, + "2": { + "then": "European wall plug with ground pin (CEE7/4 type E)" + }, "20": { "then": "Tesla Supercharger CCS (a branded type2_css)" }, @@ -1754,11 +1733,32 @@ "29": { "then": "Bosch Active Connect with 3 pins and cable" }, + "3": { + "then": "European wall plug with ground pin (CEE7/4 type E)" + }, "30": { "then": "Bosch Active Connect with 5 pins and cable" }, "31": { "then": "Bosch Active Connect with 5 pins and cable" + }, + "4": { + "then": "Chademo" + }, + "5": { + "then": "Chademo" + }, + "6": { + "then": "Type 1 with cable (J1772)" + }, + "7": { + "then": "Type 1 with cable (J1772)" + }, + "8": { + "then": "Type 1 without cable (J1772)" + }, + "9": { + "then": "Type 1 without cable (J1772)" } }, "question": "Which charging connections are available here?" @@ -3243,6 +3243,15 @@ "1": { "then": "This cycleway is paved" }, + "10": { + "then": "This cycleway is made of fine gravel" + }, + "11": { + "then": "This cycleway is made of pebblestone" + }, + "12": { + "then": "This cycleway is made from raw ground" + }, "2": { "then": "This cycleway is made of asphalt" }, @@ -3266,15 +3275,6 @@ }, "9": { "then": "This cycleway is made of gravel" - }, - "10": { - "then": "This cycleway is made of fine gravel" - }, - "11": { - "then": "This cycleway is made of pebblestone" - }, - "12": { - "then": "This cycleway is made from raw ground" } }, "question": "What is the surface of the cycleway made from?", @@ -3323,6 +3323,15 @@ "1": { "then": "This cycleway is paved" }, + "10": { + "then": "This cycleway is made of fine gravel" + }, + "11": { + "then": "This cycleway is made of pebblestone" + }, + "12": { + "then": "This cycleway is made from raw ground" + }, "2": { "then": "This cycleway is made of asphalt" }, @@ -3346,15 +3355,6 @@ }, "9": { "then": "This cycleway is made of gravel" - }, - "10": { - "then": "This cycleway is made of fine gravel" - }, - "11": { - "then": "This cycleway is made of pebblestone" - }, - "12": { - "then": "This cycleway is made from raw ground" } }, "question": "What is the surface of the street made from?", @@ -4276,30 +4276,6 @@ "1": { "then": "This fitness station has a sign with instructions for a specific exercise." }, - "2": { - "then": "This fitness station has a facility for sit-ups." - }, - "3": { - "then": "This fitness station has a facility for push-ups. Usually consists of one or more low horizontal bars." - }, - "4": { - "then": "This fitness station has bars for stretching." - }, - "5": { - "then": "This fitness station has a station for making hyperextensions." - }, - "6": { - "then": "This fitness station has rings for gymnastic exercises." - }, - "7": { - "then": "This fitness station has a horizontal ladder, also known as monkey bars." - }, - "8": { - "then": "This fitness station has wall bars to climb on." - }, - "9": { - "then": "This fitness station has posts for performing slalom exercises." - }, "10": { "then": "This fitness station has stepping stones." }, @@ -4330,6 +4306,9 @@ "19": { "then": "This fitness station has battling ropes." }, + "2": { + "then": "This fitness station has a facility for sit-ups." + }, "20": { "then": "This fitness station has a stationary bicycle." }, @@ -4344,6 +4323,27 @@ }, "24": { "then": "This fitness station has a slackline." + }, + "3": { + "then": "This fitness station has a facility for push-ups. Usually consists of one or more low horizontal bars." + }, + "4": { + "then": "This fitness station has bars for stretching." + }, + "5": { + "then": "This fitness station has a station for making hyperextensions." + }, + "6": { + "then": "This fitness station has rings for gymnastic exercises." + }, + "7": { + "then": "This fitness station has a horizontal ladder, also known as monkey bars." + }, + "8": { + "then": "This fitness station has wall bars to climb on." + }, + "9": { + "then": "This fitness station has posts for performing slalom exercises." } }, "question": "What kind of equipment does this fitness station have?" @@ -4429,6 +4429,21 @@ "1": { "then": "This is a friture" }, + "10": { + "then": "Chinese dishes are served here" + }, + "11": { + "then": "Greek dishes are served here" + }, + "12": { + "then": "Indian dishes are served here" + }, + "13": { + "then": "Turkish dishes are served here" + }, + "14": { + "then": "Thai dishes are served here" + }, "2": { "then": "Mainly serves pasta" }, @@ -4452,21 +4467,6 @@ }, "9": { "then": "French dishes are served here" - }, - "10": { - "then": "Chinese dishes are served here" - }, - "11": { - "then": "Greek dishes are served here" - }, - "12": { - "then": "Indian dishes are served here" - }, - "13": { - "then": "Turkish dishes are served here" - }, - "14": { - "then": "Thai dishes are served here" } }, "question": "Which food is served here?", @@ -5597,6 +5597,19 @@ } } }, + "10": { + "options": { + "0": { + "question": "All Notes" + }, + "1": { + "question": "Hide import notes" + }, + "2": { + "question": "Show only import Notes" + } + } + }, "2": { "options": { "0": { @@ -5652,19 +5665,6 @@ "question": "Only show open notes" } } - }, - "10": { - "options": { - "0": { - "question": "All Notes" - }, - "1": { - "question": "Hide import notes" - }, - "2": { - "question": "Show only import Notes" - } - } } }, "name": "OpenStreetMap notes", @@ -5993,6 +5993,21 @@ "1": { "then": "This is a normal parking space." }, + "10": { + "then": "This is a parking space reserved for parents with children." + }, + "11": { + "then": "This is a parking space reserved for staff." + }, + "12": { + "then": "This is a parking space reserved for taxis." + }, + "13": { + "then": "This is a parking space reserved for vehicles towing a trailer." + }, + "14": { + "then": "This is a parking space reserved for car sharing." + }, "2": { "then": "This is a disabled parking space." }, @@ -6016,21 +6031,6 @@ }, "9": { "then": "This is parking space reserved for motorcycles." - }, - "10": { - "then": "This is a parking space reserved for parents with children." - }, - "11": { - "then": "This is a parking space reserved for staff." - }, - "12": { - "then": "This is a parking space reserved for taxis." - }, - "13": { - "then": "This is a parking space reserved for vehicles towing a trailer." - }, - "14": { - "then": "This is a parking space reserved for car sharing." } }, "question": "What kind of parking space is this?" @@ -6655,30 +6655,6 @@ "1": { "question": "Recycling of batteries" }, - "2": { - "question": "Recycling of beverage cartons" - }, - "3": { - "question": "Recycling of cans" - }, - "4": { - "question": "Recycling of clothes" - }, - "5": { - "question": "Recycling of cooking oil" - }, - "6": { - "question": "Recycling of engine oil" - }, - "7": { - "question": "Recycling of fluorescent tubes" - }, - "8": { - "question": "Recycling of green waste" - }, - "9": { - "question": "Recycling of glass bottles" - }, "10": { "question": "Recycling of glass" }, @@ -6708,6 +6684,30 @@ }, "19": { "question": "Recycling of residual waste" + }, + "2": { + "question": "Recycling of beverage cartons" + }, + "3": { + "question": "Recycling of cans" + }, + "4": { + "question": "Recycling of clothes" + }, + "5": { + "question": "Recycling of cooking oil" + }, + "6": { + "question": "Recycling of engine oil" + }, + "7": { + "question": "Recycling of fluorescent tubes" + }, + "8": { + "question": "Recycling of green waste" + }, + "9": { + "question": "Recycling of glass bottles" } } }, @@ -6775,30 +6775,6 @@ "1": { "then": "Beverage cartons can be recycled here" }, - "2": { - "then": "Cans can be recycled here" - }, - "3": { - "then": "Clothes can be recycled here" - }, - "4": { - "then": "Cooking oil can be recycled here" - }, - "5": { - "then": "Engine oil can be recycled here" - }, - "6": { - "then": "Fluorescent tubes can be recycled here" - }, - "7": { - "then": "Green waste can be recycled here" - }, - "8": { - "then": "Organic waste can be recycled here" - }, - "9": { - "then": "Glass bottles can be recycled here" - }, "10": { "then": "Glass can be recycled here" }, @@ -6829,6 +6805,9 @@ "19": { "then": "Small electrical appliances can be recycled here" }, + "2": { + "then": "Cans can be recycled here" + }, "20": { "then": "Small electrical appliances can be recycled here" }, @@ -6837,6 +6816,27 @@ }, "22": { "then": "Residual waste can be recycled here" + }, + "3": { + "then": "Clothes can be recycled here" + }, + "4": { + "then": "Cooking oil can be recycled here" + }, + "5": { + "then": "Engine oil can be recycled here" + }, + "6": { + "then": "Fluorescent tubes can be recycled here" + }, + "7": { + "then": "Green waste can be recycled here" + }, + "8": { + "then": "Organic waste can be recycled here" + }, + "9": { + "then": "Glass bottles can be recycled here" } }, "question": "What can be recycled here?" @@ -7249,10 +7249,10 @@ "question": "Soccer fields" }, "3": { - "question": "Ping-pong table" + "question": "Ping-pong tables" }, "4": { - "question": "Tennis field" + "question": "Tennis fields" } } } @@ -7543,6 +7543,12 @@ "1": { "then": "This lamp uses LEDs" }, + "10": { + "then": "This lamp uses high pressure sodium lamps (orange with white)" + }, + "11": { + "then": "This lamp is lit using gas" + }, "2": { "then": "This lamp uses incandescent lighting" }, @@ -7566,12 +7572,6 @@ }, "9": { "then": "This lamp uses low pressure sodium lamps (monochrome orange)" - }, - "10": { - "then": "This lamp uses high pressure sodium lamps (orange with white)" - }, - "11": { - "then": "This lamp is lit using gas" } }, "question": "What kind of lighting does this lamp use?" @@ -8905,4 +8905,4 @@ } } } -} \ No newline at end of file +} From 0ec27353268dcc15e4dd45b9d1dfab9a267f5ec1 Mon Sep 17 00:00:00 2001 From: kjon Date: Wed, 8 Mar 2023 12:25:16 +0000 Subject: [PATCH 5/8] Translated using Weblate (German) Currently translated at 99.9% (2716 of 2718 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/ --- langs/layers/de.json | 450 ++++++++++++++++++++++++------------------- 1 file changed, 256 insertions(+), 194 deletions(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index 0d226128d..176a2edbc 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -98,6 +98,15 @@ "1": { "then": "Wandbild" }, + "10": { + "then": "Azulejo (spanische dekorative Fliesenarbeit)" + }, + "11": { + "then": "Fliesenarbeit" + }, + "12": { + "then": "Holzschnitzerei" + }, "2": { "then": "Malerei" }, @@ -121,15 +130,6 @@ }, "9": { "then": "Relief" - }, - "10": { - "then": "Azulejo (spanische dekorative Fliesenarbeit)" - }, - "11": { - "then": "Fliesenarbeit" - }, - "12": { - "then": "Holzschnitzerei" } }, "question": "Um welche Art Kunstwerk handelt es sich?", @@ -1571,6 +1571,27 @@ "1": { "question": "Verfügt über einen
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
" }, + "10": { + "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" + }, + "11": { + "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" + }, + "12": { + "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" + }, + "13": { + "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" + }, + "14": { + "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" + }, + "15": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" + }, + "16": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" + }, "2": { "question": "Verfügt über einen
europäischen Netzstecker mit Erdungsstift (CEE7/4 Typ E)
Anschluss" }, @@ -1594,27 +1615,6 @@ }, "9": { "question": "Hat einen
Typ 2 CCS (Mennekes)
Anschluss" - }, - "10": { - "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" - }, - "11": { - "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" - }, - "12": { - "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" - }, - "13": { - "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" - }, - "14": { - "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" - }, - "15": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" - }, - "16": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" } } } @@ -1670,30 +1670,6 @@ "1": { "then": "Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)" }, - "2": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, - "3": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, - "4": { - "then": "Chademo-Anschluss" - }, - "5": { - "then": "Chademo-Anschluss" - }, - "6": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "7": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "8": { - "then": "Typ 1 ohne Kabel (J1772)" - }, - "9": { - "then": " Typ 1 ohne Kabel (J1772)" - }, "10": { "then": "Typ 1 CCS (Typ 1 Combo)" }, @@ -1724,6 +1700,9 @@ "19": { "then": "Typ 2 mit Kabel (mennekes)" }, + "2": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, "20": { "then": "Tesla Supercharger CCS (Typ 2 CSS von Tesla)" }, @@ -1754,11 +1733,32 @@ "29": { "then": " Bosch Active Connect mit 3 Pins und Kabel" }, + "3": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, "30": { "then": "Bosch Active Connect mit 5 Pins und Kabel" }, "31": { "then": " Bosch Active Connect mit 5 Pins und Kabel" + }, + "4": { + "then": "Chademo-Anschluss" + }, + "5": { + "then": "Chademo-Anschluss" + }, + "6": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "7": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "8": { + "then": "Typ 1 ohne Kabel (J1772)" + }, + "9": { + "then": " Typ 1 ohne Kabel (J1772)" } }, "question": "Welche Ladeanschlüsse gibt es hier?" @@ -3243,6 +3243,15 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" + }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3266,15 +3275,6 @@ }, "9": { "then": "Der Radweg ist aus Schotter" - }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieses Radwegs?", @@ -3323,6 +3323,15 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" + }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3346,15 +3355,6 @@ }, "9": { "then": "Der Radweg ist aus Schotter" - }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieser Straße?", @@ -4276,30 +4276,6 @@ "1": { "then": "Die Fitness-Station hat ein Schild mit Anweisungen für eine bestimmte Übung." }, - "2": { - "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." - }, - "3": { - "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." - }, - "4": { - "then": "Die Fitness-Station hat Stangen zum Dehnen." - }, - "5": { - "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." - }, - "6": { - "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." - }, - "7": { - "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." - }, - "8": { - "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." - }, - "9": { - "then": "Die Fitness-Station hat Pfosten für Slalomübungen." - }, "10": { "then": "Die Fitness-Station hat Trittsteine." }, @@ -4330,6 +4306,9 @@ "19": { "then": "Die Fitness-Station hat Kampfseile (battle ropes)." }, + "2": { + "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." + }, "20": { "then": "Die Fitness-Station hat ein Fahrradergometer." }, @@ -4344,6 +4323,27 @@ }, "24": { "then": "Die Fitness-Station hat eine Slackline." + }, + "3": { + "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." + }, + "4": { + "then": "Die Fitness-Station hat Stangen zum Dehnen." + }, + "5": { + "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." + }, + "6": { + "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." + }, + "7": { + "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." + }, + "8": { + "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." + }, + "9": { + "then": "Die Fitness-Station hat Pfosten für Slalomübungen." } }, "question": "Welche Übungsgeräte gibt es an dieser Fitness-Station?" @@ -4429,6 +4429,21 @@ "1": { "then": "Dies ist eine Pommesbude" }, + "10": { + "then": "Hier werden chinesische Gerichte serviert" + }, + "11": { + "then": "Hier werden griechische Gerichte serviert" + }, + "12": { + "then": "Hier werden indische Gerichte serviert" + }, + "13": { + "then": "Hier werden türkische Gerichte serviert" + }, + "14": { + "then": "Hier werden thailändische Gerichte serviert" + }, "2": { "then": "Bietet vorwiegend Pastagerichte an" }, @@ -4452,21 +4467,6 @@ }, "9": { "then": "Hier werden französische Gerichte serviert" - }, - "10": { - "then": "Hier werden chinesische Gerichte serviert" - }, - "11": { - "then": "Hier werden griechische Gerichte serviert" - }, - "12": { - "then": "Hier werden indische Gerichte serviert" - }, - "13": { - "then": "Hier werden türkische Gerichte serviert" - }, - "14": { - "then": "Hier werden thailändische Gerichte serviert" } }, "question": "Welches Essen gibt es hier?", @@ -5597,6 +5597,19 @@ } } }, + "10": { + "options": { + "0": { + "question": "Alle Notizen" + }, + "1": { + "question": "Importnotizen ausblenden" + }, + "2": { + "question": "Nur Importnotizen anzeigen" + } + } + }, "2": { "options": { "0": { @@ -5652,19 +5665,6 @@ "question": "Nur offene Notizen anzeigen" } } - }, - "10": { - "options": { - "0": { - "question": "Alle Notizen" - }, - "1": { - "question": "Importnotizen ausblenden" - }, - "2": { - "question": "Nur Importnotizen anzeigen" - } - } } }, "name": "OpenStreetMap-Hinweise", @@ -5993,6 +5993,21 @@ "1": { "then": "Dies ist ein normaler Stellplatz." }, + "10": { + "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." + }, + "11": { + "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." + }, + "12": { + "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." + }, + "13": { + "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." + }, + "14": { + "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." + }, "2": { "then": "Dies ist ein Behindertenstellplatz." }, @@ -6016,21 +6031,6 @@ }, "9": { "then": "Dies ist ein Stellplatz, der für Motorräder reserviert ist." - }, - "10": { - "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." - }, - "11": { - "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." - }, - "12": { - "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." - }, - "13": { - "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." - }, - "14": { - "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." } }, "question": "Welche Art von Stellplatz ist dies?" @@ -6655,30 +6655,6 @@ "1": { "question": "Recycling von Batterien" }, - "2": { - "question": "Recycling von Getränkekartons" - }, - "3": { - "question": "Recycling von Dosen" - }, - "4": { - "question": "Recycling von Kleidung" - }, - "5": { - "question": "Recycling von Speiseöl" - }, - "6": { - "question": "Recycling von Motoröl" - }, - "7": { - "question": "Recycling von Leuchtstoffröhren" - }, - "8": { - "question": "Recycling von Grünabfällen" - }, - "9": { - "question": "Recycling von Glasflaschen" - }, "10": { "question": "Recycling von Glas" }, @@ -6708,6 +6684,30 @@ }, "19": { "question": "Recycling von Restabfällen" + }, + "2": { + "question": "Recycling von Getränkekartons" + }, + "3": { + "question": "Recycling von Dosen" + }, + "4": { + "question": "Recycling von Kleidung" + }, + "5": { + "question": "Recycling von Speiseöl" + }, + "6": { + "question": "Recycling von Motoröl" + }, + "7": { + "question": "Recycling von Leuchtstoffröhren" + }, + "8": { + "question": "Recycling von Grünabfällen" + }, + "9": { + "question": "Recycling von Glasflaschen" } } }, @@ -6775,30 +6775,6 @@ "1": { "then": "Getränkekartons können hier recycelt werden" }, - "2": { - "then": "Dosen können hier recycelt werden" - }, - "3": { - "then": "Kleidung kann hier recycelt werden" - }, - "4": { - "then": "Speiseöl kann hier recycelt werden" - }, - "5": { - "then": "Motoröl kann hier recycelt werden" - }, - "6": { - "then": "Hier können Leuchtstoffröhren recycelt werden" - }, - "7": { - "then": "Grünabfälle können hier recycelt werden" - }, - "8": { - "then": "Bio-Abfall kann hier recycelt werden" - }, - "9": { - "then": "Glasflaschen können hier recycelt werden" - }, "10": { "then": "Glas kann hier recycelt werden" }, @@ -6829,6 +6805,9 @@ "19": { "then": "Elektrokleingeräte können hier recycelt werden" }, + "2": { + "then": "Dosen können hier recycelt werden" + }, "20": { "then": "Elektrokleingeräte können hier recycelt werden" }, @@ -6837,6 +6816,27 @@ }, "22": { "then": "Restmüll kann hier recycelt werden" + }, + "3": { + "then": "Kleidung kann hier recycelt werden" + }, + "4": { + "then": "Speiseöl kann hier recycelt werden" + }, + "5": { + "then": "Motoröl kann hier recycelt werden" + }, + "6": { + "then": "Hier können Leuchtstoffröhren recycelt werden" + }, + "7": { + "then": "Grünabfälle können hier recycelt werden" + }, + "8": { + "then": "Bio-Abfall kann hier recycelt werden" + }, + "9": { + "then": "Glasflaschen können hier recycelt werden" } }, "question": "Was kann hier recycelt werden?" @@ -7229,6 +7229,34 @@ }, "sport_pitch": { "description": "Ein Sportplatz", + "filter": { + "0": { + "options": { + "0": { + "question": "Öffentlich zugänglich" + } + } + }, + "1": { + "options": { + "0": { + "question": "Alle Sportarten" + }, + "1": { + "question": "Basketballplätze" + }, + "2": { + "question": "Fußballplätze" + }, + "3": { + "question": "Tischtennisplatten" + }, + "4": { + "question": "Tennisplätze" + } + } + } + }, "name": "Sportplätze", "presets": { "0": { @@ -7383,6 +7411,12 @@ }, "question": "Hat die Treppe einen Handlauf?" }, + "multilevels": { + "override": { + "question": "Zwischen welchen Stockwerken befinden sich diese Stufen?", + "render": "Diese Stufen befinden sich zwischen den Stockwerken {level}" + } + }, "ramp": { "mappings": { "0": { @@ -7509,6 +7543,12 @@ "1": { "then": "Diese Straßenlaterne verwendet LEDs" }, + "10": { + "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" + }, + "11": { + "then": "Diese Straßenlaterne wird mit Gas beleuchtet" + }, "2": { "then": "Diese Straßenlaterne verwendet Glühlampenlicht" }, @@ -7532,12 +7572,6 @@ }, "9": { "then": "Diese Straßenlaterne verwendet Niederdruck-Natriumdampflampen (einfarbig orange)" - }, - "10": { - "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" - }, - "11": { - "then": "Diese Straßenlaterne wird mit Gas beleuchtet" } }, "question": "Mit welcher Art von Beleuchtung arbeitet diese Straßenlaterne?" @@ -7796,6 +7830,18 @@ }, "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}" }, + "payment-options": { + "override": { + "mappings+": { + "0": { + "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" + }, + "1": { + "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" + } + } + } + }, "validator-operator": { "freeform": { "placeholder": "Name des Betreibers" @@ -8015,6 +8061,11 @@ }, "name": "Toiletten in anderen Einrichtungen", "tagRenderings": { + "opening_hours": { + "override": { + "question": "Wann ist die Einrichtung, in der sich diese Toiletten befinden, geöffnet?" + } + }, "toilet-access": { "mappings": { "0": { @@ -8432,6 +8483,17 @@ "usersettings": { "description": "Eine spezielle Ebene, die nicht für die Darstellung auf einer Karte gedacht ist, sondern für die Festlegung von Benutzereinstellungen verwendet wird", "tagRenderings": { + "all-questions-at-once": { + "mappings": { + "0": { + "then": "Alle Fragen in der Infobox zusammen anzeigen" + }, + "1": { + "then": "Fragen der Reihe nach anzeigen" + } + }, + "question": "Sollen Fragen für unbekannte Datenfelder einzeln oder zusammen angezeigt werden?" + }, "contributor-thanks": { "mappings": { "0": { @@ -8843,4 +8905,4 @@ } } } -} \ No newline at end of file +} From 7355f2c0dde4fe4c9c3d22b91b29246f7c0db525 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 8 Mar 2023 13:39:26 +0000 Subject: [PATCH 6/8] Translated using Weblate (Dutch) Currently translated at 98.2% (748 of 761 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/nl/ --- langs/nl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/langs/nl.json b/langs/nl.json index f6177c851..47277874e 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -133,6 +133,7 @@ "josmOpened": "JOSM is geopend", "mapContributionsBy": "De huidige data is bijgedragen door {contributors}", "mapContributionsByAndHidden": "De zichtbare data heeft bijdragen van {contributors} en {hiddenCount} andere bijdragers", + "mapDataByOsm": "Kaartgegevens: OpenStreetMap", "mapillaryHelp": "Mapillary is een online dienst waar straatbeelden onder een vrije licentie gedeeld worden. Deze beelden mogen gebruikt worden om OpenStreetMap te verbeteren.", "openIssueTracker": "Geef een fout in de software door", "openMapillary": "Open Mapillary op deze locatie", From 4220563e346b19cc8ea53b6096d3913e96b6913b Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 9 Mar 2023 15:18:32 +0100 Subject: [PATCH 7/8] chore: automated housekeeping... --- Docs/Layers/sport_pitch.md | 4 +- assets/contributors.json | 2 +- assets/layers/sport_pitch/sport_pitch.json | 18 +- assets/layers/usersettings/usersettings.json | 9 +- assets/translators.json | 10 +- langs/layers/de.json | 411 +++++++++---------- langs/layers/en.json | 388 ++++++++--------- 7 files changed, 414 insertions(+), 428 deletions(-) diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md index 14b8f1b80..0fce02a79 100644 --- a/Docs/Layers/sport_pitch.md +++ b/Docs/Layers/sport_pitch.md @@ -259,8 +259,8 @@ id | question | osmTags available_sports.0 | All sports (default) | available_sports.1 | Basketball fields | sport=basketball available_sports.2 | Soccer fields | sport=soccer -available_sports.3 | Ping-pong table | sport=table_tennis -available_sports.4 | Tennis field | sport=tennis +available_sports.3 | Ping-pong tables | sport=table_tennis +available_sports.4 | Tennis fields | sport=tennis diff --git a/assets/contributors.json b/assets/contributors.json index 8ba315025..a645c9313 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,7 +1,7 @@ { "contributors": [ { - "commits": 5094, + "commits": 5097, "contributor": "Pieter Vander Vennet" }, { diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index 0900d878b..56da57d07 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -611,7 +611,8 @@ { "question": { "en": "Publicly accessible", - "nl": "Publiek toegankelijk" + "nl": "Publiek toegankelijk", + "de": "Öffentlich zugänglich" }, "osmTags": { "or": [ @@ -629,35 +630,40 @@ { "question": { "en": "All sports", - "nl": "Alle sporten" + "nl": "Alle sporten", + "de": "Alle Sportarten" } }, { "osmTags": "sport=basketball", "question": { "nl": "Basketbalvelden", - "en": "Basketball fields" + "en": "Basketball fields", + "de": "Basketballplätze" } }, { "osmTags": "sport=soccer", "question": { "nl": "Voetbalvelden", - "en": "Soccer fields" + "en": "Soccer fields", + "de": "Fußballplätze" } }, { "osmTags": "sport=table_tennis", "question": { "nl": "Pingpong-tafel", - "en": "Ping-pong table" + "en": "Ping-pong tables", + "de": "Tischtennisplatten" } }, { "osmTags": "sport=tennis", "question": { "nl": "Tennisveld", - "en": "Tennis field" + "en": "Tennis fields", + "de": "Tennisplätze" } } ] diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json index 63a8788f0..bf45f4f69 100644 --- a/assets/layers/usersettings/usersettings.json +++ b/assets/layers/usersettings/usersettings.json @@ -70,19 +70,22 @@ { "id": "all-questions-at-once", "question": { - "en": "Should questions for unknown data fields appear one-by-one or together?" + "en": "Should questions for unknown data fields appear one-by-one or together?", + "de": "Sollen Fragen für unbekannte Datenfelder einzeln oder zusammen angezeigt werden?" }, "mappings": [ { "if": "mapcomplete-show-all-questions=true", "then": { - "en": "Show all questions in the infobox together" + "en": "Show all questions in the infobox together", + "de": "Alle Fragen in der Infobox zusammen anzeigen" } }, { "if": "mapcomplete-show-all-questions=false", "then": { - "en": "Show questions one-by-one" + "en": "Show questions one-by-one", + "de": "Fragen der Reihe nach anzeigen" } } ] diff --git a/assets/translators.json b/assets/translators.json index 46ed8672b..641948f69 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -1,12 +1,12 @@ { "contributors": [ { - "commits": 249, - "contributor": "Pieter Vander Vennet" + "commits": 250, + "contributor": "kjon" }, { - "commits": 248, - "contributor": "kjon" + "commits": 249, + "contributor": "Pieter Vander Vennet" }, { "commits": 94, @@ -17,7 +17,7 @@ "contributor": "paunofu" }, { - "commits": 66, + "commits": 67, "contributor": "Robin van der Linde" }, { diff --git a/langs/layers/de.json b/langs/layers/de.json index 176a2edbc..70e175570 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -98,15 +98,6 @@ "1": { "then": "Wandbild" }, - "10": { - "then": "Azulejo (spanische dekorative Fliesenarbeit)" - }, - "11": { - "then": "Fliesenarbeit" - }, - "12": { - "then": "Holzschnitzerei" - }, "2": { "then": "Malerei" }, @@ -130,6 +121,15 @@ }, "9": { "then": "Relief" + }, + "10": { + "then": "Azulejo (spanische dekorative Fliesenarbeit)" + }, + "11": { + "then": "Fliesenarbeit" + }, + "12": { + "then": "Holzschnitzerei" } }, "question": "Um welche Art Kunstwerk handelt es sich?", @@ -1571,27 +1571,6 @@ "1": { "question": "Verfügt über einen
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
" }, - "10": { - "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" - }, - "11": { - "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" - }, - "12": { - "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" - }, - "13": { - "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" - }, - "14": { - "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" - }, - "15": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" - }, - "16": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" - }, "2": { "question": "Verfügt über einen
europäischen Netzstecker mit Erdungsstift (CEE7/4 Typ E)
Anschluss" }, @@ -1615,6 +1594,27 @@ }, "9": { "question": "Hat einen
Typ 2 CCS (Mennekes)
Anschluss" + }, + "10": { + "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" + }, + "11": { + "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" + }, + "12": { + "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" + }, + "13": { + "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" + }, + "14": { + "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" + }, + "15": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" + }, + "16": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" } } } @@ -1670,6 +1670,30 @@ "1": { "then": "Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)" }, + "2": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, + "3": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, + "4": { + "then": "Chademo-Anschluss" + }, + "5": { + "then": "Chademo-Anschluss" + }, + "6": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "7": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "8": { + "then": "Typ 1 ohne Kabel (J1772)" + }, + "9": { + "then": " Typ 1 ohne Kabel (J1772)" + }, "10": { "then": "Typ 1 CCS (Typ 1 Combo)" }, @@ -1700,9 +1724,6 @@ "19": { "then": "Typ 2 mit Kabel (mennekes)" }, - "2": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, "20": { "then": "Tesla Supercharger CCS (Typ 2 CSS von Tesla)" }, @@ -1733,32 +1754,11 @@ "29": { "then": " Bosch Active Connect mit 3 Pins und Kabel" }, - "3": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, "30": { "then": "Bosch Active Connect mit 5 Pins und Kabel" }, "31": { "then": " Bosch Active Connect mit 5 Pins und Kabel" - }, - "4": { - "then": "Chademo-Anschluss" - }, - "5": { - "then": "Chademo-Anschluss" - }, - "6": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "7": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "8": { - "then": "Typ 1 ohne Kabel (J1772)" - }, - "9": { - "then": " Typ 1 ohne Kabel (J1772)" } }, "question": "Welche Ladeanschlüsse gibt es hier?" @@ -3243,15 +3243,6 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" - }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3275,6 +3266,15 @@ }, "9": { "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieses Radwegs?", @@ -3323,15 +3323,6 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" - }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3355,6 +3346,15 @@ }, "9": { "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieser Straße?", @@ -4276,6 +4276,30 @@ "1": { "then": "Die Fitness-Station hat ein Schild mit Anweisungen für eine bestimmte Übung." }, + "2": { + "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." + }, + "3": { + "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." + }, + "4": { + "then": "Die Fitness-Station hat Stangen zum Dehnen." + }, + "5": { + "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." + }, + "6": { + "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." + }, + "7": { + "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." + }, + "8": { + "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." + }, + "9": { + "then": "Die Fitness-Station hat Pfosten für Slalomübungen." + }, "10": { "then": "Die Fitness-Station hat Trittsteine." }, @@ -4306,9 +4330,6 @@ "19": { "then": "Die Fitness-Station hat Kampfseile (battle ropes)." }, - "2": { - "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." - }, "20": { "then": "Die Fitness-Station hat ein Fahrradergometer." }, @@ -4323,27 +4344,6 @@ }, "24": { "then": "Die Fitness-Station hat eine Slackline." - }, - "3": { - "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." - }, - "4": { - "then": "Die Fitness-Station hat Stangen zum Dehnen." - }, - "5": { - "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." - }, - "6": { - "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." - }, - "7": { - "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." - }, - "8": { - "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." - }, - "9": { - "then": "Die Fitness-Station hat Pfosten für Slalomübungen." } }, "question": "Welche Übungsgeräte gibt es an dieser Fitness-Station?" @@ -4429,21 +4429,6 @@ "1": { "then": "Dies ist eine Pommesbude" }, - "10": { - "then": "Hier werden chinesische Gerichte serviert" - }, - "11": { - "then": "Hier werden griechische Gerichte serviert" - }, - "12": { - "then": "Hier werden indische Gerichte serviert" - }, - "13": { - "then": "Hier werden türkische Gerichte serviert" - }, - "14": { - "then": "Hier werden thailändische Gerichte serviert" - }, "2": { "then": "Bietet vorwiegend Pastagerichte an" }, @@ -4467,6 +4452,21 @@ }, "9": { "then": "Hier werden französische Gerichte serviert" + }, + "10": { + "then": "Hier werden chinesische Gerichte serviert" + }, + "11": { + "then": "Hier werden griechische Gerichte serviert" + }, + "12": { + "then": "Hier werden indische Gerichte serviert" + }, + "13": { + "then": "Hier werden türkische Gerichte serviert" + }, + "14": { + "then": "Hier werden thailändische Gerichte serviert" } }, "question": "Welches Essen gibt es hier?", @@ -5597,19 +5597,6 @@ } } }, - "10": { - "options": { - "0": { - "question": "Alle Notizen" - }, - "1": { - "question": "Importnotizen ausblenden" - }, - "2": { - "question": "Nur Importnotizen anzeigen" - } - } - }, "2": { "options": { "0": { @@ -5665,6 +5652,19 @@ "question": "Nur offene Notizen anzeigen" } } + }, + "10": { + "options": { + "0": { + "question": "Alle Notizen" + }, + "1": { + "question": "Importnotizen ausblenden" + }, + "2": { + "question": "Nur Importnotizen anzeigen" + } + } } }, "name": "OpenStreetMap-Hinweise", @@ -5993,21 +5993,6 @@ "1": { "then": "Dies ist ein normaler Stellplatz." }, - "10": { - "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." - }, - "11": { - "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." - }, - "12": { - "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." - }, - "13": { - "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." - }, - "14": { - "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." - }, "2": { "then": "Dies ist ein Behindertenstellplatz." }, @@ -6031,6 +6016,21 @@ }, "9": { "then": "Dies ist ein Stellplatz, der für Motorräder reserviert ist." + }, + "10": { + "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." + }, + "11": { + "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." + }, + "12": { + "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." + }, + "13": { + "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." + }, + "14": { + "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." } }, "question": "Welche Art von Stellplatz ist dies?" @@ -6655,6 +6655,30 @@ "1": { "question": "Recycling von Batterien" }, + "2": { + "question": "Recycling von Getränkekartons" + }, + "3": { + "question": "Recycling von Dosen" + }, + "4": { + "question": "Recycling von Kleidung" + }, + "5": { + "question": "Recycling von Speiseöl" + }, + "6": { + "question": "Recycling von Motoröl" + }, + "7": { + "question": "Recycling von Leuchtstoffröhren" + }, + "8": { + "question": "Recycling von Grünabfällen" + }, + "9": { + "question": "Recycling von Glasflaschen" + }, "10": { "question": "Recycling von Glas" }, @@ -6684,30 +6708,6 @@ }, "19": { "question": "Recycling von Restabfällen" - }, - "2": { - "question": "Recycling von Getränkekartons" - }, - "3": { - "question": "Recycling von Dosen" - }, - "4": { - "question": "Recycling von Kleidung" - }, - "5": { - "question": "Recycling von Speiseöl" - }, - "6": { - "question": "Recycling von Motoröl" - }, - "7": { - "question": "Recycling von Leuchtstoffröhren" - }, - "8": { - "question": "Recycling von Grünabfällen" - }, - "9": { - "question": "Recycling von Glasflaschen" } } }, @@ -6775,6 +6775,30 @@ "1": { "then": "Getränkekartons können hier recycelt werden" }, + "2": { + "then": "Dosen können hier recycelt werden" + }, + "3": { + "then": "Kleidung kann hier recycelt werden" + }, + "4": { + "then": "Speiseöl kann hier recycelt werden" + }, + "5": { + "then": "Motoröl kann hier recycelt werden" + }, + "6": { + "then": "Hier können Leuchtstoffröhren recycelt werden" + }, + "7": { + "then": "Grünabfälle können hier recycelt werden" + }, + "8": { + "then": "Bio-Abfall kann hier recycelt werden" + }, + "9": { + "then": "Glasflaschen können hier recycelt werden" + }, "10": { "then": "Glas kann hier recycelt werden" }, @@ -6805,9 +6829,6 @@ "19": { "then": "Elektrokleingeräte können hier recycelt werden" }, - "2": { - "then": "Dosen können hier recycelt werden" - }, "20": { "then": "Elektrokleingeräte können hier recycelt werden" }, @@ -6816,27 +6837,6 @@ }, "22": { "then": "Restmüll kann hier recycelt werden" - }, - "3": { - "then": "Kleidung kann hier recycelt werden" - }, - "4": { - "then": "Speiseöl kann hier recycelt werden" - }, - "5": { - "then": "Motoröl kann hier recycelt werden" - }, - "6": { - "then": "Hier können Leuchtstoffröhren recycelt werden" - }, - "7": { - "then": "Grünabfälle können hier recycelt werden" - }, - "8": { - "then": "Bio-Abfall kann hier recycelt werden" - }, - "9": { - "then": "Glasflaschen können hier recycelt werden" } }, "question": "Was kann hier recycelt werden?" @@ -7411,12 +7411,6 @@ }, "question": "Hat die Treppe einen Handlauf?" }, - "multilevels": { - "override": { - "question": "Zwischen welchen Stockwerken befinden sich diese Stufen?", - "render": "Diese Stufen befinden sich zwischen den Stockwerken {level}" - } - }, "ramp": { "mappings": { "0": { @@ -7543,12 +7537,6 @@ "1": { "then": "Diese Straßenlaterne verwendet LEDs" }, - "10": { - "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" - }, - "11": { - "then": "Diese Straßenlaterne wird mit Gas beleuchtet" - }, "2": { "then": "Diese Straßenlaterne verwendet Glühlampenlicht" }, @@ -7572,6 +7560,12 @@ }, "9": { "then": "Diese Straßenlaterne verwendet Niederdruck-Natriumdampflampen (einfarbig orange)" + }, + "10": { + "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" + }, + "11": { + "then": "Diese Straßenlaterne wird mit Gas beleuchtet" } }, "question": "Mit welcher Art von Beleuchtung arbeitet diese Straßenlaterne?" @@ -7830,18 +7824,6 @@ }, "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}" }, - "payment-options": { - "override": { - "mappings+": { - "0": { - "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" - }, - "1": { - "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" - } - } - } - }, "validator-operator": { "freeform": { "placeholder": "Name des Betreibers" @@ -8061,11 +8043,6 @@ }, "name": "Toiletten in anderen Einrichtungen", "tagRenderings": { - "opening_hours": { - "override": { - "question": "Wann ist die Einrichtung, in der sich diese Toiletten befinden, geöffnet?" - } - }, "toilet-access": { "mappings": { "0": { @@ -8905,4 +8882,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index d1279849c..7984dfc3f 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -98,15 +98,6 @@ "1": { "then": "Mural" }, - "10": { - "then": "Azulejo (Spanish decorative tilework)" - }, - "11": { - "then": "Tilework" - }, - "12": { - "then": "Woodcarving" - }, "2": { "then": "Painting" }, @@ -130,6 +121,15 @@ }, "9": { "then": "Relief" + }, + "10": { + "then": "Azulejo (Spanish decorative tilework)" + }, + "11": { + "then": "Tilework" + }, + "12": { + "then": "Woodcarving" } }, "question": "What is the type of this artwork?", @@ -1571,27 +1571,6 @@ "1": { "question": "Has a
Schuko wall plug without ground pin (CEE7/4 type F)
connector" }, - "10": { - "question": "Has a
Type 2 with cable (mennekes)
connector" - }, - "11": { - "question": "Has a
Tesla Supercharger CCS (a branded type2_css)
connector" - }, - "12": { - "question": "Has a
Tesla Supercharger (destination)
connector" - }, - "13": { - "question": "Has a
Tesla Supercharger (Destination) (A Type 2 with cable branded as tesla)
connector" - }, - "14": { - "question": "Has a
USB to charge phones and small electronics
connector" - }, - "15": { - "question": "Has a
Bosch Active Connect with 3 pins and cable
connector" - }, - "16": { - "question": "Has a
Bosch Active Connect with 5 pins and cable
connector" - }, "2": { "question": "Has a
European wall plug with ground pin (CEE7/4 type E)
connector" }, @@ -1615,6 +1594,27 @@ }, "9": { "question": "Has a
Type 2 CCS (mennekes)
connector" + }, + "10": { + "question": "Has a
Type 2 with cable (mennekes)
connector" + }, + "11": { + "question": "Has a
Tesla Supercharger CCS (a branded type2_css)
connector" + }, + "12": { + "question": "Has a
Tesla Supercharger (destination)
connector" + }, + "13": { + "question": "Has a
Tesla Supercharger (Destination) (A Type 2 with cable branded as tesla)
connector" + }, + "14": { + "question": "Has a
USB to charge phones and small electronics
connector" + }, + "15": { + "question": "Has a
Bosch Active Connect with 3 pins and cable
connector" + }, + "16": { + "question": "Has a
Bosch Active Connect with 5 pins and cable
connector" } } } @@ -1670,6 +1670,30 @@ "1": { "then": "Schuko wall plug without ground pin (CEE7/4 type F)" }, + "2": { + "then": "European wall plug with ground pin (CEE7/4 type E)" + }, + "3": { + "then": "European wall plug with ground pin (CEE7/4 type E)" + }, + "4": { + "then": "Chademo" + }, + "5": { + "then": "Chademo" + }, + "6": { + "then": "Type 1 with cable (J1772)" + }, + "7": { + "then": "Type 1 with cable (J1772)" + }, + "8": { + "then": "Type 1 without cable (J1772)" + }, + "9": { + "then": "Type 1 without cable (J1772)" + }, "10": { "then": "Type 1 CCS (aka Type 1 Combo)" }, @@ -1700,9 +1724,6 @@ "19": { "then": "Type 2 with cable (mennekes)" }, - "2": { - "then": "European wall plug with ground pin (CEE7/4 type E)" - }, "20": { "then": "Tesla Supercharger CCS (a branded type2_css)" }, @@ -1733,32 +1754,11 @@ "29": { "then": "Bosch Active Connect with 3 pins and cable" }, - "3": { - "then": "European wall plug with ground pin (CEE7/4 type E)" - }, "30": { "then": "Bosch Active Connect with 5 pins and cable" }, "31": { "then": "Bosch Active Connect with 5 pins and cable" - }, - "4": { - "then": "Chademo" - }, - "5": { - "then": "Chademo" - }, - "6": { - "then": "Type 1 with cable (J1772)" - }, - "7": { - "then": "Type 1 with cable (J1772)" - }, - "8": { - "then": "Type 1 without cable (J1772)" - }, - "9": { - "then": "Type 1 without cable (J1772)" } }, "question": "Which charging connections are available here?" @@ -3243,15 +3243,6 @@ "1": { "then": "This cycleway is paved" }, - "10": { - "then": "This cycleway is made of fine gravel" - }, - "11": { - "then": "This cycleway is made of pebblestone" - }, - "12": { - "then": "This cycleway is made from raw ground" - }, "2": { "then": "This cycleway is made of asphalt" }, @@ -3275,6 +3266,15 @@ }, "9": { "then": "This cycleway is made of gravel" + }, + "10": { + "then": "This cycleway is made of fine gravel" + }, + "11": { + "then": "This cycleway is made of pebblestone" + }, + "12": { + "then": "This cycleway is made from raw ground" } }, "question": "What is the surface of the cycleway made from?", @@ -3323,15 +3323,6 @@ "1": { "then": "This cycleway is paved" }, - "10": { - "then": "This cycleway is made of fine gravel" - }, - "11": { - "then": "This cycleway is made of pebblestone" - }, - "12": { - "then": "This cycleway is made from raw ground" - }, "2": { "then": "This cycleway is made of asphalt" }, @@ -3355,6 +3346,15 @@ }, "9": { "then": "This cycleway is made of gravel" + }, + "10": { + "then": "This cycleway is made of fine gravel" + }, + "11": { + "then": "This cycleway is made of pebblestone" + }, + "12": { + "then": "This cycleway is made from raw ground" } }, "question": "What is the surface of the street made from?", @@ -4276,6 +4276,30 @@ "1": { "then": "This fitness station has a sign with instructions for a specific exercise." }, + "2": { + "then": "This fitness station has a facility for sit-ups." + }, + "3": { + "then": "This fitness station has a facility for push-ups. Usually consists of one or more low horizontal bars." + }, + "4": { + "then": "This fitness station has bars for stretching." + }, + "5": { + "then": "This fitness station has a station for making hyperextensions." + }, + "6": { + "then": "This fitness station has rings for gymnastic exercises." + }, + "7": { + "then": "This fitness station has a horizontal ladder, also known as monkey bars." + }, + "8": { + "then": "This fitness station has wall bars to climb on." + }, + "9": { + "then": "This fitness station has posts for performing slalom exercises." + }, "10": { "then": "This fitness station has stepping stones." }, @@ -4306,9 +4330,6 @@ "19": { "then": "This fitness station has battling ropes." }, - "2": { - "then": "This fitness station has a facility for sit-ups." - }, "20": { "then": "This fitness station has a stationary bicycle." }, @@ -4323,27 +4344,6 @@ }, "24": { "then": "This fitness station has a slackline." - }, - "3": { - "then": "This fitness station has a facility for push-ups. Usually consists of one or more low horizontal bars." - }, - "4": { - "then": "This fitness station has bars for stretching." - }, - "5": { - "then": "This fitness station has a station for making hyperextensions." - }, - "6": { - "then": "This fitness station has rings for gymnastic exercises." - }, - "7": { - "then": "This fitness station has a horizontal ladder, also known as monkey bars." - }, - "8": { - "then": "This fitness station has wall bars to climb on." - }, - "9": { - "then": "This fitness station has posts for performing slalom exercises." } }, "question": "What kind of equipment does this fitness station have?" @@ -4429,21 +4429,6 @@ "1": { "then": "This is a friture" }, - "10": { - "then": "Chinese dishes are served here" - }, - "11": { - "then": "Greek dishes are served here" - }, - "12": { - "then": "Indian dishes are served here" - }, - "13": { - "then": "Turkish dishes are served here" - }, - "14": { - "then": "Thai dishes are served here" - }, "2": { "then": "Mainly serves pasta" }, @@ -4467,6 +4452,21 @@ }, "9": { "then": "French dishes are served here" + }, + "10": { + "then": "Chinese dishes are served here" + }, + "11": { + "then": "Greek dishes are served here" + }, + "12": { + "then": "Indian dishes are served here" + }, + "13": { + "then": "Turkish dishes are served here" + }, + "14": { + "then": "Thai dishes are served here" } }, "question": "Which food is served here?", @@ -5597,19 +5597,6 @@ } } }, - "10": { - "options": { - "0": { - "question": "All Notes" - }, - "1": { - "question": "Hide import notes" - }, - "2": { - "question": "Show only import Notes" - } - } - }, "2": { "options": { "0": { @@ -5665,6 +5652,19 @@ "question": "Only show open notes" } } + }, + "10": { + "options": { + "0": { + "question": "All Notes" + }, + "1": { + "question": "Hide import notes" + }, + "2": { + "question": "Show only import Notes" + } + } } }, "name": "OpenStreetMap notes", @@ -5993,21 +5993,6 @@ "1": { "then": "This is a normal parking space." }, - "10": { - "then": "This is a parking space reserved for parents with children." - }, - "11": { - "then": "This is a parking space reserved for staff." - }, - "12": { - "then": "This is a parking space reserved for taxis." - }, - "13": { - "then": "This is a parking space reserved for vehicles towing a trailer." - }, - "14": { - "then": "This is a parking space reserved for car sharing." - }, "2": { "then": "This is a disabled parking space." }, @@ -6031,6 +6016,21 @@ }, "9": { "then": "This is parking space reserved for motorcycles." + }, + "10": { + "then": "This is a parking space reserved for parents with children." + }, + "11": { + "then": "This is a parking space reserved for staff." + }, + "12": { + "then": "This is a parking space reserved for taxis." + }, + "13": { + "then": "This is a parking space reserved for vehicles towing a trailer." + }, + "14": { + "then": "This is a parking space reserved for car sharing." } }, "question": "What kind of parking space is this?" @@ -6655,6 +6655,30 @@ "1": { "question": "Recycling of batteries" }, + "2": { + "question": "Recycling of beverage cartons" + }, + "3": { + "question": "Recycling of cans" + }, + "4": { + "question": "Recycling of clothes" + }, + "5": { + "question": "Recycling of cooking oil" + }, + "6": { + "question": "Recycling of engine oil" + }, + "7": { + "question": "Recycling of fluorescent tubes" + }, + "8": { + "question": "Recycling of green waste" + }, + "9": { + "question": "Recycling of glass bottles" + }, "10": { "question": "Recycling of glass" }, @@ -6684,30 +6708,6 @@ }, "19": { "question": "Recycling of residual waste" - }, - "2": { - "question": "Recycling of beverage cartons" - }, - "3": { - "question": "Recycling of cans" - }, - "4": { - "question": "Recycling of clothes" - }, - "5": { - "question": "Recycling of cooking oil" - }, - "6": { - "question": "Recycling of engine oil" - }, - "7": { - "question": "Recycling of fluorescent tubes" - }, - "8": { - "question": "Recycling of green waste" - }, - "9": { - "question": "Recycling of glass bottles" } } }, @@ -6775,6 +6775,30 @@ "1": { "then": "Beverage cartons can be recycled here" }, + "2": { + "then": "Cans can be recycled here" + }, + "3": { + "then": "Clothes can be recycled here" + }, + "4": { + "then": "Cooking oil can be recycled here" + }, + "5": { + "then": "Engine oil can be recycled here" + }, + "6": { + "then": "Fluorescent tubes can be recycled here" + }, + "7": { + "then": "Green waste can be recycled here" + }, + "8": { + "then": "Organic waste can be recycled here" + }, + "9": { + "then": "Glass bottles can be recycled here" + }, "10": { "then": "Glass can be recycled here" }, @@ -6805,9 +6829,6 @@ "19": { "then": "Small electrical appliances can be recycled here" }, - "2": { - "then": "Cans can be recycled here" - }, "20": { "then": "Small electrical appliances can be recycled here" }, @@ -6816,27 +6837,6 @@ }, "22": { "then": "Residual waste can be recycled here" - }, - "3": { - "then": "Clothes can be recycled here" - }, - "4": { - "then": "Cooking oil can be recycled here" - }, - "5": { - "then": "Engine oil can be recycled here" - }, - "6": { - "then": "Fluorescent tubes can be recycled here" - }, - "7": { - "then": "Green waste can be recycled here" - }, - "8": { - "then": "Organic waste can be recycled here" - }, - "9": { - "then": "Glass bottles can be recycled here" } }, "question": "What can be recycled here?" @@ -7543,12 +7543,6 @@ "1": { "then": "This lamp uses LEDs" }, - "10": { - "then": "This lamp uses high pressure sodium lamps (orange with white)" - }, - "11": { - "then": "This lamp is lit using gas" - }, "2": { "then": "This lamp uses incandescent lighting" }, @@ -7572,6 +7566,12 @@ }, "9": { "then": "This lamp uses low pressure sodium lamps (monochrome orange)" + }, + "10": { + "then": "This lamp uses high pressure sodium lamps (orange with white)" + }, + "11": { + "then": "This lamp is lit using gas" } }, "question": "What kind of lighting does this lamp use?" @@ -8905,4 +8905,4 @@ } } } -} +} \ No newline at end of file From 0bb487b1ba9cd493f03fac06e3ba791eec78667f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 9 Mar 2023 15:23:50 +0100 Subject: [PATCH 8/8] chore: remove stray import --- UI/Base/LinkToWeblate.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/UI/Base/LinkToWeblate.ts b/UI/Base/LinkToWeblate.ts index 73afabb56..f7f1b8653 100644 --- a/UI/Base/LinkToWeblate.ts +++ b/UI/Base/LinkToWeblate.ts @@ -2,7 +2,6 @@ import { VariableUiElement } from "./VariableUIElement" import Locale from "../i18n/Locale" import Link from "./Link" import Svg from "../../Svg" -import show = Mocha.reporters.Base.cursor.show /** * The little 'translate'-icon next to every icon + some static helper functions