X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/727c1b059503543e58c74771e97c954659ebf49f..7ee554ed64d67cee025e3a5c80ba9404b01b407f:/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 f7e5f4459..7ba252867 100644
--- a/vendor/assets/iD/iD/locales/yue.json
+++ b/vendor/assets/iD/iD/locales/yue.json
@@ -1,5 +1,10 @@
 {
     "yue": {
+        "icons": {
+            "information": "知",
+            "remove": "徐",
+            "undo": "返事"
+        },
         "modes": {
             "add_area": {
                 "title": "範圍",
@@ -82,7 +87,6 @@
                     "line": "整方個綫角",
                     "area": "整方範圍角"
                 },
-                "key": "S",
                 "annotation": {
                     "line": "整方咗綫角。",
                     "area": "整方咗範圍角。"
@@ -93,20 +97,30 @@
             },
             "straighten": {
                 "title": "拉直",
-                "description": "拉直條綫",
                 "key": "S",
-                "annotation": "條綫拉直咗。",
-                "too_bendy": "條綫太彎，拉直唔到。",
-                "connected_to_hidden": "無得拉直，佢連咗去隱藏地貌。"
+                "too_bendy": "條綫太彎，拉直唔到。"
             },
             "delete": {
                 "title": "刪",
+                "description": {
+                    "single": "刪走此地貌，從此消失。",
+                    "multiple": "刪走此等地貌，從此消失。"
+                },
                 "annotation": {
                     "point": "刪咗處。",
                     "vertex": "道度刪咗節。",
                     "line": "刪咗綫。",
                     "area": "刪咗範圍。",
-                    "relation": "刪咗關聯。"
+                    "relation": "刪咗關聯。",
+                    "multiple": "刪走 {n} 地貌。"
+                },
+                "too_large": {
+                    "single": "此地貌不得刪走，皆因依家見到部份唔夠數。",
+                    "multiple": "此等地貌不得刪走，皆因依家見到部份唔夠數。"
+                },
+                "incomplete_relation": {
+                    "single": "此地貌不得刪走，皆因佢未傳晒落來。",
+                    "multiple": "此等地貌不得刪走，皆因佢哋未傳晒落來。"
                 }
             },
             "add_member": {
@@ -115,14 +129,6 @@
             "delete_member": {
                 "annotation": "拎走咗關聯成員。"
             },
-            "connect": {
-                "annotation": {
-                    "point": "駁咗道去嗰處。",
-                    "vertex": "駁咗道去其他。",
-                    "line": "駁咗道去綫。",
-                    "area": "駁咗道去範圍。"
-                }
-            },
             "disconnect": {
                 "title": "掹開",
                 "description": "此綫或者範圍等，全部掹開。",
@@ -138,7 +144,6 @@
                 "key": "C",
                 "annotation": "拼咗地貌 {n} 個",
                 "not_eligible": "爾啲地貌，無得併埋。",
-                "restriction": "地貌無得拼，佢哋至少一個，屬於 {relation} 關聯。",
                 "incomplete_relation": "地貌無得拼，佢哋至少一個未傳晒落來。",
                 "conflicting_tags": "地貌無得拼，佢哋籤中內有矛盾。"
             },
@@ -150,6 +155,16 @@
                     "vertex": "道度搬咗節。",
                     "line": "搬咗條綫。",
                     "area": "搬咗範圍。"
+                },
+                "incomplete_relation": {
+                    "single": "此地貌冇得搬，皆因佢未傳晒落來。",
+                    "multiple": "此等地貌冇得搬，皆因佢哋未傳晒落來。"
+                }
+            },
+            "reflect": {
+                "key": {
+                    "long": "T",
+                    "short": "Y"
                 }
             },
             "rotate": {
@@ -184,12 +199,6 @@
                 "connected_to_hidden": "無得分，佢連咗去隠藏地貌。"
             },
             "restriction": {
-                "help": {
-                    "select": "撳一下揀段車道",
-                    "toggle": "撳一下限制車道轉向",
-                    "toggle_on": "撳一下加條則，限制車道轉向 {restriction}",
-                    "toggle_off": "撳一下減條則，限制車道轉向 {restriction}"
-                },
                 "annotation": {
                     "create": "加咗一則，限制車道轉向",
                     "delete": "減咗一則，限制車道轉向"
@@ -208,12 +217,10 @@
         "browser_notice": "只能在 Firefox、Chrome、Safari、Opera，以及Internet Explorer 至少版本十一。更新瀏覽器，又或者用 Potlatch 2 修改地圖。",
         "translate": {
             "translate": "繙",
-            "localized_translation_label": "話名",
             "localized_translation_language": "揀話",
             "localized_translation_name": "名"
         },
-        "zoom_in_edit": "放大去改",
-        "logout": "簽走",
+        "zoom_in_edit": "放大去修改",
         "loading_auth": "駁上去公家街圖⋯⋯",
         "report_a_bug": "報錯",
         "help_translate": "幫手繙",
@@ -227,36 +234,37 @@
             "readonly": "程式接口，只讀不寫。你要等下先記到你修改。"
         },
         "commit": {
-            "description_placeholder": "簡述你做過啲乜（必填）",
+            "title": "傳上去公家街圖",
             "upload_explanation": "你嘅修改，傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",
             "upload_explanation_with_user": "你以{user}名義，修改傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",
+            "request_review": "想有人翻睇我修改。",
+            "save": "傳上",
             "cancel": "唔記",
             "changes": "變更 {count} 個",
+            "download_changes": "公家街圖修改嘅檔案，傳落來",
             "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}人修改"
         },
-        "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": "點",
@@ -267,7 +275,6 @@
         },
         "geocoder": {
             "search": "搵天下各地⋯⋯",
-            "no_results_visible": "圖內可見之處，都搵唔到",
             "no_results_worldwide": "無嘢搵到"
         },
         "geolocate": {
@@ -275,8 +282,6 @@
             "locating": "摷緊地方，等下⋯⋯"
         },
         "inspector": {
-            "no_documentation_combination": "爾組籤，未有文件解",
-            "no_documentation_key": "爾個圖例，未有文件解。",
             "show_more": "睇多啲",
             "view_on_osm": "入公家街圖睇",
             "all_fields": "所有欄位",
@@ -287,7 +292,6 @@
             "role": "作用",
             "choose": "揀地貌",
             "results": "{search}搵出{n}項",
-            "reference": "入公家街圖百科睇",
             "back_tooltip": "轉地貌",
             "remove": "移走",
             "search": "搵",
@@ -310,20 +314,16 @@
         "background": {
             "title": "背景",
             "description": "背景設定",
-            "percent_brightness": "{opacity}% 光",
             "none": "無",
             "best_imagery": "此地至出名相源",
             "switch": "轉返去爾個背景",
             "custom": "自訂",
-            "custom_button": "改自訂背景",
-            "fix_misalignment": "校正背圖對位誤差",
-            "imagery_source_faq": "相邊度來？",
             "reset": "重設",
-            "offset": "下面灰帶內，拖到任何位，去校正背圖對位誤差，又或者，以米為單位，入返啲差額。",
             "minimap": {
-                "description": "細地圖",
                 "tooltip": "開個縮圖，幫手搵返家下睇到嘅範圍。"
-            }
+            },
+            "fix_misalignment": "校正背圖對位誤差",
+            "offset": "下面灰帶內，拖到任何位，去校正背圖對位誤差，又或者，以米為單位，入返啲差額。"
         },
         "map_data": {
             "title": "地圖資料",
@@ -375,11 +375,9 @@
                 "tooltip": "電纜、發電廠、變電站等。"
             },
             "past_future": {
-                "description": "過往／未來",
                 "tooltip": "籌備、興建、廢棄、移平等。"
             },
             "others": {
-                "description": "其他",
                 "tooltip": "其他"
             }
         },
@@ -397,18 +395,14 @@
                 "tooltip": "範圍全填。"
             }
         },
-        "restore": {
-            "heading": "你有修改未記妥",
-            "description": "要唔要囘復上次未記妥之修改？",
-            "restore": "囘復",
-            "reset": "重新開始"
-        },
         "save": {
             "title": "記低",
+            "help": "重閱所變更，傳上公家街圖，等其他用者睇到。",
             "no_changes": "無修改可記",
             "error": "記低途中有錯。",
             "status_code": "服務電腦回覆狀況代號 {code}",
             "unknown_error_details": "請確保你上到互聯網",
+            "uploading": "傳緊改動上公家街圖",
             "unsaved_changes": "你有修改未記妥",
             "conflict": {
                 "header": "調解相衝修改",
@@ -419,7 +413,7 @@
                 "keep_remote": "用佢",
                 "restore": "囘復",
                 "delete": "由佢唔要",
-                "download_changes": "或者下載你改嘅。",
+                "download_changes": "或者，公家街圖修改嘅檔案，傳落來",
                 "done": "衝突通通解決！"
             }
         },
@@ -431,25 +425,18 @@
             }
         },
         "success": {
-            "edited_osm": "改掂公家街圖！",
-            "just_edited": "你啱啱改咗公家街圖！",
-            "view_on_osm": "入公家街圖睇",
-            "facebook": "放上Facebook",
-            "twitter": "放上Twitter",
-            "google": "放上Google+",
-            "help_html": "你改過嘅，幾分鐘就會見到喺「普通」層。其他層，咁啲地貌，就會耐啲。",
             "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": {
+            "okay": "知",
             "cancel": "唔做"
         },
-        "splash": {
-            "welcome": "歡迎來到艾第公家街圖造圖。",
-            "text": "艾第爾件架生，易用之時，亦功用多多，用來投稿修改去，世界至好，任用嘅世界地圖片。現時版本係{version}。想多啲資料，睇下 {website}同埋去{github}報告出錯。",
-            "walkthrough": "開始逐步解釋",
-            "start": "卽改"
-        },
         "source_switch": {
             "live": "運行之中",
             "lose_changes": "你未有修改未記妥。轉地圖電腦，就會無咗修改。你真係要轉地圖電腦？",
@@ -460,16 +447,6 @@
             "on_wiki": "喺公家街圖百科度嘅{tag}",
             "used_with": "同{type}一齊用"
         },
-        "validations": {
-            "untagged_point": "未有籤嘅點",
-            "untagged_point_tooltip": "揀種地貌，兼且寫呢處係乜來。",
-            "untagged_line": "冇籤嘅綫",
-            "untagged_line_tooltip": "揀種地貌，兼且寫呢綫係乜來。",
-            "untagged_area": "冇籤嘅範圍",
-            "untagged_area_tooltip": "揀種地貌，兼且寫呢範圍係乜來。",
-            "tag_suggests_area": "{tag}籤話條綫係範圍，實情佢唔係。",
-            "deprecated_tags": "廢籤：{tags}"
-        },
         "zoom": {
             "in": "放大",
             "out": "縮細"
@@ -477,26 +454,20 @@
         "cannot_zoom": "今下模式，無得再縮。",
         "full_screen": "來回全螢幕",
         "mapillary_images": {
-            "tooltip": "拎輿兵嘅街相",
-            "title": "疊相（輿兵）"
-        },
-        "mapillary_signs": {
-            "tooltip": "拎輿兵嘅交通燈（必先開疊相）",
-            "title": "疊交通燈（輿兵）"
+            "tooltip": "拎輿兵嘅街相"
         },
         "mapillary": {
             "view_on_mapillary": "去輿兵度睇張相"
         },
         "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",
-            "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": "搞掂",
@@ -511,10 +482,38 @@
                 "state": "<value for addr:state>",
                 "subdistrict": "<value for addr:subdistrict>",
                 "suburb": "<value for addr:suburb>",
-                "countrycode": "cn"
+                "countrycode": "cn",
+                "name": {
+                    "spring-street": "泉街"
+                }
+            },
+            "welcome": {
+                "title": "歡迎",
+                "welcome": "歡迎！此行教君改公家街圖之基本。",
+                "practice": "此行君只不過練習，改乜都唔會記低。",
+                "words": "此行會介紹新字新義。有新字時，會見字斜。",
+                "mouse": "君可用任意輸入裝置來改圖，之不過，此行當君有滑鼠，鼠上有左右掣。**君要駁滑鼠，當下就做，撳知掣。**",
+                "leftclick": "此處指導問君撳一下，連撳一下，就指用左掣。觸控皮嘅話，可以係撳一下，或者單指點一下。**左撳  {num} 次。**",
+                "rightclick": "有時會叫你右撳。如此等同控制鍵加一撳，或者觸控板上二指點一下。君之鍵盤或者有選單鍵，如同加撳。**右撳 {num} 次。**",
+                "chapters": "做得唔錯！君可以按下面嘅掣，隨時跳過幾課，或者遇難時，重新一課。開始喇！**撳 '{next}' 繼續。**"
             },
             "navigation": {
-                "title": "周圍望"
+                "title": "周圍望",
+                "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": {
                 "title": "處"
@@ -525,46 +524,47 @@
             "lines": {
                 "title": "綫"
             },
+            "buildings": {
+                "title": "屋宇"
+            },
             "startediting": {
                 "title": "開始改",
+                "shortcuts": "撳下「{key}」掣，你可睇下連串命令，同埋佢嘅鍵盤快掣。",
                 "save": "記得定時記低修改！",
                 "start": "開始制圖"
             }
         },
+        "shortcuts": {
+            "title": "鍵盤快掣",
+            "tooltip": "螢幕上睇到鍵盤快掣",
+            "browsing": {
+                "navigation": {
+                    "zoom": "放大／縮細"
+                },
+                "help": {
+                    "keyboard": "睇鍵盤快掣"
+                }
+            },
+            "tools": {
+                "title": "架生"
+            }
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
-                    "name": "阻擋地貌"
+                    "name": "屏障地貌"
                 },
                 "category-building": {
                     "name": "屋宇地貌"
                 },
-                "category-golf": {
-                    "name": "哥夫波地貌"
-                },
                 "category-landuse": {
                     "name": "用地地貌"
                 },
-                "category-path": {
-                    "name": "徑地貌"
-                },
-                "category-rail": {
-                    "name": "軌道地貌"
-                },
                 "category-restriction": {
                     "name": "限制地貌"
                 },
-                "category-road": {
-                    "name": "車道地貌"
-                },
                 "category-route": {
                     "name": "路綫地貌"
-                },
-                "category-water-area": {
-                    "name": "水地貌"
-                },
-                "category-water-line": {
-                    "name": "水地貌"
                 }
             },
             "fields": {
@@ -572,31 +572,24 @@
                     "label": "准過",
                     "options": {
                         "designated": {
-                            "description": "通行與否，按法例或路牌指定",
                             "title": "指名"
                         },
                         "destination": {
-                            "description": "限往目的地",
                             "title": "目的地"
                         },
                         "dismount": {
-                            "description": "過得，要落車推。",
                             "title": "落車推"
                         },
                         "no": {
-                            "description": "公眾不通",
                             "title": "禁入"
                         },
                         "permissive": {
-                            "description": "可通，直至地主唔畀。",
                             "title": "任過"
                         },
                         "private": {
-                            "description": "要地主批准",
                             "title": "私家"
                         },
                         "yes": {
-                            "description": "按法例可通，有權過路。",
                             "title": "准許"
                         }
                     },
@@ -612,23 +605,29 @@
                 "access_simple": {
                     "label": "過得"
                 },
-                "access_toilets": {
-                    "label": "通"
-                },
                 "address": {
                     "label": "地埗",
                     "placeholders": {
+                        "block_number": "座數",
+                        "block_number!jp": "座數",
                         "city": "城",
+                        "city!jp": "城／鎮／村／東京都區部",
+                        "city!vn": "城／鎮",
                         "conscriptionnumber": "一百二十三號",
                         "country": "國",
+                        "county": "郡縣",
+                        "county!jp": "區",
                         "district": "區",
+                        "district!vn": "法國之縣／鎮／區",
                         "floor": "樓數",
                         "hamlet": "村仔",
                         "housename": "屋名",
                         "housenumber": "一百二十三號",
+                        "housenumber!jp": "屋號／地號",
                         "place": "地",
                         "postcode": "郵政編號",
                         "province": "省",
+                        "province!jp": "縣",
                         "state": "州",
                         "street": "街",
                         "subdistrict": "分區",
@@ -699,6 +698,19 @@
                 "barrier": {
                     "label": "類"
                 },
+                "bath/open_air": {
+                    "label": "露天"
+                },
+                "bath/sand_bath": {
+                    "label": "沙浴"
+                },
+                "bath/type": {
+                    "options": {
+                        "foot_bath": "浸腳",
+                        "hot_spring": "溫泉",
+                        "onsen": "日本溫泉"
+                    }
+                },
                 "bench": {
                     "label": "長凳"
                 },
@@ -717,59 +729,61 @@
                         "whole": "全血"
                     }
                 },
+                "board_type": {
+                    "label": "類"
+                },
+                "boules": {
+                    "label": "類"
+                },
                 "boundary": {
                     "label": "類"
                 },
                 "brand": {
                     "label": "牌"
                 },
+                "brewery": {
+                    "label": "生啤"
+                },
+                "bridge": {
+                    "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..."
                 },
-                "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": "收集時間"
                 },
+                "comment": {
+                    "label": "變更之留言"
+                },
                 "construction": {
                     "label": "類"
                 },
-                "content": {
-                    "label": "內容"
-                },
                 "country": {
                     "label": "國"
                 },
@@ -779,12 +793,18 @@
                 "craft": {
                     "label": "類"
                 },
+                "crop": {
+                    "label": "作物"
+                },
                 "crossing": {
                     "label": "類"
                 },
                 "currency_multi": {
                     "label": "錢類"
                 },
+                "cutting": {
+                    "label": "類"
+                },
                 "cycle_network": {
                     "label": "網絡"
                 },
@@ -816,7 +836,7 @@
                             "title": "共用單車道"
                         },
                         "track": {
-                            "description": "單車道與交通有阻隔",
+                            "description": "單車道與交通有屏障",
                             "title": "單連分徑"
                         }
                     },
@@ -841,9 +861,43 @@
                 "description": {
                     "label": "描述"
                 },
+                "devices": {
+                    "placeholder": "1, 2, 3..."
+                },
                 "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": "順時針"
+                    }
+                },
                 "display": {
                     "label": "顯示"
                 },
@@ -866,6 +920,13 @@
                 "elevation": {
                     "label": "海拔"
                 },
+                "email": {
+                    "label": "電郵",
+                    "placeholder": "example@example.com"
+                },
+                "embankment": {
+                    "label": "類"
+                },
                 "emergency": {
                     "label": "急症室"
                 },
@@ -882,11 +943,12 @@
                 "fee": {
                     "label": "費用"
                 },
+                "fence_type": {
+                    "label": "類"
+                },
                 "fire_hydrant/type": {
-                    "label": "類",
                     "options": {
                         "pillar": "柱／地上",
-                        "pond": "塘",
                         "underground": "地底",
                         "wall": "牆"
                     }
@@ -894,6 +956,9 @@
                 "fixme": {
                     "label": "整好我"
                 },
+                "ford": {
+                    "label": "類"
+                },
                 "fuel": {
                     "label": "燃料"
                 },
@@ -921,9 +986,8 @@
                 "generator/type": {
                     "label": "類"
                 },
-                "golf_hole": {
-                    "label": "參攷",
-                    "placeholder": "洞數（一到十八）"
+                "government": {
+                    "label": "類"
                 },
                 "handicap": {
                     "label": "差點",
@@ -932,6 +996,12 @@
                 "handrail": {
                     "label": "扶手"
                 },
+                "healthcare": {
+                    "label": "類"
+                },
+                "height": {
+                    "label": "高（米）"
+                },
                 "highway": {
                     "label": "類"
                 },
@@ -961,6 +1031,9 @@
                 "indoor": {
                     "label": "戶內"
                 },
+                "industrial": {
+                    "label": "類"
+                },
                 "information": {
                     "label": "類"
                 },
@@ -1048,13 +1121,25 @@
                 "man_made": {
                     "label": "類"
                 },
+                "manhole": {
+                    "label": "類"
+                },
+                "map_type": {
+                    "label": "類"
+                },
                 "maxspeed": {
                     "label": "限速",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "留得時間"
                 },
+                "memorial": {
+                    "label": "類"
+                },
                 "mtb/scale": {
                     "label": "越野單車徑難度",
                     "options": {
@@ -1166,13 +1251,6 @@
                     "label": "標準桿",
                     "placeholder": "3, 4, 5..."
                 },
-                "parallel_direction": {
-                    "label": "方向",
-                    "options": {
-                        "backward": "向後",
-                        "forward": "向前"
-                    }
-                },
                 "park_ride": {
                     "label": "泊車轉乖"
                 },
@@ -1197,15 +1275,6 @@
                 },
                 "piste/difficulty": {
                     "label": "難度",
-                    "options": {
-                        "advanced": "進階（黑鑽）",
-                        "easy": "易（綠圈）",
-                        "expert": "專家（雙黑鑽）",
-                        "extreme": "極難（要攀山架生）",
-                        "freeride": "自由滑行（場地外）",
-                        "intermediate": "中階（藍方）",
-                        "novice": "新手（教學）"
-                    },
                     "placeholder": "易、中階、 進階⋯⋯"
                 },
                 "piste/grooming": {
@@ -1251,8 +1320,8 @@
                 "recycling_accepts": {
                     "label": "收得"
                 },
-                "ref": {
-                    "label": "參攷"
+                "ref_road_number": {
+                    "label": "道號"
                 },
                 "relation": {
                     "label": "類"
@@ -1352,8 +1421,11 @@
                     },
                     "placeholder": "轆仔、有轆、越野⋯⋯"
                 },
+                "social_facility": {
+                    "label": "類"
+                },
                 "source": {
-                    "label": "來源"
+                    "label": "來歷"
                 },
                 "stars": {
                     "label": "星級"
@@ -1362,7 +1434,7 @@
                     "label": "停車指示",
                     "options": {
                         "all": "所有方向",
-                        "minor": "小車路"
+                        "minor": "車道仔"
                     }
                 },
                 "structure": {
@@ -1391,6 +1463,9 @@
                 "surface": {
                     "label": "表面"
                 },
+                "switch": {
+                    "label": "類"
+                },
                 "tactile_paving": {
                     "label": "盲人引路徑"
                 },
@@ -1408,13 +1483,18 @@
                     "options": {
                         "bucket": "尿兜",
                         "chemical": "化學",
-                        "flush": "沖水",
-                        "pitlatrine": "廁坑／旱廁"
+                        "flush": "沖水"
                     }
                 },
+                "tomb": {
+                    "label": "類"
+                },
                 "tourism": {
                     "label": "類"
                 },
+                "tower/type": {
+                    "label": "類"
+                },
                 "tracktype": {
                     "label": "道類",
                     "options": {
@@ -1426,6 +1506,12 @@
                     },
                     "placeholder": "實、多數實、軟⋯⋯"
                 },
+                "trade": {
+                    "label": "類"
+                },
+                "traffic_calming": {
+                    "label": "類"
+                },
                 "traffic_signals": {
                     "label": "類"
                 },
@@ -1441,14 +1527,19 @@
                     },
                     "placeholder": "極好、好、差⋯⋯"
                 },
+                "transformer": {
+                    "label": "類"
+                },
                 "trees": {
                     "label": "樹"
                 },
                 "tunnel": {
-                    "label": "隧道"
+                    "label": "類"
                 },
-                "vending": {
-                    "label": "貨類"
+                "usage_rail": {
+                    "options": {
+                        "military": "軍"
+                    }
                 },
                 "visibility": {
                     "label": "顯隱",
@@ -1458,6 +1549,9 @@
                         "street": "五到二十米（十六到六十五呎）"
                     }
                 },
+                "wall": {
+                    "label": "類"
+                },
                 "water": {
                     "label": "類"
                 },
@@ -1468,8 +1562,7 @@
                     "label": "類"
                 },
                 "website": {
-                    "label": "網站",
-                    "placeholder": "http://example.com/"
+                    "label": "網站"
                 },
                 "wetland": {
                     "label": "類"
@@ -1482,6 +1575,9 @@
                 },
                 "wikipedia": {
                     "label": "維基百科全書"
+                },
+                "windings": {
+                    "placeholder": "1, 2, 3..."
                 }
             },
             "presets": {
@@ -1615,8 +1711,7 @@
                     "terms": "Drinking Water,水源,活水,飲水,飲水處,飲用水"
                 },
                 "amenity/embassy": {
-                    "name": "大使館",
-                    "terms": "Embassy,使館,大使館,領事館"
+                    "name": "大使館"
                 },
                 "amenity/fast_food": {
                     "name": "快餐店",
@@ -1638,6 +1733,9 @@
                     "name": "墳地",
                     "terms": "Graveyard,墓地,墳地,墳場"
                 },
+                "amenity/hospital": {
+                    "name": "醫院地"
+                },
                 "amenity/library": {
                     "name": "圖書館",
                     "terms": "Library,圖書館,拉記"
@@ -1646,14 +1744,6 @@
                     "name": "街市",
                     "terms": "Marketplace,市場,菜市場,街市"
                 },
-                "amenity/parking": {
-                    "name": "停車場",
-                    "terms": "Car Parking,停車場"
-                },
-                "amenity/pharmacy": {
-                    "name": "藥房",
-                    "terms": "Pharmacy,葯局,葯店,葯房,葯舖,藥局,藥店,藥房,藥舖"
-                },
                 "amenity/place_of_worship": {
                     "name": "拜神之所",
                     "terms": "Place of Worship,Worship,宗教祟拜場所,宗教禮拜處,崇拜處,拜神之所,禮拜場所"
@@ -1662,18 +1752,6 @@
                     "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,差館,派出所,警察局,警局,警署"
@@ -1694,10 +1772,6 @@
                     "name": "郊野訪客處",
                     "terms": "Ranger Station,郊野訪客處,野郊訪客處"
                 },
-                "amenity/recycling": {
-                    "name": "囘收桶",
-                    "terms": "Recycling,囘收桶,囘收箱,回收桶,回收箱"
-                },
                 "amenity/restaurant": {
                     "name": "餐廳",
                     "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
@@ -1737,8 +1811,11 @@
                     "name": "範圍",
                     "terms": "Area,區域,範圍"
                 },
+                "area/highway": {
+                    "name": "道面"
+                },
                 "barrier": {
-                    "name": "阻擋",
+                    "name": "屏障",
                     "terms": "Barrier,屏障,阻擋,障礙,障礙物"
                 },
                 "barrier/block": {
@@ -1761,6 +1838,9 @@
                     "name": "單車減速欄",
                     "terms": "Cycle Barrier,單車減速欄,單車矮欄"
                 },
+                "barrier/ditch": {
+                    "name": "坑"
+                },
                 "barrier/entrance": {
                     "name": "入口"
                 },
@@ -1808,10 +1888,6 @@
                     "name": "屋宇",
                     "terms": "Building,屋宇,建築物"
                 },
-                "building/apartments": {
-                    "name": "公寓",
-                    "terms": "Apartments,公寓,分層屋宇"
-                },
                 "building/commercial": {
                     "name": "商業樓宇",
                     "terms": "Commercial Building,商業建築物,商業樓宇"
@@ -1836,6 +1912,9 @@
                     "name": "住宅樓宇",
                     "terms": "Residential Building,住宅建築物,住宅樓宇"
                 },
+                "building/retail": {
+                    "name": "舖屋宇"
+                },
                 "craft/watchmaker": {
                     "name": "鐘錶匠",
                     "terms": "Watchmaker,鐘錶匠"
@@ -1845,8 +1924,7 @@
                     "terms": "Window Construction,造窗"
                 },
                 "embankment": {
-                    "name": "基堤",
-                    "terms": "Embankment,基堤,堤,堤壩,堤岸"
+                    "name": "基堤"
                 },
                 "emergency/ambulance_station": {
                     "name": "救護站",
@@ -1860,10 +1938,6 @@
                     "name": "求助電話",
                     "terms": "Emergency Phone,求助電話,緊急電話"
                 },
-                "footway/sidewalk": {
-                    "name": "行人路",
-                    "terms": "Sidewalk,行人路"
-                },
                 "golf/bunker": {
                     "name": "沙坑",
                     "terms": "Sand Trap,沙坑"
@@ -1895,10 +1969,6 @@
                     "name": "馬徑",
                     "terms": "Bridle Path,馬徑,馬道"
                 },
-                "highway/bus_stop": {
-                    "name": "巴士站",
-                    "terms": "Bus Stop,公交車站,公共汽車站,巴士站"
-                },
                 "highway/cycleway": {
                     "name": "單車徑",
                     "terms": "Cycle Path,單車徑,自行車道"
@@ -1927,8 +1997,14 @@
                     "name": "徑",
                     "terms": "Path,徑,路徑"
                 },
+                "highway/pedestrian_area": {
+                    "name": "行人地"
+                },
+                "highway/pedestrian_line": {
+                    "name": "行人街"
+                },
                 "highway/primary": {
-                    "name": "大路",
+                    "name": "大道",
                     "terms": "Primary Road,主要道路,大路"
                 },
                 "highway/primary_link": {
@@ -1936,15 +2012,15 @@
                     "terms": "Primary Link,主要道路匝道,主要道路連接路,大路駁路"
                 },
                 "highway/residential": {
-                    "name": "住宅路",
+                    "name": "住宅道",
                     "terms": "Residential Road,住宅區道路,住宅路"
                 },
                 "highway/road": {
-                    "name": "未明路",
+                    "name": "未明道",
                     "terms": "Unknown Road,不明路,不知路,未明路,未知嘅路,未知種類的道路,未知種類道路"
                 },
                 "highway/secondary": {
-                    "name": "中路",
+                    "name": "中道",
                     "terms": "Secondary Road,中路,次要道路"
                 },
                 "highway/secondary_link": {
@@ -1952,7 +2028,7 @@
                     "terms": "Secondary Link,中路駁路,次級道路連接路,次要道路匝道"
                 },
                 "highway/service": {
-                    "name": "支路",
+                    "name": "支道",
                     "terms": "Service Road,支路,輔助道路"
                 },
                 "highway/service/alley": {
@@ -1988,19 +2064,22 @@
                     "terms": "Street Lamp,街燈,路燈,道燈"
                 },
                 "highway/tertiary": {
-                    "name": "ç´°è·¯",
+                    "name": "細道",
                     "terms": "Tertiary Road,三級道路,細路"
                 },
                 "highway/tertiary_link": {
                     "name": "細路駁路",
                     "terms": "Tertiary Link,三級道路匝道,三級道路連接路,細路駁路"
                 },
+                "highway/track": {
+                    "name": "無修道"
+                },
                 "highway/traffic_signals": {
                     "name": "紅綠燈",
                     "terms": "Traffic Signals,交通燈,紅綠燈"
                 },
                 "highway/trunk": {
-                    "name": "幹路",
+                    "name": "幹道",
                     "terms": "Trunk Road,幹線道路,幹路,幹道"
                 },
                 "highway/trunk_link": {
@@ -2011,6 +2090,9 @@
                     "name": "迴旋處",
                     "terms": "Turning Circle,回轉圈,廻旋處,環島,迴旋處"
                 },
+                "highway/unclassified": {
+                    "name": "道仔／無類道"
+                },
                 "historic": {
                     "name": "史蹟",
                     "terms": "Historic Site,史跡,史蹟,歷史遺址,歷史遺跡"
@@ -2047,34 +2129,50 @@
                     "name": "路邊神祠",
                     "terms": "Wayside Shrine,路邊神社,路邊神祠"
                 },
+                "landuse/aquaculture": {
+                    "name": "水產"
+                },
                 "landuse/basin": {
-                    "name": "盆地",
-                    "terms": "Basin,水池,盆地"
+                    "name": "盆地"
                 },
                 "landuse/cemetery": {
                     "name": "墳場",
                     "terms": "Cemetery,墓地,墳場"
                 },
+                "landuse/commercial": {
+                    "name": "商地"
+                },
                 "landuse/construction": {
                     "name": "地盤",
                     "terms": "Construction,地盤,建築工程,建築物"
                 },
+                "landuse/farm": {
+                    "name": "田地"
+                },
+                "landuse/farmland": {
+                    "name": "田地"
+                },
                 "landuse/farmyard": {
                     "name": "地堂",
                     "terms": "Farmyard,地堂,農莊"
                 },
-                "landuse/forest": {
-                    "name": "森",
-                    "terms": "Forest,森,森林"
-                },
                 "landuse/grass": {
                     "name": "草地",
                     "terms": "Grass,草地"
                 },
+                "landuse/industrial": {
+                    "name": "工地"
+                },
                 "landuse/meadow": {
                     "name": "牧地",
                     "terms": "Meadow,牧地,牧場"
                 },
+                "landuse/military": {
+                    "name": "軍地"
+                },
+                "landuse/military/airfield": {
+                    "name": "軍用機場"
+                },
                 "landuse/orchard": {
                     "name": "菓園",
                     "terms": "Orchard,果園,菓園"
@@ -2083,13 +2181,21 @@
                     "name": "石塘",
                     "terms": "Quarry,石塘,石礦場,礦場"
                 },
+                "landuse/religious": {
+                    "name": "拜神地"
+                },
+                "landuse/residential": {
+                    "name": "住地"
+                },
+                "landuse/retail": {
+                    "name": "舖地"
+                },
                 "landuse/vineyard": {
                     "name": "葡萄園",
                     "terms": "Vineyard,葡萄園,酒莊"
                 },
                 "leisure": {
-                    "name": "消閒",
-                    "terms": "Leisure,休閑場所,休閒設施,消閒"
+                    "name": "消閒"
                 },
                 "leisure/common": {
                     "name": "公地",
@@ -2123,10 +2229,6 @@
                     "name": "美式足球場",
                     "terms": "American Football Field,美式足球場"
                 },
-                "leisure/pitch/baseball": {
-                    "name": "棒球場",
-                    "terms": "Baseball Diamond,棒球場"
-                },
                 "leisure/pitch/basketball": {
                     "name": "籃球場",
                     "terms": "Basketball Court,球場,籃球場"
@@ -2168,8 +2270,7 @@
                     "terms": "Line,綫,線"
                 },
                 "man_made": {
-                    "name": "人造",
-                    "terms": "Man Made,人造,人造構築,人造物"
+                    "name": "人造"
                 },
                 "man_made/breakwater": {
                     "name": "防波堤",
@@ -2190,10 +2291,6 @@
                     "name": "燈塔",
                     "terms": "Lighthouse,燈塔"
                 },
-                "man_made/observation": {
-                    "name": "瞭望臺",
-                    "terms": "Observation Tower,瞭望塔,瞭望臺"
-                },
                 "man_made/pier": {
                     "name": "埗頭",
                     "terms": "Pier,埗頭,碼頭"
@@ -2223,8 +2320,10 @@
                     "terms": "Water Works,供水廠,水務設施"
                 },
                 "natural": {
-                    "name": "天然",
-                    "terms": "Natural,天然,自然,自然物件"
+                    "name": "天然"
+                },
+                "natural/bare_rock": {
+                    "name": "石地"
                 },
                 "natural/bay": {
                     "name": "灣",
@@ -2234,6 +2333,9 @@
                     "name": "灘",
                     "terms": "Beach,沙灘,海灘,灘"
                 },
+                "natural/cave_entrance": {
+                    "name": "洞口"
+                },
                 "natural/cliff": {
                     "name": "崖",
                     "terms": "Cliff,崖,懸崖"
@@ -2262,6 +2364,9 @@
                     "name": "峯",
                     "terms": "Peak,山峰,山頂,峯"
                 },
+                "natural/sand": {
+                    "name": "砂"
+                },
                 "natural/scree": {
                     "name": "碎石坡",
                     "terms": "Scree,碎石坡"
@@ -2278,10 +2383,6 @@
                     "name": "樹",
                     "terms": "Tree,木,樹"
                 },
-                "natural/tree_row": {
-                    "name": "排樹",
-                    "terms": "Tree row,排樹,排樹"
-                },
                 "natural/volcano": {
                     "name": "火山",
                     "terms": "Volcano,火山"
@@ -2314,21 +2415,8 @@
                     "name": "寫字樓",
                     "terms": "Office,寫字樓,辦公室"
                 },
-                "office/accountant": {
-                    "name": "會計師樓",
-                    "terms": "Accountant,會計師樓"
-                },
                 "office/administrative": {
-                    "name": "行政樓",
-                    "terms": "Administrative Office,行政樓"
-                },
-                "office/architect": {
-                    "name": "則樓",
-                    "terms": "Architect,則師樓,則樓,建築師樓"
-                },
-                "office/company": {
-                    "name": "公司寫字樓",
-                    "terms": "Company Office,公司,公司寫字樓"
+                    "name": "行政樓"
                 },
                 "office/educational_institution": {
                     "name": "敎育機構",
@@ -2354,25 +2442,16 @@
                     "name": "保險公司寫字樓",
                     "terms": "Insurance Office,保險公司,保險公司寫字樓"
                 },
-                "office/it": {
-                    "name": "電腦資訊寫字樓",
-                    "terms": "IT Office,IT公司,資訊工藝寫字樓,資訊技藝寫字樓,資訊科技寫字樓,電腦公司寫字樓"
-                },
                 "office/lawyer": {
                     "name": "律師事務所",
                     "terms": "Law Office,律師事務所"
                 },
-                "office/newspaper": {
-                    "name": "報社",
-                    "terms": "Newspaper,報社,新聞社,通訊社"
-                },
                 "office/ngo": {
                     "name": "志顠機構寫字樓",
                     "terms": "NGO Office,志顠機構寫字樓,非政府組織"
                 },
                 "office/physician": {
-                    "name": "醫生",
-                    "terms": "Physician,醫生"
+                    "name": "醫生"
                 },
                 "office/political_party": {
                     "name": "政黨",
@@ -2382,14 +2461,13 @@
                     "name": "研究所",
                     "terms": "Research Office,研究所"
                 },
+                "office/surveyor": {
+                    "name": "量地官寫字樓"
+                },
                 "office/telecommunication": {
                     "name": "電話公司寫字樓",
                     "terms": "Telecom Office,電信公司,電話公司寫字樓"
                 },
-                "office/therapist": {
-                    "name": "治療師",
-                    "terms": "Therapist,治療師,醫療師"
-                },
                 "office/travel_agent": {
                     "name": "旅行社"
                 },
@@ -2408,8 +2486,11 @@
                     "terms": "Hamlet,村仔,村莊"
                 },
                 "place/island": {
-                    "name": "島",
-                    "terms": "Island,島,島嶼"
+                    "name": "æ´²",
+                    "terms": "Island,洲,島,島嶼"
+                },
+                "place/islet": {
+                    "name": "洲仔"
                 },
                 "place/isolated_dwelling": {
                     "name": "孤離居所",
@@ -2419,6 +2500,9 @@
                     "name": "地方",
                     "terms": "Locality,地方,地點,地點（無人定居）"
                 },
+                "place/square": {
+                    "name": "前地"
+                },
                 "place/town": {
                     "name": "鎮",
                     "terms": "Town,城鎮,市鎮,鎮"
@@ -2427,6 +2511,9 @@
                     "name": "村",
                     "terms": "Village,村,村莊,村鎮"
                 },
+                "playground/sandpit": {
+                    "name": "砂池"
+                },
                 "point": {
                     "name": "點",
                     "terms": "Point,點"
@@ -2461,14 +2548,6 @@
                     "name": "火牛房",
                     "terms": "Transformer,火牛房,變電所"
                 },
-                "public_transport/platform": {
-                    "name": "站頭",
-                    "terms": "Platform,平臺,站頭"
-                },
-                "public_transport/stop_position": {
-                    "name": "街中站",
-                    "terms": "Stop Position,停止位置,街中站"
-                },
                 "railway": {
                     "name": "鐵路"
                 },
@@ -2480,9 +2559,8 @@
                     "name": "停用鐵路",
                     "terms": "Disused Railway,停用鐵路,廢棄的鐵路"
                 },
-                "railway/halt": {
-                    "name": "火車細站",
-                    "terms": "Railway Halt,小火車站,火車站仔,火車細站"
+                "railway/level_crossing": {
+                    "name": "鐵道口（車道）"
                 },
                 "railway/monorail": {
                     "name": "單軌",
@@ -2492,18 +2570,10 @@
                     "name": "窄軌火車",
                     "terms": "Narrow Gauge Rails,窄軌火車,窄軌,窄軌鐵路"
                 },
-                "railway/platform": {
-                    "name": "月臺",
-                    "terms": "Railway Platform,月臺,站臺,鐵道月台"
-                },
                 "railway/rail": {
                     "name": "路軌",
                     "terms": "Rail,火車軌,路軌,軌,鐵軌"
                 },
-                "railway/station": {
-                    "name": "火車站",
-                    "terms": "Railway Station,火車站,鐵路站"
-                },
                 "railway/subway": {
                     "name": "地下鐵路",
                     "terms": "MTR,Mass Transit Railway,Subway,地下鐵,地下鐵路,地鐵"
@@ -2549,8 +2619,7 @@
                     "terms": "Bicycle Shop,單車店,單車舖,自行車店"
                 },
                 "shop/boutique": {
-                    "name": "時裝店",
-                    "terms": "Boutique,時裝店,服飾店,精品店"
+                    "name": "時裝店"
                 },
                 "shop/butcher": {
                     "name": "肉舖",
@@ -2639,10 +2708,6 @@
                     "name": "音響舖",
                     "terms": "Hifi Store,音響店,音響舖"
                 },
-                "shop/jewelry": {
-                    "name": "珠寶金行",
-                    "terms": "Jeweler,珠寶店,珠寶舖,珠寶金行,首飾店,首飾舖"
-                },
                 "shop/laundry": {
                     "name": "洗衣舖",
                     "terms": "Laundry,洗衣店,洗衣舖"
@@ -2679,10 +2744,16 @@
                     "name": "影相舖",
                     "terms": "Photography Store,影相舖,照相館"
                 },
+                "shop/pyrotechnics": {
+                    "name": "煙花舖"
+                },
                 "shop/radiotechnics": {
                     "name": "無綫電／電子零件舖",
                     "terms": "Radio Component Store,Electronic Component Store,無線電零件舖,無綫電零件舖,電子零件舖"
                 },
+                "shop/religion": {
+                    "name": "宗教舖"
+                },
                 "shop/shoes": {
                     "name": "鞋舖",
                     "terms": "Shoe Store,鞋店,鞋舖"
@@ -2727,8 +2798,7 @@
                     "terms": "Wine Shop,酒舖"
                 },
                 "tourism": {
-                    "name": "旅行",
-                    "terms": "Tourism,旅行,旅遊設施"
+                    "name": "旅行"
                 },
                 "tourism/alpine_hut": {
                     "name": "高山屋仔",
@@ -2746,10 +2816,6 @@
                     "name": "露營車營地",
                     "terms": "RV Park,房車營地,露營車停車場,露營車營地"
                 },
-                "tourism/chalet": {
-                    "name": "木屋",
-                    "terms": "Chalet,木屋"
-                },
                 "tourism/guest_house": {
                     "name": "賓館",
                     "terms": "Guest House,賓館"
@@ -2805,6 +2871,30 @@
                     "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,路綫,路線"
@@ -2857,10 +2947,6 @@
                     "name": "路綫總管",
                     "terms": "Route Master,線路總管,路綫總管,路線總目"
                 },
-                "vertex": {
-                    "name": "其他",
-                    "terms": "Other,其他,其它"
-                },
                 "waterway": {
                     "name": "æ°´è·¯"
                 },
@@ -2885,8 +2971,7 @@
                     "terms": "River,江,江河,河,河流"
                 },
                 "waterway/riverbank": {
-                    "name": "江岸",
-                    "terms": "Riverbank,江岸,河堤,河床,河牀"
+                    "name": "江岸"
                 },
                 "waterway/stream": {
                     "name": "涌",
@@ -2897,6 +2982,69 @@
                     "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