Osmwithspace/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-01-13 04:02:50 +01:00
commit a81dbb170e
39 changed files with 464 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Docs/Hotkeys.md
View file

@ -7,7 +7,7 @@
## Table of contents ## Table of contents
1. [Hotkeys](#hotkeys) 1. [Hotkeys](#)

2
Docs/wikiIndex.txt
View file

@ -436,7 +436,7 @@
{{service_item {{service_item
|name= [https://mapcomplete.osm.be/street_lighting street_lighting] |name= [https://mapcomplete.osm.be/street_lighting street_lighting]
|region= Worldwide |region= Worldwide
|lang= {{#language:en|en}}, {{#language:nl|en}}, {{#language:zh_Hant|en}}, {{#language:hu|en}}, {{#language:de|en}}, {{#language:es|en}}, {{#language:fr|en}}, {{#language:da|en}} |lang= {{#language:en|en}}, {{#language:nl|en}}, {{#language:zh_Hant|en}}, {{#language:hu|en}}, {{#language:de|en}}, {{#language:es|en}}, {{#language:fr|en}}, {{#language:da|en}}, {{#language:ca|en}}
|descr= A MapComplete theme: On this map you can find everything about street lighting |descr= A MapComplete theme: On this map you can find everything about street lighting
|material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |material= {{yes|[https://mapcomplete.osm.be/ Yes]}}
|image= MapComplete_Screenshot.png |image= MapComplete_Screenshot.png

2
Logic/ImageProviders/Imgur.ts
View file

@ -105,7 +105,7 @@ export class Imgur extends ImageProvider {
} }
/** /**
* Download the attribution from attribution * Download the attribution and license info for the picture at the given URL
* *
* const data = {"data":{"id":"I9t6B7B","title":"Station Knokke","description":"author:Pieter Vander Vennet\r\nlicense:CC-BY 4.0\r\nosmid:node\/9812712386","datetime":1655052078,"type":"image\/jpeg","animated":false,"width":2400,"height":1795,"size":910872,"views":2,"bandwidth":1821744,"vote":null,"favorite":false,"nsfw":false,"section":null,"account_url":null,"account_id":null,"is_ad":false,"in_most_viral":false,"has_sound":false,"tags":[],"ad_type":0,"ad_url":"","edited":"0","in_gallery":false,"link":"https:\/\/i.imgur.com\/I9t6B7B.jpg","ad_config":{"safeFlags":["not_in_gallery","share"],"highRiskFlags":[],"unsafeFlags":["sixth_mod_unsafe"],"wallUnsafeFlags":[],"showsAds":false,"showAdLevel":1}},"success":true,"status":200} * const data = {"data":{"id":"I9t6B7B","title":"Station Knokke","description":"author:Pieter Vander Vennet\r\nlicense:CC-BY 4.0\r\nosmid:node\/9812712386","datetime":1655052078,"type":"image\/jpeg","animated":false,"width":2400,"height":1795,"size":910872,"views":2,"bandwidth":1821744,"vote":null,"favorite":false,"nsfw":false,"section":null,"account_url":null,"account_id":null,"is_ad":false,"in_most_viral":false,"has_sound":false,"tags":[],"ad_type":0,"ad_url":"","edited":"0","in_gallery":false,"link":"https:\/\/i.imgur.com\/I9t6B7B.jpg","ad_config":{"safeFlags":["not_in_gallery","share"],"highRiskFlags":[],"unsafeFlags":["sixth_mod_unsafe"],"wallUnsafeFlags":[],"showsAds":false,"showAdLevel":1}},"success":true,"status":200}
* Utils.injectJsonDownloadForTests("https://api.imgur.com/3/image/E0RuAK3", data) * Utils.injectJsonDownloadForTests("https://api.imgur.com/3/image/E0RuAK3", data)

8
UI/Base/Hotkeys.ts
View file

@ -7,6 +7,7 @@ import { UIEventSource } from "../../Logic/UIEventSource"
import { VariableUiElement } from "./VariableUIElement" import { VariableUiElement } from "./VariableUIElement"
import { Translation } from "../i18n/Translation" import { Translation } from "../i18n/Translation"
import { FixedUiElement } from "./FixedUiElement" import { FixedUiElement } from "./FixedUiElement"
import Translations from "../i18n/Translations"
export default class Hotkeys { export default class Hotkeys {
private static readonly _docs: UIEventSource< private static readonly _docs: UIEventSource<
@ -106,11 +107,12 @@ export default class Hotkeys {
return <[string, string | Translation]>[modifiers.join("+"), documentation] return <[string, string | Translation]>[modifiers.join("+"), documentation]
}) })
.sort() .sort()
const t = Translations.t.hotkeyDocumentation
return new Combine([ return new Combine([
new Title("Hotkeys", 1), new Title(t.title, 1),
"MapComplete supports the following keys:", t.intro,
new Table( new Table(
["Key combination", "Action"], [t.key, t.action],
byKey.map(([key, doc]) => { byKey.map(([key, doc]) => {
return [new FixedUiElement(key).SetClass("code"), doc] return [new FixedUiElement(key).SetClass("code"), doc]
}) })

2
UI/Base/MinimapImplementation.ts
View file

@ -404,7 +404,7 @@ export default class MinimapImplementation extends BaseUIElement implements Mini
if (this._options.lastClickLocation) { if (this._options.lastClickLocation) {
const lastClickLocation = this._options.lastClickLocation const lastClickLocation = this._options.lastClickLocation
map.on("click", function (e: LeafletMouseEvent) { map.addEventListener("click", function (e: LeafletMouseEvent) {
if (e.originalEvent["dismissed"]) { if (e.originalEvent["dismissed"]) {
return return
} }

4
UI/ShowDataLayer/ShowDataLayerImplementation.ts
View file

@ -340,6 +340,7 @@ export default class ShowDataLayerImplementation {
const self = this const self = this
function activate(event: LeafletMouseEvent) { function activate(event: LeafletMouseEvent) {
Utils.preventDefaultOnMouseEvent(event)
if (infobox === undefined) { if (infobox === undefined) {
const tags = const tags =
self.allElements?.getEventSourceById(key) ?? self.allElements?.getEventSourceById(key) ??
@ -383,8 +384,9 @@ export default class ShowDataLayerImplementation {
leafletLayer.on({ leafletLayer.on({
dblclick: activate, dblclick: activate,
contextmenu: activate, contextmenu: activate,
click: activate, // click: activate,
}) })
leafletLayer.addEventListener("click", activate)
// Add the feature to the index to open the popup when needed // Add the feature to the index to open the popup when needed
this.leafletLayersPerId.set(key, { this.leafletLayersPerId.set(key, {
feature: feature, feature: feature,

8
assets/contributors.json
View file

@ -1,11 +1,11 @@
{ {
"contributors": [ "contributors": [
{ {
"commits": 4812, "commits": 4872,
"contributor": "Pieter Vander Vennet" "contributor": "Pieter Vander Vennet"
}, },
{ {
"commits": 317, "commits": 318,
"contributor": "Robin van der Linde" "contributor": "Robin van der Linde"
}, },
{ {
@ -212,6 +212,10 @@
"commits": 2, "commits": 2,
"contributor": "Stanislas Gueniffey" "contributor": "Stanislas Gueniffey"
}, },
{
"commits": 1,
"contributor": "flaburgan"
},
{ {
"commits": 1, "commits": 1,
"contributor": "bgo-eiu" "contributor": "bgo-eiu"

3
assets/layers/ambulancestation/ambulancestation.json
View file

@ -317,7 +317,8 @@
"es": "una estación de ambulancias", "es": "una estación de ambulancias",
"nb_NO": "en ambulansestasjon", "nb_NO": "en ambulansestasjon",
"da": "en ambulancestation", "da": "en ambulancestation",
"cs": "stanice rychlé záchranné služby" "cs": "stanice rychlé záchranné služby",
"ca": "una estació d'ambulàncies"
}, },
"description": { "description": {
"en": "Add an ambulance station to the map", "en": "Add an ambulance station to the map",

3
assets/layers/atm/atm.json
View file

@ -45,7 +45,8 @@
"en": "an ATM", "en": "an ATM",
"de": "ein Geldautomat", "de": "ein Geldautomat",
"fr": "un DAB", "fr": "un DAB",
"nl": "een geldautomaat" "nl": "een geldautomaat",
"ca": "un caixer automàtic"
} }
} }
], ],

22
assets/layers/bank/bank.json
View file

@ -1,10 +1,13 @@
{ {
"id": "bank", "id": "bank",
"description": { "description": {
"en": "A financial institution to deposit money" "en": "A financial institution to deposit money",
"de": "Ein Finanzinstitut, um Geld einzuzahlen",
"nl": "Een financiële instelling waar je geld kunt"
}, },
"name": { "name": {
"en": "Banks" "en": "Banks",
"de": "Banken"
}, },
"title": { "title": {
"render": "Bank", "render": "Bank",
@ -31,25 +34,29 @@
{ {
"id": "has_atm", "id": "has_atm",
"question": { "question": {
"en": "Does this bank have an ATM?" "en": "Does this bank have an ATM?",
"de": "Hat diese Bank einen Geldautomaten?"
}, },
"mappings": [ "mappings": [
{ {
"if": "atm=yes", "if": "atm=yes",
"then": { "then": {
"en": "This bank has an ATM" "en": "This bank has an ATM",
"de": "Diese Bank hat einen Geldautomaten"
} }
}, },
{ {
"if": "atm=no", "if": "atm=no",
"then": { "then": {
"en": "This bank does <b>not</b> have an ATM" "en": "This bank does <b>not</b> have an ATM",
"de": "Diese Bank hat <b>keinen</b> Geldautomaten"
} }
}, },
{ {
"if": "atm=separate", "if": "atm=separate",
"then": { "then": {
"en": "This bank does have an ATM, but it is mapped as a different icon" "en": "This bank does have an ATM, but it is mapped as a different icon",
"de": "Diese Bank hat zwar einen Geldautomaten, aber dieser ist mit einem anderen Symbol dargestellt"
} }
} }
] ]
@ -62,7 +69,8 @@
"options": [ "options": [
{ {
"question": { "question": {
"en": "With an ATM" "en": "With an ATM",
"de": "Mit einem Geldautomaten"
}, },
"osmTags": "atm=yes" "osmTags": "atm=yes"
} }

5
assets/layers/bike_cleaning/bike_cleaning.json
View file

@ -189,7 +189,7 @@
"if": "fee=no", "if": "fee=no",
"then": { "then": {
"en": "This cleaning service is free to use", "en": "This cleaning service is free to use",
"de": "Kostenloser Reinigungsservice", "de": "Der Reinigungsservice ist kostenlos",
"nl": "Dit fietsschoonmaakpunt is gratis te gebruiken", "nl": "Dit fietsschoonmaakpunt is gratis te gebruiken",
"es": "Servicio de limpieza gratis", "es": "Servicio de limpieza gratis",
"fr": "Service de nettoyage gratuit", "fr": "Service de nettoyage gratuit",
@ -207,7 +207,8 @@
"en": "This cleaning service is paid", "en": "This cleaning service is paid",
"nl": "Dit fietsschoonmaakpunt is betalend", "nl": "Dit fietsschoonmaakpunt is betalend",
"es": "Este servicio de limpieza es de pago", "es": "Este servicio de limpieza es de pago",
"ca": "Aquest servei de neteja és de pagament" "ca": "Aquest servei de neteja és de pagament",
"de": "Dieser Reinigungsservice ist kostenpflichtig"
} }
} }
], ],

3
assets/layers/bike_repair_station/bike_repair_station.json
View file

@ -831,7 +831,8 @@
"pt_BR": "uma bomba de bicicleta", "pt_BR": "uma bomba de bicicleta",
"es": "una bomba de bicicletas", "es": "una bomba de bicicletas",
"da": "en cykelpumpe", "da": "en cykelpumpe",
"cs": "pumpa na kolo" "cs": "pumpa na kolo",
"ca": "una manxa per a bicicletes"
}, },
"tags": [ "tags": [
"amenity=bicycle_repair_station", "amenity=bicycle_repair_station",

2
assets/layers/bike_shop/bike_shop.json
View file

@ -281,7 +281,7 @@
"pt": "Esta loja de bicicletas se chama {name}", "pt": "Esta loja de bicicletas se chama {name}",
"es": "Esta tienda de bicicletas se llama {name}", "es": "Esta tienda de bicicletas se llama {name}",
"da": "Denne cykelbutik hedder {name}", "da": "Denne cykelbutik hedder {name}",
"ca": "Aquesta botiga de bicicletes és diu {name}" "ca": "Aquesta botiga de bicicletes s'anomena {name}"
}, },
"freeform": { "freeform": {
"key": "name" "key": "name"

6
assets/layers/cafe_pub/cafe_pub.json
View file

@ -34,7 +34,7 @@
"hu": "kocsma", "hu": "kocsma",
"ca": "un bar", "ca": "un bar",
"da": "en pub", "da": "en pub",
"es": "un pub", "es": "un bar",
"fr": "un pub" "fr": "un pub"
}, },
"description": { "description": {
@ -59,9 +59,9 @@
"de": "eine Bar", "de": "eine Bar",
"ru": "бар", "ru": "бар",
"hu": "bár", "hu": "bár",
"ca": "un pub", "ca": "un bar de copes",
"da": "en bar", "da": "en bar",
"es": "un bar", "es": "un bar de copas",
"fr": "un bar" "fr": "un bar"
}, },
"description": { "description": {

3
assets/layers/climbing_gym/climbing_gym.json
View file

@ -237,7 +237,8 @@
{ {
"title": { "title": {
"en": "Climbing gym", "en": "Climbing gym",
"nl": "Klimzaal" "nl": "Klimzaal",
"de": "Kletterhalle"
}, },
"tags": [ "tags": [
"leisure=sports_centre", "leisure=sports_centre",

4
assets/layers/defibrillator/defibrillator.json
View file

@ -44,8 +44,8 @@
{ {
"title": { "title": {
"en": "a defibrillator", "en": "a defibrillator",
"ca": "Desfibril·lador", "ca": "un desfibril·lador",
"es": "una desfibrilador", "es": "un desfibrilador",
"fr": "une défibrillateur", "fr": "une défibrillateur",
"nl": "een defibrillator", "nl": "een defibrillator",
"de": "einen Defibrillator", "de": "einen Defibrillator",

3
assets/layers/food/food.json
View file

@ -70,7 +70,8 @@
"en": "a fries shop", "en": "a fries shop",
"nl": "een frituur", "nl": "een frituur",
"de": "eine Pommesbude", "de": "eine Pommesbude",
"fr": "Une friterie" "fr": "Une friterie",
"ca": "una botiga de patates fregides"
}, },
"tags": [ "tags": [
"amenity=fast_food", "amenity=fast_food",

3
assets/layers/gps_track/gps_track.json
View file

@ -34,7 +34,8 @@
"nl": "Jouw afgelegde route", "nl": "Jouw afgelegde route",
"de": "Zurückgelegte Strecke anzeigen", "de": "Zurückgelegte Strecke anzeigen",
"fr": "Votre chemin parcouru", "fr": "Votre chemin parcouru",
"da": "Dit tilbagelagte spor" "da": "Dit tilbagelagte spor",
"ca": "La teva pista recorreguda"
}, },
"mapRendering": [ "mapRendering": [
{ {

2
assets/layers/hospital/hospital.json
View file

@ -29,7 +29,7 @@
"id": "name", "id": "name",
"render": { "render": {
"en": "This hospital is called {name}", "en": "This hospital is called {name}",
"ca": "Aquest hospital es diu {name}", "ca": "Aquest hospital s'anomena {name}",
"de": "Der Name des Krankenhauses lautet {name}", "de": "Der Name des Krankenhauses lautet {name}",
"nl": "Dit ziekenhuis heet {name}" "nl": "Dit ziekenhuis heet {name}"
}, },

3
assets/layers/hotel/hotel.json
View file

@ -38,7 +38,8 @@
"title": { "title": {
"en": "a hotel", "en": "a hotel",
"nl": "een hotel", "nl": "een hotel",
"de": "ein Hotel" "de": "ein Hotel",
"ca": "un hotel"
}, },
"tags": [ "tags": [
"tourism=hotel" "tourism=hotel"

3
assets/layers/kindergarten_childcare/kindergarten_childcare.json
View file

@ -77,7 +77,8 @@
"question": { "question": {
"en": "What is the name of this facility?", "en": "What is the name of this facility?",
"de": "Wie lautet der Name dieser Einrichtung?", "de": "Wie lautet der Name dieser Einrichtung?",
"nl": "Wat is de naam van deze faciliteit?" "nl": "Wat is de naam van deze faciliteit?",
"ca": "Com s'anomena aquesta instal·lació?"
}, },
"render": { "render": {
"en": "This facility is named <b>{name}</b>", "en": "This facility is named <b>{name}</b>",

6
assets/layers/parking/parking.json
View file

@ -41,7 +41,8 @@
"en": "This is a surface parking lot", "en": "This is a surface parking lot",
"nl": "Dit is een bovengronds parkeerterrein", "nl": "Dit is een bovengronds parkeerterrein",
"de": "Dies ist ein oberirdischer Parkplatz", "de": "Dies ist ein oberirdischer Parkplatz",
"fr": "Il s'agit d'un parking en surface" "fr": "Il s'agit d'un parking en surface",
"ca": "Aquest és un aparcament en superfície"
} }
}, },
{ {
@ -180,7 +181,8 @@
"en": "How many disabled parking spots are there at this parking?", "en": "How many disabled parking spots are there at this parking?",
"nl": "Hoeveel parkeerplaatsen voor gehandicapten zijn er op deze parking?", "nl": "Hoeveel parkeerplaatsen voor gehandicapten zijn er op deze parking?",
"de": "Wie viele barrierefreie Stellplätze gibt es auf diesem Parkplatz?", "de": "Wie viele barrierefreie Stellplätze gibt es auf diesem Parkplatz?",
"fr": "Combien y a-t-il de places de stationnement pour personnes à mobilité réduite dans ce parking ?" "fr": "Combien y a-t-il de places de stationnement pour personnes à mobilité réduite dans ce parking ?",
"ca": "Quantes places d'aparcament per a persones amb mobilitat reduïda hi ha al parking?"
}, },
"render": { "render": {
"en": "There are {capacity:disabled} disabled parking spots", "en": "There are {capacity:disabled} disabled parking spots",

41
assets/layers/school/school.json
View file

@ -32,13 +32,15 @@
"en": "This school is named {name}", "en": "This school is named {name}",
"nl": "Deze school heet <b>{name}</b>", "nl": "Deze school heet <b>{name}</b>",
"de": "Diese Schule heißt {name}", "de": "Diese Schule heißt {name}",
"fr": "Cet établissement scolaire s'appelle {name}" "fr": "Cet établissement scolaire s'appelle {name}",
"ca": "L'escola s'anomena {name}"
}, },
"question": { "question": {
"en": "What is the name of this school?", "en": "What is the name of this school?",
"nl": "Wat is de naam van deze school?", "nl": "Wat is de naam van deze school?",
"de": "Wie lautet der Name dieser Schule?", "de": "Wie lautet der Name dieser Schule?",
"fr": "Quel est le nom de cet établissement scolaire?" "fr": "Quel est le nom de cet établissement scolaire?",
"ca": "Quin és el nom d'aquesta escola?"
}, },
"freeform": { "freeform": {
"key": "name" "key": "name"
@ -51,7 +53,8 @@
"en": "How much students can at most enroll in this school?", "en": "How much students can at most enroll in this school?",
"de": "Wie viele Schüler können sich maximal an dieser Schule anmelden?", "de": "Wie viele Schüler können sich maximal an dieser Schule anmelden?",
"nl": "Ten hoogste hoeveel studenten kunnen er les volgen in deze school?", "nl": "Ten hoogste hoeveel studenten kunnen er les volgen in deze school?",
"fr": "Combien d'élèves peuvent s'inscrire au maximum dans cette école ?" "fr": "Combien d'élèves peuvent s'inscrire au maximum dans cette école ?",
"ca": "Quants alumnes poden matricular-se com a màxim a aquesta escola?"
}, },
"render": { "render": {
"en": "This school can enroll at most {capacity} students", "en": "This school can enroll at most {capacity} students",
@ -146,7 +149,8 @@
"en": "Which genders can enroll at this school?", "en": "Which genders can enroll at this school?",
"nl": "Mogen jongens en meisjes les volgen op deze school?", "nl": "Mogen jongens en meisjes les volgen op deze school?",
"de": "Welche Geschlechter können sich an dieser Schule anmelden?", "de": "Welche Geschlechter können sich an dieser Schule anmelden?",
"fr": "Quels genres de personnes peuvent s'inscrire dans cette école ?" "fr": "Quels genres de personnes peuvent s'inscrire dans cette école ?",
"ca": "Quins gèneres poden inscriure's a aquesta escola?"
}, },
"mappings": [ "mappings": [
{ {
@ -155,7 +159,8 @@
"en": "Both boys and girls can enroll here and have classes together", "en": "Both boys and girls can enroll here and have classes together",
"nl": "Zowel jongens als meisjes kunnen hier les volgen. In de lessen zitten jongens en meisjes samen.", "nl": "Zowel jongens als meisjes kunnen hier les volgen. In de lessen zitten jongens en meisjes samen.",
"de": "Sowohl Jungen als auch Mädchen können sich hier anmelden und gemeinsam unterrichtet werden", "de": "Sowohl Jungen als auch Mädchen können sich hier anmelden und gemeinsam unterrichtet werden",
"fr": "Les garçons et les filles peuvent s'inscrire ici et suivre des cours ensemble" "fr": "Les garçons et les filles peuvent s'inscrire ici et suivre des cours ensemble",
"ca": "Els dos, nois i noies poden inscriure's aquí i prendre classes junts"
} }
}, },
{ {
@ -164,7 +169,8 @@
"en": "Both boys and girls can enroll here but they are separated (e.g. they have lessons in different classrooms or at different times)", "en": "Both boys and girls can enroll here but they are separated (e.g. they have lessons in different classrooms or at different times)",
"nl": "Jongens en meisjes kunnen hier lesvolgen, maar de lessen zijn gescheiden (bv. de lessen zijn in andere lokalen of op andere momenten)", "nl": "Jongens en meisjes kunnen hier lesvolgen, maar de lessen zijn gescheiden (bv. de lessen zijn in andere lokalen of op andere momenten)",
"de": "Hier können sich sowohl Jungen als auch Mädchen anmelden, aber sie werden getrennt unterrichtet (z. B. in verschiedenen Klassenräumen oder zu verschiedenen Zeiten)", "de": "Hier können sich sowohl Jungen als auch Mädchen anmelden, aber sie werden getrennt unterrichtet (z. B. in verschiedenen Klassenräumen oder zu verschiedenen Zeiten)",
"fr": "Les garçons et les filles peuvent s'inscrire ici, mais ils sont séparés (par exemple, ils ont des cours dans des classes différentes ou à des heures différentes)" "fr": "Les garçons et les filles peuvent s'inscrire ici, mais ils sont séparés (par exemple, ils ont des cours dans des classes différentes ou à des heures différentes)",
"ca": "Els dos, nois i noies poden inscriure's aquí, però estan separats (p. e. prenen les classes a diferents aules o diferentes hores)"
} }
}, },
{ {
@ -173,7 +179,8 @@
"en": "This is a boys only-school", "en": "This is a boys only-school",
"nl": "Deze school is enkel voor jongens", "nl": "Deze school is enkel voor jongens",
"de": "Dies ist eine reine Jungenschule", "de": "Dies ist eine reine Jungenschule",
"fr": "C'est une école réservée aux garçons" "fr": "C'est une école réservée aux garçons",
"ca": "Aquesta és una escola exclusivament per a nois"
} }
}, },
{ {
@ -182,7 +189,8 @@
"en": "This is a girls-only school", "en": "This is a girls-only school",
"nl": "Deze school is enkel voor meisjes", "nl": "Deze school is enkel voor meisjes",
"de": "Dies ist eine reine Mädchenschule", "de": "Dies ist eine reine Mädchenschule",
"fr": "C'est une école réservée aux filles" "fr": "C'est une école réservée aux filles",
"ca": "Aquesta és una escola exclusivament per a noies"
} }
} }
] ]
@ -226,7 +234,7 @@
"nl": "Deze school richt zich op studenten zonder extra zorgbehoefte<div class='subtle>Dit omvat leerlingen waarbij kleine, ad-hoc maatregelen volstaan om de lessen te volgen.</div>", "nl": "Deze school richt zich op studenten zonder extra zorgbehoefte<div class='subtle>Dit omvat leerlingen waarbij kleine, ad-hoc maatregelen volstaan om de lessen te volgen.</div>",
"de": "Dies ist eine Schule für Schüler ohne besondere Bedürfnisse<div class='subtle'>Dazu gehören auch Schüler, die den Kursen mit kleinen Ad-hoc-Maßnahmen folgen können</div>", "de": "Dies ist eine Schule für Schüler ohne besondere Bedürfnisse<div class='subtle'>Dazu gehören auch Schüler, die den Kursen mit kleinen Ad-hoc-Maßnahmen folgen können</div>",
"fr": "Ceci est un établissement scolaire pour étudiants sans besoins partucliers. <div class='subtle'>Sont inclus les étudiants qui peuvent suivre les cours avec de petites adaptations.</div>", "fr": "Ceci est un établissement scolaire pour étudiants sans besoins partucliers. <div class='subtle'>Sont inclus les étudiants qui peuvent suivre les cours avec de petites adaptations.</div>",
"ca": "Aquesta és una escola per a estudiants sense necesitats especials <div class='subtle'> Açò inclou alumnes que poden seguir les classes amb petites messures</div>" "ca": "Aquesta és una escola per a estudiants sense necessitats especials <div class='subtle'> Açò inclou alumnes que poden seguir les classes amb petites mesures</div>"
} }
}, },
{ {
@ -235,7 +243,8 @@
"en": "This is a school where adults are taught skills on the level as specified.", "en": "This is a school where adults are taught skills on the level as specified.",
"nl": "Deze school richt zich op volwassenen", "nl": "Deze school richt zich op volwassenen",
"de": "Dies ist eine Schule, in der Erwachsene auf dem angegebenen Niveau unterrichtet werden.", "de": "Dies ist eine Schule, in der Erwachsene auf dem angegebenen Niveau unterrichtet werden.",
"fr": "Ceci est un établissement où des adultes sont formés au niveau mentionné." "fr": "Ceci est un établissement où des adultes sont formés au niveau mentionné.",
"ca": "Aquesta és una escola on els adults reben competències al nivell especificat."
} }
}, },
{ {
@ -310,23 +319,27 @@
"key": "language", "key": "language",
"render_all": { "render_all": {
"en": "The following languages are used in this school:{list()}", "en": "The following languages are used in this school:{list()}",
"de": "Folgende Sprachen werden in der Schule verwendet:{list()}" "de": "Folgende Sprachen werden in der Schule verwendet:{list()}",
"ca": "En aquesta escola s'utilitzen els idiomes següents:{list()}"
}, },
"render_single_language": { "render_single_language": {
"en": "{language():font-bold} is the main language of this school", "en": "{language():font-bold} is the main language of this school",
"de": "{language():font-bold} ist die Hauptsprache der Schule" "de": "{language():font-bold} ist die Hauptsprache der Schule",
"ca": "{language():font-bold} és la llengua principal d'aquesta escola"
}, },
"question": { "question": {
"en": "What is the main language of this school?<div class='subtle'>What language is spoken with the students in non-language related courses and with the administration?</div>", "en": "What is the main language of this school?<div class='subtle'>What language is spoken with the students in non-language related courses and with the administration?</div>",
"nl": "Wat is de voertaal van deze school?<div class='subtle'>Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?</div>", "nl": "Wat is de voertaal van deze school?<div class='subtle'>Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?</div>",
"de": "Was ist die Hauptsprache dieser Schule?<div class='subtle'>Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?</div>", "de": "Was ist die Hauptsprache dieser Schule?<div class='subtle'>Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?</div>",
"fr": "Quelle est la langue principale de cette école ?<div class='subtle'>Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?</div>" "fr": "Quelle est la langue principale de cette école ?<div class='subtle'>Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?</div>",
"ca": "Quina és la llengua principal d'aquesta escola?<div class='subtle'>Quina llengua es parla amb els estudiants en classes no relacionades amb la llengua i l'administració?</div>"
}, },
"no_known_languages": { "no_known_languages": {
"en": "The main language of this school is unknown", "en": "The main language of this school is unknown",
"nl": "De voertaal van deze school is niet gekend", "nl": "De voertaal van deze school is niet gekend",
"de": "Die Unterrichtssprache der Schule ist unbekannt", "de": "Die Unterrichtssprache der Schule ist unbekannt",
"fr": "La langue principale de cette école est inconnue" "fr": "La langue principale de cette école est inconnue",
"ca": "La llengua principal d'aquesta escola és desconeguda"
} }
} }
} }

6
assets/layers/shops/shops.json
View file

@ -98,7 +98,8 @@
"render": { "render": {
"en": "This shop is called <i>{name}</i>", "en": "This shop is called <i>{name}</i>",
"de": "Der Name des Geschäfts lautet <i>{name}</i>", "de": "Der Name des Geschäfts lautet <i>{name}</i>",
"nl": "Deze zaak heet <i>{name}</i>" "nl": "Deze zaak heet <i>{name}</i>",
"ca": "La botiga s'anomena <i>{name}</i>"
}, },
"freeform": { "freeform": {
"key": "name" "key": "name"
@ -219,7 +220,8 @@
"then": { "then": {
"en": "This shop offers organic products", "en": "This shop offers organic products",
"de": "Dieses Geschäft bietet Bio-Produkte an", "de": "Dieses Geschäft bietet Bio-Produkte an",
"nl": "Deze winkel biedt biologische producten aan" "nl": "Deze winkel biedt biologische producten aan",
"ca": "Aquesta botiga ofereix productes orgànics"
} }
}, },
{ {

93
assets/layers/street_lamps/street_lamps.json
View file

@ -4,7 +4,8 @@
"en": "Street Lamps", "en": "Street Lamps",
"nl": "Straatlantaarns", "nl": "Straatlantaarns",
"de": "Straßenlaternen", "de": "Straßenlaternen",
"es": "Farolas" "es": "Farolas",
"ca": "Fanals"
}, },
"source": { "source": {
"osmTags": "highway=street_lamp" "osmTags": "highway=street_lamp"
@ -51,7 +52,8 @@
"en": "a street lamp", "en": "a street lamp",
"nl": "een straatlantaarn", "nl": "een straatlantaarn",
"de": "eine Straßenlaterne", "de": "eine Straßenlaterne",
"es": "una farola" "es": "una farola",
"ca": "un fanal"
}, },
"tags": [ "tags": [
"highway=street_lamp" "highway=street_lamp"
@ -73,7 +75,8 @@
"en": "What is the reference number of this street lamp?", "en": "What is the reference number of this street lamp?",
"nl": "Wat is het nummer van deze straatlantaarn?", "nl": "Wat is het nummer van deze straatlantaarn?",
"de": "Wie lautet die Referenznummer dieser Straßenlaterne?", "de": "Wie lautet die Referenznummer dieser Straßenlaterne?",
"es": "¿Cual es el número de referencia de esta lámpara callejera?" "es": "¿Cual es el número de referencia de esta lámpara callejera?",
"ca": "Quin és el número de referència d'aquest fanal?"
}, },
"freeform": { "freeform": {
"key": "ref" "key": "ref"
@ -130,7 +133,8 @@
"en": "This lamp is mounted on a pole", "en": "This lamp is mounted on a pole",
"nl": "Deze lantaarn zit op een paal", "nl": "Deze lantaarn zit op een paal",
"de": "Die Straßenlaterne ist an einem Mast befestigt", "de": "Die Straßenlaterne ist an einem Mast befestigt",
"es": "Esta lámpara está montada en un poste" "es": "Esta lámpara está montada en un poste",
"ca": "Aquest fanal està muntat en un pal"
} }
}, },
{ {
@ -159,7 +163,8 @@
"en": "How is this lamp mounted to the pole?", "en": "How is this lamp mounted to the pole?",
"nl": "Hoe zit deze lantaarn aan de paal?", "nl": "Hoe zit deze lantaarn aan de paal?",
"de": "Wie ist diese Straßenlaterne am Mast befestigt?", "de": "Wie ist diese Straßenlaterne am Mast befestigt?",
"es": "¿Cómo está montada esta lámpara al poste?" "es": "¿Cómo está montada esta lámpara al poste?",
"ca": "Com està muntat aquest fanal al pal?"
}, },
"condition": "support=pole", "condition": "support=pole",
"mappings": [ "mappings": [
@ -169,7 +174,8 @@
"en": "This lamp sits atop of a straight mast", "en": "This lamp sits atop of a straight mast",
"nl": "Deze lantaarn zit boven op een rechte paal", "nl": "Deze lantaarn zit boven op een rechte paal",
"de": "Diese Straßenlaterne sitzt auf einem geraden Mast", "de": "Diese Straßenlaterne sitzt auf einem geraden Mast",
"es": "Esta lampara está encima de un mástil recto" "es": "Esta lampara está encima de un mástil recto",
"ca": "Aquest fanal es troba al final d'un pal recte"
} }
}, },
{ {
@ -178,7 +184,8 @@
"en": "This lamp sits at the end of a bent mast", "en": "This lamp sits at the end of a bent mast",
"nl": "Deze lantaarn zit aan het eind van een gebogen paal", "nl": "Deze lantaarn zit aan het eind van een gebogen paal",
"de": "Diese Straßenlaterne sitzt am Ende eines gebogenen Mastes", "de": "Diese Straßenlaterne sitzt am Ende eines gebogenen Mastes",
"es": "Esta lámpara está encima de un mástil curvado" "es": "Esta lámpara está encima de un mástil curvado",
"ca": "Aquest fanal es troba al final d'un pal doblegat"
} }
} }
] ]
@ -208,7 +215,8 @@
"en": "This lamp uses LEDs", "en": "This lamp uses LEDs",
"nl": "Deze lantaarn gebruikt LEDs", "nl": "Deze lantaarn gebruikt LEDs",
"de": "Diese Straßenlaterne verwendet LEDs", "de": "Diese Straßenlaterne verwendet LEDs",
"es": "Esta lámpara utiliza LEDs" "es": "Esta lámpara utiliza LEDs",
"ca": "Aquest fanal utilitza LED"
} }
}, },
{ {
@ -217,7 +225,8 @@
"en": "This lamp uses incandescent lighting", "en": "This lamp uses incandescent lighting",
"nl": "Deze lantaarn gebruikt gloeilampen", "nl": "Deze lantaarn gebruikt gloeilampen",
"de": "Diese Straßenlaterne verwendet Glühlampenlicht", "de": "Diese Straßenlaterne verwendet Glühlampenlicht",
"es": "Esta lámpara utiliza iluminación incandescente" "es": "Esta lámpara utiliza iluminación incandescente",
"ca": "Aquest fanal utilitza il·luminació incandescent"
} }
}, },
{ {
@ -226,7 +235,8 @@
"en": "This lamp uses halogen lighting", "en": "This lamp uses halogen lighting",
"nl": "Deze lantaarn gebruikt halogeen verlichting", "nl": "Deze lantaarn gebruikt halogeen verlichting",
"de": "Diese Straßenlaterne verwendet Halogenlicht", "de": "Diese Straßenlaterne verwendet Halogenlicht",
"es": "Esta lámpara utiliza iluminación halógena" "es": "Esta lámpara utiliza iluminación halógena",
"ca": "Aquest fanal utilitza il·luminació halògena"
} }
}, },
{ {
@ -235,7 +245,8 @@
"en": "This lamp uses discharge lamps (unknown type)", "en": "This lamp uses discharge lamps (unknown type)",
"nl": "Deze lantaarn gebruikt gasontladingslampen (onbekend type)", "nl": "Deze lantaarn gebruikt gasontladingslampen (onbekend type)",
"de": "Diese Straßenlaterne verwendet Entladungslampen (unbekannter Typ)", "de": "Diese Straßenlaterne verwendet Entladungslampen (unbekannter Typ)",
"es": "Esta lámpara utiliza lámparas de descarga (de tipo desconocido)" "es": "Esta lámpara utiliza lámparas de descarga (de tipo desconocido)",
"ca": "Aquest fanal utilitza làmpades de descàrrega (tipus desconegut)"
} }
}, },
{ {
@ -244,7 +255,8 @@
"en": "This lamp uses a mercury-vapour lamp (lightly blueish)", "en": "This lamp uses a mercury-vapour lamp (lightly blueish)",
"nl": "Deze lantaarn gebruikt een kwiklamp (enigszins blauwachtig)", "nl": "Deze lantaarn gebruikt een kwiklamp (enigszins blauwachtig)",
"de": "Diese Straßenlaterne verwendet eine Quecksilberdampflampe (leicht bläulich)", "de": "Diese Straßenlaterne verwendet eine Quecksilberdampflampe (leicht bläulich)",
"es": "Esta lámpara utiliza una lámpara de vapor de mercurio (levemente azulada)" "es": "Esta lámpara utiliza una lámpara de vapor de mercurio (levemente azulada)",
"ca": "Aquest fanal utilitza una làmpada de vapor de mercuri (lleugerament blau)"
} }
}, },
{ {
@ -252,7 +264,8 @@
"then": { "then": {
"en": "This lamp uses metal-halide lamps (bright white)", "en": "This lamp uses metal-halide lamps (bright white)",
"nl": "Deze lantaarn gebruikt metaalhalidelampen", "nl": "Deze lantaarn gebruikt metaalhalidelampen",
"de": "Diese Straßenlaterne verwendet Halogen-Metalldampflampen (hellweiß)" "de": "Diese Straßenlaterne verwendet Halogen-Metalldampflampen (hellweiß)",
"ca": "Aquest fanal utilitza làmpades d'halogenurs metàl·lics (blanc brillant)"
} }
}, },
{ {
@ -261,7 +274,8 @@
"en": "This lamp uses fluorescent lighting", "en": "This lamp uses fluorescent lighting",
"nl": "Deze lantaarn gebruikt fluorescentieverlichting (TL en spaarlamp)", "nl": "Deze lantaarn gebruikt fluorescentieverlichting (TL en spaarlamp)",
"de": "Diese Straßenlaterne verwendet Leuchtstoffröhren", "de": "Diese Straßenlaterne verwendet Leuchtstoffröhren",
"es": "Esta lámpara utiliza iluminación fluorescente" "es": "Esta lámpara utiliza iluminación fluorescente",
"ca": "Aquest fanal utilitza il·luminació fluorescent"
} }
}, },
{ {
@ -270,7 +284,8 @@
"en": "This lamp uses sodium lamps (unknown type)", "en": "This lamp uses sodium lamps (unknown type)",
"nl": "Deze lantaarn gebruikt natriumlampen (onbekend type)", "nl": "Deze lantaarn gebruikt natriumlampen (onbekend type)",
"de": "Diese Straßenlaterne verwendet Natriumdampflampen (unbekannter Typ)", "de": "Diese Straßenlaterne verwendet Natriumdampflampen (unbekannter Typ)",
"es": "Esta lámpara utiliza lámparas de sodio (de tipo desconocido)" "es": "Esta lámpara utiliza lámparas de sodio (de tipo desconocido)",
"ca": "Aquest fanal utilitza làmpades de sodi (tipus desconegut)"
} }
}, },
{ {
@ -279,7 +294,8 @@
"en": "This lamp uses low pressure sodium lamps (monochrome orange)", "en": "This lamp uses low pressure sodium lamps (monochrome orange)",
"nl": "Deze lantaarn gebruikt lagedruknatriumlampen (monochroom oranje)", "nl": "Deze lantaarn gebruikt lagedruknatriumlampen (monochroom oranje)",
"de": "Diese Straßenlaterne verwendet Niederdruck-Natriumdampflampen (einfarbig orange)", "de": "Diese Straßenlaterne verwendet Niederdruck-Natriumdampflampen (einfarbig orange)",
"es": "Esta lámpara utiliza lámparas de sodio de baja presión (naranja monocromo)" "es": "Esta lámpara utiliza lámparas de sodio de baja presión (naranja monocromo)",
"ca": "Aquest fanal utilitza làmpades de sodi de baixa pressió (taronja monocroma)"
} }
}, },
{ {
@ -288,7 +304,8 @@
"en": "This lamp uses high pressure sodium lamps (orange with white)", "en": "This lamp uses high pressure sodium lamps (orange with white)",
"nl": "Deze lantaarn gebruikt hogedruknatriumlampen (oranje met wit)", "nl": "Deze lantaarn gebruikt hogedruknatriumlampen (oranje met wit)",
"de": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)", "de": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)",
"es": "Esta lámpara utiliza lámparas de sodio de alta presión (naranja con blanco)" "es": "Esta lámpara utiliza lámparas de sodio de alta presión (naranja con blanco)",
"ca": "Aquest fanal utilitza làmpades de sodi d'alta pressió (taronja amb blanc)"
} }
}, },
{ {
@ -297,7 +314,8 @@
"en": "This lamp is lit using gas", "en": "This lamp is lit using gas",
"nl": "Deze lantaarn wordt verlicht met gas", "nl": "Deze lantaarn wordt verlicht met gas",
"de": "Diese Straßenlaterne wird mit Gas beleuchtet", "de": "Diese Straßenlaterne wird mit Gas beleuchtet",
"es": "Esta lampara se ilumina con gas" "es": "Esta lampara se ilumina con gas",
"ca": "Aquest fanal s'il·lumina amb gas"
} }
} }
] ]
@ -308,7 +326,8 @@
"en": "What colour light does this lamp emit?", "en": "What colour light does this lamp emit?",
"nl": "Wat voor kleur licht geeft deze lantaarn?", "nl": "Wat voor kleur licht geeft deze lantaarn?",
"de": "Welche Lichtfarbe strahlt diese Lampe aus?", "de": "Welche Lichtfarbe strahlt diese Lampe aus?",
"es": "¿De qué color es la luz que emite esta lámpara?" "es": "¿De qué color es la luz que emite esta lámpara?",
"ca": "Quin color de llum emet aquest fanal?"
}, },
"render": { "render": {
"en": "This lamp emits {light:colour} light", "en": "This lamp emits {light:colour} light",
@ -327,7 +346,8 @@
"en": "This lamp emits white light", "en": "This lamp emits white light",
"nl": "Deze lantaarn geeft wit licht", "nl": "Deze lantaarn geeft wit licht",
"de": "Diese Lampe strahlt weißes Licht aus", "de": "Diese Lampe strahlt weißes Licht aus",
"es": "Esta lámpara emite luz blanca" "es": "Esta lámpara emite luz blanca",
"ca": "Aquest fanal emet llum blanca"
} }
}, },
{ {
@ -336,7 +356,8 @@
"en": "This lamp emits green light", "en": "This lamp emits green light",
"nl": "Deze lantaarn geeft groen licht", "nl": "Deze lantaarn geeft groen licht",
"de": "Diese Lampe strahlt grünes Licht aus", "de": "Diese Lampe strahlt grünes Licht aus",
"es": "Esta lámpara emite luz verde" "es": "Esta lámpara emite luz verde",
"ca": "Aquest fanal emet llum verda"
} }
}, },
{ {
@ -345,7 +366,8 @@
"en": "This lamp emits orange light", "en": "This lamp emits orange light",
"nl": "Deze lantaarn geeft oranje licht", "nl": "Deze lantaarn geeft oranje licht",
"de": "Diese Lampe strahlt orangefarbenes Licht aus", "de": "Diese Lampe strahlt orangefarbenes Licht aus",
"es": "Esta lámpara emite luz naranja" "es": "Esta lámpara emite luz naranja",
"ca": "Aquest fanal emet llum taronja"
} }
} }
] ]
@ -374,7 +396,8 @@
"en": "This lamp has 1 fixture", "en": "This lamp has 1 fixture",
"nl": "Deze lantaarn heeft 1 lamp", "nl": "Deze lantaarn heeft 1 lamp",
"de": "Diese Straßenlaterne hat 1 Leuchte", "de": "Diese Straßenlaterne hat 1 Leuchte",
"es": "" "es": "",
"ca": "Aquest fanal té 1 aparell"
} }
}, },
{ {
@ -382,7 +405,8 @@
"then": { "then": {
"en": "This lamp has 2 fixtures", "en": "This lamp has 2 fixtures",
"nl": "Deze lantaarn heeft 2 lampen", "nl": "Deze lantaarn heeft 2 lampen",
"de": "Diese Straßenlaterne hat 2 Leuchten" "de": "Diese Straßenlaterne hat 2 Leuchten",
"ca": "Aquest fanal té 2 aparells"
} }
} }
] ]
@ -393,7 +417,8 @@
"en": "When is this lamp lit?", "en": "When is this lamp lit?",
"nl": "Wanneer is deze lantaarn verlicht?", "nl": "Wanneer is deze lantaarn verlicht?",
"de": "Wann leuchtet diese Straßenlaterne?", "de": "Wann leuchtet diese Straßenlaterne?",
"es": "¿Cuándo se ilumina esta lámpara?" "es": "¿Cuándo se ilumina esta lámpara?",
"ca": "Quan s'encén aquest fanal?"
}, },
"mappings": [ "mappings": [
{ {
@ -402,7 +427,8 @@
"en": "This lamp is lit at night", "en": "This lamp is lit at night",
"nl": "Deze lantaarn is 's nachts verlicht", "nl": "Deze lantaarn is 's nachts verlicht",
"de": "Diese Straßenlaterne leuchtet nachts", "de": "Diese Straßenlaterne leuchtet nachts",
"es": "Esta lámpara está iluminada por la noche" "es": "Esta lámpara está iluminada por la noche",
"ca": "Aquest fanal s'encén a la nit"
} }
}, },
{ {
@ -411,7 +437,8 @@
"en": "This lamp is lit 24/7", "en": "This lamp is lit 24/7",
"nl": "Deze lantaarn is 24/7 verlicht", "nl": "Deze lantaarn is 24/7 verlicht",
"de": "Diese Straßenlaterne leuchtet durchgehend", "de": "Diese Straßenlaterne leuchtet durchgehend",
"es": "Esta lámpara está iluminada 24/7" "es": "Esta lámpara está iluminada 24/7",
"ca": "Aquest fanal està encès les 24 hores del dia"
} }
}, },
{ {
@ -420,7 +447,8 @@
"en": "This lamp is lit based on motion", "en": "This lamp is lit based on motion",
"nl": "Deze lantaarn is verlicht op basis van beweging", "nl": "Deze lantaarn is verlicht op basis van beweging",
"de": "Diese Straßenlaterne leuchtet bewegungsgesteuert", "de": "Diese Straßenlaterne leuchtet bewegungsgesteuert",
"es": "Esta lámpara se ilumina con el movimiento" "es": "Esta lámpara se ilumina con el movimiento",
"ca": "Aquest fanal s'encén en funció del moviment"
} }
}, },
{ {
@ -429,7 +457,8 @@
"en": "This lamp is lit based on demand (e.g. with a pushbutton)", "en": "This lamp is lit based on demand (e.g. with a pushbutton)",
"nl": "Deze lantaarn is verlicht op verzoek (bijv. met een drukknop)", "nl": "Deze lantaarn is verlicht op verzoek (bijv. met een drukknop)",
"de": "Diese Straßenlaterne leuchtet bei Bedarf (z. B. mit einem Taster)", "de": "Diese Straßenlaterne leuchtet bei Bedarf (z. B. mit einem Taster)",
"es": "Esta lámpara se ilumina bajo demanda (ej. con un pulsador)" "es": "Esta lámpara se ilumina bajo demanda (ej. con un pulsador)",
"ca": "Aquest fanal s'encén segons la demanda (per exemple, amb un polsador)"
} }
} }
] ]
@ -440,13 +469,15 @@
"en": "This lamp points towards {light:direction}", "en": "This lamp points towards {light:direction}",
"nl": "Deze lantaarn is gericht naar {light:direction}", "nl": "Deze lantaarn is gericht naar {light:direction}",
"de": "Diese Straßenlaterne leuchtet in Richtung {light:direction}", "de": "Diese Straßenlaterne leuchtet in Richtung {light:direction}",
"es": "Esta lámpara apunta hacia {light:direction}" "es": "Esta lámpara apunta hacia {light:direction}",
"ca": "Aquest fanal apunta cap a {light:direction}"
}, },
"question": { "question": {
"en": "Where does this lamp point to?", "en": "Where does this lamp point to?",
"nl": "Waar is deze lamp heengericht?", "nl": "Waar is deze lamp heengericht?",
"de": "Wohin leuchtet diese Straßenlaterne?", "de": "Wohin leuchtet diese Straßenlaterne?",
"es": "¿Hacia donde apunta esta lámpara?" "es": "¿Hacia donde apunta esta lámpara?",
"ca": "Cap a on apunta aquest fanal?"
}, },
"condition": "light:count=1", "condition": "light:count=1",
"freeform": { "freeform": {

9
assets/layers/toilet/toilet.json
View file

@ -90,7 +90,8 @@
"nl": "Toegankelijkheid is {access}", "nl": "Toegankelijkheid is {access}",
"it": "L'accesso è {access}", "it": "L'accesso è {access}",
"es": "El acceso es {access}", "es": "El acceso es {access}",
"da": "Adgang er {access}" "da": "Adgang er {access}",
"ca": "L'accés és {access}"
}, },
"freeform": { "freeform": {
"key": "access", "key": "access",
@ -294,7 +295,8 @@
"en": "There is only a dedicated toilet for wheelchair users", "en": "There is only a dedicated toilet for wheelchair users",
"nl": "Er is alleen een toilet voor rolstoelgebruikers", "nl": "Er is alleen een toilet voor rolstoelgebruikers",
"de": "Es gibt nur eine barrierefreie Toilette für Rollstuhlfahrer", "de": "Es gibt nur eine barrierefreie Toilette für Rollstuhlfahrer",
"da": "Der er kun et særligt toilet til kørestolsbrugere" "da": "Der er kun et særligt toilet til kørestolsbrugere",
"ca": "Sols hi ha un lavabo per a usuaris amb cadira de rodes"
} }
} }
] ]
@ -381,7 +383,8 @@
"nl": "Er zijn zowel urinoirs als zittoiletten", "nl": "Er zijn zowel urinoirs als zittoiletten",
"it": "Ci sono sia sedili, sia urinali", "it": "Ci sono sia sedili, sia urinali",
"es": "Aquí hay tanto váteres de sentarse como orinales", "es": "Aquí hay tanto váteres de sentarse como orinales",
"da": "Både siddende toiletter og urinaler er tilgængelige her" "da": "Både siddende toiletter og urinaler er tilgængelige her",
"ca": "Aquí hi ha lavabos per a utilitzar tant de peu com asseguts"
} }
} }
] ]

3
assets/themes/street_lighting/street_lighting.json
View file

@ -21,7 +21,8 @@
"de": "Eine Karte für alles zum Thema Straßenbeleuchtung", "de": "Eine Karte für alles zum Thema Straßenbeleuchtung",
"es": "En este mapa puedes encontrar todo sobre la iluminación callejera", "es": "En este mapa puedes encontrar todo sobre la iluminación callejera",
"fr": "Retrouvez tout ce qui touche à l’éclairage de rue sur cette carte", "fr": "Retrouvez tout ce qui touche à l’éclairage de rue sur cette carte",
"da": "På dette kort kan du finde alt om gadebelysning" "da": "På dette kort kan du finde alt om gadebelysning",
"ca": "En aquest mapa pots trobar tot el relacionat amb l'enllumenat públic"
}, },
"icon": "./assets/layers/street_lamps/street_lamp.svg", "icon": "./assets/layers/street_lamps/street_lamp.svg",
"startZoom": 19, "startZoom": 19,

26
assets/translators.json
View file

@ -1,11 +1,11 @@
{ {
"contributors": [ "contributors": [
{ {
"commits": 230, "commits": 233,
"contributor": "Pieter Vander Vennet" "contributor": "Pieter Vander Vennet"
}, },
{ {
"commits": 198, "commits": 204,
"contributor": "kjon" "contributor": "kjon"
}, },
{ {
@ -14,11 +14,11 @@
}, },
{ {
"commits": 61, "commits": 61,
"contributor": "danieldegroot2" "contributor": "Robin van der Linde"
}, },
{ {
"commits": 58, "commits": 61,
"contributor": "Robin van der Linde" "contributor": "danieldegroot2"
}, },
{ {
"commits": 45, "commits": 45,
@ -36,6 +36,10 @@
"commits": 29, "commits": 29,
"contributor": "Artem" "contributor": "Artem"
}, },
{
"commits": 28,
"contributor": "paunofu"
},
{ {
"commits": 27, "commits": 27,
"contributor": "Supaplex" "contributor": "Supaplex"
@ -68,10 +72,6 @@
"commits": 14, "commits": 14,
"contributor": "J. Lavoie" "contributor": "J. Lavoie"
}, },
{
"commits": 13,
"contributor": "paunofu"
},
{ {
"commits": 13, "commits": 13,
"contributor": "Romain de Bossoreille" "contributor": "Romain de Bossoreille"
@ -132,6 +132,10 @@
"commits": 7, "commits": 7,
"contributor": "Niels Elgaard Larsen" "contributor": "Niels Elgaard Larsen"
}, },
{
"commits": 6,
"contributor": "Jaime Marquínez Ferrándiz"
},
{ {
"commits": 6, "commits": 6,
"contributor": "Joost Schouppe" "contributor": "Joost Schouppe"
@ -218,11 +222,11 @@
}, },
{ {
"commits": 3, "commits": 3,
"contributor": "aleksej0R" "contributor": "Bibi56"
}, },
{ {
"commits": 3, "commits": 3,
"contributor": "Jaime Marquínez Ferrándiz" "contributor": "aleksej0R"
}, },
{ {
"commits": 3, "commits": 3,

13
langs/ca.json
View file

@ -88,6 +88,7 @@
"josmOpened": "JOSM és obert", "josmOpened": "JOSM és obert",
"mapContributionsBy": "Les dades mostrades tenen edicions fetes per {contributors}", "mapContributionsBy": "Les dades mostrades tenen edicions fetes per {contributors}",
"mapContributionsByAndHidden": "Les dades mostrades tenen edicions fetes per {contributors} i {hiddenCount} col·laboradors més", "mapContributionsByAndHidden": "Les dades mostrades tenen edicions fetes per {contributors} i {hiddenCount} col·laboradors més",
"mapillaryHelp": "<b>Mapillary</b> és un servei en línea que arreplega imatges a peu de carrer i les ofereix sota una llicència lliure. Els contribuïdors poden utilizar aquestes imatges per a millorar OpenStreetMap",
"openIssueTracker": "Registrar un error", "openIssueTracker": "Registrar un error",
"openMapillary": "Obrir Mapillary aquí", "openMapillary": "Obrir Mapillary aquí",
"openOsmcha": "Veure darreres edicions fetes amb {theme}", "openOsmcha": "Veure darreres edicions fetes amb {theme}",
@ -122,6 +123,7 @@
}, },
"example": "Exemple", "example": "Exemple",
"examples": "Exemples", "examples": "Exemples",
"feelFreeToSkip": "Podeu afegir més informació a sota, però sentiu-vos lliures de <b>botar preguntes</b> que no conegueu la resposta.",
"fewChangesBefore": "Contesta unes quantes preguntes sobre punts existents abans d'afegir-ne un de nou.", "fewChangesBefore": "Contesta unes quantes preguntes sobre punts existents abans d'afegir-ne un de nou.",
"getStartedLogin": "Entra a OpenStreetMap per començar", "getStartedLogin": "Entra a OpenStreetMap per començar",
"getStartedNewAccount": " o <a href=\"https://www.openstreetmap.org/user/new\" target=\"_blank\">crea un nou compte</a>", "getStartedNewAccount": " o <a href=\"https://www.openstreetmap.org/user/new\" target=\"_blank\">crea un nou compte</a>",
@ -150,6 +152,7 @@
"streetcomplete": "Una altra aplicació similar és <a class=\"underline hover:text-blue-800\" href=\"https://play.google.com/store/apps/details?id=de.westnordost.streetcomplete\" target=\"_blank\">StreetComplete</a>." "streetcomplete": "Una altra aplicació similar és <a class=\"underline hover:text-blue-800\" href=\"https://play.google.com/store/apps/details?id=de.westnordost.streetcomplete\" target=\"_blank\">StreetComplete</a>."
}, },
"nameInlineQuestion": "{category}: El seu nom és $$$", "nameInlineQuestion": "{category}: El seu nom és $$$",
"newlyCreated": "Acabeu de crear aquest element! Gràcies per compartir aquesta informació amb el mon i ajudar a persones al voltant del món.",
"next": "Següent", "next": "Següent",
"noNameCategory": "{category} sense nom", "noNameCategory": "{category} sense nom",
"noTagsSelected": "No s'han seleccionat etiquetes", "noTagsSelected": "No s'han seleccionat etiquetes",
@ -242,7 +245,10 @@
}, },
"welcomeBack": "Has entrat, benvingut/da.", "welcomeBack": "Has entrat, benvingut/da.",
"welcomeExplanation": { "welcomeExplanation": {
"addNew": "Toqueu el mapa per afegir un nou PDI." "addNew": "Toqueu el mapa per afegir un nou PDI.",
"browseMoreMaps": "Descobreix més mapes",
"browseOtherThemesIntro": "Varios mapes temàtics existents a MapComplete",
"general": "A aquest mapa, podeu observar, editar i afegir <i>punt d'interés</i>. Feu zoom pel voltant per veure el PDI, toque una vegada per a veure o editar la informació. Totes les dades s'obtenen i es desen a OpenStreetMap, que es poden reutilitzar lliurement."
}, },
"wikipedia": { "wikipedia": {
"createNewWikidata": "Crear un ítem de Wikidata", "createNewWikidata": "Crear un ítem de Wikidata",
@ -542,6 +548,11 @@
"missing": "{count} cadenes sense traduir", "missing": "{count} cadenes sense traduir",
"notImmediate": "Les traduccions no s'actualitzen directament. Això sol trigar uns quants dies" "notImmediate": "Les traduccions no s'actualitzen directament. Això sol trigar uns quants dies"
}, },
"userinfo": {
"gotoInbox": "Obre la teva safata d'entrada",
"gotoSettings": "Aneu a la vostra configuració a OpenStreetMap.org",
"moveToHome": "Mou el mapa a la vostra ubicació de casa"
},
"validation": { "validation": {
"color": { "color": {
"description": "Un color o codi hex" "description": "Un color o codi hex"

6
langs/en.json
View file

@ -355,12 +355,16 @@
} }
}, },
"hotkeyDocumentation": { "hotkeyDocumentation": {
"action": "Action",
"closeSidebar": "Close the sidebar", "closeSidebar": "Close the sidebar",
"geolocate": "Pan the map to the current location or zoom the map to the current location. Requests geopermission", "geolocate": "Pan the map to the current location or zoom the map to the current location. Requests geopermission",
"intro": "MapComplete supports the following keys:",
"key": "Key combination",
"openLayersPanel": "Opens the Background, layers and filters panel", "openLayersPanel": "Opens the Background, layers and filters panel",
"selectBackground": "Select a background layer of category {category}", "selectBackground": "Select a background layer of category {category}",
"selectMapnik": "Sets the background layer to OpenStreetMap-carto", "selectMapnik": "Sets the background layer to OpenStreetMap-carto",
"selectSearch": "Select the search bar to search locations" "selectSearch": "Select the search bar to search locations",
"title": "Hotkeys"
}, },
"image": { "image": {
"addPicture": "Add picture", "addPicture": "Add picture",

228
langs/layers/ca.json
View file

@ -29,7 +29,8 @@
"name": "Mapa d'estacions d'ambulàncies", "name": "Mapa d'estacions d'ambulàncies",
"presets": { "presets": {
"0": { "0": {
"description": "Afegeix una estació d'ambulàncies al mapa" "description": "Afegeix una estació d'ambulàncies al mapa",
"title": "una estació d'ambulàncies"
} }
}, },
"tagRenderings": { "tagRenderings": {
@ -89,6 +90,11 @@
}, },
"atm": { "atm": {
"description": "Caixers automàtics on retirar diners", "description": "Caixers automàtics on retirar diners",
"presets": {
"0": {
"title": "un caixer automàtic"
}
},
"tagRenderings": { "tagRenderings": {
"brand": { "brand": {
"question": "De quina marca és aquest caixer?" "question": "De quina marca és aquest caixer?"
@ -371,6 +377,11 @@
}, },
"bike_repair_station": { "bike_repair_station": {
"name": "Manxa i reparació de bicicletes", "name": "Manxa i reparació de bicicletes",
"presets": {
"0": {
"title": "una manxa per a bicicletes"
}
},
"tagRenderings": { "tagRenderings": {
"bike_repair_station-available-services": { "bike_repair_station-available-services": {
"mappings": { "mappings": {
@ -458,7 +469,7 @@
} }
}, },
"bike_shop-name": { "bike_shop-name": {
"render": "Aquesta botiga de bicicletes és diu {name}" "render": "Aquesta botiga de bicicletes s'anomena {name}"
} }
}, },
"title": { "title": {
@ -504,7 +515,7 @@
"title": "un bar" "title": "un bar"
}, },
"1": { "1": {
"title": "un pub" "title": "un bar de copes"
}, },
"2": { "2": {
"title": "un cafè" "title": "un cafè"
@ -772,7 +783,7 @@
"name": "Desfibril·ladors", "name": "Desfibril·ladors",
"presets": { "presets": {
"0": { "0": {
"title": "Desfibril·lador" "title": "un desfibril·lador"
} }
}, },
"tagRenderings": { "tagRenderings": {
@ -937,7 +948,8 @@
"title": "un de menjar ràpid" "title": "un de menjar ràpid"
}, },
"2": { "2": {
"description": "Un local de menjar ràpid centrat en les patates fregides" "description": "Un local de menjar ràpid centrat en les patates fregides",
"title": "una botiga de patates fregides"
} }
}, },
"tagRenderings": { "tagRenderings": {
@ -995,6 +1007,9 @@
"render": "Bicicleta blanca" "render": "Bicicleta blanca"
} }
}, },
"gps_track": {
"name": "La teva pista recorreguda"
},
"hackerspace": { "hackerspace": {
"presets": { "presets": {
"1": { "1": {
@ -1014,7 +1029,14 @@
"tagRenderings": { "tagRenderings": {
"name": { "name": {
"question": "Quin és el nom d'aquest hospital?", "question": "Quin és el nom d'aquest hospital?",
"render": "Aquest hospital es diu {name}" "render": "Aquest hospital s'anomena {name}"
}
}
},
"hotel": {
"presets": {
"0": {
"title": "un hotel"
} }
} }
}, },
@ -1073,6 +1095,7 @@
} }
}, },
"name": { "name": {
"question": "Com s'anomena aquesta instal·lació?",
"render": "Aquesta instal·lació s'anomena <b>{name}</b>" "render": "Aquesta instal·lació s'anomena <b>{name}</b>"
} }
} }
@ -1144,7 +1167,19 @@
} }
}, },
"parking": { "parking": {
"name": "Aparcament" "name": "Aparcament",
"tagRenderings": {
"capacity-disabled": {
"question": "Quantes places d'aparcament per a persones amb mobilitat reduïda hi ha al parking?"
},
"parking-type": {
"mappings": {
"0": {
"then": "Aquest és un aparcament en superfície"
}
}
}
}
}, },
"parking_spaces": { "parking_spaces": {
"tagRenderings": { "tagRenderings": {
@ -1327,10 +1362,47 @@
}, },
"school": { "school": {
"tagRenderings": { "tagRenderings": {
"capacity": {
"question": "Quants alumnes poden matricular-se com a màxim a aquesta escola?"
},
"gender": {
"mappings": {
"0": {
"then": "Els dos, nois i noies poden inscriure's aquí i prendre classes junts"
},
"1": {
"then": "Els dos, nois i noies poden inscriure's aquí, però estan separats (p. e. prenen les classes a diferents aules o diferentes hores)"
},
"2": {
"then": "Aquesta és una escola exclusivament per a nois"
},
"3": {
"then": "Aquesta és una escola exclusivament per a noies"
}
},
"question": "Quins gèneres poden inscriure's a aquesta escola?"
},
"school-language": {
"render": {
"special": {
"no_known_languages": "La llengua principal d'aquesta escola és desconeguda",
"question": "Quina és la llengua principal d'aquesta escola?<div class='subtle'>Quina llengua es parla amb els estudiants en classes no relacionades amb la llengua i l'administració?</div>",
"render_all": "En aquesta escola s'utilitzen els idiomes següents:{list()}",
"render_single_language": "{language():font-bold} és la llengua principal d'aquesta escola"
}
}
},
"school-name": {
"question": "Quin és el nom d'aquesta escola?",
"render": "L'escola s'anomena {name}"
},
"target-audience": { "target-audience": {
"mappings": { "mappings": {
"1": { "1": {
"then": "Aquesta és una escola per a estudiants sense necesitats especials <div class='subtle'> Açò inclou alumnes que poden seguir les classes amb petites messures</div>" "then": "Aquesta és una escola per a estudiants sense necessitats especials <div class='subtle'> Açò inclou alumnes que poden seguir les classes amb petites mesures</div>"
},
"2": {
"then": "Aquesta és una escola on els adults reben competències al nivell especificat."
}, },
"3": { "3": {
"then": "Aquesta és una escola per a estudiants amb autisme" "then": "Aquesta és una escola per a estudiants amb autisme"
@ -1354,6 +1426,18 @@
}, },
"shops": { "shops": {
"name": "Botiga", "name": "Botiga",
"tagRenderings": {
"organic": {
"mappings": {
"0": {
"then": "Aquesta botiga ofereix productes orgànics"
}
}
},
"shops-name": {
"render": "La botiga s'anomena <i>{name}</i>"
}
},
"title": { "title": {
"mappings": { "mappings": {
"0": { "0": {
@ -1413,6 +1497,119 @@
"render": "Camp d'esports" "render": "Camp d'esports"
} }
}, },
"street_lamps": {
"name": "Fanals",
"presets": {
"0": {
"title": "un fanal"
}
},
"tagRenderings": {
"colour": {
"mappings": {
"0": {
"then": "Aquest fanal emet llum blanca"
},
"1": {
"then": "Aquest fanal emet llum verda"
},
"2": {
"then": "Aquest fanal emet llum taronja"
}
},
"question": "Quin color de llum emet aquest fanal?"
},
"count": {
"mappings": {
"0": {
"then": "Aquest fanal té 1 aparell"
},
"1": {
"then": "Aquest fanal té 2 aparells"
}
}
},
"direction": {
"question": "Cap a on apunta aquest fanal?",
"render": "Aquest fanal apunta cap a {light:direction}"
},
"lamp_mount": {
"mappings": {
"0": {
"then": "Aquest fanal es troba al final d'un pal recte"
},
"1": {
"then": "Aquest fanal es troba al final d'un pal doblegat"
}
},
"question": "Com està muntat aquest fanal al pal?"
},
"lit": {
"mappings": {
"0": {
"then": "Aquest fanal s'encén a la nit"
},
"1": {
"then": "Aquest fanal està encès les 24 hores del dia"
},
"2": {
"then": "Aquest fanal s'encén en funció del moviment"
},
"3": {
"then": "Aquest fanal s'encén segons la demanda (per exemple, amb un polsador)"
}
},
"question": "Quan s'encén aquest fanal?"
},
"method": {
"mappings": {
"1": {
"then": "Aquest fanal utilitza LED"
},
"2": {
"then": "Aquest fanal utilitza il·luminació incandescent"
},
"3": {
"then": "Aquest fanal utilitza il·luminació halògena"
},
"4": {
"then": "Aquest fanal utilitza làmpades de descàrrega (tipus desconegut)"
},
"5": {
"then": "Aquest fanal utilitza una làmpada de vapor de mercuri (lleugerament blau)"
},
"6": {
"then": "Aquest fanal utilitza làmpades d'halogenurs metàl·lics (blanc brillant)"
},
"7": {
"then": "Aquest fanal utilitza il·luminació fluorescent"
},
"8": {
"then": "Aquest fanal utilitza làmpades de sodi (tipus desconegut)"
},
"9": {
"then": "Aquest fanal utilitza làmpades de sodi de baixa pressió (taronja monocroma)"
},
"10": {
"then": "Aquest fanal utilitza làmpades de sodi d'alta pressió (taronja amb blanc)"
},
"11": {
"then": "Aquest fanal s'il·lumina amb gas"
}
}
},
"ref": {
"question": "Quin és el número de referència d'aquest fanal?"
},
"support": {
"mappings": {
"4": {
"then": "Aquest fanal està muntat en un pal"
}
}
}
}
},
"surveillance_camera": { "surveillance_camera": {
"name": "Càmeres de videovigilància", "name": "Càmeres de videovigilància",
"tagRenderings": { "tagRenderings": {
@ -1440,7 +1637,22 @@
"toilet": { "toilet": {
"name": "Lavabos", "name": "Lavabos",
"tagRenderings": { "tagRenderings": {
"toilet-access": {
"render": "L'accés és {access}"
},
"toilets-type": {
"mappings": {
"3": {
"then": "Aquí hi ha lavabos per a utilitzar tant de peu com asseguts"
}
}
},
"toilets-wheelchair": { "toilets-wheelchair": {
"mappings": {
"2": {
"then": "Sols hi ha un lavabo per a usuaris amb cadira de rodes"
}
},
"question": "Hi ha un lavabo específic per a usuaris de cadira de rodes?" "question": "Hi ha un lavabo específic per a usuaris de cadira de rodes?"
} }
}, },

39
langs/layers/de.json
View file

@ -260,6 +260,35 @@
"render": "Geldautomat" "render": "Geldautomat"
} }
}, },
"bank": {
"description": "Ein Finanzinstitut, um Geld einzuzahlen",
"filter": {
"1": {
"options": {
"0": {
"question": "Mit einem Geldautomaten"
}
}
}
},
"name": "Banken",
"tagRenderings": {
"has_atm": {
"mappings": {
"0": {
"then": "Diese Bank hat einen Geldautomaten"
},
"1": {
"then": "Diese Bank hat <b>keinen</b> Geldautomaten"
},
"2": {
"then": "Diese Bank hat zwar einen Geldautomaten, aber dieser ist mit einem anderen Symbol dargestellt"
}
},
"question": "Hat diese Bank einen Geldautomaten?"
}
}
},
"barrier": { "barrier": {
"description": "Hindernisse beim Fahrradfahren, wie zum Beispiel Poller und Fahrrad Barrieren", "description": "Hindernisse beim Fahrradfahren, wie zum Beispiel Poller und Fahrrad Barrieren",
"name": "Hindernisse", "name": "Hindernisse",
@ -832,7 +861,10 @@
"bike_cleaning-charge": { "bike_cleaning-charge": {
"mappings": { "mappings": {
"0": { "0": {
"then": "Kostenloser Reinigungsservice" "then": "Der Reinigungsservice ist kostenlos"
},
"1": {
"then": "Dieser Reinigungsservice ist kostenpflichtig"
} }
}, },
"question": "Wie viel kostet die Nutzung des Reinigungsdienstes?", "question": "Wie viel kostet die Nutzung des Reinigungsdienstes?",
@ -2695,6 +2727,11 @@
"climbing_gym": { "climbing_gym": {
"description": "Eine Kletterhalle", "description": "Eine Kletterhalle",
"name": "Kletterhallen", "name": "Kletterhallen",
"presets": {
"0": {
"title": "Kletterhalle"
}
},
"tagRenderings": { "tagRenderings": {
"Speed climbing?": { "Speed climbing?": {
"mappings": { "mappings": {

6
langs/layers/es.json
View file

@ -1113,11 +1113,11 @@
"presets": { "presets": {
"0": { "0": {
"description": "Un bar, principalmente para beber cervezas en un interior templado y relajado", "description": "Un bar, principalmente para beber cervezas en un interior templado y relajado",
"title": "un pub" "title": "un bar"
}, },
"1": { "1": {
"description": "Un <b>bar</b> más moderno y comercial, posiblemente con una instalación de música y luz", "description": "Un <b>bar</b> más moderno y comercial, posiblemente con una instalación de música y luz",
"title": "un bar" "title": "un bar de copas"
}, },
"2": { "2": {
"description": "Una <b>cafetería</b> para beber té, café o una bebida alcohólica en un ambiente tranquilo", "description": "Una <b>cafetería</b> para beber té, café o una bebida alcohólica en un ambiente tranquilo",
@ -1947,7 +1947,7 @@
"name": "Desfibriladores", "name": "Desfibriladores",
"presets": { "presets": {
"0": { "0": {
"title": "una desfibrilador" "title": "un desfibrilador"
}, },
"1": { "1": {
"title": "un desfibrilador montado en una pared" "title": "un desfibrilador montado en una pared"

3
langs/layers/nl.json
View file

@ -260,6 +260,9 @@
"render": "Geldautomaat" "render": "Geldautomaat"
} }
}, },
"bank": {
"description": "Een financiële instelling waar je geld kunt"
},
"barrier": { "barrier": {
"description": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes", "description": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes",
"name": "Barrières", "name": "Barrières",

2
langs/nl.json
View file

@ -930,7 +930,7 @@
"gotoSettings": "Ga naar je instellingen op OpenStreetMap.org", "gotoSettings": "Ga naar je instellingen op OpenStreetMap.org",
"moveToHome": "Beweeg de kaart naar je thuislocatie", "moveToHome": "Beweeg de kaart naar je thuislocatie",
"newMessages": "je hebt nieuwe berichten", "newMessages": "je hebt nieuwe berichten",
"noDescription": "Je hebt nog een beschrijving op je profiel", "noDescription": "Je hebt nog geen beschrijving op je profiel",
"noDescriptionCallToAction": "Voeg een profielbeschrijving toe", "noDescriptionCallToAction": "Voeg een profielbeschrijving toe",
"welcome": "Welkom {name}" "welcome": "Welkom {name}"
}, },

1
langs/themes/ca.json
View file

@ -685,6 +685,7 @@
"title": "Camps d'esports" "title": "Camps d'esports"
}, },
"street_lighting": { "street_lighting": {
"description": "En aquest mapa pots trobar tot el relacionat amb l'enllumenat públic",
"layers": { "layers": {
"1": { "1": {
"name": "Il·luminació de carrers", "name": "Il·luminació de carrers",

3
package.json
View file

@ -47,9 +47,8 @@
"clean": "rm -rf .cache/ && (find *.html | grep -v \"^\\(404\\|index\\|land\\|test\\|preferences\\|customGenerator\\|professional\\|automaton\\|import_helper\\|import_viewer\\|theme\\).html\" | xargs rm) && (ls | grep \"^index_[a-zA-Z_-]\\+\\.ts$\" | xargs rm) && (ls | grep \".*.webmanifest$\" | grep -v \"manifest.webmanifest\" | xargs rm)", "clean": "rm -rf .cache/ && (find *.html | grep -v \"^\\(404\\|index\\|land\\|test\\|preferences\\|customGenerator\\|professional\\|automaton\\|import_helper\\|import_viewer\\|theme\\).html\" | xargs rm) && (ls | grep \"^index_[a-zA-Z_-]\\+\\.ts$\" | xargs rm) && (ls | grep \".*.webmanifest$\" | grep -v \"manifest.webmanifest\" | xargs rm)",
"generate:dependency-graph": "node_modules/.bin/depcruise --exclude \"^node_modules\" --output-type dot Logic/State/MapState.ts > dependencies.dot && dot dependencies.dot -T svg -o dependencies.svg && rm dependencies.dot", "generate:dependency-graph": "node_modules/.bin/depcruise --exclude \"^node_modules\" --output-type dot Logic/State/MapState.ts > dependencies.dot && dot dependencies.dot -T svg -o dependencies.svg && rm dependencies.dot",
"script": "ts-node", "script": "ts-node",
"weblate-merge": "./scripts/automerge-translations.sh",
"weblate-add-upstream": "git remote add weblate-github git@github.com:weblate/MapComplete.git", "weblate-add-upstream": "git remote add weblate-github git@github.com:weblate/MapComplete.git",
"weblate-fix": "git remote update weblate-github; git merge weblate-github/weblate-mapcomplete-core; git merge weblate-github/weblate-mapcomplete-layers; git merge weblate-github/weblate-mapcomplete-layer-translations", "weblate-merge": "git remote update weblate-github; git merge weblate-github/weblate-mapcomplete-core weblate-github/weblate-mapcomplete-layers weblate-github/weblate-mapcomplete-layer-translations",
"weblate-fix-heavy": "git remote rm weblate-layers; git remote add weblate-layers https://hosted.weblate.org/git/mapcomplete/layers/; git remote update weblate-layers; git merge weblate-layers/master", "weblate-fix-heavy": "git remote rm weblate-layers; git remote add weblate-layers https://hosted.weblate.org/git/mapcomplete/layers/; git remote update weblate-layers; git merge weblate-layers/master",
"housekeeping": "npm run generate && npm run generate:docs && npm run generate:contributor-list && npm run format && git add assets/ langs/ Docs/ **/*.ts Docs/* && git commit -m 'Housekeeping...'", "housekeeping": "npm run generate && npm run generate:docs && npm run generate:contributor-list && npm run format && git add assets/ langs/ Docs/ **/*.ts Docs/* && git commit -m 'Housekeeping...'",
"parseSchools": "ts-node scripts/schools/amendSchoolData.ts", "parseSchools": "ts-node scripts/schools/amendSchoolData.ts",

18
scripts/automerge-translations.sh
View file

@ -1,18 +0,0 @@
#! /usr/bin/env bash
# Automerge translations automatically fetches the translations from weblate
git fetch weblate-github
git merge --no-commit weblate-github/weblate-mapcomplete-layers weblate-github/weblate-mapcomplete-layer-translations weblate-github/weblate-mapcomplete-core
npm run generate:translations
if [ "$?" = "0" ]; then
# Translation generation went fine - commit
git add langs/
git add assets/
git commit -m "Merge weblate translations and regenerate translations"
git push
else
echo "Generation of translations failed!"
git merge --abort
fi