Remove require_terms_agreed configuration option

[rails.git] / 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 5d91abdbf60759096368aec3a07dc8495bdc8050..8fbd2d677aaa2d3c160bfdd1a4aa6b86f889e07b 100644 (file)
--- a/vendor/assets/iD/iD/locales/yue.json
+++ b/vendor/assets/iD/iD/locales/yue.json
@@ -1,5 +1,10 @@
 {
     "yue": {
 {
     "yue": {

+        "icons": {
+            "information": "知",
+            "remove": "徐",
+            "undo": "返事"
+        },

         "modes": {
             "add_area": {
                 "title": "範圍",
         "modes": {
             "add_area": {
                 "title": "範圍",


@@ -101,18 +106,26 @@
             },
             "delete": {
                 "title": "刪",
             },
             "delete": {
                 "title": "刪",

-                "description": "物體刪走無回頭。",
+                "description": {
+                    "single": "刪走此地貌，從此消失。",
+                    "multiple": "刪走此等地貌，從此消失。"
+                },

                 "annotation": {
                     "point": "刪咗處。",
                     "vertex": "道度刪咗節。",
                     "line": "刪咗綫。",
                     "area": "刪咗範圍。",
                     "relation": "刪咗關聯。",
                 "annotation": {
                     "point": "刪咗處。",
                     "vertex": "道度刪咗節。",
                     "line": "刪咗綫。",
                     "area": "刪咗範圍。",
                     "relation": "刪咗關聯。",

-                    "multiple": "刪咗物體{n}個。"
+                    "multiple": "刪走 {n} 地貌。"

                 },
                 },

-                "incomplete_relation": "此地貌無得刪走，皆因佢未傳晒落來。",
-                "part_of_relation": "呢個地貌無得刪，佢喺大關聯之中。你要撤去關聯先。",
-                "connected_to_hidden": "無得刪走，佢連咗去隠藏地貌。"
+                "too_large": {
+                    "single": "此地貌不得刪走，皆因依家見到部份唔夠數。",
+                    "multiple": "此等地貌不得刪走，皆因依家見到部份唔夠數。"
+                },
+                "incomplete_relation": {
+                    "single": "此地貌不得刪走，皆因佢未傳晒落來。",
+                    "multiple": "此等地貌不得刪走，皆因佢哋未傳晒落來。"
+                }

             },
             "add_member": {
                 "annotation": "加咗成員入關聯。"
             },
             "add_member": {
                 "annotation": "加咗成員入關聯。"


@@ -120,14 +133,6 @@
             "delete_member": {
                 "annotation": "拎走咗關聯成員。"
             },
             "delete_member": {
                 "annotation": "拎走咗關聯成員。"
             },

-            "connect": {
-                "annotation": {
-                    "point": "駁咗道去嗰處。",
-                    "vertex": "駁咗道去其他。",
-                    "line": "駁咗道去綫。",
-                    "area": "駁咗道去範圍。"
-                }
-            },

             "disconnect": {
                 "title": "掹開",
                 "description": "此綫或者範圍等，全部掹開。",
             "disconnect": {
                 "title": "掹開",
                 "description": "此綫或者範圍等，全部掹開。",


@@ -143,36 +148,36 @@
                 "key": "C",
                 "annotation": "拼咗地貌 {n} 個",
                 "not_eligible": "爾啲地貌，無得併埋。",
                 "key": "C",
                 "annotation": "拼咗地貌 {n} 個",
                 "not_eligible": "爾啲地貌，無得併埋。",

-                "not_adjacent": "地貌無得拼，佢哋根本無聯埋。",
-                "restriction": "地貌無得拼，佢哋至少一個，屬於 {relation} 關聯。",

                 "incomplete_relation": "地貌無得拼，佢哋至少一個未傳晒落來。",
                 "conflicting_tags": "地貌無得拼，佢哋籤中內有矛盾。"
             },
             "move": {
                 "title": "搬",
                 "incomplete_relation": "地貌無得拼，佢哋至少一個未傳晒落來。",
                 "conflicting_tags": "地貌無得拼，佢哋籤中內有矛盾。"
             },
             "move": {
                 "title": "搬",

-                "description": "搬爾個去另第度。",

                 "key": "M",
                 "annotation": {
                     "point": "搬一點",
                     "vertex": "道度搬咗節。",
                     "line": "搬咗條綫。",
                 "key": "M",
                 "annotation": {
                     "point": "搬一點",
                     "vertex": "道度搬咗節。",
                     "line": "搬咗條綫。",

-                    "area": "搬咗範圍。",
-                    "multiple": "搬物體幾個。"
+                    "area": "搬咗範圍。"

                 },
                 },

-                "incomplete_relation": "此地貌無得搬，皆因佢未傳晒落來。",
-                "too_large": "無得郁，睇到嘅部份唔夠做。",
-                "connected_to_hidden": "無得郁，佢連咗去隠藏地貌。"
+                "incomplete_relation": {
+                    "single": "此地貌冇得搬，皆因佢未傳晒落來。",
+                    "multiple": "此等地貌冇得搬，皆因佢哋未傳晒落來。"
+                }
+            },
+            "reflect": {
+                "key": {
+                    "long": "T",
+                    "short": "Y"
+                }

             },
             "rotate": {
                 "title": "擰轉",
             },
             "rotate": {
                 "title": "擰轉",

-                "description": "圍住中心點，擰轉爾個物體。",

                 "key": "R",
                 "annotation": {
                     "line": "條綫擰轉咗。",
                     "area": "範圍擰轉咗。"
                 "key": "R",
                 "annotation": {
                     "line": "條綫擰轉咗。",
                     "area": "範圍擰轉咗。"

-                },
-                "too_large": "無得轉，睇到嘅部份唔夠做。",
-                "connected_to_hidden": "無得轉，佢連咗去隠藏地貌。"
+                }

             },
             "reverse": {
                 "title": "倒向。",
             },
             "reverse": {
                 "title": "倒向。",


@@ -198,12 +203,6 @@
                 "connected_to_hidden": "無得分，佢連咗去隠藏地貌。"
             },
             "restriction": {
                 "connected_to_hidden": "無得分，佢連咗去隠藏地貌。"
             },
             "restriction": {

-                "help": {
-                    "select": "撳一下揀段車道",
-                    "toggle": "撳一下限制車道轉向",
-                    "toggle_on": "撳一下加條則，限制車道轉向 {restriction}",
-                    "toggle_off": "撳一下減條則，限制車道轉向 {restriction}"
-                },

                 "annotation": {
                     "create": "加咗一則，限制車道轉向",
                     "delete": "減咗一則，限制車道轉向"
                 "annotation": {
                     "create": "加咗一則，限制車道轉向",
                     "delete": "減咗一則，限制車道轉向"


@@ -222,12 +221,10 @@
         "browser_notice": "只能在 Firefox、Chrome、Safari、Opera，以及Internet Explorer 至少版本十一。更新瀏覽器，又或者用 Potlatch 2 修改地圖。",
         "translate": {
             "translate": "繙",
         "browser_notice": "只能在 Firefox、Chrome、Safari、Opera，以及Internet Explorer 至少版本十一。更新瀏覽器，又或者用 Potlatch 2 修改地圖。",
         "translate": {
             "translate": "繙",

-            "localized_translation_label": "話名",

             "localized_translation_language": "揀話",
             "localized_translation_name": "名"
         },
             "localized_translation_language": "揀話",
             "localized_translation_name": "名"
         },

-        "zoom_in_edit": "放大去改",
-        "logout": "簽走",
+        "zoom_in_edit": "放大去修改",

         "loading_auth": "駁上去公家街圖⋯⋯",
         "report_a_bug": "報錯",
         "help_translate": "幫手繙",
         "loading_auth": "駁上去公家街圖⋯⋯",
         "report_a_bug": "報錯",
         "help_translate": "幫手繙",


@@ -241,39 +238,37 @@
             "readonly": "程式接口，只讀不寫。你要等下先記到你修改。"
         },
         "commit": {
             "readonly": "程式接口，只讀不寫。你要等下先記到你修改。"
         },
         "commit": {

-            "title": "記低修改",
-            "description_placeholder": "簡述你做過啲乜（必填）",
-            "message_label": "變更留言",
+            "title": "傳上去公家街圖",

             "upload_explanation": "你嘅修改，傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",
             "upload_explanation_with_user": "你以{user}名義，修改傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",
             "upload_explanation": "你嘅修改，傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",
             "upload_explanation_with_user": "你以{user}名義，修改傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",

-            "save": "記",
+            "request_review": "想有人翻睇我修改。",
+            "save": "傳上",

             "cancel": "唔記",
             "changes": "變更 {count} 個",
             "cancel": "唔記",
             "changes": "變更 {count} 個",

+            "download_changes": "公家街圖修改嘅檔案，傳落來",

             "warnings": "警告",
             "modified": "改咗",
             "deleted": "刪咗",
             "created": "開咗",
             "about_changeset_comments": "相關變更留言",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
             "warnings": "警告",
             "modified": "改咗",
             "deleted": "刪咗",
             "created": "開咗",
             "about_changeset_comments": "相關變更留言",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",

-            "google_warning": "留言提及谷歌（Google）：留意，不得抄谷哥地圖（Google Maps）。",
-            "google_warning_link": "http://www.openstreetmap.org/copyright"
+            "google_warning": "留言提及谷歌（Google）：留意，不得抄谷哥地圖（Google Maps）。"

         },
         "contributors": {
             "list": "有{users}修改",
             "truncated_list": "有{users}同另外{count}人修改"
         },
         },
         "contributors": {
             "list": "有{users}修改",
             "truncated_list": "有{users}同另外{count}人修改"
         },

-        "infobox": {
-            "selected": "揀咗 {n} 個",
-            "geometry": "幾何形狀",
-            "closed": "封咗",
-            "center": "中心",
-            "perimeter": "周界",
-            "length": "長",
-            "area": "範圍",
-            "centroid": "重心",
-            "location": "地點",
-            "metric": "十進制",
-            "imperial": "英制"
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "zoom": "放大縮細"
+            },
+            "history": {
+                "last_edit": "最近修改",
+                "edited_by": "修改人為",
+                "changeset": "變更"
+            }

         },
         "geometry": {
             "point": "點",
         },
         "geometry": {
             "point": "點",


@@ -308,7 +303,6 @@
             "back_tooltip": "轉地貌",
             "remove": "移走",
             "search": "搵",
             "back_tooltip": "轉地貌",
             "remove": "移走",
             "search": "搵",

-            "multiselect": "揀咗嘅項目",

             "unknown": "未知",
             "incomplete": "<無傳落來>",
             "feature_list": "搵地貌",
             "unknown": "未知",
             "incomplete": "<無傳落來>",
             "feature_list": "搵地貌",


@@ -328,20 +322,16 @@
         "background": {
             "title": "背景",
             "description": "背景設定",
         "background": {
             "title": "背景",
             "description": "背景設定",

-            "percent_brightness": "{opacity}% 光",

             "none": "無",
             "best_imagery": "此地至出名相源",
             "switch": "轉返去爾個背景",
             "custom": "自訂",
             "none": "無",
             "best_imagery": "此地至出名相源",
             "switch": "轉返去爾個背景",
             "custom": "自訂",

-            "custom_button": "改自訂背景",
-            "fix_misalignment": "校正背圖對位誤差",
-            "imagery_source_faq": "相邊度來？",

             "reset": "重設",
             "reset": "重設",

-            "offset": "下面灰帶內，拖到任何位，去校正背圖對位誤差，又或者，以米為單位，入返啲差額。",

             "minimap": {
             "minimap": {

-                "description": "細地圖",

                 "tooltip": "開個縮圖，幫手搵返家下睇到嘅範圍。"
                 "tooltip": "開個縮圖，幫手搵返家下睇到嘅範圍。"

-            }
+            },
+            "fix_misalignment": "校正背圖對位誤差",
+            "offset": "下面灰帶內，拖到任何位，去校正背圖對位誤差，又或者，以米為單位，入返啲差額。"

         },
         "map_data": {
             "title": "地圖資料",
         },
         "map_data": {
             "title": "地圖資料",


@@ -417,18 +407,16 @@
         },
         "restore": {
             "heading": "你有修改未記妥",
         },
         "restore": {
             "heading": "你有修改未記妥",

-            "description": "要唔要囘復上次未記妥之修改？",
-            "restore": "囘復",
-            "reset": "重新開始"
+            "description": "要唔要囘復上次未記妥之修改？"

         },
         "save": {
             "title": "記低",
         },
         "save": {
             "title": "記低",

-            "help": "修改放上公家街圖，等其他用者都睇到。",
+            "help": "重閱所變更，傳上公家街圖，等其他用者睇到。",

             "no_changes": "無修改可記",
             "error": "記低途中有錯。",
             "status_code": "服務電腦回覆狀況代號 {code}",
             "unknown_error_details": "請確保你上到互聯網",
             "no_changes": "無修改可記",
             "error": "記低途中有錯。",
             "status_code": "服務電腦回覆狀況代號 {code}",
             "unknown_error_details": "請確保你上到互聯網",

-            "uploading": "修改傳上公家街圖。",
+            "uploading": "傳緊改動上公家街圖",

             "unsaved_changes": "你有修改未記妥",
             "conflict": {
                 "header": "調解相衝修改",
             "unsaved_changes": "你有修改未記妥",
             "conflict": {
                 "header": "調解相衝修改",


@@ -439,33 +427,32 @@
                 "keep_remote": "用佢",
                 "restore": "囘復",
                 "delete": "由佢唔要",
                 "keep_remote": "用佢",
                 "restore": "囘復",
                 "delete": "由佢唔要",

-                "download_changes": "或者下載你改嘅。",
-                "done": "衝突通通解決！",
-                "help": "你改咗嘅地貌，咁啱另一用戶改咗。\n撳下以嘅嘢，睇下衝突明細，睇下跟自己改，\n定跟人哋改。\n"
+                "download_changes": "或者，公家街圖修改嘅檔案，傳落來",
+                "done": "衝突通通解決！"

             }
         },
         "merge_remote_changes": {
             "conflict": {
             }
         },
         "merge_remote_changes": {
             "conflict": {

-                "deleted": "{user} 刪走此項。",
-                "location": "{user} 同你搬過此項。",

                 "nodelist": "{user} 同你改過此項。",
                 "memberlist": "{user} 同你改過關聯細項。",
                 "tags": "你改<b>{tag}</b>做「{local}」，而 {user} 改佢做「{remote}」。"
             }
         },
         "success": {
                 "nodelist": "{user} 同你改過此項。",
                 "memberlist": "{user} 同你改過關聯細項。",
                 "tags": "你改<b>{tag}</b>做「{local}」，而 {user} 改佢做「{remote}」。"
             }
         },
         "success": {

-            "edited_osm": "改掂公家街圖！",

             "just_edited": "你啱啱改咗公家街圖！",
             "just_edited": "你啱啱改咗公家街圖！",

-            "view_on_osm": "入公家街圖睇",
-            "facebook": "放上Facebook",
-            "twitter": "放上Twitter",
-            "google": "放上Google+",
-            "help_html": "你改過嘅，幾分鐘就會見到喺「普通」層。其他層，咁啲地貌，就會耐啲。",
+            "thank_you": "謝君修善輿圖。",
+            "thank_you_location": "謝君修善 {where} 之輿圖。",
+            "help_html": "君所修所改，幾分鐘就會上公家街圖。其他輿圖，或者遲啲收到。",

             "help_link_text": "明細",
             "help_link_text": "明細",

-            "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
+            "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F",
+            "view_on_osm": "公家街圖處，睇返修改",
+            "changeset_id": "修改編號： {changeset_id}",
+            "like_osm": "中意公家街圖？出面睇下傾下：",
+            "missing": "有嘢無列明出來？",
+            "tell_us": "話過我知！"

         },
         "confirm": {
         },
         "confirm": {

-            "okay": "得",
+            "okay": "知",

             "cancel": "唔做"
         },
         "splash": {
             "cancel": "唔做"
         },
         "splash": {


@@ -485,14 +472,14 @@
             "used_with": "同{type}一齊用"
         },
         "validations": {
             "used_with": "同{type}一齊用"
         },
         "validations": {

+            "disconnected_highway": "道無駁通",

             "untagged_point": "未有籤嘅點",
             "untagged_point": "未有籤嘅點",

-            "untagged_line": "冇籤嘅綫",
-            "untagged_area": "冇籤嘅範圍",
-            "many_deletions": "你要刪走物件{n}個。你真係想咁做？咁人人用開嘅公家街圖入便，都會刪走埋。",
-            "tag_suggests_area": "{tag}籤話條綫係範圍，實情佢唔係。",

             "untagged_point_tooltip": "揀種地貌，兼且寫呢處係乜來。",
             "untagged_point_tooltip": "揀種地貌，兼且寫呢處係乜來。",

+            "untagged_line": "冇籤嘅綫",

             "untagged_line_tooltip": "揀種地貌，兼且寫呢綫係乜來。",
             "untagged_line_tooltip": "揀種地貌，兼且寫呢綫係乜來。",

+            "untagged_area": "冇籤嘅範圍",

             "untagged_area_tooltip": "揀種地貌，兼且寫呢範圍係乜來。",
             "untagged_area_tooltip": "揀種地貌，兼且寫呢範圍係乜來。",

+            "tag_suggests_area": "{tag}籤話條綫係範圍，實情佢唔係。",

             "deprecated_tags": "廢籤：{tags}"
         },
         "zoom": {
             "deprecated_tags": "廢籤：{tags}"
         },
         "zoom": {


@@ -501,12 +488,6 @@
         },
         "cannot_zoom": "今下模式，無得再縮。",
         "full_screen": "來回全螢幕",
         },
         "cannot_zoom": "今下模式，無得再縮。",
         "full_screen": "來回全螢幕",

-        "gpx": {
-            "local_layer": "本地 GPX 檔案",
-            "drag_drop": "拉個 .gpx檔案入來爾版。或者，撳右邊粒掣揀檔案。",
-            "zoom": "校到GPX路徑大細",
-            "browse": "望下有乜 .gpx 檔案"
-        },

         "mapillary_images": {
             "tooltip": "拎輿兵嘅街相",
             "title": "疊相（輿兵）"
         "mapillary_images": {
             "tooltip": "拎輿兵嘅街相",
             "title": "疊相（輿兵）"


@@ -520,102 +501,98 @@
         },
         "help": {
             "title": "指南",
         },
         "help": {
             "title": "指南",

-            "help": "# 指南\n\n爾個編器，係爲 [公家街圖](http://www.openstreetmap.org/)而做。 有世界地圖，任用亦改得。你可以用佢，喺你處加嘢改嘢。如此一來，裏面嘅料，人人可以公開任用，人人得益。\n\n邊個用公家街圖，都見得到你整嘅地圖。要改得到，就要開定個\n[簽入戶口](https://www.openstreetmap.org/login).\n\n[iD editor](http://ideditor.com/) 係合作而成， [程式碼放喺 GitHub](https://github.com/openstreetmap/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\n###用製圖程式\n要睇捷鍵，可以睇[爾度]((http://wiki.openstreetmap.org/wiki/ID/Shortcuts))。\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/mobile-mapping/)。\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欄下面，你會見到啲細公仔，係用來加其他明細，好似連去維基百科資料、行唔行到輪輢等等。\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"
+            "editing": {
+                "upload_h": "傳上",
+                "upload": "傳上修改之前，要入\n [changeset comment]\n（https://wiki.openstreetmap.org/wiki/Good_changeset_comments）。按下**傳上**，送去公家街圖。在此併入輿圖，人人公開見到。"
+            },
+            "imagery": {
+                "sources_h": "圖來歷"
+            }

         },
         "intro": {
             "done": "搞掂",
             "graph": {
         },
         "intro": {
             "done": "搞掂",
             "graph": {

-                "city_hall": "三江大會堂",
-                "fire_department": "三江消防局",
-                "memory_isle_park": "念洲園",
-                "riverwalk_trail": "江徑",
-                "w_michigan_ave": "海西道",
-                "e_michigan_ave": "海東道",
-                "spring_st": "春街",
-                "scidmore_park": "野居園",
-                "petting_zoo": "野居園寵物園",
-                "n_andrews_st": "漢北街",
-                "s_andrews_st": "漢南街",
-                "n_constantine_st": "恆北街",
-                "s_constantine_st": "恆南街",
-                "rocky_river": "石江",
-                "railroad_dr": "火車道",
-                "conrail_rr": "合鐵道",
-                "st_joseph_river": "增聖道",
-                "n_main_st": "北大街",
-                "s_main_st": "南大街",
-                "water_st": "水街",
-                "foster_st": "司林街",
-                "portage_river": "負江",
-                "flower_st": "華街",
-                "elm_st": "榆街",
-                "walnut_st": "核桃街",
-                "morris_ave": "黎道",
-                "east_st": "東街",
-                "portage_ave": "負道"
+                "block_number": "<value for addr:block_number>",
+                "county": "<value for addr:county>",
+                "district": "<value for addr:district>",
+                "hamlet": "<value for addr:hamlet>",
+                "neighbourhood": "<value for addr:neighbourhood>",
+                "province": "<value for addr:province>",
+                "quarter": "<value for addr:quarter>",
+                "state": "<value for addr:state>",
+                "subdistrict": "<value for addr:subdistrict>",
+                "suburb": "<value for addr:suburb>",
+                "countrycode": "cn",
+                "name": {
+                    "spring-street": "泉街"
+                }
+            },
+            "welcome": {
+                "title": "歡迎",
+                "welcome": "歡迎！此行教君改公家街圖之基本。",
+                "practice": "此行君只不過練習，改乜都唔會記低。",
+                "words": "此行會介紹新字新義。有新字時，會見字斜。",
+                "mouse": "君可用任意輸入裝置來改圖，之不過，此行當君有滑鼠，鼠上有左右掣。**君要駁滑鼠，當下就做，撳知掣。**",
+                "leftclick": "此處指導問君撳一下，連撳一下，就指用左掣。觸控皮嘅話，可以係撳一下，或者單指點一下。**左撳  {num} 次。**",
+                "rightclick": "有時會叫你右撳。如此等同控制鍵加一撳，或者觸控板上二指點一下。君之鍵盤或者有選單鍵，如同加撳。**右撳 {num} 次。**",
+                "chapters": "做得唔錯！君可以按下面嘅掣，隨時跳過幾課，或者遇難時，重新一課。開始喇！**撳 '{next}' 繼續。**"

             },
             "navigation": {
                 "title": "周圍望",
             },
             "navigation": {
                 "title": "周圍望",

-                "drag": "大地圖度，公家街圖資料，放喺背景之上。你想周圍望，就拖住，推上落，推左右，就好似普通網上地圖咁。**拖住地圖**",
-                "select": "圖上地貌，有三種方法表示，處、綫同範圍。所有地貌，都以一撳就揀。**撳處去揀。**",
-                "pane": "一揀地貌，地貌器就出。頂頭話我哋知乜嘢地貌，主要顯示地貌屬性，如名同地址。**閂地貌器，就撳右上{button}個掣。**",
-                "search": "喺家陣畫面，或全世界，你亦搵得地貌。**搵'{name}'**",
-                "choose": "**由一覽度揀 {name}。**",
-                "chosen": "正！家陣揀咗 {name} 。**撳{button} 掣，收埋地貌編輯。**"
+                "drag": "此主圖，下有底圖，上有公家街圖資料。{br}君可拖張圖，撳定滑鼠左掣，滑鼠移來移去。用鍵盤箭嘴鍵一樣得。**拖張圖！**",
+                "zoom": "君可放大縮細。用滑鼠面個轆，或者觸控板卷動，或者撳圖上 {plus} ／ {minus} 掣。**放大縮細張圖！**",
+                "features": "*地貌*指圖上見到之物。現實世界何物，均可化成公家街圖中之地貌。",
+                "points_lines_areas": "圖中地貌，都以*處、綫或範圍*代表。",
+                "nodes_ways": "公家街圖中，處亦叫*節點*，綫及範圍亦叫*道*。",
+                "click_townhall": "圖上所有地貌，撳一下就㨂到。**撳一點就揀佢。**",
+                "selected_townhall": "做得好！處就揀咗喇。揀咗地貌佢會發光，時弱時強。",
+                "editor_townhall": "地貌㨂咗，*改地貌*亦會圖邊出現。",
+                "preset_townhall": "頂上有地貌分類。此處為 {preset}。",
+                "fields_townhall": "中間帶*欄*，地貌有何種性質，如名如地址。",
+                "close_townhall": "**要收返佢，鍵盤撳脫出掣，或者上面個 {button} 掣。**",
+                "search_street": "無論此面或全部，都可以搵地貌。**搵 '{name}' 。**",
+                "selected_street": "掂喎！ {name} 現下㨂咗喇。",
+                "editor_street": "街所有之欄，同大會堂有唔同。{br}依條街會有欄位 '{field1}' 同 '{field2}'。**收起編輯，鍵盤撳脫出掣，或上面 {button} 掣。**",
+                "play": "移下張圖，撳下其他地貌。睇下有乜可以加入公家街圖。**君攪掂時，去下一課，撳 '{next}' 。**"

             },
             "points": {
             },
             "points": {

-                "title": "處",
-                "add": "處，用來指示地貌，如舖、餐廳、紀念碑。佢哋畫低某個位置，用來講下當地係乜。**撳 {button}  處個掣，開新一處。**",
-                "place": "地圖度，撳一下擺低一處。**撳下地圖，擺新嗰處去屋頂。**",
-                "search": "處可以用來指示種種地貌。你加爾處就係茶座。**搵【{name}】**",
-                "choose": "**由一覽度揀茶座。**",
-                "describe": "爾處畫成茶座。用地貌編器，我哋可以加名啲料上地貌。**加個名**",
-                "close": "地貌編寫會自動自覺，記低你改過乜。你一改地貌，閂掣會轉成清查記號。**要閂地貌編寫，撳{button}掣**",
-                "reselect": "有時處在。之不過整錯，又或者未完。我哋可改已有之處。**撳一下，揀你啱啱整嗰處。**",
-                "fixname": "**改名，兼撳 {button} 掣閂地貌編寫**",
-                "reselect_delete": "地圖度，乜地貌都刪得。**撳你嗰開嗰處去揀佢。**",
-                "delete": "個選單，會圍住嗰處。嗰處有唔同嘢做，當中有刪。**撳落 {button} 掣，刪嗰處。**"
+                "title": "處"

             },
             "areas": {
             },
             "areas": {

-                "title": "範圍",
-                "add": "範圍，地貌邊界，如湖、屋宇、住宅區。又原本地貌一處，範圍勾畫加之詳細。**撳住 {button} 範圍掣，開新範圍。**",
-                "corner": "要畫範圍，就用節來勾出邊界，包住範圍。**撳一下遊樂場一角，開一節。**",
-                "place": "畫範圍，就要擺多啲節。要完成範圍，就欽返頭嗰節。**畫個範圍畀遊樂場。**",
-                "search": "**搵【{name}】。**",
-                "choose": "**由一覽度揀遊樂場。**",
-                "describe": "**加名兼撳 {button} 掣閂埋地貌編寫**"
+                "title": "範圍"

             },
             "lines": {
             },
             "lines": {

-                "title": "綫",
-                "add": "綫，用來地示地貌，如道、鐵道、江河等。\"\"撳 {button} 綫掣會加條新綫。**",
-                "start": "**開一條綫，就撳路一端。**",
-                "intersect": "撳一下，條綫加多節。必要時，一邊畫一邊用滑鼠拖地圖，道，同埋其他種種綫。都係大綫網之中。特別留意依啲綫，有相連特性，用來畀帶街程式用。**撳落個 {名} 開新交點，駁埋兩條綫。**",
-                "finish": "畫綫到尾，只要再撳最尾一節一次。**畫完條路。**",
-                "road": "**由一覽度揀路。**",
-                "residential": "種種道路，最常見係住宅路。**揀住宅路**",
-                "describe": "**同車道起名，跟手撳  {button} 掣閂埋地貌製圖程式。**",
-                "restart": "車道要同 {name} 相交。",
-                "wrong_preset": "你未有指名住宅路。**撳爾度去揀多次**"
+                "title": "綫"
+            },
+            "buildings": {
+                "title": "屋宇"

             },
             "startediting": {
                 "title": "開始改",
             },
             "startediting": {
                 "title": "開始改",

-                "help": "逐步解釋，可以由頭來過。又或者，睇多啲文件，撳下 {button} 幫助掣。",
+                "shortcuts": "撳下「{key}」掣，你可睇下連串命令，同埋佢嘅鍵盤快掣。",

                 "save": "記得定時記低修改！",
                 "start": "開始制圖"
             }
         },
                 "save": "記得定時記低修改！",
                 "start": "開始制圖"
             }
         },

+        "shortcuts": {
+            "title": "鍵盤快掣",
+            "tooltip": "螢幕上睇到鍵盤快掣",
+            "browsing": {
+                "navigation": {
+                    "zoom": "放大／縮細"
+                },
+                "help": {
+                    "keyboard": "睇鍵盤快掣"
+                }
+            },
+            "tools": {
+                "title": "架生"
+            }
+        },

         "presets": {
             "categories": {
                 "category-barrier": {
         "presets": {
             "categories": {
                 "category-barrier": {

-                    "name": "阻擋地貌"
+                    "name": "屏障地貌"

                 },
                 "category-building": {
                     "name": "屋宇地貌"
                 },
                 "category-building": {
                     "name": "屋宇地貌"


@@ -626,6 +603,15 @@
                 "category-landuse": {
                     "name": "用地地貌"
                 },
                 "category-landuse": {
                     "name": "用地地貌"
                 },

+                "category-natural-area": {
+                    "name": "天然地貌"
+                },
+                "category-natural-line": {
+                    "name": "天然地貌"
+                },
+                "category-natural-point": {
+                    "name": "天然地貌"
+                },

                 "category-path": {
                     "name": "徑地貌"
                 },
                 "category-path": {
                     "name": "徑地貌"
                 },


@@ -653,31 +639,24 @@
                     "label": "准過",
                     "options": {
                         "designated": {
                     "label": "准過",
                     "options": {
                         "designated": {

-                            "description": "通行與否，按法例或路牌指定",

                             "title": "指名"
                         },
                         "destination": {
                             "title": "指名"
                         },
                         "destination": {

-                            "description": "限往目的地",

                             "title": "目的地"
                         },
                         "dismount": {
                             "title": "目的地"
                         },
                         "dismount": {

-                            "description": "過得，要落車推。",

                             "title": "落車推"
                         },
                         "no": {
                             "title": "落車推"
                         },
                         "no": {

-                            "description": "公眾不通",

                             "title": "禁入"
                         },
                         "permissive": {
                             "title": "禁入"
                         },
                         "permissive": {

-                            "description": "可通，直至地主唔畀。",

                             "title": "任過"
                         },
                         "private": {
                             "title": "任過"
                         },
                         "private": {

-                            "description": "要地主批准",

                             "title": "私家"
                         },
                         "yes": {
                             "title": "私家"
                         },
                         "yes": {

-                            "description": "按法例可通，有權過路。",

                             "title": "准許"
                         }
                     },
                             "title": "准許"
                         }
                     },


@@ -693,23 +672,29 @@
                 "access_simple": {
                     "label": "過得"
                 },
                 "access_simple": {
                     "label": "過得"
                 },

-                "access_toilets": {
-                    "label": "通"
-                },

                 "address": {
                     "label": "地埗",
                     "placeholders": {
                 "address": {
                     "label": "地埗",
                     "placeholders": {

+                        "block_number": "座數",
+                        "block_number!jp": "座數",

                         "city": "城",
                         "city": "城",

+                        "city!jp": "城／鎮／村／東京都區部",
+                        "city!vn": "城／鎮",

                         "conscriptionnumber": "一百二十三號",
                         "country": "國",
                         "conscriptionnumber": "一百二十三號",
                         "country": "國",

+                        "county": "郡縣",
+                        "county!jp": "區",

                         "district": "區",
                         "district": "區",

+                        "district!vn": "法國之縣／鎮／區",

                         "floor": "樓數",
                         "hamlet": "村仔",
                         "housename": "屋名",
                         "housenumber": "一百二十三號",
                         "floor": "樓數",
                         "hamlet": "村仔",
                         "housename": "屋名",
                         "housenumber": "一百二十三號",

+                        "housenumber!jp": "屋號／地號",

                         "place": "地",
                         "postcode": "郵政編號",
                         "province": "省",
                         "place": "地",
                         "postcode": "郵政編號",
                         "province": "省",

+                        "province!jp": "縣",

                         "state": "州",
                         "street": "街",
                         "subdistrict": "分區",
                         "state": "州",
                         "street": "街",
                         "subdistrict": "分區",


@@ -780,6 +765,19 @@
                 "barrier": {
                     "label": "類"
                 },
                 "barrier": {
                     "label": "類"
                 },

+                "bath/open_air": {
+                    "label": "露天"
+                },
+                "bath/sand_bath": {
+                    "label": "沙浴"
+                },
+                "bath/type": {
+                    "options": {
+                        "foot_bath": "浸腳",
+                        "hot_spring": "溫泉",
+                        "onsen": "日本溫泉"
+                    }
+                },

                 "bench": {
                     "label": "長凳"
                 },
                 "bench": {
                     "label": "長凳"
                 },


@@ -798,59 +796,61 @@
                         "whole": "全血"
                     }
                 },
                         "whole": "全血"
                     }
                 },

+                "board_type": {
+                    "label": "類"
+                },
+                "boules": {
+                    "label": "類"
+                },

                 "boundary": {
                     "label": "類"
                 },
                 "brand": {
                     "label": "牌"
                 },
                 "boundary": {
                     "label": "類"
                 },
                 "brand": {
                     "label": "牌"
                 },

+                "brewery": {
+                    "label": "生啤"
+                },
+                "bridge": {
+                    "label": "類"
+                },

                 "building": {
                     "label": "屋宇"
                 },
                 "building_area": {
                     "label": "屋宇"
                 },
                 "building": {
                     "label": "屋宇"
                 },
                 "building_area": {
                     "label": "屋宇"
                 },

+                "bunker_type": {
+                    "label": "類"
+                },
+                "cables": {
+                    "placeholder": "1, 2, 3..."
+                },
+                "camera/direction": {
+                    "placeholder": "45, 90, 180, 270"
+                },

                 "capacity": {
                     "label": "容納",
                     "placeholder": "50, 100, 200..."
                 },
                 "capacity": {
                     "label": "容納",
                     "placeholder": "50, 100, 200..."
                 },

-                "cardinal_direction": {
-                    "label": "方向",
-                    "options": {
-                        "E": "東",
-                        "ENE": "東北偏東",
-                        "ESE": "東南偏東",
-                        "N": "北",
-                        "NE": "東北",
-                        "NNE": "東北偏北",
-                        "NNW": "西北偏北",
-                        "NW": "西北",
-                        "S": "南",
-                        "SE": "東南",
-                        "SSE": "東南偏南",
-                        "SSW": "西南偏南",
-                        "SW": "西南",
-                        "W": "西",
-                        "WNW": "西北偏西",
-                        "WSW": "西南偏西"
-                    }
+                "castle_type": {
+                    "label": "類"

                 },
                 },

-                "clock_direction": {
-                    "label": "方向",
-                    "options": {
-                        "anticlockwise": "逆時針",
-                        "clockwise": "順時針"
-                    }
+                "clothes": {
+                    "label": "衣"
+                },
+                "club": {
+                    "label": "類"

                 },
                 "collection_times": {
                     "label": "收集時間"
                 },
                 },
                 "collection_times": {
                     "label": "收集時間"
                 },

+                "comment": {
+                    "label": "變更之留言"
+                },

                 "construction": {
                     "label": "類"
                 },
                 "construction": {
                     "label": "類"
                 },

-                "content": {
-                    "label": "內容"
-                },

                 "country": {
                     "label": "國"
                 },
                 "country": {
                     "label": "國"
                 },


@@ -861,17 +861,17 @@
                     "label": "類"
                 },
                 "crop": {
                     "label": "類"
                 },
                 "crop": {

-                    "label": "剪裁"
+                    "label": "作物"

                 },
                 "crossing": {
                     "label": "類"
                 },
                 },
                 "crossing": {
                     "label": "類"
                 },

-                "cuisine": {
-                    "label": "菜系"
-                },

                 "currency_multi": {
                     "label": "錢類"
                 },
                 "currency_multi": {
                     "label": "錢類"
                 },

+                "cutting": {
+                    "label": "類"
+                },

                 "cycle_network": {
                     "label": "網絡"
                 },
                 "cycle_network": {
                     "label": "網絡"
                 },


@@ -903,7 +903,7 @@
                             "title": "共用單車道"
                         },
                         "track": {
                             "title": "共用單車道"
                         },
                         "track": {

-                            "description": "單車道與交通有阻隔",
+                            "description": "單車道與交通有屏障",

                             "title": "單連分徑"
                         }
                     },
                             "title": "單連分徑"
                         }
                     },


@@ -928,9 +928,46 @@
                 "description": {
                     "label": "描述"
                 },
                 "description": {
                     "label": "描述"
                 },

+                "devices": {
+                    "placeholder": "1, 2, 3..."
+                },

                 "diaper": {
                     "label": "換得尿片"
                 },
                 "diaper": {
                     "label": "換得尿片"
                 },

+                "direction": {
+                    "placeholder": "45, 90, 180, 270"
+                },
+                "direction_cardinal": {
+                    "label": "方向",
+                    "options": {
+                        "E": "東",
+                        "ENE": "東北偏東",
+                        "ESE": "東南偏東",
+                        "N": "北",
+                        "NE": "東北",
+                        "NNE": "東北偏北",
+                        "NNW": "西北偏北",
+                        "NW": "西北",
+                        "S": "南",
+                        "SE": "東南",
+                        "SSE": "東南偏南",
+                        "SSW": "西南偏南",
+                        "SW": "西南",
+                        "W": "西",
+                        "WNW": "西北偏西",
+                        "WSW": "西北偏西"
+                    }
+                },
+                "direction_clock": {
+                    "label": "方向",
+                    "options": {
+                        "anticlockwise": "逆時針",
+                        "clockwise": "順時針"
+                    }
+                },
+                "direction_vertex": {
+                    "label": "方向"
+                },

                 "display": {
                     "label": "顯示"
                 },
                 "display": {
                     "label": "顯示"
                 },


@@ -953,6 +990,13 @@
                 "elevation": {
                     "label": "海拔"
                 },
                 "elevation": {
                     "label": "海拔"
                 },

+                "email": {
+                    "label": "電郵",
+                    "placeholder": "example@example.com"
+                },
+                "embankment": {
+                    "label": "類"
+                },

                 "emergency": {
                     "label": "急症室"
                 },
                 "emergency": {
                     "label": "急症室"
                 },


@@ -969,11 +1013,12 @@
                 "fee": {
                     "label": "費用"
                 },
                 "fee": {
                     "label": "費用"
                 },

+                "fence_type": {
+                    "label": "類"
+                },

                 "fire_hydrant/type": {
                 "fire_hydrant/type": {

-                    "label": "類",

                     "options": {
                         "pillar": "柱／地上",
                     "options": {
                         "pillar": "柱／地上",

-                        "pond": "塘",

                         "underground": "地底",
                         "wall": "牆"
                     }
                         "underground": "地底",
                         "wall": "牆"
                     }


@@ -981,6 +1026,9 @@
                 "fixme": {
                     "label": "整好我"
                 },
                 "fixme": {
                     "label": "整好我"
                 },

+                "ford": {
+                    "label": "類"
+                },

                 "fuel": {
                     "label": "燃料"
                 },
                 "fuel": {
                     "label": "燃料"
                 },


@@ -1008,9 +1056,8 @@
                 "generator/type": {
                     "label": "類"
                 },
                 "generator/type": {
                     "label": "類"
                 },

-                "golf_hole": {
-                    "label": "參攷",
-                    "placeholder": "洞數（一到十八）"
+                "government": {
+                    "label": "類"

                 },
                 "handicap": {
                     "label": "差點",
                 },
                 "handicap": {
                     "label": "差點",


@@ -1019,6 +1066,12 @@
                 "handrail": {
                     "label": "扶手"
                 },
                 "handrail": {
                     "label": "扶手"
                 },

+                "healthcare": {
+                    "label": "類"
+                },
+                "height": {
+                    "label": "高（米）"
+                },

                 "highway": {
                     "label": "類"
                 },
                 "highway": {
                     "label": "類"
                 },


@@ -1048,6 +1101,9 @@
                 "indoor": {
                     "label": "戶內"
                 },
                 "indoor": {
                     "label": "戶內"
                 },

+                "industrial": {
+                    "label": "類"
+                },

                 "information": {
                     "label": "類"
                 },
                 "information": {
                     "label": "類"
                 },


@@ -1064,9 +1120,6 @@
                 "internet_access/fee": {
                     "label": "上網費"
                 },
                 "internet_access/fee": {
                     "label": "上網費"
                 },

-                "kerb": {
-                    "label": "下斜路緣"
-                },

                 "lamp_type": {
                     "label": "類"
                 },
                 "lamp_type": {
                     "label": "類"
                 },


@@ -1138,13 +1191,25 @@
                 "man_made": {
                     "label": "類"
                 },
                 "man_made": {
                     "label": "類"
                 },

+                "manhole": {
+                    "label": "類"
+                },
+                "map_type": {
+                    "label": "類"
+                },

                 "maxspeed": {
                     "label": "限速",
                     "placeholder": "40, 50, 60..."
                 },
                 "maxspeed": {
                     "label": "限速",
                     "placeholder": "40, 50, 60..."
                 },

+                "maxspeed/advisory": {
+                    "placeholder": "40, 50, 60..."
+                },

                 "maxstay": {
                     "label": "留得時間"
                 },
                 "maxstay": {
                     "label": "留得時間"
                 },

+                "memorial": {
+                    "label": "類"
+                },

                 "mtb/scale": {
                     "label": "越野單車徑難度",
                     "options": {
                 "mtb/scale": {
                     "label": "越野單車徑難度",
                     "options": {


@@ -1256,13 +1321,6 @@
                     "label": "標準桿",
                     "placeholder": "3, 4, 5..."
                 },
                     "label": "標準桿",
                     "placeholder": "3, 4, 5..."
                 },

-                "parallel_direction": {
-                    "label": "方向",
-                    "options": {
-                        "backward": "向後",
-                        "forward": "向前"
-                    }
-                },

                 "park_ride": {
                     "label": "泊車轉乖"
                 },
                 "park_ride": {
                     "label": "泊車轉乖"
                 },


@@ -1287,15 +1345,6 @@
                 },
                 "piste/difficulty": {
                     "label": "難度",
                 },
                 "piste/difficulty": {
                     "label": "難度",

-                    "options": {
-                        "advanced": "進階（黑鑽）",
-                        "easy": "易（綠圈）",
-                        "expert": "專家（雙黑鑽）",
-                        "extreme": "極難（要攀山架生）",
-                        "freeride": "自由滑行（場地外）",
-                        "intermediate": "中階（藍方）",
-                        "novice": "新手（教學）"
-                    },

                     "placeholder": "易、中階、 進階⋯⋯"
                 },
                 "piste/grooming": {
                     "placeholder": "易、中階、 進階⋯⋯"
                 },
                 "piste/grooming": {


@@ -1341,8 +1390,8 @@
                 "recycling_accepts": {
                     "label": "收得"
                 },
                 "recycling_accepts": {
                     "label": "收得"
                 },

-                "ref": {
-                    "label": "參攷"
+                "ref_road_number": {
+                    "label": "道號"

                 },
                 "relation": {
                     "label": "類"
                 },
                 "relation": {
                     "label": "類"


@@ -1442,21 +1491,11 @@
                     },
                     "placeholder": "轆仔、有轆、越野⋯⋯"
                 },
                     },
                     "placeholder": "轆仔、有轆、越野⋯⋯"
                 },

-                "social_facility_for": {
-                    "label": "接待",
-                    "placeholder": "無家、傷殘、細蚊等等"
+                "social_facility": {
+                    "label": "類"

                 },
                 "source": {
                 },
                 "source": {

-                    "label": "來源"
-                },
-                "sport": {
-                    "label": "運動"
-                },
-                "sport_ice": {
-                    "label": "運動"
-                },
-                "sport_racing": {
-                    "label": "運動"
+                    "label": "來歷"

                 },
                 "stars": {
                     "label": "星級"
                 },
                 "stars": {
                     "label": "星級"


@@ -1465,7 +1504,7 @@
                     "label": "停車指示",
                     "options": {
                         "all": "所有方向",
                     "label": "停車指示",
                     "options": {
                         "all": "所有方向",

-                        "minor": "小車路"
+                        "minor": "車道仔"

                     }
                 },
                 "structure": {
                     }
                 },
                 "structure": {


@@ -1494,6 +1533,9 @@
                 "surface": {
                     "label": "表面"
                 },
                 "surface": {
                     "label": "表面"
                 },

+                "switch": {
+                    "label": "類"
+                },

                 "tactile_paving": {
                     "label": "盲人引路徑"
                 },
                 "tactile_paving": {
                     "label": "盲人引路徑"
                 },


@@ -1515,9 +1557,15 @@
                         "pitlatrine": "廁坑／旱廁"
                     }
                 },
                         "pitlatrine": "廁坑／旱廁"
                     }
                 },

+                "tomb": {
+                    "label": "類"
+                },

                 "tourism": {
                     "label": "類"
                 },
                 "tourism": {
                     "label": "類"
                 },

+                "tower/type": {
+                    "label": "類"
+                },

                 "tracktype": {
                     "label": "道類",
                     "options": {
                 "tracktype": {
                     "label": "道類",
                     "options": {


@@ -1529,6 +1577,12 @@
                     },
                     "placeholder": "實、多數實、軟⋯⋯"
                 },
                     },
                     "placeholder": "實、多數實、軟⋯⋯"
                 },

+                "trade": {
+                    "label": "類"
+                },
+                "traffic_calming": {
+                    "label": "類"
+                },

                 "traffic_signals": {
                     "label": "類"
                 },
                 "traffic_signals": {
                     "label": "類"
                 },


@@ -1544,14 +1598,19 @@
                     },
                     "placeholder": "極好、好、差⋯⋯"
                 },
                     },
                     "placeholder": "極好、好、差⋯⋯"
                 },

+                "transformer": {
+                    "label": "類"
+                },

                 "trees": {
                     "label": "樹"
                 },
                 "tunnel": {
                 "trees": {
                     "label": "樹"
                 },
                 "tunnel": {

-                    "label": "é\9a§é\81\93"
+                    "label": "é¡\9e"

                 },
                 },

-                "vending": {
-                    "label": "貨類"
+                "usage_rail": {
+                    "options": {
+                        "military": "軍"
+                    }

                 },
                 "visibility": {
                     "label": "顯隱",
                 },
                 "visibility": {
                     "label": "顯隱",


@@ -1561,6 +1620,9 @@
                         "street": "五到二十米（十六到六十五呎）"
                     }
                 },
                         "street": "五到二十米（十六到六十五呎）"
                     }
                 },

+                "wall": {
+                    "label": "類"
+                },

                 "water": {
                     "label": "類"
                 },
                 "water": {
                     "label": "類"
                 },


@@ -1585,6 +1647,9 @@
                 },
                 "wikipedia": {
                     "label": "維基百科全書"
                 },
                 "wikipedia": {
                     "label": "維基百科全書"

+                },
+                "windings": {
+                    "placeholder": "1, 2, 3..."

                 }
             },
             "presets": {
                 }
             },
             "presets": {


@@ -1630,10 +1695,6 @@
                     "name": "停機坪",
                     "terms": "Apron,停機坪"
                 },
                     "name": "停機坪",
                     "terms": "Apron,停機坪"
                 },

-                "aeroway/gate": {
-                    "name": "機場閘口",
-                    "terms": "Airport gate,機場閘口,登機閘口,落機閘口,閘口"
-                },

                 "aeroway/hangar": {
                     "name": "飛機庫",
                     "terms": "Hangar,機庫,飛機庫"
                 "aeroway/hangar": {
                     "name": "飛機庫",
                     "terms": "Hangar,機庫,飛機庫"


@@ -1650,10 +1711,6 @@
                     "name": "滑行道",
                     "terms": "Taxiway,滑行道"
                 },
                     "name": "滑行道",
                     "terms": "Taxiway,滑行道"
                 },

-                "aeroway/terminal": {
-                    "name": "飛機場大樓",
-                    "terms": "Airport terminal,機場大堂,機場大樓,機場客運大樓,機場航站樓,飛機場大樓"
-                },

                 "amenity": {
                     "name": "便利設施"
                 },
                 "amenity": {
                     "name": "便利設施"
                 },


@@ -1749,6 +1806,9 @@
                     "name": "墳地",
                     "terms": "Graveyard,墓地,墳地,墳場"
                 },
                     "name": "墳地",
                     "terms": "Graveyard,墓地,墳地,墳場"
                 },

+                "amenity/hospital": {
+                    "name": "醫院地"
+                },

                 "amenity/library": {
                     "name": "圖書館",
                     "terms": "Library,圖書館,拉記"
                 "amenity/library": {
                     "name": "圖書館",
                     "terms": "Library,圖書館,拉記"


@@ -1757,14 +1817,6 @@
                     "name": "街市",
                     "terms": "Marketplace,市場,菜市場,街市"
                 },
                     "name": "街市",
                     "terms": "Marketplace,市場,菜市場,街市"
                 },

-                "amenity/parking": {
-                    "name": "停車場",
-                    "terms": "Car Parking,停車場"
-                },
-                "amenity/pharmacy": {
-                    "name": "藥房",
-                    "terms": "Pharmacy,葯局,葯店,葯房,葯舖,藥局,藥店,藥房,藥舖"
-                },

                 "amenity/place_of_worship": {
                     "name": "拜神之所",
                     "terms": "Place of Worship,Worship,宗教祟拜場所,宗教禮拜處,崇拜處,拜神之所,禮拜場所"
                 "amenity/place_of_worship": {
                     "name": "拜神之所",
                     "terms": "Place of Worship,Worship,宗教祟拜場所,宗教禮拜處,崇拜處,拜神之所,禮拜場所"


@@ -1773,18 +1825,6 @@
                     "name": "佛寺",
                     "terms": "Buddhist Temple,佛堂,佛寺,佛廟,和尚寺,寶殿,寺,寺廟,尼姑庵,尼庵,庵堂,廟,精舍,閣,靜院"
                 },
                     "name": "佛寺",
                     "terms": "Buddhist Temple,佛堂,佛寺,佛廟,和尚寺,寶殿,寺,寺廟,尼姑庵,尼庵,庵堂,廟,精舍,閣,靜院"
                 },

-                "amenity/place_of_worship/christian": {
-                    "name": "敎堂",
-                    "terms": "Christian,Church,基督敎堂,基督教堂,天主堂,天主敎堂,天主教堂,敎堂,教堂,聖堂"
-                },
-                "amenity/place_of_worship/jewish": {
-                    "name": "猶太廟",
-                    "terms": "Synagogue,jewish,猶太寺,猶太廟,猶太教堂"
-                },
-                "amenity/place_of_worship/muslim": {
-                    "name": "囘敎寺",
-                    "terms": "Mosque,Muslim,囘敎寺,囘教寺,回敎寺,回教寺,清真寺"
-                },

                 "amenity/police": {
                     "name": "差館",
                     "terms": "Police,差館,派出所,警察局,警局,警署"
                 "amenity/police": {
                     "name": "差館",
                     "terms": "Police,差館,派出所,警察局,警局,警署"


@@ -1805,10 +1845,6 @@
                     "name": "郊野訪客處",
                     "terms": "Ranger Station,郊野訪客處,野郊訪客處"
                 },
                     "name": "郊野訪客處",
                     "terms": "Ranger Station,郊野訪客處,野郊訪客處"
                 },

-                "amenity/recycling": {
-                    "name": "囘收桶",
-                    "terms": "Recycling,囘收桶,囘收箱,回收桶,回收箱"
-                },

                 "amenity/restaurant": {
                     "name": "餐廳",
                     "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
                 "amenity/restaurant": {
                     "name": "餐廳",
                     "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"


@@ -1848,8 +1884,11 @@
                     "name": "範圍",
                     "terms": "Area,區域,範圍"
                 },
                     "name": "範圍",
                     "terms": "Area,區域,範圍"
                 },

+                "area/highway": {
+                    "name": "道面"
+                },

                 "barrier": {
                 "barrier": {

-                    "name": "阻擋",
+                    "name": "屏障",

                     "terms": "Barrier,屏障,阻擋,障礙,障礙物"
                 },
                 "barrier/block": {
                     "terms": "Barrier,屏障,阻擋,障礙,障礙物"
                 },
                 "barrier/block": {


@@ -1872,6 +1911,9 @@
                     "name": "單車減速欄",
                     "terms": "Cycle Barrier,單車減速欄,單車矮欄"
                 },
                     "name": "單車減速欄",
                     "terms": "Cycle Barrier,單車減速欄,單車矮欄"
                 },

+                "barrier/ditch": {
+                    "name": "坑"
+                },

                 "barrier/entrance": {
                     "name": "入口"
                 },
                 "barrier/entrance": {
                     "name": "入口"
                 },


@@ -1919,10 +1961,6 @@
                     "name": "屋宇",
                     "terms": "Building,屋宇,建築物"
                 },
                     "name": "屋宇",
                     "terms": "Building,屋宇,建築物"
                 },

-                "building/apartments": {
-                    "name": "公寓",
-                    "terms": "Apartments,公寓,分層屋宇"
-                },

                 "building/commercial": {
                     "name": "商業樓宇",
                     "terms": "Commercial Building,商業建築物,商業樓宇"
                 "building/commercial": {
                     "name": "商業樓宇",
                     "terms": "Commercial Building,商業建築物,商業樓宇"


@@ -1947,6 +1985,9 @@
                     "name": "住宅樓宇",
                     "terms": "Residential Building,住宅建築物,住宅樓宇"
                 },
                     "name": "住宅樓宇",
                     "terms": "Residential Building,住宅建築物,住宅樓宇"
                 },

+                "building/retail": {
+                    "name": "舖屋宇"
+                },

                 "craft/watchmaker": {
                     "name": "鐘錶匠",
                     "terms": "Watchmaker,鐘錶匠"
                 "craft/watchmaker": {
                     "name": "鐘錶匠",
                     "terms": "Watchmaker,鐘錶匠"


@@ -1956,8 +1997,7 @@
                     "terms": "Window Construction,造窗"
                 },
                 "embankment": {
                     "terms": "Window Construction,造窗"
                 },
                 "embankment": {

-                    "name": "基堤",
-                    "terms": "Embankment,基堤,堤,堤壩,堤岸"
+                    "name": "基堤"

                 },
                 "emergency/ambulance_station": {
                     "name": "救護站",
                 },
                 "emergency/ambulance_station": {
                     "name": "救護站",


@@ -1971,10 +2011,6 @@
                     "name": "求助電話",
                     "terms": "Emergency Phone,求助電話,緊急電話"
                 },
                     "name": "求助電話",
                     "terms": "Emergency Phone,求助電話,緊急電話"
                 },

-                "footway/sidewalk": {
-                    "name": "行人路",
-                    "terms": "Sidewalk,行人路"
-                },

                 "golf/bunker": {
                     "name": "沙坑",
                     "terms": "Sand Trap,沙坑"
                 "golf/bunker": {
                     "name": "沙坑",
                     "terms": "Sand Trap,沙坑"


@@ -2006,10 +2042,6 @@
                     "name": "馬徑",
                     "terms": "Bridle Path,馬徑,馬道"
                 },
                     "name": "馬徑",
                     "terms": "Bridle Path,馬徑,馬道"
                 },

-                "highway/bus_stop": {
-                    "name": "巴士站",
-                    "terms": "Bus Stop,公交車站,公共汽車站,巴士站"
-                },

                 "highway/cycleway": {
                     "name": "單車徑",
                     "terms": "Cycle Path,單車徑,自行車道"
                 "highway/cycleway": {
                     "name": "單車徑",
                     "terms": "Cycle Path,單車徑,自行車道"


@@ -2038,8 +2070,14 @@
                     "name": "徑",
                     "terms": "Path,徑,路徑"
                 },
                     "name": "徑",
                     "terms": "Path,徑,路徑"
                 },

+                "highway/pedestrian_area": {
+                    "name": "行人地"
+                },
+                "highway/pedestrian_line": {
+                    "name": "行人街"
+                },

                 "highway/primary": {
                 "highway/primary": {

-                    "name": "大路",
+                    "name": "大道",

                     "terms": "Primary Road,主要道路,大路"
                 },
                 "highway/primary_link": {
                     "terms": "Primary Road,主要道路,大路"
                 },
                 "highway/primary_link": {


@@ -2047,15 +2085,15 @@
                     "terms": "Primary Link,主要道路匝道,主要道路連接路,大路駁路"
                 },
                 "highway/residential": {
                     "terms": "Primary Link,主要道路匝道,主要道路連接路,大路駁路"
                 },
                 "highway/residential": {

-                    "name": "住宅路",
+                    "name": "住宅道",

                     "terms": "Residential Road,住宅區道路,住宅路"
                 },
                 "highway/road": {
                     "terms": "Residential Road,住宅區道路,住宅路"
                 },
                 "highway/road": {

-                    "name": "未明路",
+                    "name": "未明道",

                     "terms": "Unknown Road,不明路,不知路,未明路,未知嘅路,未知種類的道路,未知種類道路"
                 },
                 "highway/secondary": {
                     "terms": "Unknown Road,不明路,不知路,未明路,未知嘅路,未知種類的道路,未知種類道路"
                 },
                 "highway/secondary": {

-                    "name": "中路",
+                    "name": "中道",

                     "terms": "Secondary Road,中路,次要道路"
                 },
                 "highway/secondary_link": {
                     "terms": "Secondary Road,中路,次要道路"
                 },
                 "highway/secondary_link": {


@@ -2063,7 +2101,7 @@
                     "terms": "Secondary Link,中路駁路,次級道路連接路,次要道路匝道"
                 },
                 "highway/service": {
                     "terms": "Secondary Link,中路駁路,次級道路連接路,次要道路匝道"
                 },
                 "highway/service": {

-                    "name": "支路",
+                    "name": "支道",

                     "terms": "Service Road,支路,輔助道路"
                 },
                 "highway/service/alley": {
                     "terms": "Service Road,支路,輔助道路"
                 },
                 "highway/service/alley": {


@@ -2099,19 +2137,22 @@
                     "terms": "Street Lamp,街燈,路燈,道燈"
                 },
                 "highway/tertiary": {
                     "terms": "Street Lamp,街燈,路燈,道燈"
                 },
                 "highway/tertiary": {

-                    "name": "細路",
+                    "name": "細道",

                     "terms": "Tertiary Road,三級道路,細路"
                 },
                 "highway/tertiary_link": {
                     "name": "細路駁路",
                     "terms": "Tertiary Link,三級道路匝道,三級道路連接路,細路駁路"
                 },
                     "terms": "Tertiary Road,三級道路,細路"
                 },
                 "highway/tertiary_link": {
                     "name": "細路駁路",
                     "terms": "Tertiary Link,三級道路匝道,三級道路連接路,細路駁路"
                 },

+                "highway/track": {
+                    "name": "無修道"
+                },

                 "highway/traffic_signals": {
                     "name": "紅綠燈",
                     "terms": "Traffic Signals,交通燈,紅綠燈"
                 },
                 "highway/trunk": {
                 "highway/traffic_signals": {
                     "name": "紅綠燈",
                     "terms": "Traffic Signals,交通燈,紅綠燈"
                 },
                 "highway/trunk": {

-                    "name": "幹路",
+                    "name": "幹道",

                     "terms": "Trunk Road,幹線道路,幹路,幹道"
                 },
                 "highway/trunk_link": {
                     "terms": "Trunk Road,幹線道路,幹路,幹道"
                 },
                 "highway/trunk_link": {


@@ -2122,6 +2163,9 @@
                     "name": "迴旋處",
                     "terms": "Turning Circle,回轉圈,廻旋處,環島,迴旋處"
                 },
                     "name": "迴旋處",
                     "terms": "Turning Circle,回轉圈,廻旋處,環島,迴旋處"
                 },

+                "highway/unclassified": {
+                    "name": "道仔／無類道"
+                },

                 "historic": {
                     "name": "史蹟",
                     "terms": "Historic Site,史跡,史蹟,歷史遺址,歷史遺跡"
                 "historic": {
                     "name": "史蹟",
                     "terms": "Historic Site,史跡,史蹟,歷史遺址,歷史遺跡"


@@ -2158,34 +2202,50 @@
                     "name": "路邊神祠",
                     "terms": "Wayside Shrine,路邊神社,路邊神祠"
                 },
                     "name": "路邊神祠",
                     "terms": "Wayside Shrine,路邊神社,路邊神祠"
                 },

+                "landuse/aquaculture": {
+                    "name": "水產"
+                },

                 "landuse/basin": {
                 "landuse/basin": {

-                    "name": "盆地",
-                    "terms": "Basin,水池,盆地"
+                    "name": "盆地"

                 },
                 "landuse/cemetery": {
                     "name": "墳場",
                     "terms": "Cemetery,墓地,墳場"
                 },
                 },
                 "landuse/cemetery": {
                     "name": "墳場",
                     "terms": "Cemetery,墓地,墳場"
                 },

+                "landuse/commercial": {
+                    "name": "商地"
+                },

                 "landuse/construction": {
                     "name": "地盤",
                     "terms": "Construction,地盤,建築工程,建築物"
                 },
                 "landuse/construction": {
                     "name": "地盤",
                     "terms": "Construction,地盤,建築工程,建築物"
                 },

+                "landuse/farm": {
+                    "name": "田地"
+                },
+                "landuse/farmland": {
+                    "name": "田地"
+                },

                 "landuse/farmyard": {
                     "name": "地堂",
                     "terms": "Farmyard,地堂,農莊"
                 },
                 "landuse/farmyard": {
                     "name": "地堂",
                     "terms": "Farmyard,地堂,農莊"
                 },

-                "landuse/forest": {
-                    "name": "森",
-                    "terms": "Forest,森,森林"
-                },

                 "landuse/grass": {
                     "name": "草地",
                     "terms": "Grass,草地"
                 },
                 "landuse/grass": {
                     "name": "草地",
                     "terms": "Grass,草地"
                 },

+                "landuse/industrial": {
+                    "name": "工地"
+                },

                 "landuse/meadow": {
                     "name": "牧地",
                     "terms": "Meadow,牧地,牧場"
                 },
                 "landuse/meadow": {
                     "name": "牧地",
                     "terms": "Meadow,牧地,牧場"
                 },

+                "landuse/military": {
+                    "name": "軍地"
+                },
+                "landuse/military/airfield": {
+                    "name": "軍用機場"
+                },

                 "landuse/orchard": {
                     "name": "菓園",
                     "terms": "Orchard,果園,菓園"
                 "landuse/orchard": {
                     "name": "菓園",
                     "terms": "Orchard,果園,菓園"


@@ -2194,6 +2254,15 @@
                     "name": "石塘",
                     "terms": "Quarry,石塘,石礦場,礦場"
                 },
                     "name": "石塘",
                     "terms": "Quarry,石塘,石礦場,礦場"
                 },

+                "landuse/religious": {
+                    "name": "拜神地"
+                },
+                "landuse/residential": {
+                    "name": "住地"
+                },
+                "landuse/retail": {
+                    "name": "舖地"
+                },

                 "landuse/vineyard": {
                     "name": "葡萄園",
                     "terms": "Vineyard,葡萄園,酒莊"
                 "landuse/vineyard": {
                     "name": "葡萄園",
                     "terms": "Vineyard,葡萄園,酒莊"


@@ -2234,10 +2303,6 @@
                     "name": "美式足球場",
                     "terms": "American Football Field,美式足球場"
                 },
                     "name": "美式足球場",
                     "terms": "American Football Field,美式足球場"
                 },

-                "leisure/pitch/baseball": {
-                    "name": "棒球場",
-                    "terms": "Baseball Diamond,棒球場"
-                },

                 "leisure/pitch/basketball": {
                     "name": "籃球場",
                     "terms": "Basketball Court,球場,籃球場"
                 "leisure/pitch/basketball": {
                     "name": "籃球場",
                     "terms": "Basketball Court,球場,籃球場"


@@ -2301,10 +2366,6 @@
                     "name": "燈塔",
                     "terms": "Lighthouse,燈塔"
                 },
                     "name": "燈塔",
                     "terms": "Lighthouse,燈塔"
                 },

-                "man_made/observation": {
-                    "name": "瞭望臺",
-                    "terms": "Observation Tower,瞭望塔,瞭望臺"
-                },

                 "man_made/pier": {
                     "name": "埗頭",
                     "terms": "Pier,埗頭,碼頭"
                 "man_made/pier": {
                     "name": "埗頭",
                     "terms": "Pier,埗頭,碼頭"


@@ -2333,26 +2394,13 @@
                     "name": "供水廠",
                     "terms": "Water Works,供水廠,水務設施"
                 },
                     "name": "供水廠",
                     "terms": "Water Works,供水廠,水務設施"
                 },

-                "military/airfield": {
-                    "name": "飛機場",
-                    "terms": "Airfield,機場,飛機場"
-                },
-                "military/barracks": {
-                    "name": "兵房",
-                    "terms": "Barracks,兵房,兵營,營房,軍營"
-                },
-                "military/bunker": {
-                    "name": "地堡",
-                    "terms": "Bunker,地堡,暗堡"
-                },
-                "military/range": {
-                    "name": "操炮區",
-                    "terms": "Military Range,操炮區,軍事範圍"
-                },

                 "natural": {
                     "name": "天然",
                     "terms": "Natural,天然,自然,自然物件"
                 },
                 "natural": {
                     "name": "天然",
                     "terms": "Natural,天然,自然,自然物件"
                 },

+                "natural/bare_rock": {
+                    "name": "石地"
+                },

                 "natural/bay": {
                     "name": "灣",
                     "terms": "Bay,海灣,灣"
                 "natural/bay": {
                     "name": "灣",
                     "terms": "Bay,海灣,灣"


@@ -2361,6 +2409,9 @@
                     "name": "灘",
                     "terms": "Beach,沙灘,海灘,灘"
                 },
                     "name": "灘",
                     "terms": "Beach,沙灘,海灘,灘"
                 },

+                "natural/cave_entrance": {
+                    "name": "洞口"
+                },

                 "natural/cliff": {
                     "name": "崖",
                     "terms": "Cliff,崖,懸崖"
                 "natural/cliff": {
                     "name": "崖",
                     "terms": "Cliff,崖,懸崖"


@@ -2389,6 +2440,9 @@
                     "name": "峯",
                     "terms": "Peak,山峰,山頂,峯"
                 },
                     "name": "峯",
                     "terms": "Peak,山峰,山頂,峯"
                 },

+                "natural/sand": {
+                    "name": "砂"
+                },

                 "natural/scree": {
                     "name": "碎石坡",
                     "terms": "Scree,碎石坡"
                 "natural/scree": {
                     "name": "碎石坡",
                     "terms": "Scree,碎石坡"


@@ -2405,10 +2459,6 @@
                     "name": "樹",
                     "terms": "Tree,木,樹"
                 },
                     "name": "樹",
                     "terms": "Tree,木,樹"
                 },

-                "natural/tree_row": {
-                    "name": "排樹",
-                    "terms": "Tree row,排樹,排樹"
-                },

                 "natural/volcano": {
                     "name": "火山",
                     "terms": "Volcano,火山"
                 "natural/volcano": {
                     "name": "火山",
                     "terms": "Volcano,火山"


@@ -2441,21 +2491,8 @@
                     "name": "寫字樓",
                     "terms": "Office,寫字樓,辦公室"
                 },
                     "name": "寫字樓",
                     "terms": "Office,寫字樓,辦公室"
                 },

-                "office/accountant": {
-                    "name": "會計師樓",
-                    "terms": "Accountant,會計師樓"
-                },

                 "office/administrative": {
                 "office/administrative": {

-                    "name": "行政樓",
-                    "terms": "Administrative Office,行政樓"
-                },
-                "office/architect": {
-                    "name": "則樓",
-                    "terms": "Architect,則師樓,則樓,建築師樓"
-                },
-                "office/company": {
-                    "name": "公司寫字樓",
-                    "terms": "Company Office,公司,公司寫字樓"
+                    "name": "行政樓"

                 },
                 "office/educational_institution": {
                     "name": "敎育機構",
                 },
                 "office/educational_institution": {
                     "name": "敎育機構",


@@ -2481,25 +2518,16 @@
                     "name": "保險公司寫字樓",
                     "terms": "Insurance Office,保險公司,保險公司寫字樓"
                 },
                     "name": "保險公司寫字樓",
                     "terms": "Insurance Office,保險公司,保險公司寫字樓"
                 },

-                "office/it": {
-                    "name": "電腦資訊寫字樓",
-                    "terms": "IT Office,IT公司,資訊工藝寫字樓,資訊技藝寫字樓,資訊科技寫字樓,電腦公司寫字樓"
-                },

                 "office/lawyer": {
                     "name": "律師事務所",
                     "terms": "Law Office,律師事務所"
                 },
                 "office/lawyer": {
                     "name": "律師事務所",
                     "terms": "Law Office,律師事務所"
                 },

-                "office/newspaper": {
-                    "name": "報社",
-                    "terms": "Newspaper,報社,新聞社,通訊社"
-                },

                 "office/ngo": {
                     "name": "志顠機構寫字樓",
                     "terms": "NGO Office,志顠機構寫字樓,非政府組織"
                 },
                 "office/physician": {
                 "office/ngo": {
                     "name": "志顠機構寫字樓",
                     "terms": "NGO Office,志顠機構寫字樓,非政府組織"
                 },
                 "office/physician": {

-                    "name": "醫生",
-                    "terms": "Physician,醫生"
+                    "name": "醫生"

                 },
                 "office/political_party": {
                     "name": "政黨",
                 },
                 "office/political_party": {
                     "name": "政黨",


@@ -2509,14 +2537,13 @@
                     "name": "研究所",
                     "terms": "Research Office,研究所"
                 },
                     "name": "研究所",
                     "terms": "Research Office,研究所"
                 },

+                "office/surveyor": {
+                    "name": "量地官寫字樓"
+                },

                 "office/telecommunication": {
                     "name": "電話公司寫字樓",
                     "terms": "Telecom Office,電信公司,電話公司寫字樓"
                 },
                 "office/telecommunication": {
                     "name": "電話公司寫字樓",
                     "terms": "Telecom Office,電信公司,電話公司寫字樓"
                 },

-                "office/therapist": {
-                    "name": "治療師",
-                    "terms": "Therapist,治療師,醫療師"
-                },

                 "office/travel_agent": {
                     "name": "旅行社"
                 },
                 "office/travel_agent": {
                     "name": "旅行社"
                 },


@@ -2528,16 +2555,18 @@
                     "terms": "City,城,城市"
                 },
                 "place/farm": {
                     "terms": "City,城,城市"
                 },
                 "place/farm": {

-                    "name": "農場",
-                    "terms": "Farm,田,稻田,農地,農場,農田"
+                    "name": "農場"

                 },
                 "place/hamlet": {
                     "name": "村仔",
                     "terms": "Hamlet,村仔,村莊"
                 },
                 "place/island": {
                 },
                 "place/hamlet": {
                     "name": "村仔",
                     "terms": "Hamlet,村仔,村莊"
                 },
                 "place/island": {

-                    "name": "島",
-                    "terms": "Island,島,島嶼"
+                    "name": "洲",
+                    "terms": "Island,洲,島,島嶼"
+                },
+                "place/islet": {
+                    "name": "洲仔"

                 },
                 "place/isolated_dwelling": {
                     "name": "孤離居所",
                 },
                 "place/isolated_dwelling": {
                     "name": "孤離居所",


@@ -2547,6 +2576,9 @@
                     "name": "地方",
                     "terms": "Locality,地方,地點,地點（無人定居）"
                 },
                     "name": "地方",
                     "terms": "Locality,地方,地點,地點（無人定居）"
                 },

+                "place/square": {
+                    "name": "前地"
+                },

                 "place/town": {
                     "name": "鎮",
                     "terms": "Town,城鎮,市鎮,鎮"
                 "place/town": {
                     "name": "鎮",
                     "terms": "Town,城鎮,市鎮,鎮"


@@ -2555,6 +2587,9 @@
                     "name": "村",
                     "terms": "Village,村,村莊,村鎮"
                 },
                     "name": "村",
                     "terms": "Village,村,村莊,村鎮"
                 },

+                "playground/sandpit": {
+                    "name": "砂池"
+                },

                 "point": {
                     "name": "點",
                     "terms": "Point,點"
                 "point": {
                     "name": "點",
                     "terms": "Point,點"


@@ -2589,14 +2624,6 @@
                     "name": "火牛房",
                     "terms": "Transformer,火牛房,變電所"
                 },
                     "name": "火牛房",
                     "terms": "Transformer,火牛房,變電所"
                 },

-                "public_transport/platform": {
-                    "name": "站頭",
-                    "terms": "Platform,平臺,站頭"
-                },
-                "public_transport/stop_position": {
-                    "name": "街中站",
-                    "terms": "Stop Position,停止位置,街中站"
-                },

                 "railway": {
                     "name": "鐵路"
                 },
                 "railway": {
                     "name": "鐵路"
                 },


@@ -2608,9 +2635,8 @@
                     "name": "停用鐵路",
                     "terms": "Disused Railway,停用鐵路,廢棄的鐵路"
                 },
                     "name": "停用鐵路",
                     "terms": "Disused Railway,停用鐵路,廢棄的鐵路"
                 },

-                "railway/halt": {
-                    "name": "火車細站",
-                    "terms": "Railway Halt,小火車站,火車站仔,火車細站"
+                "railway/level_crossing": {
+                    "name": "鐵道口（車道）"

                 },
                 "railway/monorail": {
                     "name": "單軌",
                 },
                 "railway/monorail": {
                     "name": "單軌",


@@ -2620,18 +2646,10 @@
                     "name": "窄軌火車",
                     "terms": "Narrow Gauge Rails,窄軌火車,窄軌,窄軌鐵路"
                 },
                     "name": "窄軌火車",
                     "terms": "Narrow Gauge Rails,窄軌火車,窄軌,窄軌鐵路"
                 },

-                "railway/platform": {
-                    "name": "月臺",
-                    "terms": "Railway Platform,月臺,站臺,鐵道月台"
-                },

                 "railway/rail": {
                     "name": "路軌",
                     "terms": "Rail,火車軌,路軌,軌,鐵軌"
                 },
                 "railway/rail": {
                     "name": "路軌",
                     "terms": "Rail,火車軌,路軌,軌,鐵軌"
                 },

-                "railway/station": {
-                    "name": "火車站",
-                    "terms": "Railway Station,火車站,鐵路站"
-                },

                 "railway/subway": {
                     "name": "地下鐵路",
                     "terms": "MTR,Mass Transit Railway,Subway,地下鐵,地下鐵路,地鐵"
                 "railway/subway": {
                     "name": "地下鐵路",
                     "terms": "MTR,Mass Transit Railway,Subway,地下鐵,地下鐵路,地鐵"


@@ -2807,10 +2825,16 @@
                     "name": "影相舖",
                     "terms": "Photography Store,影相舖,照相館"
                 },
                     "name": "影相舖",
                     "terms": "Photography Store,影相舖,照相館"
                 },

+                "shop/pyrotechnics": {
+                    "name": "煙花舖"
+                },

                 "shop/radiotechnics": {
                     "name": "無綫電／電子零件舖",
                     "terms": "Radio Component Store,Electronic Component Store,無線電零件舖,無綫電零件舖,電子零件舖"
                 },
                 "shop/radiotechnics": {
                     "name": "無綫電／電子零件舖",
                     "terms": "Radio Component Store,Electronic Component Store,無線電零件舖,無綫電零件舖,電子零件舖"
                 },

+                "shop/religion": {
+                    "name": "宗教舖"
+                },

                 "shop/shoes": {
                     "name": "鞋舖",
                     "terms": "Shoe Store,鞋店,鞋舖"
                 "shop/shoes": {
                     "name": "鞋舖",
                     "terms": "Shoe Store,鞋店,鞋舖"


@@ -2874,10 +2898,6 @@
                     "name": "露營車營地",
                     "terms": "RV Park,房車營地,露營車停車場,露營車營地"
                 },
                     "name": "露營車營地",
                     "terms": "RV Park,房車營地,露營車停車場,露營車營地"
                 },

-                "tourism/chalet": {
-                    "name": "木屋",
-                    "terms": "Chalet,木屋"
-                },

                 "tourism/guest_house": {
                     "name": "賓館",
                     "terms": "Guest House,賓館"
                 "tourism/guest_house": {
                     "name": "賓館",
                     "terms": "Guest House,賓館"


@@ -2933,6 +2953,30 @@
                     "name": "限制",
                     "terms": "Restriction,限制"
                 },
                     "name": "限制",
                     "terms": "Restriction,限制"
                 },

+                "type/restriction/no_left_turn": {
+                    "name": "不得左轉"
+                },
+                "type/restriction/no_right_turn": {
+                    "name": "不得右轉"
+                },
+                "type/restriction/no_straight_on": {
+                    "name": "不得直行"
+                },
+                "type/restriction/no_u_turn": {
+                    "name": "不得倒頭"
+                },
+                "type/restriction/only_left_turn": {
+                    "name": "只能左轉"
+                },
+                "type/restriction/only_right_turn": {
+                    "name": "只能右轉"
+                },
+                "type/restriction/only_straight_on": {
+                    "name": "只能直行"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "只能倒頭"
+                },

                 "type/route": {
                     "name": "路綫",
                     "terms": "Route,路綫,路線"
                 "type/route": {
                     "name": "路綫",
                     "terms": "Route,路綫,路線"


@@ -3013,8 +3057,7 @@
                     "terms": "River,江,江河,河,河流"
                 },
                 "waterway/riverbank": {
                     "terms": "River,江,江河,河,河流"
                 },
                 "waterway/riverbank": {

-                    "name": "江岸",
-                    "terms": "Riverbank,江岸,河堤,河床,河牀"
+                    "name": "江岸"

                 },
                 "waterway/stream": {
                     "name": "涌",
                 },
                 "waterway/stream": {
                     "name": "涌",


@@ -3025,6 +3068,69 @@
                     "terms": "Weir,堤堰,堤壩,堰,壩,壆"
                 }
             }
                     "terms": "Weir,堤堰,堤壩,堰,壩,壆"
                 }
             }

+        },
+        "imagery": {
+            "Bing": {
+                "description": "衞星同般空相。",
+                "name": "必應般空相"
+            },
+            "DigitalGlobe-Premium": {
+                "attribution": {
+                    "text": "條款同回應"
+                },
+                "name": "數碼地球特等相。"
+            },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "條款同回應"
+                }
+            },
+            "DigitalGlobe-Standard": {
+                "attribution": {
+                    "text": "條款同回應"
+                },
+                "name": "數碼地球一般相。"
+            },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "條款同回應"
+                }
+            },
+            "EsriWorldImagery": {
+                "attribution": {
+                    "text": "條款同回應"
+                }
+            },
+            "EsriWorldImageryClarity": {
+                "attribution": {
+                    "text": "條款同回應"
+                }
+            },
+            "MAPNIK": {
+                "attribution": {
+                    "text": "版權所有，公家街圖協力人。共創之下，任發任改，然而必須提及協力者，改咗必以同樣條款發放。"
+                },
+                "description": "預設公家街圖層",
+                "name": "公家街圖（一般）"
+            },
+            "Mapbox": {
+                "attribution": {
+                    "text": "條款同回應"
+                },
+                "description": "衞星同般空相。",
+                "name": "輿圖盒衛星"
+            },
+            "mapbox_locator_overlay": {
+                "attribution": {
+                    "text": "條款同回應"
+                }
+            },
+            "tf-cycle": {
+                "name": "雷林公家單車地圖"
+            },
+            "tf-landscape": {
+                "name": "雷林地勢"
+            }

         }
     }
 }
\ No newline at end of file
         }
     }
 }
\ No newline at end of file