From 4b07959b2269970b428a6a6e1e55efc759827a96 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Fri, 10 Dec 2021 15:32:11 +0100 Subject: [PATCH] Translation sync --- .../charging_station/charging_station.json | 96 +++++++++++++------ assets/layers/conflation/conflation.json | 24 +++-- assets/themes/grb_import/grb.json | 4 +- langs/layers/de.json | 11 +-- 4 files changed, 86 insertions(+), 49 deletions(-) diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 3e7da3ab0b..62247c77d4 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -2,7 +2,8 @@ "id": "charging_station", "name": { "en": "Charging stations", - "nl": "Oplaadpunten" + "nl": "Oplaadpunten", + "de": "Ladestationen" }, "minzoom": 10, "source": { @@ -23,7 +24,8 @@ }, "description": { "en": "A charging station", - "nl": "Oplaadpunten" + "nl": "Oplaadpunten", + "de": "Eine Ladestation" }, "tagRenderings": [ "images", @@ -3011,7 +3013,8 @@ "#": "In some cases, charging is free but one has to be authenticated. We only ask for authentication if fee is no (or unset). By default one sees the questions for either the payment options or the authentication options, but normally not both", "question": { "en": "What kind of authentication is available at the charging station?", - "nl": "Hoe kan men zich aanmelden aan dit oplaadstation?" + "nl": "Hoe kan men zich aanmelden aan dit oplaadstation?", + "fr": "Quelle sorte d'authentification est disponible à cette station de charge ?" }, "multiAnswer": true, "mappings": [ @@ -3020,7 +3023,8 @@ "ifnot": "authentication:membership_card=no", "then": { "en": "Authentication by a membership card", - "nl": "Aanmelden met een lidkaart is mogelijk" + "nl": "Aanmelden met een lidkaart is mogelijk", + "fr": "Authentification par carte de membre" } }, { @@ -3028,7 +3032,8 @@ "ifnot": "authentication:app=no", "then": { "en": "Authentication by an app", - "nl": "Aanmelden via een applicatie is mogelijk" + "nl": "Aanmelden via een applicatie is mogelijk", + "fr": "Authentification par une app" } }, { @@ -3036,7 +3041,8 @@ "ifnot": "authentication:phone_call=no", "then": { "en": "Authentication via phone call is available", - "nl": "Aanmelden door te bellen naar een telefoonnummer is mogelijk" + "nl": "Aanmelden door te bellen naar een telefoonnummer is mogelijk", + "fr": "Authentification par appel téléphonique est disponible" } }, { @@ -3044,7 +3050,8 @@ "ifnot": "authentication:short_message=no", "then": { "en": "Authentication via SMS is available", - "nl": "Aanmelden via SMS is mogelijk" + "nl": "Aanmelden via SMS is mogelijk", + "fr": "Authentification par SMS est disponible" } }, { @@ -3052,7 +3059,8 @@ "ifnot": "authentication:nfc=no", "then": { "en": "Authentication via NFC is available", - "nl": "Aanmelden via NFC is mogelijk" + "nl": "Aanmelden via NFC is mogelijk", + "fr": "Authentification par NFC est disponible" } }, { @@ -3068,7 +3076,8 @@ "ifnot": "authentication:debit_card=no", "then": { "en": "Authentication via debit card is available", - "nl": "Aanmelden met een betaalkaart is mogelijk" + "nl": "Aanmelden met een betaalkaart is mogelijk", + "fr": "Authentification par carte de débit est disponible" } }, { @@ -3076,7 +3085,8 @@ "ifnot": "authentication:none=no", "then": { "en": "Charging here is (also) possible without authentication", - "nl": "Hier opladen is (ook) mogelijk zonder aan te melden" + "nl": "Hier opladen is (ook) mogelijk zonder aan te melden", + "fr": "Charger ici est (aussi) possible sans authentification" } } ], @@ -3515,7 +3525,8 @@ ], "title": { "en": "charging station for cars", - "nl": "oplaadstation voor elektrische auto's" + "nl": "oplaadstation voor elektrische auto's", + "de": "Ladestation für e-bikes" }, "preciseInput": { "preferredBackground": "map" @@ -3529,20 +3540,26 @@ { "question": { "en": "All vehicle types", - "nl": "Alle voertuigen" + "nl": "Alle voertuigen", + "de": "Alle Fahrzeugtypen", + "fr": "Tout type de véhicule" } }, { "question": { "en": "Charging station for bicycles", - "nl": "Oplaadpunten voor fietsen" + "nl": "Oplaadpunten voor fietsen", + "de": "Ladestation für Fahrräder", + "fr": "Station de charge pour vélos" }, "osmTags": "bicycle=yes" }, { "question": { "en": "Charging station for cars", - "nl": "Oplaadpunten voor auto's" + "nl": "Oplaadpunten voor auto's", + "de": "Ladestation für Autos", + "fr": "Station de charge pour automobiles" }, "osmTags": { "or": [ @@ -3559,7 +3576,8 @@ { "question": { "en": "Only working charging stations", - "nl": "Enkel werkende oplaadpunten" + "nl": "Enkel werkende oplaadpunten", + "de": "Nur funktionierende Ladestationen" }, "osmTags": { "and": [ @@ -3576,13 +3594,15 @@ { "question": { "en": "All connectors", - "nl": "Alle types" + "nl": "Alle types", + "de": "Alle Anschlüsse" } }, { "question": { "en": "Has a
Schuko wall plug without ground pin (CEE7/4 type F)
connector", - "nl": "Heeft een
Schuko stekker zonder aardingspin (CEE7/4 type F)
" + "nl": "Heeft een
Schuko stekker zonder aardingspin (CEE7/4 type F)
", + "de": "Verfügt über einen
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
" }, "osmTags": "socket:schuko~*" }, @@ -3596,35 +3616,40 @@ { "question": { "en": "Has a
Chademo
connector", - "nl": "Heeft een
Chademo
" + "nl": "Heeft een
Chademo
", + "de": "Verfügt über einen
Chademo
Stecker" }, "osmTags": "socket:chademo~*" }, { "question": { "en": "Has a
Type 1 with cable (J1772)
connector", - "nl": "Heeft een
Type 1 met kabel (J1772)
" + "nl": "Heeft een
Type 1 met kabel (J1772)
", + "de": "Verfügt über einen
Typ 1 (J1772)
Stecker mit Kabel" }, "osmTags": "socket:type1_cable~*" }, { "question": { "en": "Has a
Type 1 without cable (J1772)
connector", - "nl": "Heeft een
Type 1 zonder kabel (J1772)
" + "nl": "Heeft een
Type 1 zonder kabel (J1772)
", + "de": "Verfügt über einen
Typ 1 (J1772)
Stecker ohne Kabel" }, "osmTags": "socket:type1~*" }, { "question": { "en": "Has a
Type 1 CCS (aka Type 1 Combo)
connector", - "nl": "Heeft een
Type 1 CCS (ook gekend als Type 1 Combo)
" + "nl": "Heeft een
Type 1 CCS (ook gekend als Type 1 Combo)
", + "de": "Verfügt über einen
Typ 1 CCS
Stecker, auch bekannt als Typ 1 Combo" }, "osmTags": "socket:type1_combo~*" }, { "question": { "en": "Has a
Tesla Supercharger
connector", - "nl": "Heeft een
Tesla Supercharger
" + "nl": "Heeft een
Tesla Supercharger
", + "de": "Verfügt über einen
Tesla Supercharger
Stecker" }, "osmTags": "socket:tesla_supercharger~*" }, @@ -3712,11 +3737,13 @@ ], "human": { "en": " minutes", - "nl": " minuten" + "nl": " minuten", + "ru": " минут" }, "humanSingular": { "en": " minute", - "nl": " minuut" + "nl": " minuut", + "ru": " минута" } }, { @@ -3732,11 +3759,13 @@ ], "human": { "en": " hours", - "nl": " uren" + "nl": " uren", + "ru": " часов" }, "humanSingular": { "en": " hour", - "nl": " uur" + "nl": " uur", + "ru": " час" } }, { @@ -3749,11 +3778,13 @@ ], "human": { "en": " days", - "nl": " day" + "nl": " day", + "ru": " дней" }, "humanSingular": { "en": " day", - "nl": " dag" + "nl": " dag", + "ru": " день" } } ] @@ -3789,7 +3820,8 @@ ], "human": { "en": "Volts", - "nl": "volt" + "nl": "volt", + "ru": "Вольт" } } ], @@ -3858,7 +3890,8 @@ ], "human": { "en": "kilowatt", - "nl": "kilowatt" + "nl": "kilowatt", + "ru": "киловатт" } }, { @@ -3868,7 +3901,8 @@ ], "human": { "en": "megawatt", - "nl": "megawatt" + "nl": "megawatt", + "ru": "мегаватт" } } ], diff --git a/assets/layers/conflation/conflation.json b/assets/layers/conflation/conflation.json index 41ceed6002..a42f5b5894 100644 --- a/assets/layers/conflation/conflation.json +++ b/assets/layers/conflation/conflation.json @@ -22,10 +22,12 @@ "location": "end", "icon": { "render": "circle:#0f0", - "mappings":[ { - "if": "move=no", - "then": "ring:#0f0" - }] + "mappings": [ + { + "if": "move=no", + "then": "ring:#0f0" + } + ] }, "iconSize": "10,10,center" }, @@ -33,7 +35,7 @@ "location": "start", "icon": "square:#f00", "iconSize": { - "render":"10,10,center", + "render": "10,10,center", "mappings": [ { "if": "distance<0.1", @@ -44,11 +46,13 @@ }, { "width": { - "render": "3", - "mappings": [{ - "if": "distance<0.2", - "then": "0" - }] + "render": "3", + "mappings": [ + { + "if": "distance<0.2", + "then": "0" + } + ] }, "color": "#00f", "dasharray": { diff --git a/assets/themes/grb_import/grb.json b/assets/themes/grb_import/grb.json index a072e5e3aa..e6b7b6d509 100644 --- a/assets/themes/grb_import/grb.json +++ b/assets/themes/grb_import/grb.json @@ -44,7 +44,9 @@ { "icon": "square:#cc0", "iconSize": "5,5,center", - "location": ["point"] + "location": [ + "point" + ] } ], "passAllFeatures": true diff --git a/langs/layers/de.json b/langs/layers/de.json index bce4a441c0..dc35e9bcb2 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -62,8 +62,8 @@ "render": "Diese Rettungswache befindet sich in {addr:place}." }, "ambulance-street": { - "render": "Dieser Bahnhof liegt an der Straße {addr:street}.", - "question": " Wie lautet der Name der Straße, in der sich die Rettungswache befindet?" + "question": " Wie lautet der Name der Straße, in der sich die Rettungswache befindet?", + "render": "Dieser Bahnhof liegt an der Straße {addr:street}." } }, "title": { @@ -1089,10 +1089,7 @@ "presets": { "1": { "title": "Ladestation für e-bikes" - }, - "2": { - "title": "Ladestation für Autos" - } + } } }, "crossings": { @@ -3158,4 +3155,4 @@ "watermill": { "name": "Wassermühle" } -} +} \ No newline at end of file