X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/edfd358289c38927e1e14f62d66087e50da6200f..cdc4e3f8d1fd6071151327389c08db911de3bcf4:/vendor/assets/iD/iD/locales/yue.json

diff --git a/vendor/assets/iD/iD/locales/yue.json b/vendor/assets/iD/iD/locales/yue.json
index 0998612dc..0a83a8254 100644
--- a/vendor/assets/iD/iD/locales/yue.json
+++ b/vendor/assets/iD/iD/locales/yue.json
@@ -2,22 +2,22 @@
     "modes": {
         "add_area": {
             "title": "範圍",
-            "description": "地圖度，加園、屋宇、湖或者其他範圍入去。",
-            "tail": "要畫範圍，好似公園、湖、屋宇咁。撳地圖先，再去畫。"
+            "description": "加公園、建築物、湖或者其他範圍入去地圖度。",
+            "tail": "喺地圖度撳一下就可以開始畫範圍，好似公園呀、湖呀、或者建築物呀咁。"
         },
         "add_line": {
             "title": "綫",
-            "description": "地圖度，加公路、街、行人徑、水道或者其他綫。",
-            "tail": "地圖度撳一下，畫路、徑、或者路綫。"
+            "description": "加公路、街、行人路、水道或者其他綫喺地圖度。",
+            "tail": "喺地圖度撳一下就可以開始畫路、徑、或者路綫。"
         },
         "add_point": {
-            "title": "處",
-            "description": "地圖上加酒樓、紀念碑、郵筒或者其他處。",
-            "tail": "撳地圖加處"
+            "title": "點",
+            "description": "加餐廳、紀念碑、郵筒或者其他點喺地圖度。",
+            "tail": "喺地圖撳一下就可以加一點。"
         },
         "browse": {
             "title": "周圍睇",
-            "description": "地圖四圍移，放大縮細睇。"
+            "description": "郁同埋放大縮細個地圖。"
         },
         "draw_area": {
             "tail": "撳下加節入落範圍。撳第一節去完成範圍。"
@@ -95,7 +95,6 @@
         },
         "delete": {
             "title": "刪",
-            "description": "地圖度拎走佢。",
             "annotation": {
                 "point": "刪咗處。",
                 "vertex": "道度刪咗節。",
@@ -129,12 +128,8 @@
         },
         "merge": {
             "title": "ä½µ",
-            "description": "併埋爾啲綫。",
             "key": "C",
-            "annotation": "併咗綫{n}條。 ",
-            "not_eligible": "爾啲地貌，無得併埋。",
-            "not_adjacent": "爾啲綫無得掹開，根本無駁埋。",
-            "restriction": "爾啲綫併唔到，當中至少一個，屬於{relation}關聯。"
+            "not_eligible": "爾啲地貌，無得併埋。"
         },
         "move": {
             "title": "搬",
@@ -190,7 +185,6 @@
         "nothing": "無嘢好重做"
     },
     "tooltip_keyhint": "快掣",
-    "browser_notice": "爾個編輯，只用於Firefox、Chrome、Safari、Opera以及Internet Explorer 版本九或以上。唔該換新瀏覽器，或者用Potlach2去改地圖。",
     "translate": {
         "translate": "繙",
         "localized_translation_label": "話名",
@@ -200,7 +194,6 @@
     "zoom_in_edit": "放大去改",
     "logout": "簽走",
     "loading_auth": "駁上去公家街圖⋯⋯",
-    "report_a_bug": "報告有錯",
     "status": {
         "error": "駁唔通程式接口。",
         "offline": "程式接口收工。遲啲再改啦。",
@@ -208,8 +201,6 @@
     },
     "commit": {
         "title": "記低修改",
-        "description_placeholder": "簡述你爾則稿件",
-        "message_label": "遞交片語",
         "upload_explanation": "你嘅修改，傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",
         "upload_explanation_with_user": "你以{user}名義，修改傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",
         "save": "記",
@@ -252,7 +243,11 @@
         "incomplete": "<無傳落來>",
         "feature_list": "搵地貌",
         "edit": "改地貌",
-        "none": "無"
+        "none": "無",
+        "node": "節",
+        "way": "徑",
+        "relation": "關聯",
+        "location": "地點"
     },
     "background": {
         "title": "背景",
@@ -260,8 +255,6 @@
         "percent_brightness": "{opacity}% 光",
         "none": "無",
         "custom": "自訂",
-        "custom_prompt": "入個格模。有效字符係{z}、{x}、{y}對應Z/X/Y制及{u}對應四分格制。",
-        "fix_misalignment": "校正對位誤差",
         "reset": "重設"
     },
     "restore": {
@@ -274,7 +267,6 @@
         "title": "記低",
         "help": "修改放上公家街圖，等其他用者都睇到。",
         "no_changes": "無修改可記",
-        "error": "記上去時出錯",
         "uploading": "修改傳上公家街圖。",
         "unsaved_changes": "你有修改未記妥"
     },
@@ -284,8 +276,7 @@
         "view_on_osm": "入公家街圖睇",
         "facebook": "放上Facebook",
         "twitter": "放上Twitter",
-        "google": "放上Google+",
-        "help_html": "你所改嘅，幾分鐘後會送到普通層。其他層，或者某啲地貌，要用多啲時間。\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>詳解</a>)。\n"
+        "google": "放上Google+"
     },
     "confirm": {
         "okay": "得"
@@ -327,13 +318,9 @@
     },
     "help": {
         "title": "指南",
-        "help": "# 指南\n\n爾個編器，係爲 [公家街圖](http://www.openstreetmap.org/)而做。 有世界地圖，任用亦改得。你可以用佢，喺你處加嘢改嘢。如此一來，裏面嘅料，人人可以任用。\n\n邊個用公家街圖，都見得到你整嘅地圖。要改得到，就要開定個\n[免費公家街圖戶口](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) 係合作而成， [程式碼放喺 GitHub](https://github.com/systemed/iD).\n",
-        "editing_saving": "# 改同記\n\n爾個程式，係上網用嘅，你用到佢，就係喺你上緊嘅網站上面。\n\n### 㨂地貌\n\n㨂地圖地貌，好似路，名勝，就喺地圖撳佢一下。咁佢就會顯眼，同埋有一大欄，講佢明細。亦有選單，你可以點地貌。\n\n要揀多個一種，就撳實【Shift】掣先。一係跟手撳落地貌，揀你想揀。一係拖個長方形出來，包住佢嘅點都着咗。\n\n### 記修改\n\n你修改路、屋宇及地方之時，爾啲修改只喺你部電腦上面，直至你記上地圖電腦。唔好擔心，若你出錯，你可以撳還原掣還原，重做掣重做。\n\n撳【記低】就完成一組修改。畀個例，你畫完個鎮，又會去畫另一度。咁你有機會去校閱你改過乜。同埋，若然有乜改得唔妥，程式亦會有用提議同警告。\n\n若然樣樣都妥當，咁你就打啲解釋，講下你改過乜，之後【記低】送修改上 [OpenStreetMap.org](http://www.openstreetmap.org/)。如此一來，人人都會睇到，等人再以此建立同改善。\n\n若你一次改唔晒，你都可以閂咗程式，下次返來，用同一部電腦同瀏覽器，程式會畀機會你囘復修改。\n",
         "roads": "# 路\n\n用個程式，你開得，整得，刪得啲路。路有幾種，徑、公路、山徑、單車徑等等，乜嘢相交一段都要畫面出來。\n\n### 揀\n\n撳一下條路，就揀到。個外形會見得明顯，亦有架生仔選單，外加邊註欄有多啲路嘅資料。\n\n### 改\n\n你耐不耐見到條路，同背景相，或全球定位系統行縱，並唔一致。你要調較到佢哋啱位。\n\n首先撳一下，你想改嗰條路。咁條路就會特別顯眼，同埋有一點點畀你畀拉到啱位。若你想加多幾點，更加仔細，就喺條路上面，無節嘅地方，快撳兩下，咁就會開多一節。\n\n若然條路要駁去其他路，之但係無駁妥，咁你就拖住一點，拉到其他路，整到聯埋。地圖來講，駁通啲路係咁緊要，同埋駕車搵路亦必須。\n\n你亦可以用【搬】爾個架生，或撳快掣【M】，一次過搬成條路，再撳多下，就記好搬動。\n\n### 刪\n\n若成條路都唔啱，你亦要望下衞星相，以及最好親身確認，佢真係唔喺度，你就可以刪咗佢，卽係由地圖度搬走。小心啲刪走地貌，同其他改法一樣，有時地貌係人人都見到，但係衞星相過晒時，新路未必見。\n\n你刪條路，就撳佢一下，揀咗佢。跟住撳垃圾筒公仔，或者撳快掣【Delete】。\n\n### 開新\n\n要搵地方，緊係要有條路，係咪？去程式左上角，咁住【綫】個公仔，或者撳快掣【2】，就開始畫綫。\n\n地圖度，撳住路頭個位開始畫。若然條路由原路分出，就由原路上面路口位，撳一下開始。\n\n撳嘅點，應該人係跟實條路，跟䘙星相，或跟全球定位系統行蹤。若果你條路，會橫過另一條，你就喺路口位，撳落另一條路上，就起咗個交叉點。你要畫完，就快撳兩下。又或者咁鍵盤【Return】或【Enter】掣。\n",
-        "gps": "# 全球定位系統\n\n數據取自全球定位系統，係公家街圖至可靠來源。爾個造圖程式，用到本機行蹤，卽放你電腦嘅【.gpx】檔案。你收集全球定位系統行蹤，取自智能電話程式，或者個人全球定位系統儀。\n\n點去用全球定位系統測量，睇下[用全球定位系統測量](http://learnosm.org/en/beginner/using-gps/).\n\n用GPX途徑製圖，拖GPX檔案落造圖程式。若然讀得明，佢會加入地圖，用鮮綠綫顯現。喺右邊，撳落【背景設定】選單。咁就開得，閂得，放大縮細新嘅GPX層。\n\n爾個GPX途徑，唔會直上公家街圖，最好用法，就係用佢製圖。按此加新地貌，亦可[傳上公家街圖](http://www.openstreetmap.org/trace/create)以作其他用途。\n",
         "imagery": "# 相\n\n航空相係地圖要源。佢哋飛機飛過，衞星望落等組合。網上有任用來源，可供使用。就喺右邊，【背景設定】之內。\n\n程式預先已有 [兵地圖](http://www.bing.com/maps/) 䘙星相層。你放大縮細去某啲地方，就有其他可用。某幾國，如美國、法國、丹麥等，國內某啲地方，有極精細嘅相。\n\n相有時同地圖資料有差距，爾個係供相者出錯。若你睇到多多路與背景移咗位，就唔好郁住。將啲相校好個位，同地圖資料吻合。要咁做，就去背景設定，撳【校正對位誤差】校好咗先。\n",
         "addresses": "# 地埗\n\n地埗，對地圖好有用嘅資料。\n\n雖則地埗通常係街嘅一部份，不過喺公家街圖入面，會記爲沿街屋宇及地方屬性。\n\n你可以加地埗落地方，畫成屋宇界圖，亦可以畫成單處。最好來源，就係視身街一轉，或者靠個人知識。之但係，同其他地貌一樣，禁止抄其他商用來源，包括谷歌地圖。\n",
-        "inspector": "# 用明細一覽\n\n明細一覽係全版左邊嘅部份，畀你改個地貌嘅詳細資料。\n\n### 揀地貌\n\n無論你加處、綫或者範圍，你要揀係乜地貌，如公路定住宅路，超級市場定茶座。明細一覽上面有掣，揀你要嘅地貌，同埋你亦可以格中，一邊打一邊搵。\n\n個個地貌製，右邊【i】字，撳落有細解。撳落個掣度就揀到地貌。\n\n### 用表及改籤\n\n你㨂完地貌，或者你㨂嘅，早已入咗地貌，咁明細一覽，就有一欄欄，講地貌詳細資料，例如名同地埗咁。\n\n欄下面，你會見到啲細公仔，係用來加其他明細，好似 [維基百科](http://www.wikipedia.org/) 資料、行唔行到輪輢等等。\n\n明細一覽個底，撳【所有籤】，就可以隨意加其他籤落去。\n[籤料](http://taginfo.openstreetmap.org/) 係極有用嘅地方知道唔通籤嘅配搭。\n\n你喺明細一覽改嘅，都會自動送上地圖。你亦可以還原修改，只要咁下【還原】掣。\n",
         "buildings": "# 屋宇\n\n公家街圖有屋宇資料庫，全球至大。你可以幫手添啲，亦可改善資料。\n\n### 揀\n\n你要揀屋宇，咁邊佢條邊就得。間屋宇會顯眼啲，亦會有架生仔選單，同埋邊註欄講屋宇多啲資料。\n\n### 改\n\n有陣時屋宇放唔啱，又或者放錯籤。\n\n要搬成間屋宇，揀佢先，跟手用【搬】架生。郁滑鼠就移屋宇，搬啱就咁撳一下。\n\n想改屋宇個形，邊度撳一節，拖住一節到啱位爲止。\n\n### 開新\n\n時時有人問，加新屋宇落地圖，而公家街圖又可以係點，又可以加形，咁邊個好啲呢？原則就係，_用得形就用形_，以及屋宇個形內，加公司、屋企、方便設施同其他種種，喺屋宇內有嘅嘢。\n\n畫新屋宇個形，喺左上面撳【範圍】掣，畫完就撳鍵盤【Return】掣，或者撳返去第一節，咁個形就埋口。\n\n### 刪\n\n若成間屋宇都唔啱，你亦要望下衞星相，以及最好親身確認，佢真係唔喺度，你就可以刪咗佢，卽係由地圖度搬走。小心啲刪走地貌，同其他改法一樣，有時地貌係人人都見到，但係衞星相過晒時，新屋宇未必見。\n\n你要刪咗間屋宇，就撳佢揀佢。然後撳垃圾筒公你，或者撳【Delete】掣。\n",
         "relations": "# 關聯\n\n公家街圖入面，關聯係特別地貌，夾埋其他地貌做一組。例如，有兩種至常見。一係*途徑關聯*，佢係路段組成，路屬高速公路同公路。另一係*幾多邊形*，佢將唔同綫結合，定個複雜嘅範圍，好似範圍分開幾個，或者有洞好似沙翁。\n\n關聯之中，一組地貌就係*成員*。邊註欄度，你睇到地貌，佢做邊啲關聯成員。撳落關聯，就跳入關聯。一揀咗關聯，邊註欄列晒成員，地圖佢哋亦會特別顯眼。\n\n多數情形，你改嘢時，艾弟都會自動保持關聯。你要留意，你刪走一段，想畫得準確一啲，你要確保新段，都留喺原有關聯之中。\n\n## 改關聯\n\n你改關聯，爾度講基本嘢。\n\n加地貌落關聯，㨂地貌。邊註欄入面，【所有關係】度撳【+】掣，揀或打關聯名。\n\n開新關聯，㨂首個成員地貌，【所有關係】度撳【+】掣，揀【新關聯⋯⋯】。\n\n由關聯度拎走地貌，揀地貌，喺唔要嘅關聯側邊，撳垃圾桶公仔。\n\n你砌多幾多邊形開窿，可以用【併】架生。畫出兩個範圍，內同外，鍵盤撳實【Shift】掣，兩個各撳一下，揀晒佢哋，然後撳【併】掣。\n"
     },
@@ -341,132 +328,107 @@
         "navigation": {
             "title": "周圍望",
             "drag": "大地圖度，公家街圖資料，放喺背景之上。你想周圍望，就拖住，推上落，推左右，就好似普通網上地圖咁。**拖住地圖**",
-            "select": "圖上地貌，有三種方法表示，處、綫同範圍。所有地貌，都以一撳就揀。**撳處去揀。**",
-            "header": "頂頭指明地貌。",
-            "pane": "一揀地貌，地貌器就出。頂頭話我哋知乜嘢地貌，主要顯示地貌屬性，如名同地址。**閂地貌器，就撳右上閂埋個掣。**"
+            "select": "圖上地貌，有三種方法表示，處、綫同範圍。所有地貌，都以一撳就揀。**撳處去揀。**"
         },
         "points": {
             "title": "處",
-            "add": "處，用來指示地貌，如舖、餐廳、紀念碑。佢哋畫低某個位置，用來講下當地係乜。**撳處個掣，開新一處。**",
-            "place": "地圖度，撳一下擺低一處。**擺個處去屋頂。**",
             "search": "處可以用來指示種種地貌。你加爾處就係茶座。**搵【{name}】**",
             "choose": "**由一覽度揀茶座。**",
-            "describe": "爾處畫成茶座。用地貌編器，我哋可以加名啲料上地貌。**加個名**",
-            "close": "想閂地貌編寫，只要一撳閂掣。**閂地貌編寫**",
-            "reselect": "有時處在。有時整錯或者未完整。我哋可改已有之處。**揀你啱啱整嗰處。**",
-            "fixname": "**改名兼閂地貌編寫**",
-            "reselect_delete": "地圖度，乜地貌都刪得。**撳你嗰開嗰處。**",
-            "delete": "個選單，會圍住嗰處。嗰處有唔同嘢做，可以改珧嗰處，當中有刪。**刪嗰處。**"
+            "describe": "爾處畫成茶座。用地貌編器，我哋可以加名啲料上地貌。**加個名**"
         },
         "areas": {
             "title": "範圍",
-            "add": "範圍係更祥細講地貌。佢畀埋地貌界綫。處出地嘅地貌，範圍多數都用到，做到範圍就做範圍。**撳住範圍掣，開新範圍。**",
-            "corner": "要畫範圍，就用節來勾出邊界，包住範圍。**擺開始一節，喺遊樂場一角。**",
             "place": "畫範圍，就要擺多啲節。要完成範圍，就欽返頭嗰節。**畫個範圍畀遊樂場。**",
             "search": "**搵【{name}】。**",
-            "choose": "**由一覽度揀遊樂場。**",
-            "describe": "**加名兼閂咗地貌編寫**"
+            "choose": "**由一覽度揀遊樂場。**"
         },
         "lines": {
             "title": "綫",
-            "add": "綫用來指示地貌，好似馬路、火車路、江河等。**撳綫掣，開一條綫。**",
             "start": "**開一條綫，就撳路一端。**",
-            "intersect": "撳下去加幾節入綫。若有必要，你邊畫邊拖住地圖。路、同埋其他嘅綫，係大網入面。駁啱啲綫，通估綫程式，至爲重要。**撳住花街（Flower Street），爲兩綫駁做路口。**",
             "finish": "畫綫到尾，只要再撳最尾一節一次。**畫完條路。**",
             "road": "**由一覽度揀路。**",
             "residential": "種種道路，最常見係住宅路。**揀住宅路**",
-            "describe": "**同路起名，以及閂咗地貌內容。**",
-            "restart": "條路要駁去花街（Flower Street）。",
             "wrong_preset": "你未有指名住宅路。**撳爾度去揀多次**"
         },
         "startediting": {
             "title": "開始改",
-            "help": "更多文件，連同爾個逐步解釋，就放喺度。",
             "save": "記得定時記低修改！",
             "start": "開始制圖"
         }
     },
     "presets": {
-        "categories": {
-            "category-building": {
-                "name": "屋宇"
-            },
-            "category-landuse": {
-                "name": "用地"
-            },
-            "category-path": {
-                "name": "徑"
-            },
-            "category-rail": {
-                "name": "軌道"
-            },
-            "category-road": {
-                "name": "è·¯"
-            },
-            "category-route": {
-                "name": "路綫"
-            },
-            "category-water-area": {
-                "name": "æ°´"
-            },
-            "category-water-line": {
-                "name": "æ°´"
-            }
-        },
         "fields": {
             "access": {
-                "label": "通",
-                "placeholder": "未知",
-                "types": {
-                    "access": "總體",
-                    "foot": "行",
-                    "motor_vehicle": "車",
-                    "bicycle": "單車",
-                    "horse": "馬"
-                },
                 "options": {
-                    "yes": {
-                        "title": "准許",
-                        "description": "按法例可通，通路之權。"
+                    "designated": {
+                        "description": "通行與否，按法例或路牌指定",
+                        "title": "指名"
+                    },
+                    "destination": {
+                        "description": "限往目的地",
+                        "title": "目的地"
                     },
                     "no": {
-                        "title": "禁入",
-                        "description": "公眾不通"
+                        "description": "公眾不通",
+                        "title": "禁入"
                     },
                     "permissive": {
-                        "title": "放任",
-                        "description": "可通，直至地主唔畀。"
+                        "description": "可通，直至地主唔畀。",
+                        "title": "放任"
                     },
                     "private": {
-                        "title": "私家",
-                        "description": "要地主批准"
+                        "description": "要地主批准",
+                        "title": "私家"
                     },
-                    "designated": {
-                        "title": "指名",
-                        "description": "通行與否，按法例或路牌指定"
-                    },
-                    "destination": {
-                        "title": "目的地",
-                        "description": "限往目的地"
+                    "yes": {
+                        "description": "按法例可通，通路之權。",
+                        "title": "准許"
                     }
+                },
+                "types": {
+                    "bicycle": "單車",
+                    "foot": "行",
+                    "horse": "馬",
+                    "motor_vehicle": "車"
                 }
             },
-            "access_simple": {
-                "label": "通"
-            },
             "address": {
                 "label": "地埗",
                 "placeholders": {
-                    "housename": "屋名",
-                    "number": "一百二十三號",
-                    "street": "街",
                     "city": "城",
-                    "postcode": "郵政編號"
+                    "street": "街"
                 }
             },
             "admin_level": {
                 "label": "行政層次"
             },
+            "aerialway": {
+                "label": "類"
+            },
+            "aerialway/access": {
+                "label": "通"
+            },
+            "aerialway/bubble": {
+                "label": "泡"
+            },
+            "aerialway/capacity": {
+                "label": "載量（一小時計）",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "行程（分鐘）",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "有暖氣"
+            },
+            "aerialway/occupancy": {
+                "label": "一車人數",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "通（夏天）"
+            },
             "aeroway": {
                 "label": "類"
             },
@@ -510,8 +472,8 @@
             "clock_direction": {
                 "label": "方向",
                 "options": {
-                    "clockwise": "順時針",
-                    "anticlockwise": "逆時針"
+                    "anticlockwise": "逆時針",
+                    "clockwise": "順時針"
                 }
             },
             "collection_times": {
@@ -523,6 +485,9 @@
             "country": {
                 "label": "國"
             },
+            "covered": {
+                "label": "有蓋"
+            },
             "crossing": {
                 "label": "類"
             },
@@ -538,6 +503,9 @@
             "description": {
                 "label": "描述"
             },
+            "electrified": {
+                "label": "用電"
+            },
             "elevation": {
                 "label": "海拔"
             },
@@ -569,6 +537,14 @@
             "generator/type": {
                 "label": "類"
             },
+            "golf_hole": {
+                "label": "參攷",
+                "placeholder": "洞數（一到十八）"
+            },
+            "handicap": {
+                "label": "差點",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "類"
             },
@@ -584,12 +560,15 @@
             "incline": {
                 "label": "斜"
             },
+            "information": {
+                "label": "類"
+            },
             "internet_access": {
                 "label": "用到互聯網",
                 "options": {
-                    "wlan": "無綫上網",
+                    "terminal": "終端機",
                     "wired": "揷綫上網",
-                    "terminal": "終端機"
+                    "wlan": "無綫上網"
                 }
             },
             "landuse": {
@@ -650,6 +629,10 @@
             "operator": {
                 "label": "承辦商"
             },
+            "par": {
+                "label": "標準桿",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "泊車轉乖"
             },
@@ -660,6 +643,15 @@
                 "label": "電話",
                 "placeholder": "+852 12345678"
             },
+            "piste/difficulty": {
+                "label": "難度"
+            },
+            "piste/grooming": {
+                "label": "雪道類"
+            },
+            "piste/type": {
+                "label": "類"
+            },
             "place": {
                 "label": "類"
             },
@@ -676,16 +668,7 @@
                 "label": "類"
             },
             "religion": {
-                "label": "宗敎",
-                "options": {
-                    "christian": "基督敎",
-                    "muslim": "囘敎",
-                    "buddhist": "佛敎",
-                    "jewish": "猶太敎",
-                    "hindu": "印度敎",
-                    "shinto": "神道敎",
-                    "taoist": "道敎"
-                }
+                "label": "宗敎"
             },
             "restriction": {
                 "label": "類"
@@ -696,9 +679,6 @@
             "route_master": {
                 "label": "類"
             },
-            "sac_scale": {
-                "label": "行徑難度"
-            },
             "service": {
                 "label": "類"
             },
@@ -719,13 +699,13 @@
             },
             "structure": {
                 "label": "結構",
-                "placeholder": "未知",
                 "options": {
                     "bridge": "橋",
-                    "tunnel": "隧道",
+                    "cutting": "開山",
                     "embankment": "基堤",
-                    "cutting": "開山"
-                }
+                    "tunnel": "隧道"
+                },
+                "placeholder": "未知"
             },
             "supervised": {
                 "label": "有人睇"
@@ -742,14 +722,11 @@
             "towertype": {
                 "label": "塔類"
             },
-            "tracktype": {
-                "label": "類"
-            },
             "trail_visibility": {
                 "label": "徑明顯度"
             },
-            "tree_type": {
-                "label": "類"
+            "tunnel": {
+                "label": "隧道"
             },
             "vending": {
                 "label": "貨類"
@@ -772,9 +749,6 @@
             },
             "wikipedia": {
                 "label": "維基百科全書"
-            },
-            "wood": {
-                "label": "類"
             }
         },
         "presets": {
@@ -782,6 +756,22 @@
                 "name": "地埗",
                 "terms": "Address,地址,地埗,址"
             },
+            "aerialway": {
+                "name": "吊道",
+                "terms": "Aerialway,吊道"
+            },
+            "aerialway/cable_car": {
+                "name": "吊車",
+                "terms": "Cable Car,吊車,䌫車"
+            },
+            "aerialway/chair_lift": {
+                "name": "吊櫈",
+                "terms": "Chair Lift,吊櫈"
+            },
+            "aerialway/gondola": {
+                "name": "吊船",
+                "terms": "Gondola,吊船"
+            },
             "aeroway": {
                 "name": "航空設施",
                 "terms": "Aeroway,機場,機場相關設施,機場相關道路,航空,航空設施"
@@ -870,18 +860,10 @@
                 "name": "洗車舖",
                 "terms": "Car Wash,洗車,洗車店,洗車舖"
             },
-            "amenity/childcare": {
-                "name": "托兒所",
-                "terms": "Childcare,托兒所"
-            },
             "amenity/cinema": {
                 "name": "電影戲院",
                 "terms": "Cinema,戲院,電影,電影戲院,電影院"
             },
-            "amenity/college": {
-                "name": "學院",
-                "terms": "College,大學,大專,學院,專上學院,專校,專科學院,書院,理工"
-            },
             "amenity/courthouse": {
                 "name": "法庭",
                 "terms": "Courthouse,法庭,法院,臬署,裁判署"
@@ -899,8 +881,8 @@
                 "terms": "Fast Food,快餐店"
             },
             "amenity/fire_station": {
-                "name": "消防局",
-                "terms": "Fire Station,水車館,消費局,消防局,消防站"
+                "name": "滅火局",
+                "terms": "Fire Station,滅火局,水車館,消防局,消防站,救火局"
             },
             "amenity/fountain": {
                 "name": "噴水池",
@@ -914,14 +896,6 @@
                 "name": "墳地",
                 "terms": "Graveyard,墓地,墳地,墳場"
             },
-            "amenity/hospital": {
-                "name": "醫院",
-                "terms": "Hospital,療養院,醫學中心,醫療院,醫院"
-            },
-            "amenity/kindergarten": {
-                "name": "幼稚園",
-                "terms": "Kindergarten,幼兒園,幼稚園,托兒所"
-            },
             "amenity/library": {
                 "name": "圖書館",
                 "terms": "Library,圖書館,拉記"
@@ -978,14 +952,14 @@
                 "name": "郊野訪客處",
                 "terms": "Ranger Station,郊野訪客處,野郊訪客處"
             },
+            "amenity/recycling": {
+                "name": "囘收桶",
+                "terms": "Recycling,囘收桶,囘收箱,回收桶,回收箱"
+            },
             "amenity/restaurant": {
                 "name": "餐廳",
                 "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
             },
-            "amenity/school": {
-                "name": "學校",
-                "terms": "School,中學,國中,國小,學校,小學,校區,校園,高中"
-            },
             "amenity/shelter": {
                 "name": "天遮或亭",
                 "terms": "Shelter,亭,天遮,蓋,避難,避難所"
@@ -1014,14 +988,6 @@
                 "name": "大會堂",
                 "terms": "Town Hall,大會堂,市政府,市政廳"
             },
-            "amenity/university": {
-                "name": "大學",
-                "terms": "University,大學,大專"
-            },
-            "amenity/vending_machine": {
-                "name": "售賣機",
-                "terms": "Vending Machine,售賣機,自勳動賣機"
-            },
             "amenity/waste_basket": {
                 "name": "垃圾桶",
                 "terms": "Waste Basket,垃圾桶,垃圾箱,廢物箱"
@@ -1054,10 +1020,6 @@
                 "name": "單車減速欄",
                 "terms": "Cycle Barrier,單車減速欄,單車矮欄"
             },
-            "barrier/ditch": {
-                "name": "溝",
-                "terms": "Ditch,溝"
-            },
             "barrier/entrance": {
                 "name": "入口",
                 "terms": "Entrance,入口"
@@ -1114,10 +1076,6 @@
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
@@ -1138,6 +1096,14 @@
                 "name": "住宅樓宇",
                 "terms": "Residential Building,住宅建築物,住宅樓宇"
             },
+            "craft/watchmaker": {
+                "name": "鐘錶匠",
+                "terms": "Watchmaker,鐘錶匠"
+            },
+            "craft/window_construction": {
+                "name": "造窗",
+                "terms": "Window Construction,造窗"
+            },
             "embankment": {
                 "name": "基堤",
                 "terms": "Embankment,基堤,堤,堤壩,堤岸"
@@ -1154,18 +1120,42 @@
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
-            "footway/crossing": {
-                "name": "路口",
-                "terms": "Crossing,路口"
-            },
             "footway/sidewalk": {
                 "name": "行人路",
                 "terms": "Sidewalk,行人路"
             },
+            "golf/bunker": {
+                "name": "沙坑",
+                "terms": "Sand Trap,沙坑"
+            },
+            "golf/fairway": {
+                "name": "球道",
+                "terms": "Fairway,球道"
+            },
+            "golf/green": {
+                "name": "菓嶺",
+                "terms": "Putting Green,果嶺,菓嶺"
+            },
+            "golf/hole": {
+                "name": "歌夫球洞",
+                "terms": "Golf Hole,歌夫球洞"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "側面水障區",
+                "terms": "Lateral Water Hazard,側面水障區"
+            },
+            "golf/rough": {
+                "name": "深草區",
+                "terms": "Rough,深草區"
+            },
+            "golf/tee": {
+                "name": "發球區",
+                "terms": "Tee Box,發球區,開球區"
+            },
+            "golf/water_hazard": {
+                "name": "水障區",
+                "terms": "Water Hazard,水障區"
+            },
             "highway": {
                 "name": "公路",
                 "terms": "Highway,公路"
@@ -1178,10 +1168,6 @@
                 "name": "巴士站",
                 "terms": "Bus Stop,公交車站,公共汽車站,巴士站"
             },
-            "highway/crossing": {
-                "name": "路口",
-                "terms": "Crossing,路口,過路處"
-            },
             "highway/cycleway": {
                 "name": "單車徑",
                 "terms": "Cycle Path,單車徑,自行車道"
@@ -1202,10 +1188,6 @@
                 "name": "高速公路",
                 "terms": "Motorway,高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路口",
-                "terms": "Motorway Junction,高速公路交匯處,高速公路口,高速公路連接點"
-            },
             "highway/motorway_link": {
                 "name": "高速公路駁路",
                 "terms": "Motorway Link,高速公路匝道,高速公路引道,高速公路駁路"
@@ -1214,10 +1196,6 @@
                 "name": "徑",
                 "terms": "Path,徑,路徑"
             },
-            "highway/pedestrian": {
-                "name": "行人大街",
-                "terms": "Pedestrian,行人大街,行人專用路"
-            },
             "highway/primary": {
                 "name": "大路",
                 "terms": "Primary Road,主要道路,大路"
@@ -1282,10 +1260,6 @@
                 "name": "細路駁路",
                 "terms": "Tertiary Link,三級道路匝道,三級道路連接路,細路駁路"
             },
-            "highway/track": {
-                "name": "分徑",
-                "terms": "Track,分徑,未舖設路面的車徑,未鋪設路面的車徑"
-            },
             "highway/traffic_signals": {
                 "name": "紅綠燈",
                 "terms": "Traffic Signals,交通燈,紅綠燈"
@@ -1302,10 +1276,6 @@
                 "name": "迴旋處",
                 "terms": "Turning Circle,回轉圈,廻旋處,環島,迴旋處"
             },
-            "highway/unclassified": {
-                "name": "未歸類之路",
-                "terms": "Unclassified Road,未分級的道路,未分類的道路,未歸類之路"
-            },
             "historic": {
                 "name": "史蹟",
                 "terms": "Historic Site,史跡,史蹟,歷史遺址,歷史遺跡"
@@ -1342,14 +1312,6 @@
                 "name": "路邊神祠",
                 "terms": "Wayside Shrine,路邊神社,路邊神祠"
             },
-            "landuse": {
-                "name": "用地",
-                "terms": "Landuse,土地用途,用地"
-            },
-            "landuse/allotments": {
-                "name": "菜地",
-                "terms": "Allotments,社區花園,菜地"
-            },
             "landuse/basin": {
                 "name": "盆地",
                 "terms": "Basin,水池,盆地"
@@ -1358,22 +1320,10 @@
                 "name": "墳場",
                 "terms": "Cemetery,墓地,墳場"
             },
-            "landuse/commercial": {
-                "name": "商地",
-                "terms": "Commercial,商地,商業區"
-            },
             "landuse/construction": {
                 "name": "地盤",
                 "terms": "Construction,地盤,建築工程,建築物"
             },
-            "landuse/farm": {
-                "name": "農場",
-                "terms": "Farm,田,稻田,農地,農場,農田"
-            },
-            "landuse/farmland": {
-                "name": "耕地",
-                "terms": "Farmland,田地,耕地,農田"
-            },
             "landuse/farmyard": {
                 "name": "地堂",
                 "terms": "Farmyard,地堂,農莊"
@@ -1386,10 +1336,6 @@
                 "name": "草地",
                 "terms": "Grass,草地"
             },
-            "landuse/industrial": {
-                "name": "工地",
-                "terms": "Industrial,工地,工業區"
-            },
             "landuse/meadow": {
                 "name": "牧地",
                 "terms": "Meadow,牧地,牧場"
@@ -1402,14 +1348,6 @@
                 "name": "石塘",
                 "terms": "Quarry,石塘,石礦場,礦場"
             },
-            "landuse/residential": {
-                "name": "住",
-                "terms": "Residential,住,住宅區"
-            },
-            "landuse/retail": {
-                "name": "零售",
-                "terms": "Retail,零售"
-            },
             "landuse/vineyard": {
                 "name": "葡萄園",
                 "terms": "Vineyard,葡萄園,酒莊"
@@ -1482,10 +1420,6 @@
                 "name": "船排",
                 "terms": "Slipway,船排,船架滑道,船臺"
             },
-            "leisure/sports_center": {
-                "name": "體育館",
-                "terms": "Sports Center,體育,體育中心,體育館"
-            },
             "leisure/stadium": {
                 "name": "大體育館",
                 "terms": "Stadium,大體育館,體育,體育場"
@@ -1494,10 +1428,6 @@
                 "name": "游水池",
                 "terms": "Swimming Pool,游水池,游泳池,遊泳池"
             },
-            "leisure/track": {
-                "name": "賽車跑道",
-                "terms": "Race Track,賽車跑道"
-            },
             "line": {
                 "name": "綫",
                 "terms": "Line,綫,線"
@@ -1554,10 +1484,6 @@
                 "name": "水塔",
                 "terms": "Water Tower,水塔"
             },
-            "man_made/water_well": {
-                "name": "井",
-                "terms": "Water well,井,水井"
-            },
             "man_made/water_works": {
                 "name": "供水廠",
                 "terms": "Water Works,供水廠,水務設施"
@@ -1834,14 +1760,14 @@
                 "name": "火車細站",
                 "terms": "Railway Halt,小火車站,火車站仔,火車細站"
             },
-            "railway/level_crossing": {
-                "name": "平交道口",
-                "terms": "Level Crossing,平交道,平交道口"
-            },
             "railway/monorail": {
                 "name": "單軌",
                 "terms": "Monorail,單軌,單軌鐵路,單軌電車"
             },
+            "railway/narrow_gauge": {
+                "name": "窄軌火車",
+                "terms": "Narrow Gauge Rails,窄軌火車,窄軌,窄軌鐵路"
+            },
             "railway/platform": {
                 "name": "月臺",
                 "terms": "Railway Platform,月臺,站臺,鐵道月台"
@@ -1898,10 +1824,6 @@
                 "name": "單車舖",
                 "terms": "Bicycle Shop,單車店,單車舖,自行車店"
             },
-            "shop/books": {
-                "name": "書局",
-                "terms": "Bookstore,書局,書店"
-            },
             "shop/boutique": {
                 "name": "時裝店",
                 "terms": "Boutique,時裝店,服飾店,精品店"
@@ -1922,10 +1844,6 @@
                 "name": "車房",
                 "terms": "Car Repair Shop,汽車修理店,汽車維修店,車房"
             },
-            "shop/chemist": {
-                "name": "註冊藥房",
-                "terms": "Chemist,藥房,藥行,註冊藥房"
-            },
             "shop/clothes": {
                 "name": "衫舖",
                 "terms": "Clothing Store,服裝店,服飾店,衫舖"
@@ -1934,10 +1852,6 @@
                 "name": "電腦舖",
                 "terms": "Computer Store,電腦店,電腦舖"
             },
-            "shop/confectionery": {
-                "name": "糖菓舖",
-                "terms": "Confectionery,甜點店,糖菓舖"
-            },
             "shop/convenience": {
                 "name": "便利店",
                 "terms": "Convenience Store,便利店"
@@ -1954,10 +1868,6 @@
                 "name": "自組舖",
                 "terms": "DIY Store,DIY商店,自組舖"
             },
-            "shop/dry_cleaning": {
-                "name": "乾洗",
-                "terms": "Dry Cleaners,乾洗,乾洗店"
-            },
             "shop/electronics": {
                 "name": "電子舖",
                 "terms": "Electronics Store,電器店,電子舖"
@@ -2006,10 +1916,6 @@
                 "name": "珠寶金行",
                 "terms": "Jeweler,珠寶店,珠寶舖,珠寶金行,首飾店,首飾舖"
             },
-            "shop/kiosk": {
-                "name": "小賣部、報紙檔、煙仔檔等",
-                "terms": "Kiosk,售貨亭,售賣亭,報刊亭,報攤,小賣部,書報攤"
-            },
             "shop/laundry": {
                 "name": "洗衣舖",
                 "terms": "Laundry,洗衣店,洗衣舖"
@@ -2034,18 +1940,10 @@
                 "name": "唱片舖",
                 "terms": "Music Store,唱片舖,音樂店"
             },
-            "shop/newsagent": {
-                "name": "報紙檔（有舖）",
-                "terms": "Newsagent,報攤,報紙檔,書報攤"
-            },
             "shop/optician": {
                 "name": "眼鏡鋪",
                 "terms": "Optician,眼鏡店,眼鏡行,眼鏡鋪"
             },
-            "shop/outdoor": {
-                "name": "行山舖",
-                "terms": "Outdoor Store,戶外用品店,行山舖"
-            },
             "shop/pet": {
                 "name": "寵物舖",
                 "terms": "Pet Store,寵物店,寵物舖"