From ba3293f5842cca78bb2c0d2730479bf661caea79 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 3 Jan 2023 01:07:40 +0100 Subject: [PATCH] Merge translations --- assets/contributors.json | 4 +-- assets/layers/artwork/artwork.json | 12 ++++--- assets/layers/atm/atm.json | 15 +++++--- assets/themes/onwheels/onwheels.json | 3 +- assets/translators.json | 12 +++---- langs/layers/nl.json | 53 ++++++++++++++-------------- langs/nl.json | 2 +- langs/themes/de.json | 12 +++---- 8 files changed, 62 insertions(+), 51 deletions(-) diff --git a/assets/contributors.json b/assets/contributors.json index 078e957dd..fcc9e8592 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 4798, + "commits": 4805, "contributor": "Pieter Vander Vennet" }, { - "commits": 316, + "commits": 317, "contributor": "Robin van der Linde" }, { diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index 61ab288a5..364ccd984 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -612,7 +612,8 @@ "question": { "en": "Does this artwork serve as a bench?", "de": "Dient dieses Kunstwerk auch als Sitzbank?", - "fr": "Cette oeuvre d'art sert-elle de banc ?" + "fr": "Cette oeuvre d'art sert-elle de banc ?", + "nl": "Is dit kunstwerk ook een zitbank?" }, "mappings": [ { @@ -620,7 +621,8 @@ "then": { "en": "This artwork also serves as a bench", "de": "Dieses Kunstwerk dient auch als Sitzbank", - "fr": "Cette oeuvre d'art sert aussi de banc" + "fr": "Cette oeuvre d'art sert aussi de banc", + "nl": "Dit kunstwerk doet ook dienst als zitbank" } }, { @@ -628,7 +630,8 @@ "then": { "en": "This artwork does not serve as a bench", "de": "Dieses Kunstwerk dient nicht als Sitzbank", - "fr": "Cette oeuvre d'art ne sert pas de banc" + "fr": "Cette oeuvre d'art ne sert pas de banc", + "nl": "Dit kunstwerk doet geen dienst als zitbank" } }, { @@ -636,7 +639,8 @@ "then": { "en": "This artwork does not serve as a bench", "de": "Dieses Kunstwerk dient nicht als Sitzbank", - "fr": "Cette oeuvre d'art ne sert pas de banc" + "fr": "Cette oeuvre d'art ne sert pas de banc", + "nl": "Dit kunstwerk doet geen dienst als zitbank" }, "hideInAnswer": true } diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index 807d65718..dab5cec6c 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -75,7 +75,8 @@ "condition": "amenity=bank", "render": { "en": "This ATM is located in or near a bank", - "de": "Dieser Geldautomat befindet sich in oder in der Nähe einer Bank" + "de": "Dieser Geldautomat befindet sich in oder in der Nähe einer Bank", + "nl": "Deze geldautomaat bevindt zich in of bij een bank" } }, { @@ -187,7 +188,8 @@ "if": "cash_in=", "then": { "en": "You probably cannot deposit cash into this ATM", - "de": "Sie können wahrscheinlich kein Bargeld in diesen Geldautomaten einzahlen" + "de": "Sie können wahrscheinlich kein Bargeld in diesen Geldautomaten einzahlen", + "nl": "Je kan waarschijnlijk geen geld deponeren in deze geldautomaat" }, "hideInAnswer": true }, @@ -195,14 +197,16 @@ "if": "cash_in=yes", "then": { "en": "You can deposit cash into this ATM", - "de": "Sie können Bargeld in diesen Geldautomaten einzahlen" + "de": "Sie können Bargeld in diesen Geldautomaten einzahlen", + "nl": "Je kan geld deponeren in deze geldautomaat" } }, { "if": "cash_in=no", "then": { "en": "You cannot deposit cash into this ATM", - "de": "Sie können an diesem Geldautomaten kein Bargeld einzahlen" + "de": "Sie können an diesem Geldautomaten kein Bargeld einzahlen", + "nl": "Je kan geen geld deponeren in deze geldautomaat" } } ] @@ -270,7 +274,8 @@ { "question": { "en": "With speech output", - "de": "Mit Sprachausgabe" + "de": "Mit Sprachausgabe", + "nl": "Heeft spraak" }, "osmTags": "speech_output=yes" } diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 2433b8933..79ab5a2ef 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -223,7 +223,8 @@ } ], "name": { - "en": "Disabled parking spaces" + "en": "Disabled parking spaces", + "de": "Behindertenparkplätze" } }, "hideTagRenderingsWithLabels": [ diff --git a/assets/translators.json b/assets/translators.json index b6113f60c..762473485 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 217, + "commits": 220, "contributor": "Pieter Vander Vennet" }, { - "commits": 197, + "commits": 198, "contributor": "kjon" }, { @@ -112,6 +112,10 @@ "commits": 8, "contributor": "Vinicius" }, + { + "commits": 7, + "contributor": "mcliquid" + }, { "commits": 7, "contributor": "快乐的老鼠宝宝" @@ -128,10 +132,6 @@ "commits": 7, "contributor": "Niels Elgaard Larsen" }, - { - "commits": 6, - "contributor": "mcliquid" - }, { "commits": 6, "contributor": "Joost Schouppe" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 67a9d65ce..6f202b8dc 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -169,6 +169,15 @@ }, "atm": { "description": "Geldautomaten om geld op te nemen", + "filter": { + "1": { + "options": { + "0": { + "question": "Heeft spraak" + } + } + } + }, "name": "Geldautomaten", "presets": { "0": { @@ -176,6 +185,9 @@ } }, "tagRenderings": { + "atm-in-bank-notice": { + "render": "Deze geldautomaat bevindt zich in of bij een bank" + }, "brand": { "freeform": { "placeholder": "Merknaam" @@ -183,6 +195,19 @@ "question": "Van welk merk is deze geldautomaat?", "render": "Het merk van deze geldautomaat is {brand}" }, + "cash_in": { + "mappings": { + "0": { + "then": "Je kan waarschijnlijk geen geld deponeren in deze geldautomaat" + }, + "1": { + "then": "Je kan geld deponeren in deze geldautomaat" + }, + "2": { + "then": "Je kan geen geld deponeren in deze geldautomaat" + } + } + }, "name": { "render": "De naam van deze geldautomaat is {name}" }, @@ -192,22 +217,6 @@ }, "question": "Welk bedrijf beheert deze geldautomaat?", "render": "Deze geldautomaat wordt beheerd door {operator}" - }, - "atm-in-bank-notice": { - "render": "Deze geldautomaat bevindt zich in of bij een bank" - }, - "cash_in": { - "mappings": { - "1": { - "then": "Je kan geld deponeren in deze geldautomaat" - }, - "0": { - "then": "Je kan waarschijnlijk geen geld deponeren in deze geldautomaat" - }, - "2": { - "then": "Je kan geen geld deponeren in deze geldautomaat" - } - } } }, "title": { @@ -217,15 +226,6 @@ } }, "render": "Geldautomaat" - }, - "filter": { - "1": { - "options": { - "0": { - "question": "Heeft spraak" - } - } - } } }, "barrier": { @@ -2613,6 +2613,7 @@ }, "title": { "mappings": { + "0": {}, "1": { "then": "Klimsite {name}" }, @@ -7987,4 +7988,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/nl.json b/langs/nl.json index 93a896f56..7170fbf97 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -306,6 +306,7 @@ "title": "Upload je traject naar OpenStreetMap.org", "uploading": "Traject uploaden…" }, + "useSearch": "Gebruik de zoekfunctie hierboven om meer opties te zien", "weekdays": { "abbreviations": { "friday": "Vrij", @@ -347,7 +348,6 @@ "searchWikidata": "Zoek op Wikidata", "wikipediaboxTitle": "Wikipedia" }, - "useSearch": "Gebruik de zoekfunctie hierboven om meer opties te zien", "useSearchForMore": "Gebruik de zoekfunctie om {total} meer waarden te vinden…", "noMatchingMapping": "Geen overeenkomsten gevonden…" }, diff --git a/langs/themes/de.json b/langs/themes/de.json index 65a829b40..9052cec0f 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -909,6 +909,11 @@ } } }, + "8": { + "override": { + "name": "Behindertenparkplätze" + } + }, "19": { "override": { "=title": { @@ -935,11 +940,6 @@ } } } - }, - "8": { - "override": { - "name": "Behindertenparkplätze" - } } }, "title": "Auf Rädern" @@ -1226,4 +1226,4 @@ "shortDescription": "Eine Karte mit Abfalleimern", "title": "Abfalleimer" } -} +} \ No newline at end of file