Merge master

Docs/Tools/GenerateSeries.ts

@@ -567,9 +567,24 @@ function createGraphs(allFeatures: ChangeSetData[], appliedFilterDescription: st
         .keyToDate()
         .asLine({
         compare: (a, b) => a.getTime() - b.getTime(),
-        name: "Running weekly average" + appliedFilterDescription
+        name: "Rolling 7 day average" + appliedFilterDescription
     })
-    createGraph("Changesets per day (line)" + appliedFilterDescription, perDayLine, perDayAvg)
+    
+    const perDayAvgMonth = csPerDay.asRunningAverages(key => {
+        const keys = []
+        for (let i = 0; i < 31; i++) {
+            const otherDay = new Date(new Date(key).getTime() - i * 1000 * 60 * 60 * 24)
+            keys.push(otherDay.toISOString().substr(0, 10))
+        }
+        return keys
+    })
+        .keyToDate()
+        .asLine({
+        compare: (a, b) => a.getTime() - b.getTime(),
+        name: "Rolling 31 day average" + appliedFilterDescription
+    })
+    
+    createGraph("Changesets per day (line)" + appliedFilterDescription, perDayLine, perDayAvg, perDayAvgMonth)
 
     new Histogram<string>(allFeatures.map(f => f.properties.metadata.host))
         .asPie({

assets/layers/address/address.json

@@ -2,7 +2,8 @@
   "id": "address",
   "name": {
     "en": "Known addresses in OSM",
-    "de": "Bekannte Adressen in OSM"
+    "de": "Bekannte Adressen in OSM",
+    "zh_Hant": "OSM 上已知的地址"
   },
   "minzoom": 18,
   "source": {
@@ -30,7 +31,8 @@
     "en": "Addresses",
     "nl": "Adressen",
     "de": "Adressen",
-    "ru": "Адреса"
+    "ru": "Адреса",
+    "zh_Hant": "地址"
   },
   "tagRenderings": [
     {
@@ -105,7 +107,8 @@
       "id": "fixme",
       "render": "<b>Fixme description</b>{fixme}",
       "question": {
-        "en": "What should be fixed here? Please explain"
+        "en": "What should be fixed here? Please explain",
+        "zh_Hant": "這裡需要修什麼？請直接解釋"
       },
       "freeform": {
         "key": "fixme"

assets/layers/cafe_pub/cafe_pub.json

@@ -4,7 +4,8 @@
     "nl": "Cafés",
     "en": "Cafés and pubs",
     "de": "Cafés und Kneipen",
-    "fr": "Cafés et pubs"
+    "fr": "Cafés et pubs",
+    "zh_Hant": "咖啡廳與酒吧"
   },
   "source": {
     "osmTags": {

assets/themes/climbing/climbing.json

@@ -692,7 +692,7 @@
           "render": {
             "en": "<h3>Length overview</h3>{histogram(_length_hist)}",
             "fr": "<h3>Résumé de longueur</h3>{histogram(_length_hist)}",
-            "de": "<h3>Längenübersicht</h3>{histogramm(_length_hist)}",
+            "de": "<h3>Längenübersicht</h3>{histogram(_length_hist)}",
             "it": "<h3>Riassunto della lunghezza</h3>{histogram(_length_hist)}"
           },
           "condition": "_length_hist!~\\[\\]",

assets/themes/hackerspaces/hackerspaces.json

@@ -14,13 +14,15 @@
   "description": {
     "en": "On this map you can see hackerspaces, add a new hackerspace or update data directly",
     "de": "Auf dieser Karte können Sie Hackerspaces sehen, einen neuen Hackerspace hinzufügen oder Daten direkt aktualisieren",
-    "it": "Su questa cartina è possibile vedere gli hackerspace, aggiungerne di nuovi o aggiornare le informazioni tutto in maniera pratica"
+    "it": "Su questa cartina è possibile vedere gli hackerspace, aggiungerne di nuovi o aggiornare le informazioni tutto in maniera pratica",
+    "zh_Hant": "在這份地圖上你可以看到駭客空間，新增或直接更新資料"
   },
   "language": [
     "en",
     "de",
     "it",
-    "ru"
+    "ru",
+    "zh_Hant"
   ],
   "maintainer": "",
   "icon": "./assets/themes/hackerspaces/glider.svg",
@@ -36,7 +38,8 @@
       "name": {
         "en": "Hackerspace",
         "de": "Hackerspace",
-        "ru": "Хакерспейс"
+        "ru": "Хакерспейс",
+        "zh_Hant": "駭客空間"
       },
       "minzoom": 8,
       "title": {
@@ -63,7 +66,8 @@
       "description": {
         "en": "Hackerspace",
         "de": "Hackerspace",
-        "ru": "Хакерспейс"
+        "ru": "Хакерспейс",
+        "zh_Hant": "駭客空間"
       },
       "tagRenderings": [
         {
@@ -192,11 +196,13 @@
           "title": {
             "en": "Hackerspace",
             "de": "Hackerspace",
-            "ru": "Хакерспейс"
+            "ru": "Хакерспейс",
+            "zh_Hant": "駭客空間"
           },
           "description": {
             "en": "A hackerspace is an area where people interested in software gather",
-            "de": "Ein Hackerspace ist ein Ort, an dem sich Menschen treffen, die sich für Software interessieren"
+            "de": "Ein Hackerspace ist ein Ort, an dem sich Menschen treffen, die sich für Software interessieren",
+            "zh_Hant": "駭客空間是對軟體有興趣的人聚集的地方"
           }
         },
         {

assets/themes/natuurpunt/natuurpunt.json

@@ -18,14 +18,16 @@
     "nl": "Op deze kaart vind je alle natuurgebieden die Natuurpunt ter beschikking stelt",
     "en": "On this map you can find all the nature reserves that Natuurpunt offers ",
     "it": "In questa cartina è possibile trovare tutte le riserve naturali offerte da Natuupunt. ",
-    "de": "Auf dieser Karte können Sie alle Naturschutzgebiete von Natuurpunt finden "
+    "de": "Auf dieser Karte können Sie alle Naturschutzgebiete von Natuurpunt finden ",
+    "zh_Hant": "在這張地圖上您可以找到 Natuurpunt 提供的所有自然保護區 "
   },
   "language": [
     "nl",
     "en",
     "de",
+    "nb_NO",
     "it",
-    "nb_NO"
+    "zh_Hant"
   ],
   "mustHaveLanguage": [
     "nl"

assets/themes/observation_towers/observation_towers.json

@@ -5,26 +5,30 @@
     "nl": "Uitkijktorens",
     "de": "Aussichtstürme",
     "it": "Torri di osservazione",
-    "ru": "Смотровые башни"
+    "ru": "Смотровые башни",
+    "zh_Hant": "觀景塔"
   },
   "shortDescription": {
     "en": "Publicly accessible towers to enjoy the view",
     "nl": "Publieke uitkijktorens om van het panorama te genieten",
     "de": "Öffentlich zugänglicher Aussichtsturm",
-    "it": "Torri pubblicamente accessibili per godere della vista"
+    "it": "Torri pubblicamente accessibili per godere della vista",
+    "zh_Hant": "開發可及能觀景的高塔"
   },
   "description": {
     "nl": "Publieke uitkijktorens om van het panorama te genieten",
     "en": "Publicly accessible towers to enjoy the view",
     "de": "Öffentlich zugänglicher Aussichtsturm",
-    "it": "Torri pubblicamente accessibili per godere della vista"
+    "it": "Torri pubblicamente accessibili per godere della vista",
+    "zh_Hant": "開放可及能觀景的高塔"
   },
   "language": [
     "en",
     "nl",
     "de",
     "it",
-    "ru"
+    "ru",
+    "zh_Hant"
   ],
   "maintainer": "",
   "icon": "./assets/layers/observation_tower/Tower_observation.svg",

assets/themes/openwindpowermap/openwindpowermap.json

@@ -5,7 +5,8 @@
     "fr": "OpenWindPowerMap",
     "de": "Freie Windenergie-Karte",
     "it": "OpenWindPowerMap",
-    "ru": "Открытая карта ветроэнергетики"
+    "ru": "Открытая карта ветроэнергетики",
+    "zh_Hant": "開放風力地圖"
   },
   "maintainer": "Seppe Santens",
   "icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
@@ -13,7 +14,8 @@
     "en": "A map for showing and editing wind turbines.",
     "fr": "Une carte indiquant les éoliennes et permettant leur édition.",
     "de": "Eine Karte zum Anzeigen und Bearbeiten von Windkraftanlagen.",
-    "it": "Una cartina per la visione e la modifica delle turbine eoliche."
+    "it": "Una cartina per la visione e la modifica delle turbine eoliche.",
+    "zh_Hant": "顯示與編輯風機的地圖。"
   },
   "language": [
     "en",
@@ -21,6 +23,7 @@
     "de",
     "it",
     "ru",
+    "zh_Hant",
     "nl",
     "eo",
     "nb_NO"
@@ -40,7 +43,8 @@
         "nl": "windturbine",
         "fr": "Éolienne",
         "de": "Windrad",
-        "it": "pala eolica"
+        "it": "pala eolica",
+        "zh_Hant": "風機"
       },
       "source": {
         "osmTags": "generator:source=wind"
@@ -52,7 +56,8 @@
           "nl": "windturbine",
           "fr": "éolienne",
           "de": "Windrad",
-          "it": "pala eolica"
+          "it": "pala eolica",
+          "zh_Hant": "風機"
         },
         "mappings": [
           {
@@ -62,7 +67,8 @@
               "fr": "{name}",
               "eo": "{name}",
               "it": "{name}",
-              "ru": "{name}"
+              "ru": "{name}",
+              "zh_Hant": "{name}"
             }
           }
         ]
@@ -73,12 +79,14 @@
           "render": {
             "en": "The power output of this wind turbine is {generator:output:electricity}.",
             "fr": "La puissance générée par cette éolienne est de {generator:output:electricity}.",
-            "it": "La potenza generata da questa pala eolica è {generator:output:electricity}."
+            "it": "La potenza generata da questa pala eolica è {generator:output:electricity}.",
+            "zh_Hant": "這個風機的電力輸出是 {generator:output:electricity}。"
           },
           "question": {
             "en": "What is the power output of this wind turbine? (e.g. 2.3 MW)",
             "fr": "Quel est la puissance générée par cette éolienne ?",
-            "it": "Quant’è la potenza generata da questa pala eolica? (ad es. 2.3 MW)"
+            "it": "Quant’è la potenza generata da questa pala eolica? (ad es. 2.3 MW)",
+            "zh_Hant": "這個風機的電力輸出是多少？(例如 2.3 MW)"
           },
           "freeform": {
             "key": "generator:output:electricity",
@@ -90,12 +98,14 @@
           "render": {
             "en": "This wind turbine is operated by {operator}.",
             "fr": "Cette éolienne est opérée par {operator}.",
-            "it": "Questa pala eolica è gestita da {operator}."
+            "it": "Questa pala eolica è gestita da {operator}.",
+            "zh_Hant": "這個風機營業商是 {operator}。"
           },
           "question": {
             "en": "Who operates this wind turbine?",
             "fr": "Qui est l’exploitant de cette éolienne ?",
-            "it": "Chi gestisce questa pala eolica?"
+            "it": "Chi gestisce questa pala eolica?",
+            "zh_Hant": "這個風機營業商是？"
           },
           "freeform": {
             "key": "operator"
@@ -106,12 +116,14 @@
           "render": {
             "en": "The total height (including rotor radius) of this wind turbine is {height} metres.",
             "fr": "La hauteur totale, incluant les pales, est de {height} mètres.",
-            "it": "L’altezza totale (raggio del rotore incluso) di questa pala eolica è di {height} metri."
+            "it": "L’altezza totale (raggio del rotore incluso) di questa pala eolica è di {height} metri.",
+            "zh_Hant": "這風機的總高度 (包括風葉直徑) 是 {height} 公尺。"
           },
           "question": {
             "en": "What is the total height of this wind turbine (including rotor radius), in metres?",
             "fr": "Quelle est la hauteur totale de l’éolienne en mètres, pales incluses ?",
-            "it": "Qual è l’altezza (in metri e raggio del rotore incluso) di questa pala eolica?"
+            "it": "Qual è l’altezza (in metri e raggio del rotore incluso) di questa pala eolica?",
+            "zh_Hant": "這個風機的總高度是多少 (包括風葉大小) 公尺？"
           },
           "freeform": {
             "key": "height",
@@ -123,12 +135,14 @@
           "render": {
             "en": "The rotor diameter of this wind turbine is {rotor:diameter} metres.",
             "fr": "Le diamètre du rotor est de {rotor:diameter} mètres.",
-            "it": "Il diametro del rotore di questa pala eolica è di {rotor:diameter} metri."
+            "it": "Il diametro del rotore di questa pala eolica è di {rotor:diameter} metri.",
+            "zh_Hant": "這個風力渦輪機的風葉直徑是 {rotor:diameter} 公尺。"
           },
           "question": {
             "en": "What is the rotor diameter of this wind turbine, in metres?",
             "fr": "Quel est le diamètre du rotor en mètres ?",
-            "it": "Qual è il diametro (in metri) del rotore di questa pala eolica?"
+            "it": "Qual è il diametro (in metri) del rotore di questa pala eolica?",
+            "zh_Hant": "這個風力渦輪機的風葉直徑是多少公尺？"
           },
           "freeform": {
             "key": "rotor:diameter",
@@ -140,12 +154,14 @@
           "render": {
             "en": "This wind turbine went into operation on/in {start_date}.",
             "fr": "L’éolienne est active depuis {start_date}.",
-            "it": "Questa pala eolica è entrata in funzione in data {start_date}."
+            "it": "Questa pala eolica è entrata in funzione in data {start_date}.",
+            "zh_Hant": "這個風機從 {start_date} 開始運轉。"
           },
           "question": {
             "en": "When did this wind turbine go into operation?",
             "fr": "Depuis quand l’éolienne est-elle en fonctionnement ?",
-            "it": "Quando è entrata in funzione questa pala eolica?"
+            "it": "Quando è entrata in funzione questa pala eolica?",
+            "zh_Hant": "這個風機何時開始營運？"
           },
           "freeform": {
             "key": "start_date",
@@ -165,7 +181,8 @@
             "nl": "windturbine",
             "fr": "Éolienne",
             "de": "Windrad",
-            "it": "pala eolica"
+            "it": "pala eolica",
+            "zh_Hant": "風機"
           }
         }
       ],
@@ -188,7 +205,8 @@
                 "de": " Megawatt",
                 "eo": " megavatoj",
                 "it": " megawatt",
-                "ru": " мегаватт"
+                "ru": " мегаватт",
+                "zh_Hant": " 百萬瓦"
               }
             },
             {
@@ -205,7 +223,8 @@
                 "eo": " kilovatoj",
                 "it": " kilowatt",
                 "nb_NO": " kilowatt",
-                "ru": " киловатт"
+                "ru": " киловатт",
+                "zh_Hant": " 千瓦"
               }
             },
             {
@@ -221,7 +240,8 @@
                 "de": " Watt",
                 "eo": " vatoj",
                 "it": " watt",
-                "ru": " ватт"
+                "ru": " ватт",
+                "zh_Hant": " 瓦"
               }
             },
             {
@@ -237,7 +257,8 @@
                 "de": " Gigawatt",
                 "eo": " gigavatoj",
                 "it": " gigawatt",
-                "ru": " гигаватт"
+                "ru": " гигаватт",
+                "zh_Hant": " 千兆瓦"
               }
             }
           ],
@@ -261,7 +282,8 @@
                 "de": " Meter",
                 "eo": " metro",
                 "it": " metri",
-                "ru": " метр"
+                "ru": " метр",
+                "zh_Hant": " 公尺"
               }
             }
           ]

assets/themes/parkings/parkings.json

@@ -6,20 +6,23 @@
     "de": "Parken",
     "it": "Parcheggio",
     "nb_NO": "Parkering",
-    "ru": "Парковка"
+    "ru": "Парковка",
+    "zh_Hant": "停車場"
   },
   "shortDescription": {
     "nl": "Deze kaart toont verschillende parkeerplekken",
     "en": "This map shows different parking spots",
     "de": "Diese Karte zeigt Parkplätze",
     "it": "Questa cartina mostra diversi posti dove parcheggiare",
-    "nb_NO": "Dette kartet viser forskjellige parkeringsplasser"
+    "nb_NO": "Dette kartet viser forskjellige parkeringsplasser",
+    "zh_Hant": "這地圖顯示不同的停車空間"
   },
   "description": {
     "nl": "Deze kaart toont verschillende parkeerplekken",
     "en": "This map shows different parking spots",
     "de": "Diese Karte zeigt Parkplätze",
-    "it": "Questa cartina mostra diversi posti dove parcheggiare"
+    "it": "Questa cartina mostra diversi posti dove parcheggiare",
+    "zh_Hant": "這地圖顯示不同的停車空間"
   },
   "language": [
     "nl",
@@ -27,7 +30,8 @@
     "de",
     "it",
     "nb_NO",
-    "ru"
+    "ru",
+    "zh_Hant"
   ],
   "maintainer": "",
   "icon": "./assets/themes/parkings/parkings.svg",

assets/themes/postboxes/postboxes.json

@@ -4,22 +4,26 @@
     "en": "Postbox and Post Office Map",
     "de": "Karte mit Briefkästen und Poststellen",
     "nb_NO": "Postboks og postkontor-kart",
-    "it": "Buche delle lettere e uffici postali"
+    "it": "Buche delle lettere e uffici postali",
+    "zh_Hant": "郵筒與郵局地圖"
   },
   "shortDescription": {
     "en": "A map showing postboxes and post offices",
     "de": "Eine Karte die Briefkästen und Poststellen anzeigt",
-    "it": "Una cartina che mostra le buche delle lettere e gli uffici postali"
+    "it": "Una cartina che mostra le buche delle lettere e gli uffici postali",
+    "zh_Hant": "顯示郵筒與郵局的地圖"
   },
   "description": {
     "en": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)<br/>Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. ",
-    "it": "In questa cartina puoi veder e modificare gli uffici postali e le buche delle lettere. Puoi usare questa cartina per trovare dove imbucare la tua prossima cartolina! :)<br/>Hai trovato un errore o una buca delle lettere mancante? Puoi modificare questa cartina con un account gratuito su OpenStreetMap. "
+    "it": "In questa cartina puoi veder e modificare gli uffici postali e le buche delle lettere. Puoi usare questa cartina per trovare dove imbucare la tua prossima cartolina! :)<br/>Hai trovato un errore o una buca delle lettere mancante? Puoi modificare questa cartina con un account gratuito su OpenStreetMap. ",
+    "zh_Hant": "在這份地圖你能找到與新增有關郵局與郵筒的資料，你可以用這份地圖找到寄送您下張明信片的地方！:)<br/>發現錯誤或是有郵筒遺漏嗎？你可以用免費的開放街圖帳號來編輯。 "
   },
   "language": [
     "en",
     "de",
     "nb_NO",
     "it",
+    "zh_Hant",
     "ru"
   ],
   "maintainer": "",
@@ -40,7 +44,8 @@
       "name": {
         "en": "Postboxes",
         "de": "Brieflästen",
-        "ru": "Почтовые ящики"
+        "ru": "Почтовые ящики",
+        "zh_Hant": "郵筒"
       },
       "minzoom": 12,
       "source": {
@@ -50,12 +55,14 @@
         "render": {
           "en": "Postbox",
           "de": "Briefkasten",
-          "ru": "Почтовый ящик"
+          "ru": "Почтовый ящик",
+          "zh_Hant": "郵筒"
         }
       },
       "description": {
         "en": "The layer showing postboxes.",
-        "de": "Die Ebene zeigt Briefkästen."
+        "de": "Die Ebene zeigt Briefkästen.",
+        "zh_Hant": "這圖層顯示郵筒。"
       },
       "tagRenderings": [
         "images",
@@ -72,7 +79,8 @@
           "title": {
             "en": "postbox",
             "de": "Briefkasten",
-            "ru": "почтовый ящик"
+            "ru": "почтовый ящик",
+            "zh_Hant": "郵筒"
           }
         }
       ],
@@ -112,7 +120,8 @@
       "name": {
         "en": "Post offices",
         "de": "Poststellen",
-        "ru": "Почтовые отделения"
+        "ru": "Почтовые отделения",
+        "zh_Hant": "郵局"
       },
       "minzoom": 12,
       "source": {
@@ -122,12 +131,14 @@
         "render": {
           "en": "Post Office",
           "de": "Poststelle",
-          "ru": "Почтовое отделение"
+          "ru": "Почтовое отделение",
+          "zh_Hant": "郵局"
         }
       },
       "description": {
         "en": "A layer showing post offices.",
-        "de": "Eine Ebene mit Postämtern."
+        "de": "Eine Ebene mit Postämtern.",
+        "zh_Hant": "圖層顯示郵局。"
       },
       "tagRenderings": [
         "images",
@@ -138,21 +149,24 @@
         {
           "render": {
             "en": "Opening Hours: {opening_hours_table()}",
-            "ru": "Часы работы: {opening_hours_table()}"
+            "ru": "Часы работы: {opening_hours_table()}",
+            "zh_Hant": "開放時間：{opening_hours_table()}"
           },
           "freeform": {
             "key": "opening_hours",
             "type": "opening_hours"
           },
           "question": {
-            "en": "What are the opening hours for this post office?"
+            "en": "What are the opening hours for this post office?",
+            "zh_Hant": "這間郵局的開放時間是？"
           },
           "mappings": [
             {
               "if": "opening_hours=24/7",
               "then": {
                 "en": "24/7 opened (including holidays)",
-                "de": "durchgehend geöffnet (auch an Feiertagen)"
+                "de": "durchgehend geöffnet (auch an Feiertagen)",
+                "zh_Hant": "24/7 開放 (包括假日)"
               }
             }
           ],
@@ -167,7 +181,8 @@
           "title": {
             "en": "Post Office",
             "de": "Poststelle",
-            "ru": "Почтовое отделение"
+            "ru": "Почтовое отделение",
+            "zh_Hant": "郵局"
           }
         }
       ],
@@ -178,7 +193,8 @@
             {
               "question": {
                 "en": "Currently open",
-                "de": "Aktuell geöffnet"
+                "de": "Aktuell geöffnet",
+                "zh_Hant": "目前開放"
               },
               "osmTags": "_isOpen=yes"
             }

assets/themes/street_lighting/street_lighting.json

@@ -5,16 +5,19 @@
   "language": [
     "en",
     "nl",
-    "ru"
+    "ru",
+    "zh_Hant"
   ],
   "title": {
     "en": "Street Lighting",
     "nl": "Straatverlichting",
-    "ru": "Уличное освещение"
+    "ru": "Уличное освещение",
+    "zh_Hant": "道路照明"
   },
   "description": {
     "en": "On this map you can find everything about street lighting",
-    "nl": "Op deze kaart vind je alles over straatlantaarns"
+    "nl": "Op deze kaart vind je alles over straatlantaarns",
+    "zh_Hant": "在這份地圖你可以找到任何有關路燈的事情"
   },
   "icon": "./assets/layers/street_lamps/street_lamp.svg",
   "startZoom": 19,
@@ -26,7 +29,8 @@
       "id": "lit_streets",
       "name": {
         "en": "Lit streets",
-        "nl": "Verlichte straten"
+        "nl": "Verlichte straten",
+        "zh_Hant": "有照明的道路"
       },
       "source": {
         "osmTags": {
@@ -42,7 +46,8 @@
       "title": {
         "render": {
           "en": "Lit street",
-          "nl": "Verlichte straat"
+          "nl": "Verlichte straat",
+          "zh_Hant": "照明道路"
         },
         "mappings": [
           {
@@ -61,28 +66,32 @@
           "id": "lit",
           "question": {
             "en": "Is this street lit?",
-            "nl": "Is deze straat verlicht?"
+            "nl": "Is deze straat verlicht?",
+            "zh_Hant": "這道路有路燈嗎？"
           },
           "mappings": [
             {
               "if": "lit=yes",
               "then": {
                 "en": "This street is lit",
-                "nl": "Deze straat is verlicht"
+                "nl": "Deze straat is verlicht",
+                "zh_Hant": "這個道路有照明"
               }
             },
             {
               "if": "lit=no",
               "then": {
                 "en": "This street is not lit",
-                "nl": "Deze straat is niet verlicht"
+                "nl": "Deze straat is niet verlicht",
+                "zh_Hant": "這個道路沒有照明"
               }
             },
             {
               "if": "lit=sunset-sunrise",
               "then": {
                 "en": "This street is lit at night",
-                "nl": "Deze straat is 's nachts verlicht"
+                "nl": "Deze straat is 's nachts verlicht",
+                "zh_Hant": "這個道路晚上有照明"
               },
               "hideInAnswer": true
             },
@@ -90,7 +99,8 @@
               "if": "lit=24/7",
               "then": {
                 "en": "This street is lit 24/7",
-                "nl": "Deze straat is 24/7 verlicht"
+                "nl": "Deze straat is 24/7 verlicht",
+                "zh_Hant": "這個道路 24/7 有照明"
               }
             }
           ]
@@ -103,7 +113,8 @@
       "name": {
         "en": "All streets",
         "nl": "Alle straten",
-        "ru": "Все улицы"
+        "ru": "Все улицы",
+        "zh_Hant": "所有道路"
       },
       "source": {
         "osmTags": {
@@ -119,7 +130,8 @@
         "render": {
           "en": "Street",
           "nl": "Straat",
-          "ru": "Улица"
+          "ru": "Улица",
+          "zh_Hant": "照明"
         },
         "mappings": [
           {
@@ -146,28 +158,32 @@
           "id": "lit",
           "question": {
             "en": "Is this street lit?",
-            "nl": "Is deze straat verlicht?"
+            "nl": "Is deze straat verlicht?",
+            "zh_Hant": "這道路有照明嗎？"
           },
           "mappings": [
             {
               "if": "lit=yes",
               "then": {
                 "en": "This street is lit",
-                "nl": "Deze straat is verlicht"
+                "nl": "Deze straat is verlicht",
+                "zh_Hant": "這道路有照明"
               }
             },
             {
               "if": "lit=no",
               "then": {
                 "en": "This street is not lit",
-                "nl": "Deze straat is niet verlicht"
+                "nl": "Deze straat is niet verlicht",
+                "zh_Hant": "這道路沒有照明"
               }
             },
             {
               "if": "lit=sunset-sunrise",
               "then": {
                 "en": "This street is lit at night",
-                "nl": "Deze straat is 's nachts verlicht"
+                "nl": "Deze straat is 's nachts verlicht",
+                "zh_Hant": "這道路晚上有照明"
               },
               "hideInAnswer": true
             },
@@ -175,7 +191,8 @@
               "if": "lit=24/7",
               "then": {
                 "en": "This street is lit 24/7",
-                "nl": "Deze straat is 24/7 verlicht"
+                "nl": "Deze straat is 24/7 verlicht",
+                "zh_Hant": "這道路 24/7 有照明"
               }
             }
           ]

assets/themes/waste_basket/waste_basket.json

@@ -4,25 +4,29 @@
     "en": "Waste Basket",
     "nl": "Vuilnisbak",
     "de": "Abfalleimer",
-    "it": "Cestino dei rifiuti"
+    "it": "Cestino dei rifiuti",
+    "zh_Hant": "垃圾筒"
   },
   "shortDescription": {
     "en": "A map with waste baskets",
     "nl": "Een kaart met vuilnisbakken",
     "de": "Eine Karte mit Abfalleimern",
-    "it": "Una cartina dei cestini dei rifiuti"
+    "it": "Una cartina dei cestini dei rifiuti",
+    "zh_Hant": "垃圾筒的地圖"
   },
   "description": {
     "en": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself",
     "nl": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen",
     "de": "Auf dieser Karte finden Sie Abfalleimer in Ihrer Nähe. Wenn ein Abfalleimer auf dieser Karte fehlt, können Sie ihn selbst hinzufügen",
-    "it": "In questa cartina troverai i cestini dei rifiuti nei tuoi paraggi. Se manca un cestino, puoi inserirlo tu stesso"
+    "it": "In questa cartina troverai i cestini dei rifiuti nei tuoi paraggi. Se manca un cestino, puoi inserirlo tu stesso",
+    "zh_Hant": "在這份地圖當中，你可以找到你附近的垃圾筒。如果地圖有遺漏垃圾筒，你可以自己加上去"
   },
   "language": [
     "en",
     "nl",
     "de",
-    "it"
+    "it",
+    "zh_Hant"
   ],
   "maintainer": "",
   "icon": "./assets/themes/waste_basket/waste_basket.svg",

langs/fr.json

@@ -9,7 +9,7 @@
         "ccbs": "sous la license CC-BY-SA",
         "ccb": "sous la license CC-BY",
         "uploadFailed": "L'ajout de la photo a échoué. Avez-vous accès à Internet ? Les API tierces sont-elles autorisées ? Le navigateur Brave ou UMatrix peuvent les bloquer.",
-        "respectPrivacy": "Merci de respecter la vie privée. Ne publiez pas les plaques d'immatriculation.",
+        "respectPrivacy": "Ne photographiez ni les personnes ni les plaques d'immatriculation. Ne téléversez rien issu de Google Maps, Google Streetview ou d'autre sources soumises à des droits d'auteurs.",
         "uploadDone": "Votre photo est ajoutée. Merci beaucoup !",
         "dontDelete": "Annuler",
         "doDelete": "Supprimer l'image",
@@ -26,7 +26,7 @@
     "index": {
         "#": "Ces textes sont affichés au dessus des boutons de thème quand aucun thème n'est chargé",
         "title": "Bienvenue sur MapComplete",
-        "intro": "MapComplete est une application qui permet de voir des informations d'OpenStreetMap sur un thème spécifique et de les éditer.",
+        "intro": "MapComplete est un visio-éditeur d'OpenStreetMap qui affiche des informations sur un thème défini et permet de les éditer.",
         "pickTheme": "Choisissez un thème ci-dessous pour commencer.",
         "featuredThemeTitle": "Thème de la semaine"
     },
@@ -194,6 +194,7 @@
         "isntAPoint": "Seul les points peuvent être supprimés, l'objet sélectionné est une ligne, un polygone ou une relation.",
         "onlyEditedByLoggedInUser": "Ce point a été édité seulement par vous et peut donc être supprimé.",
         "cannotBeDeleted": "Cet objet ne peut être supprimé",
-        "partOfOthers": "Ce point faire partie d'un autre objet et ne peut être supprimé directement."
+        "partOfOthers": "Ce point faire partie d'un autre objet et ne peut être supprimé directement.",
+        "whyDelete": "Pourquoi ce point devrait-il être supprimé ?"
     }
 }

langs/layers/zh_Hant.json

@@ -1,4 +1,13 @@
 {
+    "address": {
+        "description": "地址",
+        "name": "OSM 上已知的地址",
+        "tagRenderings": {
+            "fixme": {
+                "question": "這裡需要修什麼？請直接解釋"
+            }
+        }
+    },
     "artwork": {
         "description": "不同類型的藝術品",
         "name": "藝術品",
@@ -448,6 +457,9 @@
             "render": "單車停車場"
         }
     },
+    "cafe_pub": {
+        "name": "咖啡廳與酒吧"
+    },
     "extinguisher": {
         "description": "顯示消防栓的地圖圖層。"
     },
@@ -465,17 +477,5 @@
     "hydrant": {
         "description": "顯示消防栓的地圖圖層。",
         "name": "消防栓地圖"
-    },
-    "address": {
-        "description": "地址",
-        "name": "OSM 上已知的地址",
-        "tagRenderings": {
-            "fixme": {
-                "question": "這裡需要修什麼？請直接解釋"
-            }
-        }
-    },
-    "cafe_pub": {
-        "name": "咖啡廳與酒吧"
     }
-}
+}

langs/themes/zh_Hant.json

@@ -269,6 +269,21 @@
         "description": "<b>幽靈單車</b>是用來紀念死於交通事故的單車騎士，在事發地點附近放置白色單車。<br/><br/>在這份地圖上面，你可以看到所有在開放街圖已知的幽靈單車。有缺漏的幽靈單車嗎？所有人都可以在這邊新增或是更新資訊-只有你有(免費)開放街圖帳號。",
         "title": "幽靈單車"
     },
+    "hackerspaces": {
+        "description": "在這份地圖上你可以看到駭客空間，新增或直接更新資料",
+        "layers": {
+            "0": {
+                "description": "駭客空間",
+                "name": "駭客空間",
+                "presets": {
+                    "0": {
+                        "description": "駭客空間是對軟體有興趣的人聚集的地方",
+                        "title": "駭客空間"
+                    }
+                }
+            }
+        }
+    },
     "hailhydrant": {
         "description": "在這份地圖上面你可以在你喜愛的社區尋找與更新消防栓、消防隊、急救站與滅火器。\n\n你可以追蹤確切位置 (只有行動版) 以及在左下角選擇與你相關的圖層。你也可以使用這工具新增或編輯地圖上的釘子 (興趣點)，以及透過回答一些問題提供額外的資訊。\n\n所有你做出的變動都會自動存到開放街圖這個全球資料庫，而且能自由讓其他人取用。",
         "shortDescription": "顯示消防栓、滅火器、消防隊與急救站的地圖。",
@@ -279,6 +294,88 @@
         "shortDescription": "這份主題顯示所有已知的開放街圖上的 (旅遊) 地圖",
         "title": "地圖的地圖"
     },
+    "natuurpunt": {
+        "description": "在這張地圖上您可以找到 Natuurpunt 提供的所有自然保護區 "
+    },
+    "observation_towers": {
+        "description": "開放可及能觀景的高塔",
+        "shortDescription": "開發可及能觀景的高塔",
+        "title": "觀景塔"
+    },
+    "openwindpowermap": {
+        "description": "顯示與編輯風機的地圖。",
+        "layers": {
+            "0": {
+                "name": "風機",
+                "presets": {
+                    "0": {
+                        "title": "風機"
+                    }
+                },
+                "tagRenderings": {
+                    "turbine-diameter": {
+                        "question": "這個風力渦輪機的風葉直徑是多少公尺？",
+                        "render": "這個風力渦輪機的風葉直徑是 {rotor:diameter} 公尺。"
+                    },
+                    "turbine-height": {
+                        "question": "這個風機的總高度是多少 (包括風葉大小) 公尺？",
+                        "render": "這風機的總高度 (包括風葉直徑) 是 {height} 公尺。"
+                    },
+                    "turbine-operator": {
+                        "question": "這個風機營業商是？",
+                        "render": "這個風機營業商是 {operator}。"
+                    },
+                    "turbine-output": {
+                        "question": "這個風機的電力輸出是多少？(例如 2.3 MW)",
+                        "render": "這個風機的電力輸出是 {generator:output:electricity}。"
+                    },
+                    "turbine-start-date": {
+                        "question": "這個風機何時開始營運？",
+                        "render": "這個風機從 {start_date} 開始運轉。"
+                    }
+                },
+                "title": {
+                    "mappings": {
+                        "0": {
+                            "then": "{name}"
+                        }
+                    },
+                    "render": "風機"
+                },
+                "units": {
+                    "0": {
+                        "applicableUnits": {
+                            "0": {
+                                "human": " 百萬瓦"
+                            },
+                            "1": {
+                                "human": " 千瓦"
+                            },
+                            "2": {
+                                "human": " 瓦"
+                            },
+                            "3": {
+                                "human": " 千兆瓦"
+                            }
+                        }
+                    },
+                    "1": {
+                        "applicableUnits": {
+                            "0": {
+                                "human": " 公尺"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "title": "開放風力地圖"
+    },
+    "parkings": {
+        "description": "這地圖顯示不同的停車空間",
+        "shortDescription": "這地圖顯示不同的停車空間",
+        "title": "停車場"
+    },
     "personal": {
         "description": "從所有可用的主題圖層創建個人化主題",
         "title": "個人化主題"
@@ -288,6 +385,57 @@
         "shortDescription": "遊樂場的地圖",
         "title": "遊樂場"
     },
+    "postboxes": {
+        "description": "在這份地圖你能找到與新增有關郵局與郵筒的資料，你可以用這份地圖找到寄送您下張明信片的地方！:)<br/>發現錯誤或是有郵筒遺漏嗎？你可以用免費的開放街圖帳號來編輯。 ",
+        "layers": {
+            "0": {
+                "description": "這圖層顯示郵筒。",
+                "name": "郵筒",
+                "presets": {
+                    "0": {
+                        "title": "郵筒"
+                    }
+                },
+                "title": {
+                    "render": "郵筒"
+                }
+            },
+            "1": {
+                "description": "圖層顯示郵局。",
+                "filter": {
+                    "0": {
+                        "options": {
+                            "0": {
+                                "question": "目前開放"
+                            }
+                        }
+                    }
+                },
+                "name": "郵局",
+                "presets": {
+                    "0": {
+                        "title": "郵局"
+                    }
+                },
+                "tagRenderings": {
+                    "OH": {
+                        "mappings": {
+                            "0": {
+                                "then": "24/7 開放 (包括假日)"
+                            }
+                        },
+                        "question": "這間郵局的開放時間是？",
+                        "render": "開放時間：{opening_hours_table()}"
+                    }
+                },
+                "title": {
+                    "render": "郵局"
+                }
+            }
+        },
+        "shortDescription": "顯示郵筒與郵局的地圖",
+        "title": "郵筒與郵局地圖"
+    },
     "shops": {
         "description": "這份地圖上，你可以標記商家基本資訊，新增營業時間以及聯絡電話",
         "title": "開放商店地圖"
@@ -297,62 +445,23 @@
         "shortDescription": "顯示運動場地的地圖",
         "title": "運動場地"
     },
-    "surveillance": {
-        "description": "在這份開放地圖，你可以找到監視鏡頭。",
-        "shortDescription": "監視鏡頭與其他型式的監視",
-        "title": "被監視的監視器"
-    },
-    "toilets": {
-        "description": "公共廁所的地圖",
-        "title": "開放廁所地圖"
-    },
-    "trees": {
-        "description": "繪製所有樹木！",
-        "shortDescription": "所有樹木的地圖",
-        "title": "樹木"
-    },
-    "openwindpowermap": {
-        "layers": {
-            "0": {
-                "tagRenderings": {
-                    "turbine-operator": {
-                        "question": "這個風機營業商是？",
-                        "render": "這個風機營業商是 {operator}。"
-                    },
-                    "turbine-diameter": {
-                        "question": "這個風力渦輪機的風葉直徑是多少公尺？",
-                        "render": "這個風力渦輪機的風葉直徑是 {rotor:diameter} 公尺。"
-                    },
-                    "turbine-height": {
-                        "render": "這風機的總高度 (包括風葉直徑) 是 {height} 公尺。",
-                        "question": "這個風機的總高度是多少 (包括風葉大小) 公尺？"
-                    }
-                },
-                "name": "風機",
-                "presets": {
-                    "0": {
-                        "title": "風機"
-                    }
-                }
-            }
-        },
-        "description": "顯示與編輯風機的地圖。"
-    },
     "street_lighting": {
+        "description": "在這份地圖你可以找到任何有關路燈的事情",
         "layers": {
             "1": {
+                "name": "有照明的道路",
                 "tagRenderings": {
                     "lit": {
                         "mappings": {
-                            "2": {
-                                "then": "這個道路晚上有照明"
-                            },
                             "0": {
                                 "then": "這個道路有照明"
                             },
                             "1": {
                                 "then": "這個道路沒有照明"
                             },
+                            "2": {
+                                "then": "這個道路晚上有照明"
+                            },
                             "3": {
                                 "then": "這個道路 24/7 有照明"
                             }
@@ -362,8 +471,7 @@
                 },
                 "title": {
                     "render": "照明道路"
-                },
-                "name": "有照明的道路"
+                }
             },
             "2": {
                 "name": "所有道路",
@@ -391,68 +499,25 @@
                 }
             }
         },
-        "description": "在這份地圖你可以找到任何有關路燈的事情",
         "title": "道路照明"
     },
-    "postboxes": {
-        "layers": {
-            "0": {
-                "title": {
-                    "render": "郵筒"
-                },
-                "description": "這圖層顯示郵筒。",
-                "name": "郵筒",
-                "presets": {
-                    "0": {
-                        "title": "郵筒"
-                    }
-                }
-            },
-            "1": {
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "24/7 開放 (包括假日)"
-                            }
-                        },
-                        "render": "開放時間：{opening_hours_table()}",
-                        "question": "這間郵局的開放時間是？"
-                    }
-                },
-                "title": {
-                    "render": "郵局"
-                },
-                "presets": {
-                    "0": {
-                        "title": "郵局"
-                    }
-                },
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "目前開放"
-                            }
-                        }
-                    }
-                },
-                "name": "郵局",
-                "description": "圖層顯示郵局。"
-            }
-        },
-        "shortDescription": "顯示郵筒與郵局的地圖",
-        "title": "郵筒與郵局地圖",
-        "description": "在這份地圖你能找到與新增有關郵局與郵筒的資料，你可以用這份地圖找到寄送您下張明信片的地方！:)<br/>發現錯誤或是有郵筒遺漏嗎？你可以用免費的開放街圖帳號來編輯。 "
+    "surveillance": {
+        "description": "在這份開放地圖，你可以找到監視鏡頭。",
+        "shortDescription": "監視鏡頭與其他型式的監視",
+        "title": "被監視的監視器"
     },
-    "parkings": {
-        "title": "停車場",
-        "description": "這地圖顯示不同的停車空間",
-        "shortDescription": "這地圖顯示不同的停車空間"
+    "toilets": {
+        "description": "公共廁所的地圖",
+        "title": "開放廁所地圖"
+    },
+    "trees": {
+        "description": "繪製所有樹木！",
+        "shortDescription": "所有樹木的地圖",
+        "title": "樹木"
     },
     "waste_basket": {
         "description": "在這份地圖當中，你可以找到你附近的垃圾筒。如果地圖有遺漏垃圾筒，你可以自己加上去",
         "shortDescription": "垃圾筒的地圖",
         "title": "垃圾筒"
     }
-}
+}