From 53cd9913182504563b24d4da5049f3e0492e7a1a Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sat, 30 Apr 2022 02:27:12 +0200 Subject: [PATCH] Translation sync --- .../layers/bicycle_rental/bicycle_rental.json | 4 +- assets/layers/climbing_gym/climbing_gym.json | 13 ++-- .../layers/climbing_route/climbing_route.json | 2 +- assets/layers/tree_node/tree_node.json | 9 ++- langs/layers/en.json | 6 ++ langs/layers/es.json | 3 + langs/layers/nl.json | 6 ++ langs/themes/de.json | 62 +++++++++++++++++++ langs/themes/es.json | 42 ------------- 9 files changed, 96 insertions(+), 51 deletions(-) diff --git a/assets/layers/bicycle_rental/bicycle_rental.json b/assets/layers/bicycle_rental/bicycle_rental.json index ff35d50fd8..c5be01a6f6 100644 --- a/assets/layers/bicycle_rental/bicycle_rental.json +++ b/assets/layers/bicycle_rental/bicycle_rental.json @@ -261,7 +261,7 @@ "en": "Bike helmets can be rented here", "nl": "Fietshelmpen kunnen hier gehuurd worden", "es": "Aquí se pueden alquilar cascos" - } + } } ] }, @@ -467,4 +467,4 @@ } ] } -} +} \ No newline at end of file diff --git a/assets/layers/climbing_gym/climbing_gym.json b/assets/layers/climbing_gym/climbing_gym.json index afa06676b0..74976727fd 100644 --- a/assets/layers/climbing_gym/climbing_gym.json +++ b/assets/layers/climbing_gym/climbing_gym.json @@ -74,14 +74,19 @@ "phone", "email", { - "builtin": ["climbing.fee"] + "builtin": [ + "climbing.fee" + ] }, "opening_hours", { - "builtin": - ["climbing.average_length","climbing.min_difficulty","climbing.max_difficulty", + "builtin": [ + "climbing.average_length", + "climbing.min_difficulty", + "climbing.max_difficulty", "climbing.bouldering", - "climbing.sportclimbing"] + "climbing.sportclimbing" + ] }, { "builtin": "climbing.max_bolts", diff --git a/assets/layers/climbing_route/climbing_route.json b/assets/layers/climbing_route/climbing_route.json index 43e005d7dc..667f5b251c 100644 --- a/assets/layers/climbing_route/climbing_route.json +++ b/assets/layers/climbing_route/climbing_route.json @@ -226,7 +226,7 @@ { "if": { "and": [ - "climbing:grade:french~*", + "climbing:grade:french~*", "name~*" ] }, diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index ce12eb676c..9c92b6d00b 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -33,7 +33,10 @@ "mappings": [ { "if": { - "and": ["name~*","species:wikidata~*"] + "and": [ + "name~*", + "species:wikidata~*" + ] }, "then": { "*": "{name} ({wikidata_label(species:wikidata)})" @@ -41,7 +44,9 @@ }, { "if": { - "and": ["name~*"] + "and": [ + "name~*" + ] }, "then": { "*": "{name}" diff --git a/langs/layers/en.json b/langs/layers/en.json index 5b493f3225..f92051ba12 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -497,6 +497,9 @@ }, "6": { "then": "Race bicycles can be rented here" + }, + "7": { + "then": "Bike helmets can be rented here" } }, "question": "What kind of bicycles and accessories are rented here?", @@ -518,6 +521,9 @@ }, "4": { "then": "A machine is present which dispenses and accepts keys, eventually after authentication and/or payment. The bicycles are parked nearby" + }, + "5": { + "then": "This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only" } }, "question": "What kind of bicycle rental is this?" diff --git a/langs/layers/es.json b/langs/layers/es.json index 43ca6954a6..81089e735e 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -404,6 +404,9 @@ }, "6": { "then": "Aquí se pueden alquilar bicicletas de carreras" + }, + "7": { + "then": "Aquí se pueden alquilar cascos" } }, "question": "¿Qué tipo de bicicletas y accesorios se alquilan aquí?", diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 4cfc56cb70..fa9abe8cb5 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -497,6 +497,9 @@ }, "6": { "then": "Wielerfietsen (sportfietsen) kunnen hier gehuurd worden" + }, + "7": { + "then": "Fietshelmpen kunnen hier gehuurd worden" } }, "question": "Wat voor soort fietsen en fietstoebehoren worden hier verhuurd?", @@ -518,6 +521,9 @@ }, "4": { "then": "Hier is een machine die fietssleutels verdeelt en terugneemt, eventueel na aanmelden of betaling. De fietsen staan in de buurt geparkeerd" + }, + "5": { + "then": "Dit is een dropzone, bv. een fietsparkeerplaats die is voorbehouden voor fietsverhuur " } }, "question": "Wat voor fietsverhuur is dit?" diff --git a/langs/themes/de.json b/langs/themes/de.json index 6b96fea87f..39ae6fe010 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -640,6 +640,68 @@ "shortDescription": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen.", "title": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen" }, + "mapcomplete-changes": { + "description": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden", + "layers": { + "0": { + "description": "Zeigt alle MapComplete Änderungen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenname enthält {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Erstellt von {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Nicht erstellt von {search}" + } + } + } + }, + "name": "Schwerpunkte von Änderungssätzen", + "tagRenderings": { + "contributor": { + "render": "Änderung wurde von {_last_edit:contributor} gemacht" + }, + "render_id": { + "render": "Änderung {id}" + }, + "theme": { + "mappings": { + "0": { + "then": "Änderung mit inoffiziellem Thema {theme}" + } + }, + "render": "Änderung mit Thema {theme}" + } + }, + "title": { + "render": "Änderungen für {theme}" + } + }, + "1": { + "override": { + "tagRenderings": { + "link_to_more": { + "render": "Weitere Statistiken finden Sie hier" + } + } + } + } + }, + "shortDescription": "Zeigt Änderungen von MapComplete", + "title": "Änderungen mit MapComplete" + }, "maps": { "description": "Auf dieser Karte findest du alle Karten, die OpenStreetMap kennt - typischerweise eine große Karte auf einer Informationstafel, die das Gebiet, die Stadt oder die Region zeigt, z.B. eine touristische Karte auf der Rückseite einer Plakatwand, eine Karte eines Naturschutzgebietes, eine Karte der Radwegenetze in der Region, ...)

Wenn eine Karte fehlt, können Sie diese leicht auf OpenStreetMap kartieren.", "shortDescription": "Dieses Thema zeigt alle (touristischen) Karten, die OpenStreetMap kennt", diff --git a/langs/themes/es.json b/langs/themes/es.json index 16f2cfc89d..a5f1913799 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -133,48 +133,6 @@ } } }, - "climbing": { - "overrideAll": { - "tagRenderings+": { - "2": { - "mappings": { - "0": { - "then": "Accesible públicamente a cualquiera" - }, - "1": { - "then": "Necesitas una autorización para acceder aquí" - }, - "2": { - "then": "Solo clientes" - }, - "3": { - "then": "Solo miembros del club" - } - }, - "question": "¿Quién pueden acceder aquí?" - }, - "4": { - "question": "¿Cuál es la longitud (media) de la ruta en metros?", - "render": "Las rotas tienen una longitud media de {canonical(climbing:length)}" - }, - "5": { - "question": "¿Cual es el nivel de la ruta más fácil aquí, de acuerdo con el sistema de clasificación francés?" - }, - "6": { - "question": "¿Cual es la ruta de mayor nivel aquí, de acuerdo al sistema de clasificación francés?" - } - }, - "units+": { - "0": { - "applicableUnits": { - "1": { - "human": " pies" - } - } - } - } - } - }, "cycle_infra": { "description": "Un mapa en el que puedes ver y editar cosas relacionadas con la infraestructura ciclista. Hecho durante #osoc21.", "shortDescription": "Un mapa en el que puedes ver y editar cosas relacionadas con la infraestructura ciclista.",