diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md index 14b8f1b804..0fce02a792 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/UI/Base/LinkToWeblate.ts b/UI/Base/LinkToWeblate.ts index 73afabb563..f7f1b86536 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 diff --git a/UI/BigComponents/ActionButtons.ts b/UI/BigComponents/ActionButtons.ts index 2382791790..1946ea8932 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/CopyrightPanel.ts b/UI/BigComponents/CopyrightPanel.ts index 73b6157838..b9f0c5c758 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 diff --git a/UI/BigComponents/ThemeIntroductionPanel.ts b/UI/BigComponents/ThemeIntroductionPanel.ts index 1fc2f35abb..02dc660c66 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 2b5ce8ed2a..bba7a279a9 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) diff --git a/assets/contributors.json b/assets/contributors.json index cd618c19ea..a645c93136 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,7 +1,7 @@ { "contributors": [ { - "commits": 5071, + "commits": 5097, "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/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index 22d513f4b0..c592960dd0 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 63a8788f0b..bf45f4f69f 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/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 4efcfd4a84..b6b71d1cbb 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 49c1d8c673..493e614a5a 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 6e4c036a3e..feea148b16 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 diff --git a/assets/translators.json b/assets/translators.json index 46ed8672b2..641948f691 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 0d226128d8..70e1755705 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -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": { @@ -8432,6 +8460,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": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 3c78496bb1..7984dfc3f3 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -7249,10 +7249,10 @@ "question": "Soccer fields" }, "3": { - "question": "Ping-pong table" + "question": "Ping-pong tables" }, "4": { - "question": "Tennis field" + "question": "Tennis fields" } } } diff --git a/langs/nl.json b/langs/nl.json index 3bf607baab..36a15e54db 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -139,6 +139,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",