Merge pull request #12 from plepe/master

Sync

buildings-entrances.json

@@ -2,7 +2,9 @@
     "type": "overpass",
     "name": {
         "de": "Eingänge",
-        "en": "Entrances"
+        "en": "Entrances",
+        "fr": "Entrées",
+        "pt-br": "Acessos"
     },
     "query": {
         "16": [

buildings-figure-ground.json

@@ -2,7 +2,9 @@
     "type": "overpass",
     "name": {
         "de": "Schwarzplan",
-        "en": "Figure-ground diagram"
+        "en": "Figure-ground diagram",
+        "fr": "Empreintes",
+        "pt-br": "Cheios e vazios"
     },
     "query": {
         "16": [

buildings-height.json

@@ -2,7 +2,9 @@
     "type": "overpass",
     "name": {
         "de": "Gebäudehöhen",
-        "en": "Building height"
+        "en": "Building height",
+        "fr": "Hauteur",
+        "pt-br": "Altura"
     },
     "query": {
         "16": [

buildings-start_date.json

@@ -1,8 +1,10 @@
 {
     "type": "overpass",
     "name": {
+        "de": "Gebäudealter",
         "en": "Building age",
-        "de": "Gebäudealter"
+        "fr": "Date de construction",
+        "pt-br": "Idade"
     },
     "query": {
         "16": [

buildings-type.json

@@ -2,7 +2,9 @@
     "type": "overpass",
     "name": {
         "de": "Gebäudearten",
-        "en": "Building types"
+        "en": "Building types",
+        "fr": "Type",
+        "pt-br": "Tipologias"
     },
     "query": {
         "16": [

culture_religion.json

@@ -9,7 +9,7 @@
         "en": "Culture and Religion",
         "es": "Cultura y religión",
         "et": "Kultuur ja religioon",
-        "fr": "Culture et Religion",
+        "fr": "Culture et religion",
         "hu": "Kultúra és vallás",
         "it": "Cultura",
         "ja": "文化",

index.json

@@ -13,7 +13,7 @@
                 "en": "Leisure, Sport and Shopping",
                 "es": "Ocio, deporte y compras",
                 "et": "Vaba aeg, sport ja ostmine",
-                "fr": "Loisirs",
+                "fr": "Vie quotidienne, loisirs et sports",
                 "hu": "Szabadidő, sport és vásárlás",
                 "it": "Tempo libero, sport e shopping",
                 "ja": "レジャー",

lang/fr.json

@@ -4,11 +4,11 @@
     "category:alternative_amenities": "Équipement",
     "category:alternative_routes": "Routes",
     "category:buildings": "Bâtiments",
-    "category:buildings-entrances": "",
-    "category:buildings-figure-ground": "",
-    "category:buildings-height": "",
-    "category:buildings-start_date": "",
-    "category:buildings-type": "",
+    "category:buildings-entrances": "Entrées",
+    "category:buildings-figure-ground": "Empreintes",
+    "category:buildings-height": "Hauteur",
+    "category:buildings-start_date": "Date de construction",
+    "category:buildings-type": "Type",
     "category:car_amenities": "Équipements auto",
     "category:car_furniture": "Fournitures automobiles",
     "category:car_maxspeed": "Limites de vitesse",
@@ -19,7 +19,7 @@
     "category:construction": "Constructions",
     "category:craft": "Artisanat",
     "category:culture": "Culture",
-    "category:culture_religion": "Culture et Religion",
+    "category:culture_religion": "Culture et religion",
     "category:cycle_amenities": "Équipements vélo",
     "category:cycle_routes": "Itinéraires vélo",
     "category:education": "Éducation",
@@ -35,16 +35,16 @@
     "category:index": "",
     "category:infrastructure": "Infrastructures",
     "category:internet": "Internet",
-    "category:law": "",
+    "category:law": "Services législatifs",
     "category:leisure": "Loisirs",
-    "category:leisure_sport_shopping": "Loisirs",
+    "category:leisure_sport_shopping": "Vie quotidienne, loisirs et sports",
     "category:memorial": "Mémoriaux",
-    "category:military": "Militaire",
+    "category:military": "Équipements et zones militaires",
     "category:mtb-routes": "Itinéraires de VTT",
     "category:natural": "Éléments naturels",
     "category:office": "Bureaux",
     "category:oil_gas": "Pétrole et gaz naturel",
-    "category:organisations": "",
+    "category:organisations": "Organisations",
     "category:other": "Autres",
     "category:outdoor": "Activités de plein air",
     "category:phone": "Téléphone",
@@ -57,7 +57,7 @@
     "category:pt:routes": "Lignes",
     "category:pt:stops": "Arrêts/Stops, Stations",
     "category:pt_amenities": "Équipements",
-    "category:public": "Services Publics",
+    "category:public": "Services et équipements publics",
     "category:railway": "Chemins de fer",
     "category:railway-electrification": "Puissance électrique ferroviaire",
     "category:railway-infrastructure": "Infrastructure ferroviaire",
@@ -71,11 +71,11 @@
     "category:shop": "Magasins/Boutiques",
     "category:special": "Catégories spéciales",
     "category:sport": "Sports",
-    "category:swimming_bathing": "Natation/Baignade/Bains",
+    "category:swimming_bathing": "Natation, baignade et bains",
     "category:tourism_attractions": "Tourisme",
     "category:tourism_services": "Tourisme",
     "category:transport": "Transports",
-    "category:transport_alternative": "Alternatif (Cyclisme, Randonnée, ...)",
+    "category:transport_alternative": "Alternatif (cyclisme, randonnée, ...)",
     "category:transport_car": "Transport automobile",
     "category:transport_cycle": "Cyclisme",
     "category:transport_pt": "Transports publics",

lang/pt-br.json

@@ -4,11 +4,11 @@
     "category:alternative_amenities": "Equipamentos",
     "category:alternative_routes": "Rotas",
     "category:buildings": "Edificações",
-    "category:buildings-entrances": "",
-    "category:buildings-figure-ground": "",
-    "category:buildings-height": "",
-    "category:buildings-start_date": "",
-    "category:buildings-type": "",
+    "category:buildings-entrances": "Acessos",
+    "category:buildings-figure-ground": "Cheios e vazios",
+    "category:buildings-height": "Altura",
+    "category:buildings-start_date": "Idade",
+    "category:buildings-type": "Tipologias",
     "category:car_amenities": "Equipamentos",
     "category:car_furniture": "Mobiliário urbano",
     "category:car_maxspeed": "Velocidade máxima",
@@ -35,7 +35,7 @@
     "category:index": "Índice",
     "category:infrastructure": "Infraestrutura",
     "category:internet": "Acesso à Internet",
-    "category:law": "",
+    "category:law": "Direito",
     "category:leisure": "Lazer",
     "category:leisure_sport_shopping": "Lazer, esportes e compras",
     "category:memorial": "Memoriais",
@@ -44,7 +44,7 @@
     "category:natural": "Formações naturais",
     "category:office": "Escritórios e agências",
     "category:oil_gas": "Petróleo e gás",
-    "category:organisations": "",
+    "category:organisations": "Organizações",
     "category:other": "Outros",
     "category:outdoor": "Atividades ao ar livre",
     "category:phone": "Telefone",

law.json

@@ -1,7 +1,9 @@
 {
     "type": "overpass",
     "name": {
-        "en": "Law"
+        "en": "Law",
+        "fr": "Services législatifs",
+        "pt-br": "Direito"
     },
     "query": {
         "14": [

military.json

@@ -6,7 +6,7 @@
         "de": "Militär",
         "el": "Στρατιωτικό",
         "en": "Military",
-        "fr": "Militaire",
+        "fr": "Équipements et zones militaires",
         "hu": "Katonai objektumok",
         "it": "Militare",
         "ja": "軍事",

organisations.json

@@ -1,7 +1,9 @@
 {
     "type": "overpass",
     "name": {
-        "en": "Organisations"
+        "en": "Organisations",
+        "fr": "Organisations",
+        "pt-br": "Organizações"
     },
     "query": {
         "13": [

public.json

@@ -7,7 +7,7 @@
         "el": "Δημόσιες Υπηρεσίες",
         "en": "Public Services",
         "et": "Kommunaalteenused",
-        "fr": "Services Publics",
+        "fr": "Services et équipements publics",
         "hu": "Közszolgáltatások",
         "it": "Servizi pubblici",
         "ja": "公共サービス",

swimming_bathing.json

@@ -3,7 +3,7 @@
     "name": {
         "de": "Schwimmen und Baden",
         "en": "Swimming and bathing",
-        "fr": "Natation/Baignade/Bains",
+        "fr": "Natation, baignade et bains",
         "hu": "Fürdőzés, úszás",
         "pt-br": "Natação e banho"
     },

transport_alternative.json

@@ -4,7 +4,7 @@
         "cs": "Alternativní (Cyklistika, Pěší turistika, ...)",
         "el": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
         "et": "Alternatiivne (jalgrattasõit, matkamine, ...)",
-        "fr": "Alternatif (Cyclisme, Randonnée, ...)",
+        "fr": "Alternatif (cyclisme, randonnée, ...)",
         "hu": "Alternatív (Kerékpár, Túra)",
         "it": "Alternativi (bicicletta, camminate, ...)",
         "ja": "その他交通 (サイクリング、ハイキング、...)",

xmas.json

@@ -18,7 +18,7 @@
     },
     "feature": {
         "pre": [
-            "{% set isCurrent = meta.timestamp > now|date_modify('-1 month')|date('Y') %}",
+            "{% set isCurrent = meta.timestamp >= \"now\"|date_modify('-10 month')|date('Y') %}",
             "{% set bgColor = isCurrent ? '#f2756a' : 'red' %}"
         ],
         "title": "{{ attribute(tags, \"xmas:name\")|default(trans(\"unnamed\")) }}",