diff --git a/Docs/Themes/parkings.md b/Docs/Themes/parkings.md
index bb748968bf..0915329ad5 100644
--- a/Docs/Themes/parkings.md
+++ b/Docs/Themes/parkings.md
@@ -37,6 +37,7 @@ Available languages:
- es
- da
- pa_PK
+ - ca
This document is autogenerated from [assets/themes/parkings/parkings.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/parkings/parkings.json)
\ No newline at end of file
diff --git a/Docs/Themes/pets.md b/Docs/Themes/pets.md
index 10cc335c93..d2c4b99b1b 100644
--- a/Docs/Themes/pets.md
+++ b/Docs/Themes/pets.md
@@ -34,6 +34,7 @@ Available languages:
- de
- nl
- fr
+ - ca
This document is autogenerated from [assets/themes/pets/pets.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/pets/pets.json)
\ No newline at end of file
diff --git a/Docs/Themes/postboxes.md b/Docs/Themes/postboxes.md
index 83c3d06efd..05dd753949 100644
--- a/Docs/Themes/postboxes.md
+++ b/Docs/Themes/postboxes.md
@@ -34,6 +34,7 @@ Available languages:
- nl
- fr
- da
+ - ca
This document is autogenerated from [assets/themes/postboxes/postboxes.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/postboxes/postboxes.json)
\ No newline at end of file
diff --git a/Docs/Themes/sports.md b/Docs/Themes/sports.md
index c8c39ef69c..3a5177a507 100644
--- a/Docs/Themes/sports.md
+++ b/Docs/Themes/sports.md
@@ -32,6 +32,7 @@ Available languages:
- de
- pa_PK
- fr
+ - ca
This document is autogenerated from [assets/themes/sports/sports.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/sports/sports.json)
\ No newline at end of file
diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt
index 02dc796a24..ee59ab124f 100644
--- a/Docs/wikiIndex.txt
+++ b/Docs/wikiIndex.txt
@@ -445,7 +445,7 @@
{{service_item
|name= [https://mapcomplete.osm.be/surveillance surveillance]
|region= Worldwide
-|lang= {{#language:en|en}}, {{#language:nl|en}}, {{#language:ja|en}}, {{#language:zh_Hant|en}}, {{#language:fr|en}}, {{#language:pl|en}}, {{#language:de|en}}, {{#language:it|en}}, {{#language:hu|en}}, {{#language:da|en}}, {{#language:nb_NO|en}}
+|lang= {{#language:en|en}}, {{#language:nl|en}}, {{#language:ja|en}}, {{#language:zh_Hant|en}}, {{#language:fr|en}}, {{#language:pl|en}}, {{#language:de|en}}, {{#language:it|en}}, {{#language:hu|en}}, {{#language:da|en}}, {{#language:nb_NO|en}}, {{#language:ca|en}}
|descr= A MapComplete theme: Surveillance cameras and other means of surveillance
|material= {{yes|[https://mapcomplete.osm.be/ Yes]}}
|image= MapComplete_Screenshot.png
diff --git a/assets/contributors.json b/assets/contributors.json
index 12e046b0db..c253a50372 100644
--- a/assets/contributors.json
+++ b/assets/contributors.json
@@ -1,7 +1,7 @@
{
"contributors": [
{
- "commits": 4872,
+ "commits": 4874,
"contributor": "Pieter Vander Vennet"
},
{
diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json
index d1e2506c23..0df1975d81 100644
--- a/assets/layers/playground/playground.json
+++ b/assets/layers/playground/playground.json
@@ -486,7 +486,8 @@
"fr": "Quand ce terrain de jeux est-il accessible ?",
"it": "Quando si può accedere a questo campetto?",
"ru": "Когда открыта эта игровая площадка?",
- "de": "Wann ist dieser Spielplatz zugänglich?"
+ "de": "Wann ist dieser Spielplatz zugänglich?",
+ "ca": "Quan és accesible aquest parc infantil?"
},
"mappings": [
{
@@ -498,7 +499,8 @@
"it": "Si può accedere dall'alba al tramonto",
"ru": "Открыто от рассвета до заката",
"de": "Zugänglich von Sonnenaufgang bis Sonnenuntergang",
- "es": "Accesible desde el amanecer hasta el anochecer"
+ "es": "Accesible desde el amanecer hasta el anochecer",
+ "ca": "Accesible des de la sortida del sol fins al vespre"
}
},
{
@@ -510,7 +512,7 @@
"ru": "Всегда доступен",
"it": "Si può sempre accedere",
"de": "Immer zugänglich",
- "ca": "Sempre accessible--",
+ "ca": "Sempre accessible",
"es": "Siempre accesible"
}
}
diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json
index 8908521b42..6c4a9f53a2 100644
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@@ -234,7 +234,8 @@
"de": "Der Bücherschrank befindet sich im Freien",
"fr": "Cette microbibliothèque est en extérieur",
"it": "Questa microbiblioteca si trova all'aperto",
- "hu": "Ez a könyvszekrény a szabadban van"
+ "hu": "Ez a könyvszekrény a szabadban van",
+ "ca": "La prestatgeria està ubicada a l'exterior"
},
"if": "indoor=",
"hideInAnswer": true
@@ -359,7 +360,8 @@
"de": "Der Bücherschrank gehört zu keinem Netzwerk",
"fr": "Cette microbibliothèque ne fait pas partie d'un réseau/groupe",
"it": "Questa microbiblioteca non fa parte di una rete",
- "hu": "Ez a nyilvános könyvespolc nem része egy nagyobb hálózatnak"
+ "hu": "Ez a nyilvános könyvespolc nem része egy nagyobb hálózatnak",
+ "ca": "Aquesta prestatgeria pública no és part d'una xarxa més gran"
}
}
],
diff --git a/assets/layers/tertiary_education/tertiary_education.json b/assets/layers/tertiary_education/tertiary_education.json
index 65a71a9ff5..cc7cd26134 100644
--- a/assets/layers/tertiary_education/tertiary_education.json
+++ b/assets/layers/tertiary_education/tertiary_education.json
@@ -96,7 +96,8 @@
"nl": "Dit is een universiteit (of hogeschool), een onderwijsinstelling van tertaire educatie. De gegeven opleidingen halen het niveau van een bachelor-opleiding of hoger.",
"de": "Dies ist eine Universität, eine Einrichtung des tertiären Bildungsbereichs, an der Bachelor-Abschlüsse oder höhere Abschlüsse verliehen werden.",
"fr": "Il s'agit d'une université, d'un établissement d'enseignement supérieur où sont délivrés des diplômes de bachelor ou plus.",
- "da": "Dette er et universitet, en institution for videregående uddannelse, hvor der tildeles bachelorgrader eller højere."
+ "da": "Dette er et universitet, en institution for videregående uddannelse, hvor der tildeles bachelorgrader eller højere.",
+ "ca": "Açò és una universitat, una institució d'educació terciaria on s'imparteixen carreres universitàries o superior."
}
}
]
@@ -108,7 +109,8 @@
"nl": "Wat is het niveau van onderwijs?",
"de": "Welche Bildungsabschlüsse werden hier verliehen?",
"fr": "Quel niveau d'éducation est donné ici ?",
- "da": "Hvilket uddannelsesniveau gives her?"
+ "da": "Hvilket uddannelsesniveau gives her?",
+ "ca": "Quin nivell d'educació és dona aquí?"
},
"multiAnswer": true,
"mappings": [
@@ -119,7 +121,8 @@
"nl": "Bacheloropleidingen (of equivalent) worden hier gegeven",
"de": "Bachelor-Abschlüsse werden hier verliehen",
"fr": "Les diplômes de bachelor y sont décernés",
- "da": "Her udstedes bachelorgrader"
+ "da": "Her udstedes bachelorgrader",
+ "ca": "Aquí s'imparteixen carreres universitàries"
}
},
{
@@ -129,7 +132,8 @@
"nl": "Masteropleidingen (of equivalent) worden hier gegeven",
"de": "Hier werden Master-Abschlüsse verliehen",
"fr": "Des masters y sont décernés",
- "da": "Mastergrader udstedes her"
+ "da": "Mastergrader udstedes her",
+ "ca": "Aquí s'imparteixen masters"
}
},
{
@@ -138,7 +142,8 @@
"en": "Doctorate degrees are awarded here",
"nl": "Doctoraatsopleidingen (of equivalent) worden hier gegeven",
"de": "Hier werden die Doktortitel verliehen",
- "fr": "Des doctorats y sont décernés"
+ "fr": "Des doctorats y sont décernés",
+ "ca": "Aquí s'imparteixen doctorats"
}
}
],
diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index 9ec0814e40..f98b017318 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -6,7 +6,7 @@
"fr": "OnWheels",
"nl": "OnWheels",
"nb_NO": "På hjul",
- "ca": "OnWheels",
+ "ca": "Sobre rodes",
"pa_PK": "آنویل"
},
"description": {
diff --git a/assets/themes/parkings/parkings.json b/assets/themes/parkings/parkings.json
index ce2e28758d..51be42b15f 100644
--- a/assets/themes/parkings/parkings.json
+++ b/assets/themes/parkings/parkings.json
@@ -13,7 +13,8 @@
"fr": "Stationnement",
"es": "Aparcamiento",
"da": "Parkering",
- "pa_PK": "پارکنگ"
+ "pa_PK": "پارکنگ",
+ "ca": "Aparcament"
},
"shortDescription": {
"nl": "Deze kaart toont verschillende parkeerplekken",
diff --git a/assets/themes/pets/pets.json b/assets/themes/pets/pets.json
index b94cd4a101..887802670f 100644
--- a/assets/themes/pets/pets.json
+++ b/assets/themes/pets/pets.json
@@ -5,7 +5,8 @@
"da": "hundesteder",
"de": "Tierärzte, Hundeparks und andere Einrichtungen für Haustiere",
"nl": "Dierenartsen, hondenloopzones en andere huisdiervriendelijke plaatsen",
- "fr": "Vétérinaires, parcs à chiens et autres endroits pour chiens"
+ "fr": "Vétérinaires, parcs à chiens et autres endroits pour chiens",
+ "ca": "Veterinaris, parcs canins i altres instal·lacions per a mascotes"
},
"description": {
"en": "On this map, you'll find various interesting places for you pets: veterinarians, dog parks, pet shops, dog-friendly restaurants, ...",
diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
index 5a17a4bcc1..a2e7327554 100644
--- a/assets/themes/postboxes/postboxes.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -9,7 +9,8 @@
"hu": "Posta- és postaládatérkép",
"nl": "Brievenbussen en postkantoren",
"fr": "Carte des Bureaux de Poste et Boîtes à Lettres",
- "da": "Postkasse- og Posthus-Kort"
+ "da": "Postkasse- og Posthus-Kort",
+ "ca": "Mapa de bústies i oficines de correus"
},
"shortDescription": {
"en": "A map showing postboxes and post offices",
diff --git a/assets/themes/sports/sports.json b/assets/themes/sports/sports.json
index 04511a74d2..517f2690f4 100644
--- a/assets/themes/sports/sports.json
+++ b/assets/themes/sports/sports.json
@@ -5,7 +5,8 @@
"nl": "Sport",
"de": "Sport",
"pa_PK": "کھیڈاں",
- "fr": "Sports"
+ "fr": "Sports",
+ "ca": "Esports"
},
"shortDescription": {
"en": "Map showing sport facilities.",
diff --git a/assets/themes/surveillance/surveillance.json b/assets/themes/surveillance/surveillance.json
index f0f3048aac..2f4ee7a173 100644
--- a/assets/themes/surveillance/surveillance.json
+++ b/assets/themes/surveillance/surveillance.json
@@ -24,7 +24,8 @@
"it": "Telecamere di sorveglianza e altri mezzi di sorveglianza.",
"hu": "Térfigyelő kamerák és más figyelőeszközök",
"da": "Overvågningskameraer og andre overvågningsmidler",
- "nb_NO": "Overvåkningskameraer og andre typer overvåkning"
+ "nb_NO": "Overvåkningskameraer og andre typer overvåkning",
+ "ca": "Càmeres de vigilància i altres tipus de vigilància"
},
"description": {
"en": "On this open map, you can find surveillance cameras.",
diff --git a/assets/translators.json b/assets/translators.json
index 7bc114c8d3..11f9f30b8c 100644
--- a/assets/translators.json
+++ b/assets/translators.json
@@ -5,7 +5,7 @@
"contributor": "Pieter Vander Vennet"
},
{
- "commits": 204,
+ "commits": 205,
"contributor": "kjon"
},
{
@@ -33,12 +33,12 @@
"contributor": "Babos Gábor"
},
{
- "commits": 29,
- "contributor": "Artem"
+ "commits": 31,
+ "contributor": "paunofu"
},
{
- "commits": 28,
- "contributor": "paunofu"
+ "commits": 29,
+ "contributor": "Artem"
},
{
"commits": 27,
@@ -164,6 +164,10 @@
"commits": 6,
"contributor": "lvgx"
},
+ {
+ "commits": 5,
+ "contributor": "sylvain-m"
+ },
{
"commits": 5,
"contributor": "Fabio Bettani"
@@ -196,10 +200,6 @@
"commits": 5,
"contributor": "Alexey Shabanov"
},
- {
- "commits": 4,
- "contributor": "sylvain-m"
- },
{
"commits": 4,
"contributor": "Hiroshi Miura"
diff --git a/langs/fr.json b/langs/fr.json
index 3b4d55cf6d..3fee3751dc 100644
--- a/langs/fr.json
+++ b/langs/fr.json
@@ -247,6 +247,12 @@
"skippedQuestions": "Questions passées",
"testing": "Test - les changements ne seront pas sauvegardés",
"uploadGpx": {
+ "meta": {
+ "descriptionIntro": "En option, vous pouvez entrer une description de votre trace :",
+ "descriptionPlaceHolder": "Entrer la description de votre trace",
+ "title": "Titre et description",
+ "titlePlaceholder": "Entrer le titre de votre trace"
+ },
"modes": {
"private": {
"name": "Anonyme"
@@ -283,6 +289,7 @@
"createNewWikidata": "Créer un nouvel élément Wikidata",
"doSearch": "Rechercher ci-dessus pour voir les résultats",
"failed": "Le chargement de Wikipédia a échoué",
+ "fromWikipedia": "Depuis Wikipédia, l'encyclopédie libre",
"loading": "Chargement de Wikipédia…",
"noResults": "Pas de résultats pour {search}",
"noWikipediaPage": "Cet élément Wikidata n’a pas encore de page Wikipédia correspondante.",
@@ -470,7 +477,8 @@
},
"userinfo": {
"gotoInbox": "Ouvrir sa boite de réception",
- "gotoSettings": "Paramètres sur OpenStreetMap.org"
+ "gotoSettings": "Paramètres sur OpenStreetMap.org",
+ "moveToHome": "Déplacez la carte vers votre emplacement"
},
"validation": {
"email": {
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index f315b78eee..3626b7b358 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -1227,10 +1227,14 @@
},
"playground-opening_hours": {
"mappings": {
+ "0": {
+ "then": "Accesible des de la sortida del sol fins al vespre"
+ },
"1": {
- "then": "Sempre accessible--"
+ "then": "Sempre accessible"
}
- }
+ },
+ "question": "Quan és accesible aquest parc infantil?"
},
"playground-phone": {
"render": "{phone}"
@@ -1274,6 +1278,22 @@
"title": "una bústia per a llibres"
}
},
+ "tagRenderings": {
+ "bookcase-is-indoors": {
+ "mappings": {
+ "2": {
+ "then": "La prestatgeria està ubicada a l'exterior"
+ }
+ }
+ },
+ "public_bookcase-brand": {
+ "mappings": {
+ "1": {
+ "then": "Aquesta prestatgeria pública no és part d'una xarxa més gran"
+ }
+ }
+ }
+ },
"title": {
"render": "Bústia per llibres"
}
@@ -1634,6 +1654,31 @@
"render": "Càmera de videovigilància"
}
},
+ "tertiary_education": {
+ "tagRenderings": {
+ "institution-kind": {
+ "mappings": {
+ "1": {
+ "then": "Açò és una universitat, una institució d'educació terciaria on s'imparteixen carreres universitàries o superior."
+ }
+ }
+ },
+ "isced": {
+ "mappings": {
+ "0": {
+ "then": "Aquí s'imparteixen carreres universitàries"
+ },
+ "1": {
+ "then": "Aquí s'imparteixen masters"
+ },
+ "2": {
+ "then": "Aquí s'imparteixen doctorats"
+ }
+ },
+ "question": "Quin nivell d'educació és dona aquí?"
+ }
+ }
+ },
"toilet": {
"name": "Lavabos",
"tagRenderings": {
diff --git a/langs/themes/ca.json b/langs/themes/ca.json
index 1e41a70185..f62a424483 100644
--- a/langs/themes/ca.json
+++ b/langs/themes/ca.json
@@ -611,11 +611,14 @@
}
}
},
- "title": "OnWheels"
+ "title": "Sobre rodes"
},
"openwindpowermap": {
"title": "OpenWindPowerMap"
},
+ "parkings": {
+ "title": "Aparcament"
+ },
"personal": {
"description": "Crea un tema personal basat en totes les capes disponibles de totes els temes. Per a mostrar les dades, obri selecció de capes",
"title": "Interfície personal"
@@ -640,7 +643,8 @@
}
}
}
- }
+ },
+ "title": "Veterinaris, parcs canins i altres instal·lacions per a mascotes"
},
"playgrounds": {
"shortDescription": "Un mapa de parcs infantils",
@@ -665,6 +669,9 @@
"shortDescription": "Codis postals",
"title": "Codis postals"
},
+ "postboxes": {
+ "title": "Mapa de bústies i oficines de correus"
+ },
"shops": {
"title": "Open Shop Map"
},
@@ -684,6 +691,9 @@
"sport_pitches": {
"title": "Camps d'esports"
},
+ "sports": {
+ "title": "Esports"
+ },
"street_lighting": {
"description": "En aquest mapa pots trobar tot el relacionat amb l'enllumenat públic",
"layers": {
@@ -703,6 +713,7 @@
"title": "Il·luminació als carrers"
},
"surveillance": {
+ "shortDescription": "Càmeres de vigilància i altres tipus de vigilància",
"title": "Vigilància sota vigilància"
},
"toilets": {