From 07ffa16faf40e4ca85b9bc5a31b9c6424464c8d4 Mon Sep 17 00:00:00 2001 From: kjon Date: Sun, 15 Sep 2024 16:05:00 +0000 Subject: [PATCH 01/11] Translated using Weblate (German) Currently translated at 99.9% (3764 of 3766 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/ --- langs/layers/de.json | 94 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index 378413c6b2..10aa184d29 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -3033,6 +3033,7 @@ "climbing_opportunity": { "description": "Rückfallebene mit Orten, auf denen Klettern eventuell möglich ist. Sie wird erst angezeigt, wenn man stark hineinzoomt, um zu verhindern, dass Elemente doppelt hinzugefügt werden", "name": "Klettermöglichkeiten?", + "snapName": "eine Wand, eine Klippe oder einen Felsen", "tagRenderings": { "climbing-opportunity-name": { "render": "{name}" @@ -3434,6 +3435,7 @@ "cycleways_and_roads": { "description": "Infrastruktur, die man mit dem Fahrrad befahren kann, begleitet von diesbezüglichen Fragen", "name": "Radwege und Straßen", + "snapName": "eine Straße oder einen Radweg", "tagRenderings": { "Cycleway type for a road": { "mappings": { @@ -5702,6 +5704,9 @@ }, "1": { "then": "Dies ist ein traditioneller (softwareorientierter) Hackerspace" + }, + "2": { + "then": "Dies ist ein Hackerspace/Hack-Lab, das sich hauptsächlich auf grundlegende Computerkenntnisse konzentriert, recycelte Geräte verwendet und/oder der Gemeinschaft Internet bereitstellt. Es befindet sich typischerweise in autonomen Räumen, besetzten Häusern oder sozialen Einrichtungen." } }, "question": "Ist dies ein Hackerspace oder ein Makerspace?" @@ -5913,6 +5918,7 @@ "indoors": { "description": "Grundlegende Innenraumkartierung: zeigt Umrisse von Räumen", "name": "Innenräume", + "snapName": "eine Innenwand", "tagRenderings": { "name": { "freeform": { @@ -5955,6 +5961,9 @@ "14": { "then": "Dies ist ein Büro" }, + "15": { + "then": "Dies ist ein Kopierraum" + }, "16": { "then": "Dies ist eine Gefängniszelle" }, @@ -6082,6 +6091,7 @@ "title": "einen Bordstein" } }, + "snapName": "ein Bordstein", "tagRenderings": { "kerb-height": { "freeform": { @@ -6773,6 +6783,13 @@ } } }, + "10": { + "options": { + "0": { + "question": "Nicht bearbeitet zuletzt von {search}" + } + } + }, "11": { "options": { "0": { @@ -6787,6 +6804,20 @@ } } }, + "13": { + "options": { + "0": { + "question": "Zuletzt bearbeitet vor {search}" + } + } + }, + "14": { + "options": { + "0": { + "question": "Zuletzt bearbeitet nach {search}" + } + } + }, "2": { "options": { "0": { @@ -7292,7 +7323,8 @@ }, "pedestrian_path": { "description": "Fußgängerwege, insbesondere für die Navigation in Gebäuden und die Aufnahme von Eingängen in diese Ebene", - "name": "Fußgängerwege" + "name": "Fußgängerwege", + "snapName": "ein Fußweg" }, "pharmacy": { "description": "Eine Ebene mit Apotheken, die (wahrscheinlich) verschreibungspflichtige Medikamente ausgeben", @@ -7651,6 +7683,50 @@ "render": "Spielplatzgerät" } }, + "police": { + "description": "Verschiedene Polizeieinrichtungen ", + "name": "Polizeiwachen", + "presets": { + "0": { + "description": "Eine Polizeiwache, die von der Öffentlichkeit für Anfragen genutzt werden kann", + "title": "eine Polizeiwache" + }, + "1": { + "description": "Ein Ort, an dem die Polizei Kontrollen von Reisenden durchführt", + "title": "eine Polizeikontrolle" + }, + "2": { + "description": "Ein Verwaltungsbüro der Polizei ohne Dienstleistungen für die Allgemeinheit.", + "title": "ein Verwaltungsbüro der Polizei" + }, + "3": { + "description": "Ein von der Polizei betriebenes Gefängnis ohne öffentliche Dienstleistungen. Hier werden Menschen für kurze Zeit (höchstens ein paar Tage) inhaftiert, z. B. wegen kleinerer Vergehen, Störung der öffentlichen Ordnung oder in Erwartung eines Gerichtsverfahrens" + }, + "4": { + "description": "Ein Stützpunkt für die Schifffahrtspolizei; oft mit einem Anleger und Polizeibooten in der Nähe" + } + }, + "tagRenderings": { + "4_z2nrdhy6tyyh4fd": { + "mappings": { + "0": { + "then": "Die Polizeidienststelle hat Zellen für die Inhaftierung von Personen" + }, + "1": { + "then": "Die Polizeidienststelle hat keine Zellen für die Inhaftierung von Personen" + } + }, + "question": "Verfügt die Polizeidienststelle über Gewahrsamsräume?" + }, + "police_name": { + "question": "Wie lautet der Name der Polizeieinrichtung?", + "render": "{name}" + } + }, + "title": { + "render": "{name}" + } + }, "postboxes": { "description": "Die Ebene zeigt Briefkästen.", "name": "Briefkästen", @@ -8179,6 +8255,9 @@ }, "4": { "then": "Dieser Ort bietet kabelgebundenen Internetzugang" + }, + "5": { + "then": "Dieser Ort bietet sowohl drahtloses Internet als auch Internetzugang über ein Terminal oder einen Computer" } }, "question": "Bietet dieser Ort Internetzugang?" @@ -9033,6 +9112,7 @@ "shelter": { "description": "Eine Ebene, die verschiedene Bauformen von Unterständen zeigt", "name": "Unterstände", + "snapName": "ein Unterstand", "tagRenderings": { "shelter-type": { "mappings": { @@ -11579,6 +11659,17 @@ } } }, + "scalebar": { + "mappings": { + "0": { + "then": "Maßstab anzeigen" + }, + "1": { + "then": "Maßstab ausblenden" + } + }, + "question": "Kartenmaßstab anzeigen?" + }, "settings-link": { "render": { "special": { @@ -12001,6 +12092,7 @@ }, "walls_and_buildings": { "description": "Spezielle Ebene, die alle Wände und Gebäude bereitstellt. Diese Ebene ist nützlich in Voreinstellungen für Objekte, die an Wänden platziert werden können (z. B. AEDs, Briefkästen, Eingänge, Adressen, Überwachungskameras, ...). Diese Ebene ist standardmäßig unsichtbar und kann vom Benutzer nicht umgeschaltet werden.", + "snapName": "eine Wand oder ein Gebäude", "tagRenderings": { "entrance_info": { "mappings": { From 03b4f3c96df35e48cf6eeb4407d3b854af8652c9 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 14 Sep 2024 21:58:35 +0000 Subject: [PATCH 02/11] Translated using Weblate (English) Currently translated at 100.0% (453 of 453 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/en/ --- langs/themes/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/langs/themes/en.json b/langs/themes/en.json index 1af16943b4..b6a248c10b 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -437,7 +437,7 @@ }, "disaster_response": { "description": "This map contains elements meant for disaster preparedness and response.", - "title": "Disaster response" + "title": "Disaster response and emergency services" }, "drinking_water": { "description": "On this map, publicly accessible drinking water spots are shown and can be easily added", @@ -1474,4 +1474,4 @@ "shortDescription": "A map with waste baskets", "title": "Waste Baskets" } -} \ No newline at end of file +} From 73db4d348976dae5b95636364f6ef58dc8e32855 Mon Sep 17 00:00:00 2001 From: kjon Date: Sat, 14 Sep 2024 21:13:52 +0000 Subject: [PATCH 03/11] Translated using Weblate (German) Currently translated at 100.0% (682 of 682 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/de/ --- langs/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/de.json b/langs/de.json index 3d4932ead6..0c730c525a 100644 --- a/langs/de.json +++ b/langs/de.json @@ -618,7 +618,7 @@ "#": "Dieser Text wird über der Thema-Auswahlschaltfläche gezeigt, wenn kein Thema geladen ist", "about": "Über MapComplete", "featuredThemeTitle": "Diese Woche im Blickpunkt", - "intro": "Karten zu verschiedenen Themen, zu denen Sie beitragen können", + "intro": "Karten über verschiedenen Themen, zu denen Sie beitragen können", "learnMore": "Mehr erfahren", "logIn": "Anmelden, um Themen anzuzeigen, die Sie bereits besucht haben", "pickTheme": "Eines der folgenden Themen auswählen, um zu starten.", From 0e75be8025a37f925b9ca8a812171574bc554097 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 14 Sep 2024 21:58:36 +0000 Subject: [PATCH 04/11] Translated using Weblate (Catalan) Currently translated at 72.4% (328 of 453 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/ca/ --- langs/themes/ca.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 74029e90c7..f374747785 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -1038,4 +1038,4 @@ "shortDescription": "Un mapa amb papereres", "title": "Papepera" } -} \ No newline at end of file +} From 1ab08f36f9ebd76e81c31d51cd0eb574285a757c Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 14 Sep 2024 21:58:36 +0000 Subject: [PATCH 05/11] Translated using Weblate (Italian) Currently translated at 51.4% (233 of 453 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/it/ --- langs/themes/it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/themes/it.json b/langs/themes/it.json index 9b0da466a4..7531f5ce3a 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -687,4 +687,4 @@ "shortDescription": "Una cartina dei cestini dei rifiuti", "title": "Cestino dei rifiuti" } -} \ No newline at end of file +} From 20da48b8f95883701bb3deec88a9dbfc66e8631e Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 14 Sep 2024 21:58:35 +0000 Subject: [PATCH 06/11] Translated using Weblate (Danish) Currently translated at 55.4% (251 of 453 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/da/ --- langs/themes/da.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/themes/da.json b/langs/themes/da.json index f780a079f1..ec2a068e7d 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -846,4 +846,4 @@ "shortDescription": "Et kort over skraldespande", "title": "Skraldespande" } -} \ No newline at end of file +} From a22cab224b0cfcbee960c6748ec8f384a29f4a51 Mon Sep 17 00:00:00 2001 From: kjon Date: Sun, 15 Sep 2024 16:03:57 +0000 Subject: [PATCH 07/11] Translated using Weblate (German) Currently translated at 100.0% (453 of 453 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/de/ --- langs/themes/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/langs/themes/de.json b/langs/themes/de.json index afd7a11144..42ace295f5 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -437,7 +437,7 @@ }, "disaster_response": { "description": "Diese Karte enthält Elemente, die der Katastrophenvorsorge und dem Katastrophenschutz dienen.", - "title": "Katastrophenschutz" + "title": "Katastrophenschutz und Notfalldienste" }, "drinking_water": { "description": "Eine Karte zum Anzeigen und Bearbeiten öffentlicher Trinkwasserstellen", @@ -1474,4 +1474,4 @@ "shortDescription": "Eine Karte mit Abfalleimern", "title": "Abfalleimer" } -} \ No newline at end of file +} From 9c44f3329d1f2b9abf3ff0460db84bedefd7045b Mon Sep 17 00:00:00 2001 From: Ryan C Date: Sun, 15 Sep 2024 16:50:24 +0000 Subject: [PATCH 08/11] Translated using Weblate (Filipino) Currently translated at 10.5% (72 of 682 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/fil/ --- langs/fil.json | 121 ++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 68 deletions(-) diff --git a/langs/fil.json b/langs/fil.json index 56d5e8fbd4..35e37d8279 100644 --- a/langs/fil.json +++ b/langs/fil.json @@ -6,7 +6,7 @@ "zoomIn": "Mag-zoom in pa, ng makita or ma-edit ang datos." }, "delete": { - "cancel": "Kanselá", + "cancel": "Kanselahin", "cannotBeDeleted": "Ang tampok na ito ay hindi matatanggal", "delete": "Tanggalin", "explanations": { @@ -37,6 +37,12 @@ "panelIntro": "

Pangsariling tikha

Gawing aktibo ang mga paborito galing sa mga tikhang opisyal", "reload": "Muling pasanin ang datos" }, + "flyer": { + "mapcomplete": { + "title": "Ano ang MapComplete?" + }, + "whatIsOsm": "Ano ang OpenStreetMap?" + }, "general": { "about": "Madaling i-edit at mag-dagdag sa OpenStreetMap gamit ang mga partikular na tikha", "add": { @@ -57,101 +63,80 @@ "intro": "Nag-klik ka kung saan wala pang nababatid na datos.
", "layerNotEnabled": "Ang layer {layer} ay hindi gumagana. Paganahin ang layer na ito upang makapag-dagdag ng tampók" }, - "apply_button": { - }, "attribution": { - "iconAttribution": { - } - }, - "download": { - }, - "histogram": { - }, - "layerSelection": { - }, - "levelSelection": { - }, - "morescreen": { + "followOnMastodon": "Subaybayan ang MapComplete sa Mastodon", + "gotoSourceCode": "Tingnan ang source code", + "mapDataByOsm": "Datos ng mapa: OpenStreetMap", + "openMapillary": "Buksan ang Mapillary dito", + "seeOnMapillary": "Tingnan ang larawang ito sa Mapillary" }, + "back": "Bumalik", + "backToMap": "Bumalik sa mapa", + "cancel": "Kanselahin", + "confirm": "Kumpirmahin", + "openTheMap": "Buksan ang mapa", "opening_hours": { + "friday": "Sa Biyernes {ranges}", + "loadingCountry": "Tinutukoy ang bansa…", + "monday": "Sa Lunes {ranges}", + "openTill": "hanggang", + "opensAt": "mula", + "ph_closed": "sarado", + "ph_open": "bukas", + "ranges": "mula {starttime} hanggang {endtime}", + "rangescombined": "{range0} at {range1}", + "saturday": "Sa Sabado {ranges}", + "sunday": "Sa Linggo {ranges}" }, - "pdf": { + "pickLanguage": "Pumili ng wika", + "questionBox": { + "answeredMultiple": "Sinagutan mo ang {answered} na tanong" }, "questions": { + "emailOf": "Ano ba ang email address ng {category}?" }, + "returnToTheMap": "Bumalik sa mapa", "search": { - }, - "sharescreen": { - }, - "weekdays": { - "abbreviations": { - } - }, - "welcomeExplanation": { - }, - "wikipedia": { - "previewbox": { - } + "nothing": "Walang nahanap…" } }, - "image": { - }, - "importInspector": { - }, - "importLayer": { - }, - "index": { - }, - "move": { - "inviteToMove": { - }, - "reasons": { - } - }, - "multi_apply": { - }, - "notes": { - }, - "privacy": { - }, "reviews": { - }, - "split": { + "question_opinion": "Kamusta ang iyong karanasan?", + "reviewPlaceholder": "Ilarawan ang iyong karanasan…" }, "translations": { + "allMissing": "Wala pang pagsasalin" + }, + "unknown": { + "clear": "Tanggalin ang sagot" }, "validation": { "color": { + "description": "Kulay o hexcode" }, "date": { - }, - "direction": { - }, - "distance": { + "description": "Petsa na nagsisimula sa taon" }, "email": { + "noAt": "Ang e-mail address ay dapat naglalaman ng @" }, - "float": { - }, - "int": { + "fediverse": { + "onYourServer": "Tingnan at subaybayan sa iyong server" }, "nat": { - }, - "opening_hours": { + "mustBePositive": "Dapat positibo ang numerong ito" }, "pfloat": { + "description": "positibong numero" }, "phone": { - }, - "pnat": { - }, - "string": { - }, - "text": { + "description": "numero ng telepono", + "feedback": "Ito ay hindi tamang numero ng telepono", + "feedbackCountry": "Ito ay hindi tamang numero ng telepono (sa bansang {country})" }, "url": { - }, - "wikidata": { + "aggregator": "Ang {host} ay isang third-party na website. Kung maaari, hanapin ang opisyal na website.", + "feedback": "Ito ay hindi tamang web address" } } -} \ No newline at end of file +} From ca8b949477af752a9ad50d5defd3148ca4049b58 Mon Sep 17 00:00:00 2001 From: Ryan C Date: Sun, 15 Sep 2024 16:26:12 +0000 Subject: [PATCH 09/11] Translated using Weblate (Filipino) Currently translated at 3.0% (14 of 453 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/fil/ --- langs/themes/fil.json | 53 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/langs/themes/fil.json b/langs/themes/fil.json index e8329c0b08..9c48d05e1b 100644 --- a/langs/themes/fil.json +++ b/langs/themes/fil.json @@ -6,5 +6,56 @@ "artwork": { "description": "Malugod na pag-dating sa Open Artwork Map, ang mapa ng mga bantayog, graffiti, at iba pang likhang sining sa buong mundo", "title": "Open Artwork Map" + }, + "bag": { + "layers": { + "0": { + "tagRenderings": { + "Reference": { + "mappings": { + "0": { + "then": "Walang sanggunian ang gusaling ito sa BAG" + } + }, + "render": "Ang sanggunian sa BAG ay {ref:bag}" + } + } + }, + "2": { + "description": "Mga gusali mula sa rehistro ng BAG", + "tagRenderings": { + "Build year": { + "mappings": { + "0": { + "then": "Sinimulan ang gusali noong {_bag_obj:start_date}" + } + }, + "render": "Ang gusaling ito ay itinayo noong {_bag_obj:start_date}" + }, + "Building type": { + "mappings": { + "0": { + "then": "Ang uri ng gusali ay magiging {_bag_obj:construction}" + } + }, + "render": "Ang uri ng gusali ay {_bag_obj:building}" + }, + "Reference": { + "render": "Ang sanggunian sa BAG ay {_bag_obj:ref:bag}" + } + } + } + } + }, + "benches": { + "shortDescription": "Mapa ng upuan", + "title": "Mga upuan" + }, + "bicycle_parkings": { + "description": "Mapa na nagpapakita ng lahat ng uri ng paradahan ng bisikleta", + "title": "Mga paradahan ng bisikleta" + }, + "blind_osm": { + "title": "OSM para sa mga bulag" } -} \ No newline at end of file +} From 349c6538a084a33e475099d4de89d43d055c8141 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 17 Sep 2024 03:25:34 +0200 Subject: [PATCH 10/11] Chore:merge translations --- .../climbing_opportunity.json | 3 +- .../cycleways_and_roads.json | 3 +- assets/layers/hackerspace/hackerspace.json | 3 +- assets/layers/indoors/indoors.json | 6 ++- assets/layers/kerbs/kerbs.json | 3 +- assets/layers/note/note.json | 6 +-- .../pedestrian_path/pedestrian_path.json | 3 +- assets/layers/police/police.json | 48 ++++++++++++------- assets/layers/questions/questions.json | 3 +- assets/layers/shelter/shelter.json | 3 +- assets/layers/usersettings/usersettings.json | 9 ++-- .../walls_and_buildings.json | 3 +- assets/themes/bag/bag.json | 24 ++++++---- assets/themes/benches/benches.json | 6 ++- .../bicycle_parkings/bicycle_parkings.json | 6 ++- assets/themes/blind_osm/blind_osm.json | 3 +- .../disaster_response/disaster_response.json | 4 +- langs/fil.json | 2 +- langs/layers/de.json | 9 +--- langs/themes/ca.json | 2 +- langs/themes/da.json | 2 +- langs/themes/de.json | 2 +- langs/themes/en.json | 2 +- langs/themes/fil.json | 2 +- langs/themes/it.json | 2 +- 25 files changed, 97 insertions(+), 62 deletions(-) diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json index 031ec13a8d..78b3003c85 100644 --- a/assets/layers/climbing_opportunity/climbing_opportunity.json +++ b/assets/layers/climbing_opportunity/climbing_opportunity.json @@ -150,7 +150,8 @@ ], "allowMove": false, "snapName": { - "en": "a wall, cliff or rock" + "en": "a wall, cliff or rock", + "de": "eine Wand, eine Klippe oder einen Felsen" }, "doCount": false } diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 27d669d2e3..ea8a549b0c 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -1916,6 +1916,7 @@ "allowSplit": true, "snapName": { "en": "a road or a cycleway", - "nl": "een weg, straat of fietspad" + "nl": "een weg, straat of fietspad", + "de": "eine Straße oder einen Radweg" } } diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json index 5cf6bfbaed..d965326bb2 100644 --- a/assets/layers/hackerspace/hackerspace.json +++ b/assets/layers/hackerspace/hackerspace.json @@ -196,7 +196,8 @@ { "if": "hackerspace=hacklab", "then": { - "en": "This is a hacklab which is mostly focussed on basic computer skills, using recycled devices and/or providing internet to the community. This is typically located in autonomous spaces, squats or social facilities" + "en": "This is a hacklab which is mostly focussed on basic computer skills, using recycled devices and/or providing internet to the community. This is typically located in autonomous spaces, squats or social facilities", + "de": "Dies ist ein Hackerspace/Hack-Lab, das sich hauptsächlich auf grundlegende Computerkenntnisse konzentriert, recycelte Geräte verwendet und/oder der Gemeinschaft Internet bereitstellt. Es befindet sich typischerweise in autonomen Räumen, besetzten Häusern oder sozialen Einrichtungen." } } ] diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json index 3ef29d1ba8..e283ad6203 100644 --- a/assets/layers/indoors/indoors.json +++ b/assets/layers/indoors/indoors.json @@ -475,7 +475,8 @@ { "if": "room=printer", "then": { - "en": "This is a copy room" + "en": "This is a copy room", + "de": "Dies ist ein Kopierraum" } }, { @@ -622,6 +623,7 @@ }, "snapName": { "en": "an indoor wall", - "nl": "een binnenmuur" + "nl": "een binnenmuur", + "de": "eine Innenwand" } } diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index 51614d02b2..268be11178 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -408,6 +408,7 @@ } ], "snapName": { - "en": "a kerb" + "en": "a kerb", + "de": "ein Bordstein" } } diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json index 39e251fec8..8182c99f13 100644 --- a/assets/layers/note/note.json +++ b/assets/layers/note/note.json @@ -307,7 +307,6 @@ } ] }, - { "id": "opened_by", "options": [ @@ -444,7 +443,7 @@ "question": { "en": "Created after {search}", "nl": "Aangemaakt na {search}", - "de": "Erstellt nach dem {search}", + "de": "Zuletzt bearbeitet vor {search}", "es": "Creada después de {search}", "ca": "Creada després de {search}", "cs": "Vytvořeno po {search}", @@ -465,7 +464,8 @@ } ], "question": { - "en": "Last edited before {search}" + "en": "Last edited before {search}", + "de": "Zuletzt bearbeitet nach {search}" } } ] diff --git a/assets/layers/pedestrian_path/pedestrian_path.json b/assets/layers/pedestrian_path/pedestrian_path.json index 007ff1411f..d6eb09c239 100644 --- a/assets/layers/pedestrian_path/pedestrian_path.json +++ b/assets/layers/pedestrian_path/pedestrian_path.json @@ -48,6 +48,7 @@ ], "allowMove": false, "snapName": { - "en": "a pedestrian path" + "en": "a pedestrian path", + "de": "ein Fußweg" } } diff --git a/assets/layers/police/police.json b/assets/layers/police/police.json index a79631991c..1f05baaa4f 100644 --- a/assets/layers/police/police.json +++ b/assets/layers/police/police.json @@ -1,10 +1,12 @@ { "id": "police", "name": { - "en": "Police stations" + "en": "Police stations", + "de": "Polizeiwachen" }, "description": { - "en": "Many types of police facilities " + "en": "Many types of police facilities ", + "de": "Verschiedene Polizeieinrichtungen " }, "source": { "osmTags": { @@ -17,7 +19,8 @@ "minzoom": 10, "title": { "render": { - "en": "{name}" + "en": "{name}", + "de": "{name}" } }, "pointRendering": [ @@ -49,10 +52,12 @@ "amenity=police" ], "title": { - "en": "a police office" + "en": "a police office", + "de": "eine Polizeiwache" }, "description": { - "en": "A police office where the general public can enter for inquiries" + "en": "A police office where the general public can enter for inquiries", + "de": "Eine Polizeiwache, die von der Öffentlichkeit für Anfragen genutzt werden kann" } }, { @@ -60,10 +65,12 @@ "police=checkpoint" ], "title": { - "en": "a police checkpoint" + "en": "a police checkpoint", + "de": "eine Polizeikontrolle" }, "description": { - "en": "A place where police performs checks on travelling people" + "en": "A place where police performs checks on travelling people", + "de": "Ein Ort, an dem die Polizei Kontrollen von Reisenden durchführt" } }, { @@ -71,10 +78,12 @@ "police=offices" ], "title": { - "en": "an administrative, police backoffice" + "en": "an administrative, police backoffice", + "de": "ein Verwaltungsbüro der Polizei" }, "description": { - "en": "An administrative police office without services for the general public." + "en": "An administrative police office without services for the general public.", + "de": "Ein Verwaltungsbüro der Polizei ohne Dienstleistungen für die Allgemeinheit." } }, { @@ -83,7 +92,8 @@ ], "title": "a police detention center", "description": { - "en": "A jail run by the police without public services. People are detained here for a short time (at most a few days), e.g. for small misdemeanors, disturbance of the public order or awaiting a trial" + "en": "A jail run by the police without public services. People are detained here for a short time (at most a few days), e.g. for small misdemeanors, disturbance of the public order or awaiting a trial", + "de": "Ein von der Polizei betriebenes Gefängnis ohne öffentliche Dienstleistungen. Hier werden Menschen für kurze Zeit (höchstens ein paar Tage) inhaftiert, z. B. wegen kleinerer Vergehen, Störung der öffentlichen Ordnung oder in Erwartung eines Gerichtsverfahrens" } }, { @@ -92,7 +102,8 @@ ], "title": "a police naval base", "description": { - "en": "A naval or maritime base for the maritime police; often with a pier and police boats nearby" + "en": "A naval or maritime base for the maritime police; often with a pier and police boats nearby", + "de": "Ein Stützpunkt für die Schifffahrtspolizei; oft mit einem Anleger und Polizeibooten in der Nähe" } } ], @@ -101,11 +112,13 @@ "reviews", { "question": { - "en": "What is the name of this police facility?" + "en": "What is the name of this police facility?", + "de": "Wie lautet der Name der Polizeieinrichtung?" }, "id": "police_name", "render": { - "en": "{name}" + "en": "{name}", + "de": "{name}" }, "freeform": { "key": "name" @@ -116,7 +129,8 @@ "opening_hours", { "question": { - "en": "Does this police office have detention facilities?" + "en": "Does this police office have detention facilities?", + "de": "Verfügt die Polizeidienststelle über Gewahrsamsräume?" }, "id": "4_z2nrdhy6tyyh4fd", "condition": "amenity=police", @@ -124,13 +138,15 @@ { "if": "detention=yes", "then": { - "en": "This police office has some cells to detain people" + "en": "This police office has some cells to detain people", + "de": "Die Polizeidienststelle hat Zellen für die Inhaftierung von Personen" } }, { "if": "detention=no", "then": { - "en": "This police office does not have cells to detain people" + "en": "This police office does not have cells to detain people", + "de": "Die Polizeidienststelle hat keine Zellen für die Inhaftierung von Personen" } } ] diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index 2d0b1d3a6a..821b059353 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -2174,7 +2174,8 @@ "if": "internet_access=terminal;wifi", "alsoShowIf": "internet_access=wifi;terminal", "then": { - "en": "This place offers both wireless internet and internet access via a terminal or computer" + "en": "This place offers both wireless internet and internet access via a terminal or computer", + "de": "Dieser Ort bietet sowohl drahtloses Internet als auch Internetzugang über ein Terminal oder einen Computer" } } ], diff --git a/assets/layers/shelter/shelter.json b/assets/layers/shelter/shelter.json index 8b7f169be3..6c23608893 100644 --- a/assets/layers/shelter/shelter.json +++ b/assets/layers/shelter/shelter.json @@ -127,6 +127,7 @@ "enableImproveAccuracy": true }, "snapName": { - "en": "a shelter" + "en": "a shelter", + "de": "ein Unterstand" } } diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json index d7f465103d..871883e4ca 100644 --- a/assets/layers/usersettings/usersettings.json +++ b/assets/layers/usersettings/usersettings.json @@ -474,14 +474,16 @@ "id": "scalebar", "question": { "en": "Should a scale bar be shown on the map?", - "nl": "Moet er een schaalbalk weergegeven worden?" + "nl": "Moet er een schaalbalk weergegeven worden?", + "de": "Kartenmaßstab anzeigen?" }, "mappings": [ { "if": "mapcomplete-preference-show-scale=true", "then": { "en": "Show the scalebar", - "nl": "Toon de schaalbalk" + "nl": "Toon de schaalbalk", + "de": "Maßstab anzeigen" } }, { @@ -489,7 +491,8 @@ "alsoShowIf": "mapcomplete-preference-show-scale=", "then": { "en": "Hide the scalebar", - "nl": "Verberg de schaalbalk" + "nl": "Verberg de schaalbalk", + "de": "Maßstab ausblenden" } } ] diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index 9e41a19b14..3aaadfecf4 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -143,6 +143,7 @@ ], "snapName": { "en": "a wall or building", - "nl": "een muur of gebouw" + "nl": "een muur of gebouw", + "de": "eine Wand oder ein Gebäude" } } diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json index 31d9afaf12..184d47bbe1 100644 --- a/assets/themes/bag/bag.json +++ b/assets/themes/bag/bag.json @@ -73,7 +73,8 @@ "es": "La referencia de BAG es {ref:bag}", "cs": "Reference v BAG je {ref:bag}", "pl": "Numer referencyjny w BAG to {ref:bag}", - "zh_Hans": "在 BAG 中的参考是 {ref:bag}" + "zh_Hans": "在 BAG 中的参考是 {ref:bag}", + "fil": "Ang sanggunian sa BAG ay {ref:bag}" }, "mappings": [ { @@ -88,7 +89,8 @@ "zgh": "ⵜⵓⵚⴽⴰ ⴰⴷ ⵓⵔ ⵖⵓⵔⵙ ⵜⴰⵙⴰⵖⵓⵍⵜ ⴳ BAG", "es": "Este edificio no tiene referencia en el BAG", "pl": "Budynek ten nie ma odniesienia w BAG", - "zh_Hans": "这栋建筑在BAG中没有参考信息" + "zh_Hans": "这栋建筑在BAG中没有参考信息", + "fil": "Walang sanggunian ang gusaling ito sa BAG" } } ] @@ -205,7 +207,8 @@ "es": "Edificios del registro BAG", "cs": "Budovy z registru BAG", "pl": "Budynki z rejestru BAG", - "zh_Hans": "BAG 注册中的建筑物" + "zh_Hans": "BAG 注册中的建筑物", + "fil": "Mga gusali mula sa rehistro ng BAG" }, "source": { "geoJson": "https://service.pdok.nl/lv/bag/wfs/v2_0?request=GetFeature&service=WFS&version=2.0.0&outputFormat=application%2Fjson%3B%20subtype%3Dgeojson&typeName=bag%3Apand&bbox={x_min}%2C{y_min}%2C{x_max}%2C{y_max}%2CCRS84&srsName=EPSG%3A4326", @@ -291,7 +294,8 @@ "es": "La referencia en BAG es {_bag_obj:ref:bag}", "cs": "Reference v BAG je {_bag_obj:ref:bag}", "pl": "Odniesienie w BAG to {_bag_obj:ref:bag}", - "zh_Hans": "在 BAG 中的参考文献是 {_bag_obj:ref:bag}" + "zh_Hans": "在 BAG 中的参考文献是 {_bag_obj:ref:bag}", + "fil": "Ang sanggunian sa BAG ay {_bag_obj:ref:bag}" } }, { @@ -308,7 +312,8 @@ "nb_NO": "Bygning oppført {_bag_obj:start_date}", "pl": "Ten budynek zbudowano w {_bag_obj:start_date}", "pt": "Esta construção é de {_bag_obj:start_date}", - "zh_Hans": "这座建筑建于 {_bag_obj:start_date}" + "zh_Hans": "这座建筑建于 {_bag_obj:start_date}", + "fil": "Ang gusaling ito ay itinayo noong {_bag_obj:start_date}" }, "mappings": [ { @@ -323,7 +328,8 @@ "nb_NO": "Oppføring startet {_bag_obj:start_date}", "es": "Este edificio se empezó a construir en {_bag_obj:start_date}", "pl": "Budynek został zbudowany w {_bag_obj:start_date}", - "zh_Hans": "该建筑始建于 {_bag_obj:start_date}" + "zh_Hans": "该建筑始建于 {_bag_obj:start_date}", + "fil": "Sinimulan ang gusali noong {_bag_obj:start_date}" } } ] @@ -340,7 +346,8 @@ "nb_NO": "Dette er en bygning av typen {_bag_obj:building}", "es": "El edificio es de tipo {_bag_obj:building}", "pl": "Rodzaj budynku to {_bag_obj:building}", - "zh_Hans": "建筑类型是 {_bag_obj:building}" + "zh_Hans": "建筑类型是 {_bag_obj:building}", + "fil": "Ang uri ng gusali ay {_bag_obj:building}" }, "mappings": [ { @@ -354,7 +361,8 @@ "cs": "Typ budovy bude {_bag_obj:construction}", "es": "El tipo de edificio será un {_bag_obj:construction}", "pl": "Budynek będzie o typie {_bag_obj:construction}", - "zh_Hans": "建筑类型将是 {_bag_obj:construction}" + "zh_Hans": "建筑类型将是 {_bag_obj:construction}", + "fil": "Ang uri ng gusali ay magiging {_bag_obj:construction}" } } ] diff --git a/assets/themes/benches/benches.json b/assets/themes/benches/benches.json index 5e2bfee96b..f3e45b8d1c 100644 --- a/assets/themes/benches/benches.json +++ b/assets/themes/benches/benches.json @@ -21,7 +21,8 @@ "cs": "Lavičky", "eu": "Eserlekuak", "pl": "Ławki", - "pt": "Bancadas" + "pt": "Bancadas", + "fil": "Mga upuan" }, "description": { "en": "This map shows all benches that are recorded in OpenStreetMap: Individual benches, and benches belonging to public transport stops or shelters.", @@ -62,7 +63,8 @@ "cs": "Mapa laviček", "eu": "Eserleku mapa bat", "pl": "Mapa ławek", - "pt": "Um mapa de bancadas" + "pt": "Um mapa de bancadas", + "fil": "Mapa ng upuan" }, "icon": "./assets/themes/benches/bench_poi.svg", "credits": [ diff --git a/assets/themes/bicycle_parkings/bicycle_parkings.json b/assets/themes/bicycle_parkings/bicycle_parkings.json index 0cf83f1427..84c41b0d8b 100644 --- a/assets/themes/bicycle_parkings/bicycle_parkings.json +++ b/assets/themes/bicycle_parkings/bicycle_parkings.json @@ -9,14 +9,16 @@ "da": "Cykelparkering", "es": "Aparcamiento de bicicletas", "zh_Hans": "自行车停车场", - "it": "Parcheggi per biciclette" + "it": "Parcheggi per biciclette", + "fil": "Mga paradahan ng bisikleta" }, "description": { "en": "A map showing all types of bicycle parkings", "de": "Eine Karte mit allen Arten von Fahrradabstellplätzen", "es": "Un mapa que muestra todos los tipos de aparcamientos de bicicletas", "zh_Hans": "一张显示所有类型自行车停车设施的地图", - "it": "Una mappa che mostra tutti i tipi di parcheggi per biciclette" + "it": "Una mappa che mostra tutti i tipi di parcheggi per biciclette", + "fil": "Mapa na nagpapakita ng lahat ng uri ng paradahan ng bisikleta" }, "icon": "./assets/themes/bicycle_parkings/logo.svg", "layers": [ diff --git a/assets/themes/blind_osm/blind_osm.json b/assets/themes/blind_osm/blind_osm.json index 42c6e5c179..859aa5decf 100644 --- a/assets/themes/blind_osm/blind_osm.json +++ b/assets/themes/blind_osm/blind_osm.json @@ -14,7 +14,8 @@ "it": "OSM per i non vedenti", "pl": "OSM dla niewidomych", "da": "OSM for blinde", - "zh_Hans": "为盲人设计的OSM" + "zh_Hans": "为盲人设计的OSM", + "fil": "OSM para sa mga bulag" }, "description": { "en": "Help to map features relevant for the blind", diff --git a/assets/themes/disaster_response/disaster_response.json b/assets/themes/disaster_response/disaster_response.json index 70bdc00f38..fb3f7a56b8 100644 --- a/assets/themes/disaster_response/disaster_response.json +++ b/assets/themes/disaster_response/disaster_response.json @@ -1,9 +1,9 @@ { "id": "disaster_response", "title": { - "en": "Disaster response", + "en": "Disaster response and emergency services", "it": "Risposta ai disastri", - "de": "Katastrophenschutz", + "de": "Katastrophenschutz und Notfalldienste", "es": "Respuesta ante desastres", "ca": "Resposta davant de desastres", "da": "Beredskab" diff --git a/langs/fil.json b/langs/fil.json index 35e37d8279..da1d53535f 100644 --- a/langs/fil.json +++ b/langs/fil.json @@ -139,4 +139,4 @@ "feedback": "Ito ay hindi tamang web address" } } -} +} \ No newline at end of file diff --git a/langs/layers/de.json b/langs/layers/de.json index e8b73d51af..a4de1eb5cc 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -6794,13 +6794,6 @@ } } }, - "13": { - "options": { - "0": { - "question": "Erstellt nach dem {search}" - } - } - }, "13": { "options": { "0": { @@ -12313,4 +12306,4 @@ "render": "Windrad" } } -} +} \ No newline at end of file diff --git a/langs/themes/ca.json b/langs/themes/ca.json index f374747785..74029e90c7 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -1038,4 +1038,4 @@ "shortDescription": "Un mapa amb papereres", "title": "Papepera" } -} +} \ No newline at end of file diff --git a/langs/themes/da.json b/langs/themes/da.json index ec2a068e7d..f780a079f1 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -846,4 +846,4 @@ "shortDescription": "Et kort over skraldespande", "title": "Skraldespande" } -} +} \ No newline at end of file diff --git a/langs/themes/de.json b/langs/themes/de.json index 42ace295f5..4bf2951af1 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -1474,4 +1474,4 @@ "shortDescription": "Eine Karte mit Abfalleimern", "title": "Abfalleimer" } -} +} \ No newline at end of file diff --git a/langs/themes/en.json b/langs/themes/en.json index b6a248c10b..0f3fa1e510 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1474,4 +1474,4 @@ "shortDescription": "A map with waste baskets", "title": "Waste Baskets" } -} +} \ No newline at end of file diff --git a/langs/themes/fil.json b/langs/themes/fil.json index 9c48d05e1b..1b6aa16ca5 100644 --- a/langs/themes/fil.json +++ b/langs/themes/fil.json @@ -58,4 +58,4 @@ "blind_osm": { "title": "OSM para sa mga bulag" } -} +} \ No newline at end of file diff --git a/langs/themes/it.json b/langs/themes/it.json index 7531f5ce3a..9b0da466a4 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -687,4 +687,4 @@ "shortDescription": "Una cartina dei cestini dei rifiuti", "title": "Cestino dei rifiuti" } -} +} \ No newline at end of file From 2569d0cb66e411228d9d25cf50dc3278a83d0de5 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 18 Sep 2024 23:07:26 +0200 Subject: [PATCH 11/11] Fix: fix loading images for CSP, fix #2161 --- src/Logic/ImageProviders/Imgur.ts | 2 +- src/Logic/Web/NearbyImagesSearch.ts | 3 ++- src/UI/SpecialVisualizations.ts | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Logic/ImageProviders/Imgur.ts b/src/Logic/ImageProviders/Imgur.ts index 48e8fd712d..dbc2ff44c2 100644 --- a/src/Logic/ImageProviders/Imgur.ts +++ b/src/Logic/ImageProviders/Imgur.ts @@ -12,7 +12,7 @@ export class Imgur extends ImageProvider implements ImageUploader { public readonly defaultKeyPrefixes: string[] = ["image"] public readonly maxFileSizeInMegabytes = 10 public static readonly apiUrl = "https://api.imgur.com/3/image" - + public static readonly supportingUrls = ["https://i.imgur.com"] private constructor() { super() } diff --git a/src/Logic/Web/NearbyImagesSearch.ts b/src/Logic/Web/NearbyImagesSearch.ts index c4dc40dcd1..49853485d5 100644 --- a/src/Logic/Web/NearbyImagesSearch.ts +++ b/src/Logic/Web/NearbyImagesSearch.ts @@ -9,6 +9,7 @@ import { Utils } from "../../Utils" import { Point } from "geojson" import MvtSource from "../FeatureSource/Sources/MvtSource" import AllImageProviders from "../ImageProviders/AllImageProviders" +import { Imgur } from "../ImageProviders/Imgur" interface ImageFetcher { /** @@ -353,7 +354,7 @@ type P4CService = (typeof P4CImageFetcher.services)[number] export class CombinedFetcher { private readonly sources: ReadonlyArray - public static apiUrls = P4CImageFetcher.apiUrls + public static apiUrls = [...P4CImageFetcher.apiUrls, Imgur.apiUrl, ...Imgur.supportingUrls] constructor(radius: number, maxage: Date, indexedFeatures: IndexedFeatureSource) { this.sources = [ diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts index a19040e7ee..5e04a6947d 100644 --- a/src/UI/SpecialVisualizations.ts +++ b/src/UI/SpecialVisualizations.ts @@ -700,7 +700,7 @@ export default class SpecialVisualizations { { funcName: "image_upload", docs: "Creates a button where a user can upload an image to IMGUR", - needsUrls: [Imgur.apiUrl], + needsUrls: [Imgur.apiUrl, ...Imgur.supportingUrls], args: [ { name: "image-key", @@ -1098,7 +1098,7 @@ export default class SpecialVisualizations { defaultValue: "id", }, ], - needsUrls: [Imgur.apiUrl], + needsUrls: [Imgur.apiUrl, ...Imgur.supportingUrls], constr: (state, tags, args) => { const id = tags.data[args[0] ?? "id"]