Update to iD v1.8.3
[rails.git] / vendor / assets / iD / iD / locales / zh-HK.json
index 0998612..b05b41b 100644 (file)
     "modes": {
         "add_area": {
             "title": "範圍",
-            "description": "地圖度,加園、屋宇、湖或者其他範圍入去。",
-            "tail": "要畫範圍,好似公園、湖、屋宇咁。撳地圖先,再去畫。"
+            "description": "新增公園、建築物、湖或其他範圍至地圖。",
+            "tail": "於地圖上按一下開始繪畫範圍,例如公園、湖或建築物。"
         },
         "add_line": {
             "title": "綫",
-            "description": "地圖度,加公路、街、行人徑、水道或者其他綫。",
-            "tail": "地圖度撳一下,畫路、徑、或者路綫。"
+            "description": "新增公路、街道、行人路、水道或其他綫至地圖。",
+            "tail": "於地圖上按一下開始繪畫道路、路徑或者路綫。"
         },
         "add_point": {
-            "title": "",
-            "description": "地圖上加酒樓、紀念碑、郵筒或者其他處。",
-            "tail": "æ\92³å\9c°å\9c\96å\8a è\99\95"
+            "title": "",
+            "description": "新增餐廳、紀念碑、郵筒或其他點至地圖。",
+            "tail": "æ\96¼å\9c°å\9c\96ä¸\8aæ\8c\89ä¸\80ä¸\8bæ\96°å¢\9eé»\9eã\80\82"
         },
         "browse": {
-            "title": "周圍睇",
-            "description": "å\9c°å\9c\96å\9b\9bå\9c\8d移ï¼\8cæ\94¾å¤§ç¸®ç´°ç\9d\87。"
+            "title": "瀏覽",
+            "description": "平移å\92\8c縮æ\94¾å\9c°å\9c\96。"
         },
         "draw_area": {
-            "tail": "æ\92³ä¸\8bå\8a ç¯\80å\85¥è\90½ç¯\84å\9c\8dã\80\82æ\92³ç¬¬ä¸\80ç¯\80å\8e»å®\8cæ\88\90範圍。"
+            "tail": "æ\8c\89ä¸\80ä¸\8bå\8a ç¯\80è\87³ä½ ç\9a\84ç¯\84å\9c\8dï¼\8cæ\8c\89第ä¸\80ç¯\80å®\8cæ\88\90繪ç\95«範圍。"
         },
         "draw_line": {
-            "tail": "æ\92³ä¸\80ä¸\8bå\8e»å\8a å¤\9aå¹¾ç¯\80è\90½æ¢\9d綫ã\80\82æ\8e¹å\85¶ä»\96綫ï¼\8cé§\81å\8e»ä½¢å\93\8b度ï¼\8cå\90\8cå¿«æ\92³å\85©ä¸\8bï¼\8cå®\8cå\92\97æ¢\9d綫。"
+            "tail": "æ\8c\89ä¸\80ä¸\8bæ\96°å¢\9eä¸\80ç¯\80è\87³ç¶«ã\80\82æ\8c\89å\85¶ä»\96ç\9a\84綫以é\80£æ\8e¥å®\83å\80\91ï¼\8cæ\8c\89å\85©ä¸\8bå\8f¯å®\8cæ\88\90編輯綫。"
         }
     },
     "operations": {
         "add": {
             "annotation": {
-                "point": "處加咗",
-                "vertex": "道度加節",
-                "relation": "關聯加咗。"
+                "point": "已新增一點。",
+                "vertex": "已新增節至路上。",
+                "relation": "已新增關係。"
             }
         },
         "start": {
             "annotation": {
-                "line": "綫起咗。",
-                "area": "範圍起咗。"
+                "line": "開始了畫綫。",
+                "area": "開始了繪畫範圍。"
             }
         },
         "continue": {
             "key": "A",
-            "title": "繼續",
-            "description": "條綫。",
-            "not_eligible": "ç\88¾åº¦ç\84¡ç¶«å\8f¯ä»¥å\8f¯çº\8c。",
-            "multiple": "爾度幾條綫可繼續。揀一條綫,咁住Shift掣,撳住佢揀佢。",
+            "title": "伸延",
+            "description": "伸延這條綫。",
+            "not_eligible": "綫ä¸\8då\8f¯å¾\9eé\80\99裡伸延。",
+            "multiple": "數條綫可從這裡伸延。要選擇一條綫,可按著Shift鍵和用滑鼠按一下該條綫。",
             "annotation": {
-                "line": "綫續咗。",
-                "area": "範圍續咗。"
+                "line": "綫已伸延。",
+                "area": "範圍已伸延。"
             }
         },
         "cancel_draw": {
-            "annotation": "å\94\94畫。"
+            "annotation": "å·²å\8f\96æ¶\88繪畫。"
         },
         "change_role": {
-            "annotation": "改咗關聯成員嘅作用。"
+            "annotation": "已更改關係構件的作用。"
         },
         "change_tags": {
-            "annotation": "籤改咗。"
+            "annotation": "已更改標籤。"
         },
         "circularize": {
-            "title": "整圓",
+            "title": "圓形化",
             "description": {
-                "line": "整圓條綫",
-                "area": "整圓範圍"
+                "line": "將這條綫變為圓形。",
+                "area": "將這個範圍變為圓形。"
             },
             "key": "O",
             "annotation": {
-                "line": "整圓條綫。",
-                "area": "整圓範圍。"
+                "line": "將一條綫變為圓形。",
+                "area": "將一個範圍變為圓形。"
             },
-            "not_closed": "無得整圓,根本唔係圈。"
+            "not_closed": "未能將這個變為圓形因為它未成為一圈。",
+            "too_large": "未能將這個轉為圓形因為它不是被完全看得到。",
+            "connected_to_hidden": "未能將這個轉為圓形因為它連接著一個隱藏的特徵。"
         },
         "orthogonalize": {
-            "title": "æ\95´æ\96¹",
+            "title": "æ\96¹å½¢å\8c\96",
             "description": {
-                "line": "整方個綫角",
-                "area": "整方範圍角"
+                "line": "將這條綫的角方形化。",
+                "area": "將這個範圍的角方形化。"
             },
             "key": "S",
             "annotation": {
-                "line": "整方咗綫角。",
-                "area": "整方咗範圍角。"
+                "line": "已將這條綫的角方形化。",
+                "area": "已將這個範圍的角方形化。"
             },
-            "not_squarish": "佢太唔似方,整唔到方。"
+            "not_squarish": "未能將這個方形化因為它不似方形。",
+            "too_large": "未能將這個方形化因為它不是被完全看得到。",
+            "connected_to_hidden": "未能將這個方形化因為它連接著一個隱藏的特徵。"
         },
         "straighten": {
             "title": "拉直",
-            "description": "拉直條綫",
+            "description": "拉直這條綫。",
             "key": "S",
-            "annotation": "條綫拉直咗。",
-            "too_bendy": "條綫太彎,拉直唔到。"
+            "annotation": "已拉直一條綫。",
+            "too_bendy": "未能將這個拉直因為它轉太多彎。",
+            "connected_to_hidden": "未能將這條綫拉直因為它連接著一個隱藏的特徵。"
         },
         "delete": {
-            "title": "刪",
-            "description": "地圖度拎走佢。",
+            "title": "刪",
+            "description": "永久刪除物件。",
             "annotation": {
-                "point": "刪咗處。",
-                "vertex": "道度刪咗節。",
-                "line": "刪咗綫。",
-                "area": "刪咗範圍。",
-                "relation": "刪咗關聯。",
-                "multiple": "刪咗物體{n}個。"
-            },
-            "incomplete_relation": "此地貌無得刪走,皆因佢未傳晒落來。"
+                "point": "已刪除一點。",
+                "vertex": "已刪除路徑上的一個節。",
+                "line": "已刪除一條綫。",
+                "area": "已刪除一個範圍。",
+                "relation": "已刪除一個關係。",
+                "multiple": "已刪除 {n} 個物件。"
+            },
+            "incomplete_relation": "此特徵未能刪除,因為它尚未完全下載。",
+            "part_of_relation": "這個特徵不能刪除,因為它是大型關係的其中一部分。你必須先從關係中移除。",
+            "connected_to_hidden": "未能將這個刪除因為它連接著一個隱藏的特徵。"
         },
         "add_member": {
-            "annotation": "å\8a å\92\97æ\88\90å\93¡å\85¥é\97\9cè\81¯。"
+            "annotation": "å·²æ\96°å¢\9eä¸\80å\80\8bæ§\8b件è\87³é\97\9cä¿\82。"
         },
         "delete_member": {
-            "annotation": "拎走咗關聯成員。"
+            "annotation": "已將構件從關係移除。"
         },
         "connect": {
             "annotation": {
-                "point": "駁咗道去嗰處。",
-                "vertex": "駁咗道去其他。",
-                "line": "駁咗道去綫。",
-                "area": "駁咗道去範圍。"
+                "point": "已連接路徑到一個點。",
+                "vertex": "已連接路徑到另一路徑。",
+                "line": "已連接路徑到一條綫。",
+                "area": "已連接路徑到一個範圍。"
             }
         },
         "disconnect": {
-            "title": "æ\8e¹開",
-            "description": "此綫或者範圍等,全部掹開。",
+            "title": "æ\96·開",
+            "description": "將這些綫/範圍互相斷開。",
             "key": "D",
-            "annotation": "綫或範圍,經已掹開咗。",
-            "not_connected": "爾度唔够綫或者範圍去掹開。"
+            "annotation": "已斷開的綫/範圍。",
+            "not_connected": "這裡未有足夠的綫/範圍可斷開。",
+            "connected_to_hidden": "未能將這個斷開因為它連接著一個隱藏的特徵。"
         },
         "merge": {
-            "title": "併",
-            "description": "併埋爾啲綫。",
+            "title": "合併",
             "key": "C",
-            "annotation": "併咗綫{n}條。 ",
-            "not_eligible": "爾啲地貌,無得併埋。",
-            "not_adjacent": "爾啲綫無得掹開,根本無駁埋。",
-            "restriction": "爾啲綫併唔到,當中至少一個,屬於{relation}關聯。"
+            "not_eligible": "不能合併這些特徵。",
+            "incomplete_relation": "這些特徵不能合併因為最少一個尚未完全下載。"
         },
         "move": {
-            "title": "",
-            "description": "搬爾個去另第度。",
+            "title": "移動",
+            "description": "移動這個至另一位置。",
             "key": "M",
             "annotation": {
-                "point": "搬一點",
-                "vertex": "道度搬咗節。",
-                "line": "搬咗條綫。",
-                "area": "搬咗範圍。",
-                "multiple": "搬物體幾個。"
-            },
-            "incomplete_relation": "此地貌無得搬,皆因佢未傳晒落來。"
+                "point": "已移動一個點。",
+                "vertex": "已移動路徑上的一個節。",
+                "line": "已移動一條綫。",
+                "area": "已移動一個範圍。",
+                "multiple": "已移動多個物件。"
+            },
+            "incomplete_relation": "此特徵未能移動,因為它尚未完全下載。",
+            "too_large": "未能將這個移除因為它不是被完全看得到。",
+            "connected_to_hidden": "未能移動這個因為它連接著一個隱藏的特徵。"
         },
         "rotate": {
-            "title": "æ\93°轉",
-            "description": "圍住中心點,擰轉爾個物體。",
+            "title": "æ\97\8b轉",
+            "description": "依物件中心旋轉。",
             "key": "R",
             "annotation": {
-                "line": "條綫擰轉咗。",
-                "area": "範圍擰轉咗。"
-            }
+                "line": "已旋轉一條綫。",
+                "area": "已旋轉一個範圍。"
+            },
+            "too_large": "未能將這個旋轉因為它不是被完全看得到。",
+            "connected_to_hidden": "未能旋轉這個因為它連接著一個隱藏的特徵。"
         },
         "reverse": {
-            "title": "å\80\92å\90\91ã\80\82",
-            "description": "整到修綫方向相反。",
+            "title": "å\8f\8dè½\89",
+            "description": "使這條綫的方向反轉。",
             "key": "V",
-            "annotation": "條綫方向倒咗轉。"
+            "annotation": "已反轉一條綫。"
         },
         "split": {
-            "title": "斬開",
+            "title": "分割",
             "description": {
-                "line": "爾節度,斬綫爲二。",
-                "area": "斬界,一分爲二。",
-                "multiple": "爾節度,斬綫或範圍界綫,一分爲二。"
+                "line": "將這條綫分為兩個節。",
+                "area": "將這個範圍的邊界一分為二。",
+                "multiple": "在這個節將這個綫/範圍的邊界一分為二。"
             },
             "key": "X",
             "annotation": {
-                "line": "斬開條綫。",
-                "area": "斬開範圍界綫。",
-                "multiple": "斬開綫或範圍界綫{n}條。"
+                "line": "分割一條綫。",
+                "area": "分割一個範圍邊界。",
+                "multiple": "分割{n}條綫/範圍邊界。"
             },
-            "not_eligible": "綫無得喺頭尾度斬。",
-            "multiple_ways": "爾處太多綫,無得斬開。"
+            "not_eligible": "綫不能於頭或尾分割。",
+            "multiple_ways": "這裡有太多綫要分割。",
+            "connected_to_hidden": "未能分割這個因為它連接著一個隱藏的特徵。"
+        },
+        "restriction": {
+            "help": {
+                "select": "於地圖上按一下選擇一段道路。",
+                "toggle": "按一下改變轉彎限制",
+                "toggle_on": "按一下新增\"{restriction}\"限制。",
+                "toggle_off": "按一下移除\"{restriction}\"限制。"
+            },
+            "annotation": {
+                "create": "已新增轉彎限制",
+                "delete": "已刪除轉彎限制"
+            }
         }
     },
     "undo": {
         "tooltip": "還原:{action}",
-        "nothing": "無嘢好還原"
+        "nothing": "沒有可還原的動作。"
     },
     "redo": {
-        "tooltip": "重做{action}",
-        "nothing": "無嘢好重做"
+        "tooltip": "重做{action}",
+        "nothing": "沒有可重做的動作。"
     },
-    "tooltip_keyhint": "快掣",
-    "browser_notice": "爾個編輯,只用於Firefox、Chrome、Safari、Opera以及Internet Explorer 版本九或以上。唔該換新瀏覽器,或者用Potlach2去改地圖。",
+    "tooltip_keyhint": "快速鍵:",
     "translate": {
-        "translate": "繙",
-        "localized_translation_label": "話名",
-        "localized_translation_language": "揀話",
-        "localized_translation_name": "名"
+        "translate": "翻譯",
+        "localized_translation_label": "多種語言名稱",
+        "localized_translation_language": "選擇語言",
+        "localized_translation_name": "名稱"
+    },
+    "zoom_in_edit": "放大以編輯",
+    "logout": "登出",
+    "loading_auth": "正在連接 OpenStreetMap...",
+    "report_a_bug": "報告錯誤",
+    "help_translate": "協助翻譯",
+    "feature_info": {
+        "hidden_warning": "{count} 項隱藏特徵",
+        "hidden_details": "這些特徵正被隱藏: {details}"
     },
-    "zoom_in_edit": "放大去改",
-    "logout": "簽走",
-    "loading_auth": "駁上去公家街圖⋯⋯",
-    "report_a_bug": "報告有錯",
     "status": {
-        "error": "駁唔通程式接口。",
-        "offline": "程式接口收工。遲啲再改啦。",
-        "readonly": "程式接口,只讀不寫。你要等下先記到你修改。"
+        "error": "未能連接至應用程式介面。",
+        "offline": "應用程式介面現在離線。請稍後再編輯。",
+        "readonly": "應用程式介面處於唯讀模式。如要儲存變更需要稍等。"
     },
     "commit": {
-        "title": "記低修改",
-        "description_placeholder": "ç°¡è¿°ä½ ç\88¾å\89\87稿件",
-        "message_label": "遞交片語",
-        "upload_explanation": "你嘅修改,傳咗上去公家街圖。凢用公家街圖資料,地圖都會見到。",
-        "upload_explanation_with_user": "你以{user}名義,修改傳咗上去公家街圖。凢用公家街圖資料,地圖都會見到。",
+        "title": "儲存變更",
+        "description_placeholder": "ç°¡è¿°ä½ ç\9a\84è²¢ç\8d»",
+        "message_label": "編輯變動留言",
+        "upload_explanation": "你上載的變更會出現在其他使用 OpenStreetMap 資料的地圖。",
+        "upload_explanation_with_user": "你以{user}的名字上載的變更會出現在其他使用 OpenStreetMap 資料的地圖。",
         "save": "記",
         "cancel": "唔記",
+        "changes": "{count} 項變更",
         "warnings": "警告",
-        "modified": "改咗",
-        "deleted": "å\88ªå\92\97",
-        "created": "開咗"
+        "modified": "已修改",
+        "deleted": "å·²å\88ªé\99¤",
+        "created": "已建立"
     },
     "contributors": {
-        "list": "有{users}修改",
-        "truncated_list": "有{users}同另外{count}人修改"
+        "list": "由{users}編輯",
+        "truncated_list": "由 {users} 和另外 {count} 人編輯"
+    },
+    "infobox": {
+        "selected": "已選 {n} 項",
+        "geometry": "幾何",
+        "closed": "已關閉",
+        "center": "中心",
+        "perimeter": "周界",
+        "length": "長度",
+        "area": "範圍",
+        "centroid": "形心",
+        "location": "位置",
+        "metric": "十進制",
+        "imperial": "英制"
+    },
+    "geometry": {
+        "point": "點",
+        "vertex": "頂點",
+        "line": "綫",
+        "area": "範圍",
+        "relation": "關係"
     },
     "geocoder": {
-        "search": "æ\90µå¤©ä¸\8bå\90\84å\9c°â\8b¯â\8b¯",
-        "no_results_visible": "å\9c\96å\85§å\8f¯è¦\8bä¹\8bè\99\95ï¼\8cé\83½æ\90µå\94\94å\88°",
-        "no_results_worldwide": "無嘢搵到"
+        "search": "æ\90\9cå°\8bå\85¨ä¸\96ç\95\8c...",
+        "no_results_visible": "å\9c°å\9c\96å\85§å\8f¯è¦\8bç¯\84å\9c\8dé\83½æ²\92æ\9c\89çµ\90æ\9e\9c",
+        "no_results_worldwide": "找不到搜尋結果"
     },
     "geolocate": {
-        "title": "標出我喺邊"
+        "title": "顯示我的位置"
     },
     "inspector": {
-        "no_documentation_combination": "爾組籤,未有文件解",
-        "no_documentation_key": "爾個圖例,未有文件解。",
-        "show_more": "睇多啲",
-        "view_on_osm": "å\85¥å\85¬å®¶è¡\97å\9c\96ç\9d\87",
-        "all_tags": "所有籤",
-        "all_members": "æ\89\80æ\9c\89æ\88\90å\93¡",
-        "all_relations": "所有關",
-        "new_relation": "開新關聯⋯⋯",
+        "no_documentation_combination": "沒有這個標籤組合的相關文件",
+        "no_documentation_key": "沒有這個鍵值的相關文件",
+        "show_more": "顯示更多",
+        "view_on_osm": "å\9c¨ openstreetmap.org ä¸­æª¢è¦\96",
+        "all_tags": "所有籤",
+        "all_members": "æ\89\80æ\9c\89æ§\8b件",
+        "all_relations": "所有關",
+        "new_relation": "建立新關係⋯⋯",
         "role": "作用",
-        "choose": "揀地貌",
-        "results": "{search}搵出{n}項",
-        "reference": "å\85¥å\85¬å®¶è¡\97å\9c\96ç\99¾ç§\91ç\9d\87",
-        "back_tooltip": "è½\89å\9c°è²\8c",
-        "remove": "移",
-        "search": "æ\90µ",
-        "multiselect": "揀咗嘅項目",
+        "choose": "選擇特徵種類",
+        "results": "{search}的{n}個結果",
+        "reference": "å\9c¨ OpenStreetMap Wiki ä¸­æª¢é\96±",
+        "back_tooltip": "è®\8aæ\9b´ç\89¹å¾µ",
+        "remove": "移",
+        "search": "æ\90\9cå°\8b",
+        "multiselect": "已選擇的物件",
         "unknown": "未知",
-        "incomplete": "<無傳落來>",
-        "feature_list": "搵地貌",
-        "edit": "改地貌",
-        "none": "無"
+        "incomplete": "<未下載>",
+        "feature_list": "搜尋特徵",
+        "edit": "編輯特徵",
+        "check": {
+            "yes": "是",
+            "no": "否"
+        },
+        "none": "無",
+        "node": "節",
+        "way": "路徑",
+        "relation": "關係",
+        "location": "位置",
+        "add_fields": "新增資料"
     },
     "background": {
         "title": "背景",
         "description": "背景設定",
-        "percent_brightness": "{opacity}% ",
+        "percent_brightness": "{opacity}% 亮度",
         "none": "無",
         "custom": "自訂",
-        "custom_prompt": "入個格模。有效字符係{z}、{x}、{y}對應Z/X/Y制及{u}對應四分格制。",
+        "custom_button": "編輯自訂背景",
+        "custom_prompt": "輪入區塊範本的網址。有效的標記是以 {z}, {x}, {y} 作為 Z/X/Y 標記系統 Z/X/Y scheme 和 {u} 作為四分位數標記系統 quadtile scheme。",
         "fix_misalignment": "校正對位誤差",
-        "reset": "重設"
+        "reset": "重設",
+        "minimap": {
+            "description": "小地圖",
+            "tooltip": "顯示縮小地圖以確定現在被顯示範圍的位置"
+        }
+    },
+    "map_data": {
+        "title": "地圖資料",
+        "description": "地圖資料",
+        "data_layers": "資料圖層",
+        "fill_area": "填滿範圍",
+        "map_features": "地圖特徵",
+        "autohidden": "由於太多東西出現在螢幕上,這些特徵已被自動隱藏。你可以放大來編輯它們。"
+    },
+    "feature": {
+        "points": {
+            "description": "點",
+            "tooltip": "興趣點"
+        },
+        "major_roads": {
+            "description": "主要道路",
+            "tooltip": "公路、街道等等"
+        },
+        "minor_roads": {
+            "description": "次級道路",
+            "tooltip": "支路、停車場通道、小徑等等"
+        },
+        "paths": {
+            "description": "徑",
+            "tooltip": "行人路、步行徑、單車徑等等"
+        },
+        "buildings": {
+            "description": "建築物",
+            "tooltip": "建築物、涼亭、車房等等"
+        },
+        "landuse": {
+            "description": "用地特徵",
+            "tooltip": "森林、農地、公園、住宅區、商業區等等"
+        },
+        "boundaries": {
+            "description": "邊界",
+            "tooltip": "行政邊界"
+        },
+        "water": {
+            "description": "水特徵",
+            "tooltip": "河流、湖泊、池塘、流域等等"
+        },
+        "rail": {
+            "description": "鐵路特徵",
+            "tooltip": "鐵路"
+        },
+        "power": {
+            "description": "電力特徵",
+            "tooltip": "電線、發電廠、變電站等等"
+        },
+        "past_future": {
+            "description": "過去/將來",
+            "tooltip": "已建議、建築中、已廢棄、已拆毀等等"
+        },
+        "others": {
+            "description": "其他",
+            "tooltip": "其他東西"
+        }
+    },
+    "area_fill": {
+        "wireframe": {
+            "description": "不填滿 (以線條顯示)",
+            "tooltip": "啟用框線模式,很容易就看到背景影像。"
+        },
+        "partial": {
+            "description": "部分填滿",
+            "tooltip": "只有範圍邊界內側會被填滿。(適合地圖繪畫新手)"
+        },
+        "full": {
+            "description": "全部填滿",
+            "tooltip": "整個範圍會被填滿。"
+        }
     },
     "restore": {
-        "heading": "你有修改未記妥",
-        "description": "要唔要囘復上次未記妥之修改?",
-        "restore": "復",
-        "reset": "重新開始"
+        "heading": "你有未儲存的變更",
+        "description": "你想恢復上一次編輯時尚未儲存的變更嗎?",
+        "restore": "復",
+        "reset": "重"
     },
     "save": {
-        "title": "記低",
-        "help": "修改放上公家街圖,等其他用者都睇到。",
-        "no_changes": "無修改可記",
-        "error": "記上去時出錯",
-        "uploading": "修改傳上公家街圖。",
-        "unsaved_changes": "你有修改未記妥"
+        "title": "儲存",
+        "help": "儲存變更至OpenStreetMap,讓其他用戶都看得到。",
+        "no_changes": "沒有變更需要儲存。",
+        "error": "儲存時發生錯誤",
+        "status_code": "伺服器提供的狀態碼{code}",
+        "unknown_error_details": "請確保你已連接至互聯網。",
+        "uploading": "正在上傳變更到OpenStreetMap。",
+        "unsaved_changes": "你有未儲存的變更",
+        "conflict": {
+            "header": "解決有衝突的編輯項目",
+            "count": " {total}個衝突中的第{num}個",
+            "previous": "< 上一個",
+            "next": "下一個 >",
+            "keep_local": "保留我的",
+            "keep_remote": "使用其他人的",
+            "restore": "復原",
+            "delete": "放棄資料",
+            "download_changes": "或者下載你的變更。",
+            "done": "所有衝突已解決!",
+            "help": "另一用戶已變更了一些你變更過的地圖特徵。\n按一下下面的每一個項目以了解有關衝突並決定是否需要保留\n你的變更或者是其他用戶的變更。\n"
+        }
+    },
+    "merge_remote_changes": {
+        "conflict": {
+            "deleted": "這物件已被{user}刪除。",
+            "location": "這物件被你和{user}移動過。",
+            "nodelist": "這些節被你和{user}變更過。",
+            "memberlist": "關係構件已被你和{user}改變了。",
+            "tags": "你變更了{tag}標籤為\"{local}\",而{user}變更為\"{remote}\"。"
+        }
     },
     "success": {
-        "edited_osm": "改掂公家街圖!",
-        "just_edited": "ä½ å\95±å\95±æ\94¹å\92\97å\85¬å®¶è¡\97å\9c\96!",
-        "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"
+        "edited_osm": "已編輯了OSM!",
+        "just_edited": "ä½ å\89\9bå\89\9b編輯äº\86OpenStreetMap!",
+        "view_on_osm": "於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"
     },
     "confirm": {
-        "okay": "得"
+        "okay": "確定",
+        "cancel": "取消"
     },
     "splash": {
-        "welcome": "æ­¡è¿\8eä¾\86å\88°è\89¾ç¬¬å\85¬å®¶è¡\97å\9c\96é\80 å\9c\96ã\80\82",
-        "text": "艾第爾件架生,易用之時,亦功用多多,用來投稿修改去,世界至好,任用嘅世界地圖片。現時版本係{version}。想多啲資料,睇下 {website}同埋去{github}報告出錯。",
-        "walkthrough": "開始逐步解釋",
-        "start": "卽改"
+        "welcome": "æ­¡è¿\8e使ç\94¨iD OpenStreetMap編輯å\99¨",
+        "text": "iD是一個易用但功能強大的工具以便你可在世界上最好的免費地圖中作出貢獻。這個是版本{version}。你可在{website}得到更多資料和在{github}報告錯誤。",
+        "walkthrough": "開始新手教學",
+        "start": "立即編輯"
     },
     "source_switch": {
-        "live": "運行之中",
-        "lose_changes": "ä½ æ\9cªæ\9c\89ä¿®æ\94¹æ\9cªè¨\98妥ã\80\82è½\89å\9c°å\9c\96é\9b»è\85¦ï¼\8cå°±æ\9c\83ç\84¡å\92\97ä¿®æ\94¹ã\80\82ä½ ç\9c\9fä¿\82è¦\81è½\89å\9c°å\9c\96é\9b»è\85¦?",
-        "dev": "製作之中"
+        "live": "實況模式",
+        "lose_changes": "ä½ æ\9c\89å°\9aæ\9cªå\84²å­\98ç\9a\84è®\8aæ\9b´ã\80\82å\88\87æ\8f\9bå\9c°å\9c\96伺æ\9c\8då\99¨å°\87æ\94¾æ£\84å®\83å\80\91ã\80\82你確å®\9aè¦\81å\88\87æ\8f\9b伺æ\9c\8då\99¨å\97\8e?",
+        "dev": "開發模式"
     },
     "tag_reference": {
         "description": "描述",
-        "on_wiki": "å\96ºå\85¬å®¶è¡\97å\9c\96ç\99¾ç§\91度å\98\85{tag}",
-        "used_with": "同{type}一齊用"
+        "on_wiki": "å\9c¨wiki.osm.orgä¸\8aç\9a\84 {tag}",
+        "used_with": "與{type}一起用"
     },
     "validations": {
-        "untagged_point": "未有籤嘅點",
-        "untagged_line": "冇籤嘅綫",
-        "untagged_area": "冇籤嘅範圍",
-        "many_deletions": "你要刪走物件{n}個。你真係想咁做?咁人人用開嘅公家街圖入便,都會刪走埋。",
-        "tag_suggests_area": "{tag}籤話條綫係範圍,實情佢唔係。",
-        "deprecated_tags": "廢籤:{tags}"
+        "untagged_point": "未有標籤的點",
+        "untagged_line": "未有標籤的綫",
+        "untagged_area": "未有標籤的範圍",
+        "many_deletions": "你正在刪除 {n} 個物件。你確定要這樣做嗎?這樣就會將人人在openstreetmap.org 地圖內看到的物件刪除了。",
+        "tag_suggests_area": "{tag}標籤建議綫應為範圍,但這不是一個範圍。",
+        "untagged_point_tooltip": "選擇一個特徵種類來形容這個點是甚麼。",
+        "untagged_line_tooltip": "選擇一個特徵種類來形容這條綫是甚麼。",
+        "untagged_area_tooltip": "選擇一個特徵種類來形容這個範圍是甚麼。",
+        "deprecated_tags": "已棄用的標籤: {tags}"
     },
     "zoom": {
         "in": "放大",
         "out": "縮細"
     },
-    "cannot_zoom": "今下模式,無得再縮。",
+    "cannot_zoom": "在這個模式下不能再縮小。",
+    "full_screen": "切換全螢幕",
     "gpx": {
-        "local_layer": "本地 GPX 檔案",
-        "drag_drop": "拉個 .gpx檔案入來爾版。或者,撳右邊粒掣揀檔案。",
-        "zoom": "校到GPX路徑大細",
-        "browse": "望下有乜 .gpx 檔案"
+        "local_layer": "本機 GPX 檔案",
+        "drag_drop": "拖移 .gpx檔案到本頁或者按右側按鈕瀏覽。",
+        "zoom": "放大至 GPX 軌跡",
+        "browse": "開啟 .gpx 檔案"
+    },
+    "mapillary": {
+        "tooltip": "來自Mapillary的街道層相片",
+        "title": "相片覆蓋 (Mapillary)",
+        "view_on_mapillary": "在Mapillary上觀看這影像"
     },
     "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"
+        "title": "說明",
+        "help": "# 說明\n\n這是[OpenStreetMap]的編輯器 (http://www.openstreetmap.org/),\n免費而且可以編輯的世界地圖。你可以用來新增和更新\n在你附近的資料,令這個開放源碼和開放資料的地圖\n變得更好。\n你在這地圖裡所作的變更會令其他使用OpenStreetMap的人看得到。\n如要編輯,你需要[登入] (https://www.openstreetmap.org/login)。\n\n [iD 編輯器](http://ideditor.com/)是一個共同合作計劃,[原始碼可在GitHub找到](https://github.com/openstreetmap/iD)。\n",
+        "editing_saving": "# 編輯和儲存\n\n這個編輯器主要是靠網上運作而你正在\n經網頁使用它。\n\n### 選擇特徵\n\n要選擇特徵一個地圖特徵,例如道路或興趣點,\n可以在地圖上按它一下。 這樣就可以突出標示你選擇的特徵並開啟有關\n的詳細面板和顯示你可做的動作的選單。\n\n要選擇多個特徵,按著'Shift'鍵,然後\n用滑鼠按你想選擇的特徵或者在地圖上拖曳畫出長方形,\n所有在長方形內的點就會被選。\n\n### 儲存編輯\n\n當你作了變更,例如編輯道路、建築物和地方,\n它們就會儲在你的裝置直至你把它們儲存在伺服器內。如果有錯\n亦不用擔心 - 你可以按還原鍵還原你的變更和重做鍵再做過你的變更。\n\n按 '儲存' 就可儲存一組的編輯 - 例如你已完成\n一個鎮的範圍和希望開始一個新的範圍。你亦有機會\n去復審你做過甚麼,而如果有些不太正確的編輯,\n編輯器還會提供有用的建議和警告。\n\n如果沒有問題,你就可以輸入一些短句解釋一下你所作的變更。\n然後按'儲存'就可將變更上傳到\n[OpenStreetMap.org](http://www.openstreetmap.org/), 其他使用者\n就會看得到和使其他人建立和作出改進。\n\n如果你不可以一次過完成你的編輯,你可以離開編輯器\n視窗並再次回來(使用同一個瀏覽器和電腦),\n編輯器就會復原你的工作。editor application will offer to restore your work.\n\n### 使用編輯器\n\n鍵盤快捷鍵列表可以在\n[這裡](http://wiki.openstreetmap.org/wiki/ID/Shortcuts)找到。\n",
+        "gps": "# GPS\n\nGPS 追蹤是OpenStreetMap 的寶貴資料來源。這個編輯器\n支援你電腦內的 `.gpx` 檔案。使用智能電話的\n一些應用程式或個人GPS更體就可以搜集得到\n這類的GPS軌跡。\n\n要知道如何運用GPS測量,\n請參閱[用智能電話、GPS或紙繪地圖](http://learnosm.org/en/mobile-mapping/)。\n\n要使用GPX的軌跡繪畫地圖,拖放GPX檔案到編輯器上。\n如辨認得到,它就會於地圖上新增為鮮紫色的綫。\n按'地圖資料'選單右側就可顯示、\n隱藏或縮放這個新的GPX圖層。\n\nGPX軌跡不會直接上載至 OpenStreetMap - 最好的用法\n就要用來繪畫新的地圖、協助你新增特徵、\n或者用來[上載至OpenStreetMap](http://www.openstreetmap.org/trace/create)\n供其他使用者使用。\n",
+        "inspector": "# 使用檢視面版\n\n檢視面版位於畫面左側,\n你可用它編輯你選擇的特徵的詳細資料。\n\n### 選擇一個特徵種類\n\n當你新增了一個點、綫或範圍,你可以揀選它所屬的特徵,\n例如它是公路或住宅道路、起級市場或咖啡室。\n檢視面版會顯示常用的特徵種類按鈕,而你亦可\n利用尋找列搜尋其他的特徵。\n\n按一下在特徵種類按鈕右下角的 'i' ,\n就可知更多有關資訊。按一下按鈕就可選擇那個種類。\n\n### 使用表格和編輯標籤\n\n在你選擇了特徵種類後或者該特徵已有預設種類,\n檢視面版就會顯示一些相應的欄位,\n例如名稱和地址。\n\n在欄位下,你可以按一下 '新增欄位' 選單去新增\n其他資料,例如維基百科全書的連結、輪椅通道等等。\n\n於檢視面版的下方,按 '附加標籤' 就可以新增\n任意的標籤到那個物件。[Taginfo](http://taginfo.openstreetmap.org/) 可以\n提供大量有關常用標籤的組合。\n\n你在檢視面版所作的變更都會自動套用到地圖。\n你可以按 '復原' 按鈕在復原它們。\n"
     },
     "intro": {
         "navigation": {
-            "title": "å\91¨å\9c\8dæ\9c\9b",
-            "drag": "大地圖度,公家街圖資料,放喺背景之上。你想周圍望,就拖住,推上落,推左右,就好似普通網上地圖咁。**拖住地圖**",
-            "select": "å\9c\96ä¸\8aå\9c°è²\8cï¼\8cæ\9c\89ä¸\89種æ\96¹æ³\95表示ï¼\8cè\99\95ã\80\81綫å\90\8cç¯\84å\9c\8dã\80\82æ\89\80æ\9c\89å\9c°è²\8cï¼\8cé\83½ä»¥ä¸\80æ\92³å°±æ\8f\80ã\80\82**æ\92³è\99\95å\8e»æ\8f\80。**",
-            "header": "é \82é ­æ\8c\87æ\98\8eå\9c°è²\8c。",
+            "title": "å°\8eè\88ª",
+            "drag": "主要地圖顯示OpenStreetMap資料在背面之上。你可以透過拖曳與捲動來導覽,就像任何其他網絡地圖。**拖曳地圖!**",
+            "select": "å\9c°å\9c\96ç\89¹å¾µä»¥ä¸\89種æ\96¹æ³\95表示ï¼\9aé»\9eã\80\81綫æ\88\96ç¯\84å\9c\8dã\80\82æ\89\80æ\9c\89ç\89¹å¾µå\9d\87å\8f¯é»\9eé\81¸ã\80\82**æ\8c\89ä¸\80ä¸\8bé»\9eå\8e»é\81¸æ\93\87å®\83。**",
+            "header": "é \81頭顯示ç\89¹å¾µç¨®é¡\9e。",
             "pane": "一揀地貌,地貌器就出。頂頭話我哋知乜嘢地貌,主要顯示地貌屬性,如名同地址。**閂地貌器,就撳右上閂埋個掣。**"
         },
         "points": {
         },
         "areas": {
             "title": "範圍",
-            "add": "範圍係更祥細講地貌。佢畀埋地貌界綫。處出地嘅地貌,範圍多數都用到,做到範圍就做範圍。**撳住範圍掣,開新範圍。**",
+            "add": "範圍是用作顯示特徵的邊界,例如湖泊、建築物和住宅區。亦可用來更細緻地標示很多平常是點的特徵。 **按一下範圍鍵來新增範圍。**",
             "corner": "要畫範圍,就用節來勾出邊界,包住範圍。**擺開始一節,喺遊樂場一角。**",
             "place": "畫範圍,就要擺多啲節。要完成範圍,就欽返頭嗰節。**畫個範圍畀遊樂場。**",
             "search": "**搵【{name}】。**",
     "presets": {
         "categories": {
             "category-building": {
-                "name": "屋宇"
+                "name": "建築物"
+            },
+            "category-golf": {
+                "name": "高爾夫球"
             },
             "category-landuse": {
                 "name": "用地"
             "category-rail": {
                 "name": "軌道"
             },
+            "category-restriction": {
+                "name": "限制"
+            },
             "category-road": {
                 "name": "路"
             },
         },
         "fields": {
             "access": {
-                "label": "通",
-                "placeholder": "未知",
-                "types": {
-                    "access": "總體",
-                    "foot": "行",
-                    "motor_vehicle": "車",
-                    "bicycle": "單車",
-                    "horse": "馬"
-                },
+                "label": "允許通過",
                 "options": {
-                    "yes": {
-                        "title": "准許",
-                        "description": "按法例可通,通路之權。"
+                    "designated": {
+                        "description": "通行與否,按法例或路牌指定",
+                        "title": "指名"
+                    },
+                    "destination": {
+                        "description": "限往目的地",
+                        "title": "目的地"
+                    },
+                    "dismount": {
+                        "description": "允許通過但騎單車者需要下車",
+                        "title": "下車"
                     },
                     "no": {
-                        "title": "禁入",
-                        "description": "公眾不通"
+                        "description": "公眾不通",
+                        "title": "禁入"
                     },
                     "permissive": {
-                        "title": "放任",
-                        "description": "可通,直至地主唔畀。"
+                        "description": "可通,直至地主唔畀。",
+                        "title": "自由通過"
                     },
                     "private": {
-                        "title": "私家",
-                        "description": "要地主批准"
-                    },
-                    "designated": {
-                        "title": "指名",
-                        "description": "通行與否,按法例或路牌指定"
+                        "description": "要地主批准",
+                        "title": "私家"
                     },
-                    "destination": {
-                        "title": "目的地",
-                        "description": "限往目的地"
+                    "yes": {
+                        "description": "按法例可通,通路之權。",
+                        "title": "准許"
                     }
+                },
+                "placeholder": "未指明",
+                "types": {
+                    "access": "所有",
+                    "bicycle": "單車",
+                    "foot": "步行",
+                    "horse": "馬",
+                    "motor_vehicle": "車"
                 }
             },
             "access_simple": {
-                "label": "通"
+                "label": "允許通過",
+                "placeholder": "是"
+            },
+            "access_toilets": {
+                "label": "通過"
             },
             "address": {
-                "label": "å\9c°å\9f\97",
+                "label": "å\9c°å\9d\80",
                 "placeholders": {
-                    "housename": "屋名",
-                    "number": "一百二十三號",
+                    "city": "城市",
+                    "conscriptionnumber": "123",
+                    "country": "國家",
+                    "district": "地區",
+                    "hamlet": "村落",
+                    "housename": "房名",
+                    "housenumber": "123",
+                    "place": "地方",
+                    "postcode": "郵遞區號",
+                    "province": "省",
+                    "state": "州",
                     "street": "街",
-                    "city": "城",
-                    "postcode": "郵政編號"
+                    "subdistrict": "分區",
+                    "suburb": "市郊"
                 }
             },
             "admin_level": {
                 "label": "行政層次"
             },
+            "aerialway": {
+                "label": "種類"
+            },
+            "aerialway/access": {
+                "label": "通過",
+                "options": {
+                    "both": "進入及離開",
+                    "entry": "進入",
+                    "exit": "出口"
+                }
+            },
+            "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": "開放 (夏天)",
+                "options": {
+                    "both": "進入及離開",
+                    "entry": "進入",
+                    "exit": "出口"
+                }
+            },
             "aeroway": {
                 "label": "類"
             },
             "amenity": {
                 "label": "類"
             },
+            "area/highway": {
+                "label": "種類"
+            },
             "artist": {
                 "label": "藝人"
             },
             "barrier": {
                 "label": "類"
             },
+            "bench": {
+                "label": "長椅"
+            },
             "bicycle_parking": {
                 "label": "類"
             },
             "boundary": {
                 "label": "類"
             },
+            "brand": {
+                "label": "品牌"
+            },
             "building": {
-                "label": "å±\8bå®\87"
+                "label": "建ç¯\89ç\89©"
             },
             "building_area": {
-                "label": "å±\8bå®\87"
+                "label": "建ç¯\89ç\89©"
             },
             "capacity": {
                 "label": "容納",
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
-                "label": "方向"
+                "label": "方向",
+                "options": {
+                    "E": "東",
+                    "ENE": "東北偏東",
+                    "ESE": "東南偏東",
+                    "N": "北",
+                    "NE": "東北",
+                    "NNE": "東北偏北",
+                    "NNW": "西北偏北",
+                    "NW": "西北",
+                    "S": "南",
+                    "SE": "東南",
+                    "SSE": "東南偏南",
+                    "SSW": "西南偏南",
+                    "SW": "西南",
+                    "W": "西",
+                    "WNW": "西北偏西",
+                    "WSW": "西南偏西"
+                }
             },
             "clock_direction": {
                 "label": "方向",
                 "options": {
-                    "clockwise": "é \86æ\99\82é\87\9d",
-                    "anticlockwise": "é\80\86æ\99\82é\87\9d"
+                    "anticlockwise": "é\80\86æ\99\82é\87\9d",
+                    "clockwise": "é \86æ\99\82é\87\9d"
                 }
             },
             "collection_times": {
             "construction": {
                 "label": "類"
             },
+            "content": {
+                "label": "內容"
+            },
             "country": {
                 "label": "國"
             },
+            "covered": {
+                "label": "被遮蓋"
+            },
+            "craft": {
+                "label": "種類"
+            },
+            "crop": {
+                "label": "裁剪"
+            },
             "crossing": {
                 "label": "類"
             },
             "cuisine": {
                 "label": "菜系"
             },
+            "cycleway": {
+                "label": "單車徑",
+                "options": {
+                    "lane": {
+                        "description": "單車徑與行車道由地上的綫分開",
+                        "title": "標準單車徑"
+                    },
+                    "none": {
+                        "description": "沒有單車徑",
+                        "title": "無"
+                    },
+                    "opposite": {
+                        "description": "單程路提供雙程行車單車徑",
+                        "title": "雙向行駛單車徑"
+                    },
+                    "opposite_lane": {
+                        "description": "與行車方向相反的單車徑"
+                    },
+                    "share_busway": {
+                        "description": "與巴士綫共享的單車徑",
+                        "title": "與巴士綫共用的單車徑"
+                    },
+                    "shared_lane": {
+                        "description": "沒有與行車道分開的單車徑",
+                        "title": "共用單車徑"
+                    },
+                    "track": {
+                        "description": "單車徑與行車道由障礙物分開",
+                        "title": "單車徑"
+                    }
+                },
+                "placeholder": "沒有",
+                "types": {
+                    "cycleway:left": "左側",
+                    "cycleway:right": "右側"
+                }
+            },
+            "delivery": {
+                "label": "外賣"
+            },
             "denomination": {
                 "label": "派"
             },
             "description": {
                 "label": "描述"
             },
+            "drive_through": {
+                "label": "免下車"
+            },
+            "electrified": {
+                "label": "電氣化",
+                "options": {
+                    "contact_line": "電纜",
+                    "no": "否",
+                    "rail": "已通電路軌",
+                    "yes": "是 (未指定)"
+                },
+                "placeholder": "電纜、已通電路軌…"
+            },
             "elevation": {
                 "label": "海拔"
             },
             "entrance": {
                 "label": "類"
             },
+            "except": {
+                "label": "例外"
+            },
             "fax": {
                 "label": "傳真",
                 "placeholder": "+852 12345678"
                 "label": "費用"
             },
             "fire_hydrant/type": {
-                "label": "類"
+                "label": "類",
+                "options": {
+                    "pillar": "柱狀/地上",
+                    "pond": "池塘",
+                    "underground": "地下",
+                    "wall": "牆上"
+                }
             },
             "fixme": {
                 "label": "整好我"
             },
+            "fuel": {
+                "label": "燃料"
+            },
+            "fuel/biodiesel": {
+                "label": "售賣生物柴油"
+            },
+            "fuel/diesel": {
+                "label": "售賣柴油"
+            },
+            "fuel/e10": {
+                "label": "售賣E10"
+            },
+            "fuel/e85": {
+                "label": "售賣E85"
+            },
+            "fuel/lpg": {
+                "label": "售賣丙烷"
+            },
+            "fuel/octane_100": {
+                "label": "售賣賽車汽油"
+            },
+            "fuel/octane_91": {
+                "label": "售賣一般汽油"
+            },
+            "fuel/octane_95": {
+                "label": "售賣中級汽油"
+            },
+            "fuel/octane_98": {
+                "label": "售賣頂級汽油"
+            },
+            "gauge": {
+                "label": "軌距"
+            },
+            "gender": {
+                "label": "性別",
+                "options": {
+                    "female": "女",
+                    "male": "男",
+                    "unisex": "單性"
+                },
+                "placeholder": "未知"
+            },
             "generator/method": {
                 "label": "方法"
             },
             "generator/type": {
                 "label": "類"
             },
+            "golf_hole": {
+                "label": "參攷",
+                "placeholder": "洞數(一到十八)"
+            },
+            "handicap": {
+                "label": "差點",
+                "placeholder": "1-18"
+            },
+            "handrail": {
+                "label": "扶手"
+            },
             "highway": {
                 "label": "類"
             },
             "historic": {
                 "label": "類"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "萬國航空運輸協會(IATA)"
             },
             "incline": {
                 "label": "斜"
             },
+            "incline_steps": {
+                "options": {
+                    "down": "落",
+                    "up": "上"
+                }
+            },
+            "information": {
+                "label": "類"
+            },
             "internet_access": {
                 "label": "用到互聯網",
                 "options": {
-                    "wlan": "無綫上網",
+                    "no": "否",
+                    "terminal": "終端機",
                     "wired": "揷綫上網",
-                    "terminal": "終端機"
+                    "wlan": "無綫上網",
+                    "yes": "有"
                 }
             },
+            "lamp_type": {
+                "label": "種類"
+            },
             "landuse": {
                 "label": "類"
             },
             "leisure": {
                 "label": "類"
             },
+            "level": {
+                "label": "圖層"
+            },
             "levels": {
                 "label": "樓",
                 "placeholder": "2, 4, 6..."
                 "label": "限速",
                 "placeholder": "40, 50, 60..."
             },
+            "mtb/scale": {
+                "label": "越野單車徑難度",
+                "options": {
+                    "0": "0: 碎石/ 硬土、沒有障礙物、大弧度",
+                    "1": "1: 有些鬆散的地面、小型障礙物、大弧度",
+                    "2": "2: 較多鬆散的地面、大型障礙物、簡單急彎",
+                    "3": "3: 濕滑地面、大型障礙物、狹窄急彎",
+                    "4": "4: 鬆散的地面或大圓石、危險急彎",
+                    "5": "5: 十分困難、石灘、滑坡",
+                    "6": "6: 非精湛越野單車者不可騎越"
+                },
+                "placeholder": "0, 1, 2, 3..."
+            },
+            "mtb/scale/imba": {
+                "label": "國際越野單車協會路徑難度",
+                "options": {
+                    "0": "最容易 (白圓圈)",
+                    "1": "容易 (綠圓圈)",
+                    "2": "中等 (藍正方)",
+                    "3": "困難 (黑鑽石)",
+                    "4": "極度困難 (雙黑鑽石)"
+                },
+                "placeholder": "容易、中等、困難 …"
+            },
+            "mtb/scale/uphill": {
+                "placeholder": "0, 1, 2, 3..."
+            },
             "name": {
                 "label": "名",
                 "placeholder": "常用名(若有)"
                 "label": "類"
             },
             "oneway": {
-                "label": "單程"
+                "label": "單程",
+                "options": {
+                    "no": "否",
+                    "undefined": "假設為否",
+                    "yes": "是"
+                }
             },
             "oneway_yes": {
-                "label": "單程"
+                "label": "單程",
+                "options": {
+                    "no": "否",
+                    "yes": "是"
+                }
             },
             "opening_hours": {
                 "label": "時間"
             },
             "operator": {
-                "label": "承辦商"
+                "label": "營辦商"
+            },
+            "par": {
+                "label": "標準桿",
+                "placeholder": "3, 4, 5..."
             },
             "park_ride": {
-                "label": "æ³\8aè»\8aè½\89ä¹\96"
+                "label": "æ³\8aè»\8aè½\89ä¹\98"
             },
             "parking": {
-                "label": "類"
+                "label": "類",
+                "options": {
+                    "multi-storey": "多層",
+                    "sheds": "有蓋",
+                    "surface": "地面",
+                    "underground": "地下"
+                }
             },
             "phone": {
                 "label": "電話",
                 "placeholder": "+852 12345678"
             },
+            "piste/difficulty": {
+                "label": "難度",
+                "options": {
+                    "advanced": "進階 (黑鑽)",
+                    "easy": "容易 (綠圓圈)",
+                    "expert": "專家 (雙黑鑽)",
+                    "extreme": "極困難 (需要攀登工具)"
+                }
+            },
+            "piste/grooming": {
+                "options": {
+                    "mogul": "花式"
+                }
+            },
+            "piste/type": {
+                "label": "種類"
+            },
             "place": {
                 "label": "類"
             },
+            "population": {
+                "label": "人口"
+            },
             "power": {
                 "label": "類"
             },
             "railway": {
                 "label": "類"
             },
+            "recycling/cans": {
+                "label": "可收金屬罐"
+            },
+            "recycling/clothes": {
+                "label": "可收衣物"
+            },
+            "recycling/glass": {
+                "label": "可收玻璃"
+            },
+            "recycling/glass_bottles": {
+                "label": "可收玻璃瓶"
+            },
+            "recycling/paper": {
+                "label": "可收廢紙"
+            },
+            "recycling/plastic": {
+                "label": "可收塑膠"
+            },
+            "recycling/type": {
+                "label": "回收種類",
+                "options": {
+                    "centre": "回收中心"
+                }
+            },
             "ref": {
                 "label": "參攷"
             },
                 "label": "類"
             },
             "religion": {
-                "label": "宗敎",
-                "options": {
-                    "christian": "基督敎",
-                    "muslim": "囘敎",
-                    "buddhist": "佛敎",
-                    "jewish": "猶太敎",
-                    "hindu": "印度敎",
-                    "shinto": "神道敎",
-                    "taoist": "道敎"
-                }
+                "label": "宗敎"
             },
             "restriction": {
                 "label": "類"
             },
+            "restrictions": {
+                "label": "轉彎限制"
+            },
             "route": {
                 "label": "類"
             },
                 "label": "類"
             },
             "sac_scale": {
-                "label": "行徑難度"
+                "label": "遠足難度"
+            },
+            "seasonal": {
+                "label": "季節性"
             },
             "service": {
                 "label": "類"
             },
+            "service/bicycle/chain_tool": {
+                "options": {
+                    "no": "否",
+                    "undefined": "假設為沒有",
+                    "yes": "有"
+                }
+            },
+            "service/bicycle/pump": {
+                "label": "泵氣設備",
+                "options": {
+                    "no": "否",
+                    "undefined": "假設為沒有",
+                    "yes": "有"
+                }
+            },
+            "service_rail": {
+                "options": {
+                    "crossover": "渡線",
+                    "siding": "側線",
+                    "spur": "支線",
+                    "yard": "貨場"
+                }
+            },
             "shelter": {
-                "label": "有天遮"
+                "label": "有"
             },
             "shelter_type": {
-                "label": "類"
+                "label": "類"
             },
             "shop": {
-                "label": "類"
+                "label": "種類"
+            },
+            "smoking": {
+                "options": {
+                    "isolated": "於實質上隔開的吸煙區",
+                    "no": "任何地方都不可吸煙",
+                    "outside": "可於室外吸煙",
+                    "separated": "沒有隔開的吸煙區",
+                    "yes": "所有地方均可吸煙"
+                },
+                "placeholder": "禁止、隔開、可以"
+            },
+            "smoothness": {
+                "label": "順滑度"
             },
             "source": {
                 "label": "來源"
             "sport": {
                 "label": "運動"
             },
+            "sport_ice": {
+                "label": "運動"
+            },
+            "sport_racing": {
+                "label": "運動"
+            },
             "structure": {
                 "label": "結構",
-                "placeholder": "未知",
                 "options": {
-                    "bridge": "橋",
-                    "tunnel": "隧道",
+                    "bridge": "橋",
+                    "cutting": "開山",
                     "embankment": "基堤",
-                    "cutting": "開山"
-                }
+                    "ford": "淺灘",
+                    "tunnel": "隧道"
+                },
+                "placeholder": "未知"
+            },
+            "studio_type": {
+                "label": "種類"
+            },
+            "substation": {
+                "label": "種類"
             },
             "supervised": {
-                "label": "有人睇"
+                "label": "受監察"
             },
             "surface": {
                 "label": "表面"
             },
+            "tactile_paving": {
+                "label": "盲人引路徑"
+            },
+            "takeaway": {
+                "label": "外賣",
+                "options": {
+                    "no": "不可",
+                    "only": "只可外賣",
+                    "yes": "可以"
+                },
+                "placeholder": "可以、不可、只可外賣…"
+            },
             "toilets/disposal": {
                 "label": "棄置"
             },
             "towertype": {
                 "label": "塔類"
             },
-            "tracktype": {
-                "label": "類"
+            "traffic_signals": {
+                "label": "訊號種類"
             },
             "trail_visibility": {
-                "label": "徑明顯度"
+                "label": "路徑可見度"
             },
-            "tree_type": {
-                "label": "類"
+            "trees": {
+                "label": "樹"
+            },
+            "tunnel": {
+                "label": "隧道"
             },
             "vending": {
-                "label": "貨類"
+                "label": "貨品種類"
             },
             "water": {
                 "label": "類"
             "wheelchair": {
                 "label": "可通輪椅"
             },
+            "width": {
+                "label": "濶度(米)"
+            },
             "wikipedia": {
                 "label": "維基百科全書"
-            },
-            "wood": {
-                "label": "類"
             }
         },
         "presets": {
             "address": {
-                "name": "å\9c°å\9f\97",
+                "name": "å\9c°å\9d\80",
                 "terms": "Address,地址,地埗,址"
             },
+            "aerialway": {
+                "name": "纜車路線",
+                "terms": "吊車、纜車、索道"
+            },
             "aeroway": {
                 "name": "航空設施",
                 "terms": "Aeroway,機場,機場相關設施,機場相關道路,航空,航空設施"
                 "terms": "Car Rental,汽車租賃,汽車租賃處,租車,租車店,租車舖"
             },
             "amenity/car_sharing": {
-                "name": "共用車處",
-                "terms": "Car Sharing,å\85¬ç\94¨è»\8aè\99\95\85±ç\94¨è»\8a\85±ç\94¨è»\8aè\99\95,æ±½è»\8aå\85±äº«ç«\99"
+                "name": "汽車共享站",
+                "terms": "Car Sharing,共用車,共用車處,汽車共享站"
             },
             "amenity/car_wash": {
                 "name": "洗車舖",
                 "terms": "Car Wash,洗車,洗車店,洗車舖"
             },
-            "amenity/childcare": {
-                "name": "托兒所",
-                "terms": "Childcare,托兒所"
+            "amenity/casino": {
+                "name": "賭場",
+                "terms": "賭場"
             },
             "amenity/cinema": {
                 "name": "電影戲院",
                 "terms": "Cinema,戲院,電影,電影戲院,電影院"
             },
-            "amenity/college": {
-                "name": "學院",
-                "terms": "College,大學,大專,學院,專上學院,專校,專科學院,書院,理工"
-            },
             "amenity/courthouse": {
                 "name": "法庭",
                 "terms": "Courthouse,法庭,法院,臬署,裁判署"
             },
+            "amenity/doctor": {
+                "name": "醫生",
+                "terms": "醫生, 中醫, 西醫"
+            },
             "amenity/drinking_water": {
                 "name": "飲水處",
                 "terms": "Drinking Water,水源,活水,飲水,飲水處,飲用水"
                 "terms": "Graveyard,墓地,墳地,墳場"
             },
             "amenity/hospital": {
-                "name": "醫院",
-                "terms": "Hospital,療養院,醫學中心,醫療院,醫院"
+                "name": "醫院範圍",
+                "terms": "醫院"
             },
             "amenity/kindergarten": {
-                "name": "å¹¼ç¨\9aå\9c\92",
-                "terms": "Kindergarten,幼兒園,幼稚園,托兒所"
+                "name": "å­¸å\89\8dç\85§é¡§/å¹¼ç¨\9aå\9c\92ç¯\84å\9c\8d",
+                "terms": "幼兒園,幼稚園用地,幼稚園"
             },
             "amenity/library": {
                 "name": "圖書館",
                 "terms": "Pharmacy,葯局,葯店,葯房,葯舖,藥局,藥店,藥房,藥舖"
             },
             "amenity/place_of_worship": {
-                "name": "拜神之所",
-                "terms": "Place of Worship,Worship,宗教祟拜場所,宗教禮拜處,崇拜處,拜神之所,禮拜場所"
+                "name": "祟拜場所",
+                "terms": "Place of Worship,Worship,宗教祟拜場所,宗教禮拜處,崇拜處,拜神之所,禮拜場所,廟,教堂,寺廟,清真寺,禮拜堂"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "佛寺",
                 "name": "郊野訪客處",
                 "terms": "Ranger Station,郊野訪客處,野郊訪客處"
             },
+            "amenity/recycling": {
+                "name": "囘收桶",
+                "terms": "Recycling,囘收桶,囘收箱,回收桶,回收箱"
+            },
             "amenity/restaurant": {
                 "name": "餐廳",
                 "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
             },
             "amenity/school": {
-                "name": "學校",
-                "terms": "School,中學,國中,國小,學校,小學,校區,校園,高中"
+                "name": "學校範圍",
+                "terms": "學校,中學,小學,學校用地,學校範圍,國際學校"
             },
             "amenity/shelter": {
                 "name": "天遮或亭",
                 "name": "大會堂",
                 "terms": "Town Hall,大會堂,市政府,市政廳"
             },
-            "amenity/university": {
-                "name": "大學",
-                "terms": "University,大學,大專"
-            },
-            "amenity/vending_machine": {
-                "name": "售賣機",
-                "terms": "Vending Machine,售賣機,自勳動賣機"
+            "amenity/veterinary": {
+                "name": "獸醫",
+                "terms": "獸醫, 動物醫生"
             },
             "amenity/waste_basket": {
                 "name": "垃圾桶",
                 "terms": "Cycle Barrier,單車減速欄,單車矮欄"
             },
             "barrier/ditch": {
-                "name": "溝",
-                "terms": "Ditch,溝"
+                "name": "溝",
+                "terms": "Ditch,溝,溝渠,明溝"
             },
             "barrier/entrance": {
                 "name": "入口",
                 "terms": "Administrative Boundary,行政區域界線,行政區界,行政界,行政界線,行政邊界"
             },
             "building": {
-                "name": "å±\8bå®\87",
+                "name": "建ç¯\89ç\89©",
                 "terms": "Building,屋宇,建築物"
             },
             "building/apartments": {
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
             },
+            "building/hospital": {
+                "name": "醫院建築物",
+                "terms": "醫院, 醫院大樓"
+            },
             "building/house": {
                 "name": "屋",
                 "terms": "House,屋,房屋,洋房"
                 "name": "工業樓宇",
                 "terms": "Industrial Building,工業建築物,工業樓宇"
             },
+            "building/kindergarten": {
+                "name": "學前照顧/幼稚園建築物",
+                "terms": "幼兒園校舍,幼稚園校舍"
+            },
             "building/residential": {
                 "name": "住宅樓宇",
                 "terms": "Residential Building,住宅建築物,住宅樓宇"
             },
+            "building/school": {
+                "name": "校舍",
+                "terms": "學校建築物,小學建築物,中學建築物"
+            },
             "embankment": {
                 "name": "基堤",
                 "terms": "Embankment,基堤,堤,堤壩,堤岸"
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
-            "footway/crossing": {
-                "name": "路口",
-                "terms": "Crossing,路口"
-            },
             "footway/sidewalk": {
                 "name": "行人路",
                 "terms": "Sidewalk,行人路"
             },
+            "ford": {
+                "name": "淺灘"
+            },
+            "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,公路"
             },
             "highway/bridleway": {
-                "name": "馬",
-                "terms": "Bridle Path,馬徑,馬道"
+                "name": "馬",
+                "terms": "Bridle Path,馬徑,馬道,策騎徑"
             },
             "highway/bus_stop": {
                 "name": "巴士站",
                 "terms": "Bus Stop,公交車站,公共汽車站,巴士站"
             },
-            "highway/crossing": {
-                "name": "路口",
-                "terms": "Crossing,路口,過路處"
-            },
             "highway/cycleway": {
                 "name": "單車徑",
                 "terms": "Cycle Path,單車徑,自行車道"
                 "name": "高速公路",
                 "terms": "Motorway,高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路口",
-                "terms": "Motorway Junction,高速公路交匯處,高速公路口,高速公路連接點"
-            },
             "highway/motorway_link": {
                 "name": "高速公路駁路",
                 "terms": "Motorway Link,高速公路匝道,高速公路引道,高速公路駁路"
                 "terms": "Path,徑,路徑"
             },
             "highway/pedestrian": {
-                "name": "è¡\8c人大è¡\97",
-                "terms": "Pedestrian,行人大街,行人專用路"
+                "name": "è¡\8c人å°\88ç\94¨å\8d\80",
+                "terms": "行人區, 行人專用"
             },
             "highway/primary": {
                 "name": "大路",
                 "name": "住宅路",
                 "terms": "Residential Road,住宅區道路,住宅路"
             },
+            "highway/rest_area": {
+                "name": "公路休憩區",
+                "terms": "公路休息站, 公路休息區"
+            },
             "highway/road": {
                 "name": "未明路",
                 "terms": "Unknown Road,不明路,不知路,未明路,未知嘅路,未知種類的道路,未知種類道路"
                 "name": "泊車通道",
                 "terms": "Parking Aisle,停車場通道,泊車通道"
             },
+            "highway/services": {
+                "name": "公路服務區",
+                "terms": "公路服務區"
+            },
             "highway/steps": {
-                "name": "梯",
+                "name": "æ¨\93梯",
                 "terms": "Steps,梯,樓梯,石階,階梯"
             },
             "highway/stop": {
                 "name": "路邊神祠",
                 "terms": "Wayside Shrine,路邊神社,路邊神祠"
             },
-            "landuse": {
-                "name": "用地",
-                "terms": "Landuse,土地用途,用地"
-            },
-            "landuse/allotments": {
-                "name": "菜地",
-                "terms": "Allotments,社區花園,菜地"
-            },
             "landuse/basin": {
                 "name": "盆地",
                 "terms": "Basin,水池,盆地"
                 "terms": "Cemetery,墓地,墳場"
             },
             "landuse/commercial": {
-                "name": "商",
-                "terms": "Commercial,商地,商業區"
+                "name": "商業區",
+                "terms": "商業區"
             },
             "landuse/construction": {
                 "name": "地盤",
                 "terms": "Construction,地盤,建築工程,建築物"
             },
             "landuse/farm": {
-                "name": "農場",
-                "terms": "Farm,ç\94°,稻ç\94°,è¾²å\9c°,農場,è¾²ç\94°"
+                "name": "è¾²å\9c°",
+                "terms": "è¾²ç\94°, ç¨»ç\94°, ç\94°, è\80\95å\9c°"
             },
             "landuse/farmland": {
-                "name": "è\80\95地",
-                "terms": "Farmland,ç\94°å\9c°,è\80\95å\9c°,è¾²ç\94°"
+                "name": "è¾²地",
+                "terms": "è¾²ç\94°, ç¨»ç\94°, ç\94°, è\80\95å\9c°"
             },
             "landuse/farmyard": {
-                "name": "地堂",
-                "terms": "Farmyard,地堂,農莊"
+                "name": "農莊",
+                "terms": "Farmyard,農莊, 農場"
             },
             "landuse/forest": {
-                "name": "森",
+                "name": "森",
                 "terms": "Forest,森,森林"
             },
             "landuse/grass": {
                 "terms": "Grass,草地"
             },
             "landuse/industrial": {
-                "name": "工",
-                "terms": "Industrial,工地,工業區"
+                "name": "工業區",
+                "terms": "工業區, 工業村, 工業邨"
             },
             "landuse/meadow": {
                 "name": "牧地",
                 "terms": "Meadow,牧地,牧場"
             },
+            "landuse/military": {
+                "name": "軍事區",
+                "terms": "軍營"
+            },
             "landuse/orchard": {
                 "name": "菓園",
                 "terms": "Orchard,果園,菓園"
                 "terms": "Quarry,石塘,石礦場,礦場"
             },
             "landuse/residential": {
-                "name": "住",
-                "terms": "Residential,住,住宅區"
+                "name": "住宅區",
+                "terms": "住宅用地, 住宅地"
             },
             "landuse/retail": {
-                "name": "零售",
-                "terms": "Retail,零售"
+                "name": "零售",
+                "terms": "零售區域, 販賣區, 銷售區"
             },
             "landuse/vineyard": {
                 "name": "葡萄園",
                 "name": "消閒",
                 "terms": "Leisure,休閑場所,休閒設施,消閒"
             },
+            "leisure/bowling_alley": {
+                "name": "保齡球場",
+                "terms": "保齡球場"
+            },
             "leisure/common": {
                 "name": "公地",
                 "terms": "Common,公共用地,公地"
                 "terms": "Marina,碼頭,遊艇碼頭"
             },
             "leisure/park": {
-                "name": "園",
+                "name": "å\85¬å\9c\92",
                 "terms": "Park,公園,園"
             },
             "leisure/pitch": {
                 "terms": "Slipway,船排,船架滑道,船臺"
             },
             "leisure/sports_center": {
-                "name": "體育",
-                "terms": "Sports Center,體育,體育中心,體育館"
+                "name": "體育中心 / 健身室",
+                "terms": "體育中心, 健身室, 健身中心, 健身房"
             },
             "leisure/stadium": {
                 "name": "大體育館",
                 "name": "游水池",
                 "terms": "Swimming Pool,游水池,游泳池,遊泳池"
             },
-            "leisure/track": {
-                "name": "賽車跑道",
-                "terms": "Race Track,賽車跑道"
-            },
             "line": {
                 "name": "綫",
                 "terms": "Line,綫,線"
                 "name": "人造",
                 "terms": "Man Made,人造,人造構築,人造物"
             },
+            "man_made/adit": {
+                "name": "礦坑口",
+                "terms": "礦坑口, 礦洞口"
+            },
             "man_made/breakwater": {
                 "name": "防波堤",
                 "terms": "Breakwater,防波堤"
                 "name": "燈塔",
                 "terms": "Lighthouse,燈塔"
             },
+            "man_made/mast": {
+                "name": "無線電杆",
+                "terms": "無線電杆, 天線杆"
+            },
             "man_made/observation": {
                 "name": "瞭望臺",
                 "terms": "Observation Tower,瞭望塔,瞭望臺"
             },
+            "man_made/petroleum_well": {
+                "name": "油井",
+                "terms": "油井"
+            },
             "man_made/pier": {
                 "name": "埗頭",
                 "terms": "Pier,埗頭,碼頭"
                 "name": "水管",
                 "terms": "Pipeline,水管,管道"
             },
+            "man_made/silo": {
+                "name": "筒倉",
+                "terms": "筒倉, 直立式儲存倉"
+            },
+            "man_made/storage_tank": {
+                "name": "貯存箱",
+                "terms": "貯存缸, 儲存缸, 貯油缸, 貯水箱, 儲油缸, 儲水箱"
+            },
             "man_made/survey_point": {
                 "name": "測量點",
                 "terms": "Survey Point,測量點"
             },
             "man_made/wastewater_plant": {
                 "name": "廢水廠",
-                "terms": "Wastewater Plant,廢水廠,æ±\99æ°´è\99\95ç\90\86å» ,污水è\99\95ç\90\86å» "
+                "terms": "Wastewater Plant,廢水廠,污水處理廠"
             },
             "man_made/water_tower": {
                 "name": "水塔",
                 "terms": "Water Tower,水塔"
             },
             "man_made/water_well": {
-                "name": "井",
-                "terms": "Water well,井,水井"
+                "name": "井",
+                "terms": "水井, 井"
             },
             "man_made/water_works": {
                 "name": "供水廠",
                 "name": "地堡",
                 "terms": "Bunker,地堡,暗堡"
             },
+            "military/checkpoint": {
+                "name": "檢查站",
+                "terms": "檢查站, 檢查點"
+            },
+            "military/danger_area": {
+                "name": "危險區",
+                "terms": "危險地區, 危險區域, 危險範圍"
+            },
+            "military/naval_base": {
+                "name": "海軍基地",
+                "terms": "海軍基地"
+            },
+            "military/obstacle_course": {
+                "name": "越障訓練場",
+                "terms": "越障訓練場"
+            },
             "military/range": {
                 "name": "操炮區",
                 "terms": "Military Range,操炮區,軍事範圍"
             },
+            "military/training_area": {
+                "name": "訓練場地",
+                "terms": "訓練場, 練習場地, 練習場"
+            },
             "natural": {
                 "name": "天然",
                 "terms": "Natural,天然,自然,自然物件"
                 "name": "灘",
                 "terms": "Beach,沙灘,海灘,灘"
             },
+            "natural/cave_entrance": {
+                "name": "洞穴入口",
+                "terms": "洞穴入口"
+            },
             "natural/cliff": {
                 "name": "崖",
                 "terms": "Cliff,崖,懸崖"
                 "name": "峯",
                 "terms": "Peak,山峰,山頂,峯"
             },
+            "natural/saddle": {
+                "name": "山鞍",
+                "terms": "山鞍"
+            },
             "natural/scree": {
                 "name": "碎石坡",
                 "terms": "Scree,碎石坡"
                 "name": "樹",
                 "terms": "Tree,木,樹"
             },
+            "natural/tree_row": {
+                "name": "樹排",
+                "terms": "樹行"
+            },
+            "natural/volcano": {
+                "name": "火山",
+                "terms": "火山"
+            },
             "natural/water": {
                 "name": "水",
                 "terms": "Water,水"
                 "name": "旅行社",
                 "terms": "Travel Agency,旅行社"
             },
+            "piste": {
+                "name": "滑雪道",
+                "terms": "滑雪道"
+            },
             "place": {
                 "name": "地",
                 "terms": "Place,地,地方,地點"
                 "name": "城",
                 "terms": "City,城,城市"
             },
+            "place/farm": {
+                "name": "農場",
+                "terms": "農場, 農田, 農莊"
+            },
             "place/hamlet": {
                 "name": "村仔",
                 "terms": "Hamlet,村仔,村莊"
                 "name": "地方",
                 "terms": "Locality,地方,地點,地點(無人定居)"
             },
+            "place/neighbourhood": {
+                "name": "近鄰",
+                "terms": "近鄰"
+            },
+            "place/suburb": {
+                "name": "自治鎮",
+                "terms": "自治鎮, 自治市鎮"
+            },
             "place/town": {
                 "name": "鎮",
                 "terms": "Town,城鎮,市鎮,鎮"
                 "terms": "Power Generator,發電機"
             },
             "power/line": {
-                "name": "供電綫",
+                "name": "電纜",
                 "terms": "Power Line,供電綫,供電線,電線"
             },
             "power/minor_line": {
-                "name": "細供電綫",
+                "name": "次要電纜",
                 "terms": "Minor Power Line,小供電線,細供電綫"
             },
             "power/pole": {
                 "name": "配電站",
                 "terms": "Substation,變電站,配電站"
             },
+            "power/substation": {
+                "name": "變壓站",
+                "terms": "變壓站, 配電站, 電力分站"
+            },
             "power/tower": {
                 "name": "高壓電塔",
                 "terms": "High-Voltage Tower,高壓輸電塔,高壓電塔"
                 "terms": "Transformer,火牛房,變電所"
             },
             "public_transport/platform": {
-                "name": "站頭",
-                "terms": "Platform,平臺,站頭"
+                "name": "月台",
+                "terms": "Platform,月台,月臺"
             },
             "public_transport/stop_position": {
-                "name": "街中站",
-                "terms": "Stop Position,停止位置,街中站"
+                "name": "停車位置",
+                "terms": "Stop Position,停止位置"
             },
             "railway": {
                 "name": "鐵路",
                 "terms": "Railway,鐵路"
             },
             "railway/abandoned": {
-                "name": "廢鐵路",
+                "name": "廢鐵路",
                 "terms": "Abandoned Railway,廢棄的鐵路,廢鐵路,鐵路路線跡"
             },
             "railway/disused": {
                 "name": "停用鐵路",
                 "terms": "Disused Railway,停用鐵路,廢棄的鐵路"
             },
+            "railway/funicular": {
+                "name": "纜索鐵道",
+                "terms": "纜索鐵道, 索道, 纜車"
+            },
             "railway/halt": {
                 "name": "火車細站",
                 "terms": "Railway Halt,小火車站,火車站仔,火車細站"
             },
             "railway/level_crossing": {
-                "name": "平交道口",
-                "terms": "Level Crossing,平交道,平交道口"
+                "name": "鐵路交滙處",
+                "terms": "鐵路平交道, 鐵道平交道, 平交道, 交滙處, 交匯處"
             },
             "railway/monorail": {
                 "name": "單軌",
                 "terms": "Monorail,單軌,單軌鐵路,單軌電車"
             },
+            "railway/narrow_gauge": {
+                "name": "窄軌鐵路",
+                "terms": "窄軌鐵路, 窄軌鐵道"
+            },
             "railway/platform": {
                 "name": "月臺",
                 "terms": "Railway Platform,月臺,站臺,鐵道月台"
                 "terms": "Railway Station,火車站,鐵路站"
             },
             "railway/subway": {
-                "name": "地下鐵",
-                "terms": "MTR,Mass Transit Railway,Subway,地下鐵,地下鐵路,地鐵"
+                "name": "地下鐵",
+                "terms": "MTR,Mass Transit Railway,Subway,地下鐵,地下鐵路,地鐵,捷運"
             },
             "railway/subway_entrance": {
-                "name": "地下鐵路入口",
-                "terms": "Subway Entrance,地下鐵路入口,地鐵入口,地鐵口"
+                "name": "地入口",
+                "terms": "Subway Entrance,地下鐵路入口,地鐵入口,地鐵口,捷運入口"
             },
             "railway/tram": {
                 "name": "電車",
                 "name": "關係",
                 "terms": "Relation,關係,關系"
             },
+            "roundabout": {
+                "name": "廻旋處",
+                "terms": "廻旋處, 圓環"
+            },
             "route/ferry": {
                 "name": "航綫",
                 "terms": "Ferry Route,渡輪航線,航綫,航線"
                 "name": "酒莊",
                 "terms": "Liquor Store,酒店,酒莊,酒類商店"
             },
+            "shop/anime": {
+                "name": "動漫店",
+                "terms": "動漫店"
+            },
+            "shop/antiques": {
+                "name": "古董店",
+                "terms": "古董店, 古玩店"
+            },
+            "shop/art": {
+                "name": "畫廊",
+                "terms": "畫廊"
+            },
+            "shop/baby_goods": {
+                "name": "嬰兒用品店",
+                "terms": "嬰兒用品店, BB用品店"
+            },
+            "shop/bag": {
+                "name": "袋/行李店",
+                "terms": "行李店, 袋店"
+            },
             "shop/bakery": {
                 "name": "麪飽舖同餅家",
                 "terms": "Bakery,餅家,餅店,餅舖,麪包舖,麪飽店,麪飽舖,麵包店,麵包舖,麵飽店"
                 "name": "美容院",
                 "terms": "Beauty Shop,指甲美容,理容院,美妝店,美容店,美容院,護膚中心"
             },
+            "shop/bed": {
+                "name": "寢具/床褥店",
+                "terms": "寢具店, 床褥店, 床墊店, 床具店, 寢室用品店, 床上用品店, 睡房用品店"
+            },
             "shop/beverages": {
                 "name": "飲品舖",
                 "terms": "Beverage Store,飲品店,飲品舖"
                 "terms": "Bicycle Shop,單車店,單車舖,自行車店"
             },
             "shop/books": {
-                "name": "æ\9b¸å±\80",
-                "terms": "Bookstore,書局,書店"
+                "name": "æ\9b¸åº\97",
+                "terms": "書局"
             },
             "shop/boutique": {
                 "name": "時裝店",
                 "name": "肉舖",
                 "terms": "Butcher,肉舖,肉販,肉鋪"
             },
+            "shop/candles": {
+                "name": "蠟燭店",
+                "terms": "蠟燭店"
+            },
             "shop/car": {
                 "name": "車行",
                 "terms": "Car Dealership,車行"
                 "name": "車房",
                 "terms": "Car Repair Shop,汽車修理店,汽車維修店,車房"
             },
+            "shop/carpet": {
+                "name": "地毯店",
+                "terms": "地氈店"
+            },
+            "shop/cheese": {
+                "name": "芝士店",
+                "terms": "芝士店, 起司店"
+            },
             "shop/chemist": {
                 "name": "註冊藥房",
                 "terms": "Chemist,藥房,藥行,註冊藥房"
             },
+            "shop/chocolate": {
+                "name": "朱古力店",
+                "terms": "巧克力店"
+            },
             "shop/clothes": {
                 "name": "衫舖",
                 "terms": "Clothing Store,服裝店,服飾店,衫舖"
                 "terms": "Computer Store,電腦店,電腦舖"
             },
             "shop/confectionery": {
-                "name": "糖菓舖",
-                "terms": "Confectionery,甜點店,糖菓舖"
+                "name": "糖果店",
+                "terms": "糖店"
             },
             "shop/convenience": {
                 "name": "便利店",
                 "terms": "Convenience Store,便利店"
             },
+            "shop/copyshop": {
+                "name": "影印店",
+                "terms": "影印店"
+            },
+            "shop/cosmetics": {
+                "name": "化妝品店",
+                "terms": "化妝品店"
+            },
             "shop/deli": {
                 "name": "食肆",
                 "terms": "Deli,熟食店,美食店,食肆"
                 "name": "自組舖",
                 "terms": "DIY Store,DIY商店,自組舖"
             },
-            "shop/dry_cleaning": {
-                "name": "乾洗",
-                "terms": "Dry Cleaners,乾洗,乾洗店"
-            },
             "shop/electronics": {
                 "name": "電子舖",
                 "terms": "Electronics Store,電器店,電子舖"
                 "name": "音響舖",
                 "terms": "Hifi Store,音響店,音響舖"
             },
+            "shop/interior_decoration": {
+                "name": "室內設計店",
+                "terms": "室內設計店"
+            },
             "shop/jewelry": {
                 "name": "珠寶金行",
                 "terms": "Jeweler,珠寶店,珠寶舖,珠寶金行,首飾店,首飾舖"
             },
-            "shop/kiosk": {
-                "name": "小賣部、報紙檔、煙仔檔等",
-                "terms": "Kiosk,售貨亭,售賣亭,報刊亭,報攤,小賣部,書報攤"
-            },
             "shop/laundry": {
                 "name": "洗衣舖",
                 "terms": "Laundry,洗衣店,洗衣舖"
                 "terms": "Locksmith,鎖匠,鎖匠鋪,開鎖佬"
             },
             "shop/mall": {
-                "name": "大商場",
-                "terms": "Mall,商場,大商場"
+                "name": "購物中心",
+                "terms": "Mall,商場,購物中心"
             },
             "shop/mobile_phone": {
                 "name": "電話舖",
                 "name": "唱片舖",
                 "terms": "Music Store,唱片舖,音樂店"
             },
-            "shop/newsagent": {
-                "name": "報紙檔(有舖)",
-                "terms": "Newsagent,報攤,報紙檔,書報攤"
+            "shop/musical_instrument": {
+                "name": "樂器店",
+                "terms": "樂器行,樂器店"
             },
             "shop/optician": {
                 "name": "眼鏡鋪",
                 "terms": "Optician,眼鏡店,眼鏡行,眼鏡鋪"
             },
-            "shop/outdoor": {
-                "name": "行山舖",
-                "terms": "Outdoor Store,戶外用品店,行山舖"
-            },
             "shop/pet": {
                 "name": "寵物舖",
                 "terms": "Pet Store,寵物店,寵物舖"
                 "terms": "Dam,堤壩,壩,水壩"
             },
             "waterway/ditch": {
-                "name": "溝",
-                "terms": "Ditch,渠,æº\9d,æº\9d渠"
+                "name": "溝",
+                "terms": "Ditch,æº\9d,æº\9d渠,æ\98\8eæº\9d"
             },
             "waterway/drain": {
                 "name": "排水道",
-                "terms": "Drain,ä¸\8bæ°´é\81\93\8e\92æ°´é\81\93,渠,æº\9d"
+                "terms": "Drain,ä¸\8bæ°´é\81\93\8e\92æ°´é\81\93,渠,æ\8e\92水渠,æ\8e\92水管,污水渠"
             },
             "waterway/river": {
                 "name": "江",
                 "terms": "Riverbank,江岸,河堤,河床,河牀"
             },
             "waterway/stream": {
-                "name": "æ\8c",
-                "terms": "Stream,小河,小溪,涌,溪,溪流"
+                "name": "溪æµ\81",
+                "terms": "Stream,小河,小溪,涌,溪,溪流, 河溪,溪澗"
             },
             "waterway/weir": {
                 "name": "堰",