X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/714d3d9e2dec7f5449053fb3b536fd850d368aa2..c7ed8a9e8604b207e24e0899a811ff3cdb2e7c3f:/vendor/assets/iD/iD/locales/zh-HK.json

diff --git a/vendor/assets/iD/iD/locales/zh-HK.json b/vendor/assets/iD/iD/locales/zh-HK.json
index c3cdd1fc6..f61dd5bb8 100644
--- a/vendor/assets/iD/iD/locales/zh-HK.json
+++ b/vendor/assets/iD/iD/locales/zh-HK.json
@@ -1,23 +1,39 @@
 {
     "zh-HK": {
         "icons": {
-            "information": "資訊"
+            "download": "下載",
+            "information": "資訊",
+            "remove": "移除",
+            "undo": "復原",
+            "zoom_to": "縮放至",
+            "copy": "複製",
+            "open_wikidata": "在 wikidata.org 開啟"
         },
         "modes": {
             "add_area": {
                 "title": "範圍",
                 "description": "新增公園、建築物、湖或其他範圍至地圖。",
-                "tail": "於地圖上按一下開始繪畫範圍，例如公園、湖或建築物。"
+                "tail": "於地圖上按一下開始繪畫範圍，例如公園、湖或建築物。",
+                "filter_tooltip": "範圍"
             },
             "add_line": {
                 "title": "綫",
                 "description": "新增公路、街道、行人路、水道或其他綫至地圖。",
-                "tail": "於地圖上按一下開始繪畫道路、路徑或者路綫。"
+                "tail": "於地圖上按一下開始繪畫道路、路徑或者路綫。",
+                "filter_tooltip": "綫"
             },
             "add_point": {
                 "title": "點",
                 "description": "新增餐廳、紀念碑、郵筒或其他點至地圖。",
-                "tail": "於地圖上按一下新增點。"
+                "tail": "於地圖上按一下新增點。",
+                "filter_tooltip": "點"
+            },
+            "add_note": {
+                "title": "註",
+                "label": "新增備註",
+                "description": "發現了問題？讓其他製圖者知道。",
+                "tail": "於地圖上按一下新增備註。",
+                "key": "N"
             },
             "browse": {
                 "title": "瀏覽",
@@ -28,6 +44,9 @@
             },
             "draw_line": {
                 "tail": "按一下新增一節至綫。按其他的綫以連接它們，按兩下可完成編輯綫。"
+            },
+            "drag_node": {
+                "connected_to_hidden": "未能編輯這個因為它連接著一個隱藏的特徵。"
             }
         },
         "operations": {
@@ -35,7 +54,8 @@
                 "annotation": {
                     "point": "已新增一點。",
                     "vertex": "已新增節至路上。",
-                    "relation": "已新增關係。"
+                    "relation": "已新增關係。",
+                    "note": "已新增備註。"
                 }
             },
             "start": {
@@ -85,7 +105,7 @@
                     "line": "將這條綫的角方形化。",
                     "area": "將這個範圍的角方形化。"
                 },
-                "key": "S",
+                "key": "Q",
                 "annotation": {
                     "line": "已將這條綫的角方形化。",
                     "area": "已將這個範圍的角方形化。"
@@ -96,11 +116,8 @@
             },
             "straighten": {
                 "title": "拉直",
-                "description": "拉直這條綫。",
                 "key": "S",
-                "annotation": "已拉直一條綫。",
-                "too_bendy": "未能將這個拉直因為它轉太多彎。",
-                "connected_to_hidden": "未能將這條綫拉直因為它連接著一個隱藏的特徵。"
+                "too_bendy": "未能將這個拉直因為它轉太多彎。"
             },
             "delete": {
                 "title": "刪除",
@@ -141,11 +158,23 @@
             },
             "connect": {
                 "annotation": {
-                    "point": "已連接路徑到一個點。",
-                    "vertex": "已連接路徑到另一路徑。",
-                    "line": "已連接路徑到一條綫。",
-                    "area": "已連接路徑到一個範圍。"
-                }
+                    "from_vertex": {
+                        "to_point": "已連接路徑到一點。",
+                        "to_vertex": "已連接路徑到另一路徑。",
+                        "to_line": "已連接路徑到一條綫。",
+                        "to_area": "已連接路徑到一個範圍。",
+                        "to_adjacent_vertex": "已合併鄰近的點成為路徑。",
+                        "to_sibling_vertex": "已將路徑連接到它自己。"
+                    },
+                    "from_point": {
+                        "to_point": "已合併一點到另一點。",
+                        "to_vertex": "已合併一個點到一條綫上的一點。",
+                        "to_line": "已移動一個點到綫。",
+                        "to_area": "已移動一個點到範圍。"
+                    }
+                },
+                "relation": "這些特徵不能連接因為當中一些角色關係有衝突。",
+                "restriction": "這些特徵不能連接因為它會損害一個\"{relation}\" 關係的構件。"
             },
             "disconnect": {
                 "title": "斷開",
@@ -163,7 +192,8 @@
                 "annotation": "合併{n}個特徵。",
                 "not_eligible": "不能合併這些特徵。",
                 "not_adjacent": "這些特徵不能合併因為它們的端點不是連接在一起。",
-                "restriction": "這些特徵不能合併因為最少一個是\"{relation}\" 關係的構件。",
+                "restriction": "這些特徵不能合併因為它會損害一個\"{relation}\" 關係的構件。",
+                "relation": "這些特徵不能合併因為當中一些角色關係有衝突。",
                 "incomplete_relation": "這些特徵不能合併因為最少一個尚未完全下載。",
                 "conflicting_tags": "這些特徵不能合併因為當中一些標籤的數值有衝突。"
             },
@@ -292,6 +322,11 @@
             }
         },
         "restriction": {
+            "controls": {
+                "distance": "距離",
+                "via": "經",
+                "via_node_only": "只有節"
+            },
             "help": {
                 "indirect": "(間接)",
                 "turn": {
@@ -303,7 +338,10 @@
                     "only_right_turn": "只准右轉 {indirect}",
                     "only_u_turn": "只准掉頭 {indirect}",
                     "only_straight_on": "只准直行 {indirect}"
-                }
+                },
+                "from": "由",
+                "via": "經",
+                "to": "到"
             }
         },
         "undo": {
@@ -318,7 +356,6 @@
         "browser_notice": "iD 編輯器支援 Firefox、Chrome、Safari、Opera 和 Internet Explorer 11 以上的版本。請升級你的瀏覽器或是使用 Potlatch 2 來編輯地圖。",
         "translate": {
             "translate": "翻譯",
-            "localized_translation_label": "多種語言名稱",
             "localized_translation_language": "選擇語言",
             "localized_translation_name": "名稱"
         },
@@ -328,6 +365,9 @@
         "loading_auth": "正在連接 OpenStreetMap...",
         "report_a_bug": "報告錯誤",
         "help_translate": "協助翻譯",
+        "sidebar": {
+            "key": "`"
+        },
         "feature_info": {
             "hidden_warning": "{count} 項隱藏特徵",
             "hidden_details": "這些特徵正被隱藏: {details}"
@@ -347,10 +387,12 @@
             "cancel": "取消",
             "changes": "{count} 項變更",
             "download_changes": "下載 osmChange 檔案",
+            "errors": "錯誤",
             "warnings": "警告",
             "modified": "已修改",
             "deleted": "已刪除",
             "created": "已建立",
+            "outstanding_errors_message": "請先解決所有錯誤。餘下 {count} 個。",
             "about_changeset_comments": "有關變動留言",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
             "google_warning": "你在這個留言內提及過Google：緊記絕對不可複製Google地圖的資料。",
@@ -384,7 +426,10 @@
                 "edited_by": "編輯者",
                 "changeset": "變動",
                 "unknown": "未知",
-                "link_text": "openstreetmap.org 上的歷程"
+                "link_text": "openstreetmap.org 上的歷程",
+                "note_created_date": "建立日期",
+                "note_created_user": "建立者",
+                "note_link_text": "openstreetmap.org 上的備註"
             },
             "location": {
                 "key": "L",
@@ -403,7 +448,8 @@
                 "centroid": "形心",
                 "location": "位置",
                 "metric": "公制",
-                "imperial": "英制"
+                "imperial": "英制",
+                "node_count": "節數目"
             }
         },
         "geometry": {
@@ -423,20 +469,25 @@
             "locating": "定位中，請稍候..."
         },
         "inspector": {
-            "no_documentation_combination": "沒有這個標籤組合的相關文件",
-            "no_documentation_key": "沒有這個鍵值的相關文件",
-            "documentation_redirect": "這份文件已轉至新一頁",
+            "zoom_to": {
+                "key": "Z",
+                "title": "放大至這個"
+            },
             "show_more": "顯示更多",
             "view_on_osm": "在 openstreetmap.org 中檢視",
+            "view_on_keepRight": "在 keepright.at 上查看",
             "all_fields": "所有資料",
             "all_tags": "所有標籤",
             "all_members": "所有構件",
             "all_relations": "所有關係",
+            "add_to_relation": "新增至關係",
             "new_relation": "建立新關係⋯⋯",
             "role": "作用",
             "choose": "選擇特徵種類",
             "results": "{search}的{n}個結果",
-            "reference": "在 OpenStreetMap Wiki 中檢閱",
+            "no_documentation_key": "沒有相關文件",
+            "wiki_reference": "查看文件",
+            "wiki_en_reference": "查看英文版文件",
             "back_tooltip": "變更特徵",
             "remove": "移除",
             "search": "搜尋",
@@ -473,9 +524,9 @@
             "best_imagery": "這地點最為人所知的背景影像",
             "switch": "切換回這個背景",
             "custom": "自訂",
-            "custom_button": "編輯自訂背景",
             "overlays": "覆蓋層",
             "reset": "重設",
+            "reset_all": "重設所有",
             "display_options": "顯示選項",
             "brightness": "亮度",
             "contrast": "對比",
@@ -498,12 +549,25 @@
                 "osm": {
                     "tooltip": "來自 OpenStreetMap 的地圖數據",
                     "title": "OpenStreetMap 數據"
+                },
+                "notes": {
+                    "title": "OpenStreetMap 備註"
                 }
             },
             "fill_area": "填滿範圍",
             "map_features": "地圖特徵",
             "autohidden": "由於太多東西出現在螢幕上，這些特徵已被自動隱藏。你可以放大來編輯它們。"
         },
+        "photo_overlays": {
+            "traffic_signs": {
+                "title": "交通標誌"
+            },
+            "photo_type": {
+                "panoramic": {
+                    "tooltip": "360° 相片"
+                }
+            }
+        },
         "feature": {
             "points": {
                 "description": "點",
@@ -546,11 +610,11 @@
                 "tooltip": "電線、發電廠、變電站等等"
             },
             "past_future": {
-                "description": "過去／將來",
+                "description": "過去／將來特徵",
                 "tooltip": "已建議、建築中、已廢棄、已拆毀等等"
             },
             "others": {
-                "description": "其他",
+                "description": "其他特徵",
                 "tooltip": "其他東西"
             }
         },
@@ -569,6 +633,18 @@
                 "tooltip": "整個範圍會被填滿。"
             }
         },
+        "settings": {
+            "custom_background": {
+                "tooltip": "編輯自訂背景",
+                "header": "自訂背景設定"
+            },
+            "custom_data": {
+                "file": {
+                    "label": "瀏覽檔案"
+                },
+                "or": "或"
+            }
+        },
         "restore": {
             "heading": "你有未儲存的變更",
             "description": "你想恢復上一次編輯時尚未儲存的變更嗎？",
@@ -593,6 +669,7 @@
                 "keep_remote": "使用其他人的",
                 "restore": "復原",
                 "delete": "放棄資料",
+                "download_changes": "或下載 osmChange 檔案",
                 "done": "所有衝突已解決！",
                 "help": "另一用戶已變更了一些你變更過的地圖特徵。\n按一下下面的每一個特徵以了解有關衝突內容並決定是否需要保留\n你的變更或者是其他用戶的變更。\n"
             }
@@ -608,8 +685,13 @@
         },
         "success": {
             "just_edited": "你剛剛編輯了OpenStreetMap！",
+            "thank_you": "謝謝協助改善地圖。",
+            "thank_you_location": "謝謝協助改善 {where} 附近的地圖。",
             "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": "於OSM上顯示改變",
+            "languages": "語言：{languages}",
+            "tell_us": "告訴我們！"
         },
         "confirm": {
             "okay": "確定",
@@ -634,51 +716,47 @@
             "on_wiki": "在wiki.osm.org上的 {tag}",
             "used_with": "與{type}一起用"
         },
-        "validations": {
-            "disconnected_highway": "已斷開的高速公路。",
-            "disconnected_highway_tooltip": "道路必須連接至其他道路或建築物入口。",
-            "old_multipolygon": "外部路徑上的多邊形標籤",
-            "old_multipolygon_tooltip": "這種多邊形格式已停用。請將標籤分配予母多邊形，而非外部路徑。",
-            "untagged_point": "未有標籤的點",
-            "untagged_point_tooltip": "選擇一個特徵種類來形容這個點是甚麼。",
-            "untagged_line": "未有標籤的綫",
-            "untagged_line_tooltip": "選擇一個特徵種類來形容這條綫是甚麼。",
-            "untagged_area": "未有標籤的範圍",
-            "untagged_area_tooltip": "選擇一個特徵種類來形容這個範圍是甚麼。",
-            "untagged_relation": "未有標籤的關係",
-            "untagged_relation_tooltip": "選擇一個特徵種類來形容這個關係是甚麼。",
-            "tag_suggests_area": "{tag}標籤建議綫應為範圍，但這不是一個範圍。",
-            "deprecated_tags": "已棄用的標籤: {tags}"
-        },
         "zoom": {
             "in": "放大",
             "out": "縮小"
         },
         "cannot_zoom": "在這個模式下不能再縮小。",
         "full_screen": "切換全螢幕",
-        "gpx": {
-            "local_layer": "本機檔案",
-            "drag_drop": "拖移一個 .gpx, .geojson 或者 .kml 檔案到頁面或者按右側按鈕瀏覽。",
-            "zoom": "放大至圖層",
-            "browse": "瀏覽檔案"
+        "QA": {
+            "improveOSM": {
+                "directions": {
+                    "west": "西"
+                }
+            },
+            "keepRight": {
+                "title": "KeepRight 錯誤",
+                "detail_title": "錯誤",
+                "close": "關閉 (已修正錯誤)",
+                "ignore": "忽略 (不是錯誤)",
+                "save_comment": "儲存留言",
+                "close_comment": "關閉並留言",
+                "ignore_comment": "忽略並留言"
+            }
         },
         "mapillary_images": {
-            "tooltip": "來自Mapillary的街道圖層相片",
-            "title": "相片重疊 (Mapillary)"
-        },
-        "mapillary_signs": {
-            "tooltip": "來自Mapillary的交通訊號（必須啟用相片重疊）",
-            "title": "交通訊號重疊 (Mapillary)"
+            "tooltip": "來自Mapillary的街道圖層相片"
         },
         "mapillary": {
             "view_on_mapillary": "在Mapillary上觀看這影像"
         },
-        "openstreetcam_images": {
-            "title": "相片重疊 (OpenStreetCam)"
-        },
         "openstreetcam": {
             "view_on_openstreetcam": "在 OpenStreetCam 上觀看這影像"
         },
+        "note": {
+            "commentTitle": "留言",
+            "status": {
+                "commented": "已留言 {when}"
+            },
+            "newComment": "新留言",
+            "comment": "留言",
+            "close_comment": "關閉並留言",
+            "open_comment": "再開啟並留言"
+        },
         "help": {
             "title": "說明",
             "key": "H",
@@ -716,6 +794,14 @@
                 "title": "綫",
                 "add_line_h": "新增綫",
                 "modify_line_h": "修改綫"
+            },
+            "notes": {
+                "update_note_h": "關閉、再開和留言"
+            }
+        },
+        "issues": {
+            "errors": {
+                "list_title": "錯誤 ({count})"
             }
         },
         "intro": {
@@ -1044,7 +1130,6 @@
                     "add_point": "'增加節'模式",
                     "add_line": "'增加線'模式",
                     "add_area": "'增加範圍'模式",
-                    "place_point": "放置一個點",
                     "disable_snap": "長按可停用點捕捉",
                     "stop_line": "完成繪製線或範圍"
                 },
@@ -1057,7 +1142,6 @@
                     "reverse": "反轉一條線",
                     "move": "移動已選擇特徵",
                     "rotate": "旋轉已選擇特徵",
-                    "orthogonalize": "拉直線 / 將範圍方形化",
                     "circularize": "將已封閉的線或範圍圓形化",
                     "reflect_long": "以長軸鏡射特徵。",
                     "reflect_short": "以短軸鏡射特徵。",
@@ -1092,41 +1176,17 @@
                 "category-building": {
                     "name": "建築物特徵"
                 },
-                "category-golf": {
-                    "name": "高爾夫特徵"
-                },
                 "category-landuse": {
                     "name": "土地利用特徵"
                 },
-                "category-natural-area": {
-                    "name": "自然特徵"
-                },
-                "category-natural-line": {
-                    "name": "自然特徵"
-                },
-                "category-natural-point": {
-                    "name": "自然特徵"
-                },
-                "category-path": {
-                    "name": "路徑特徵"
-                },
-                "category-rail": {
-                    "name": "鐵路特徵"
-                },
                 "category-restriction": {
                     "name": "限制特徵"
                 },
-                "category-road": {
-                    "name": "道路特徵"
-                },
                 "category-route": {
                     "name": "路綫特徵"
                 },
-                "category-water-area": {
-                    "name": "水特徵"
-                },
-                "category-water-line": {
-                    "name": "水特徵"
+                "category-utility": {
+                    "name": "設施特徵"
                 }
             },
             "fields": {
@@ -1138,7 +1198,7 @@
                             "title": "指定"
                         },
                         "destination": {
-                            "description": "限往目的地",
+                            "description": "只限往目的地",
                             "title": "目的地"
                         },
                         "dismount": {
@@ -1153,6 +1213,10 @@
                             "description": "容許進入，直至擁有者撇回許可",
                             "title": "自由通過"
                         },
+                        "permit": {
+                            "description": "只限有效許可證",
+                            "title": "准許證"
+                        },
                         "private": {
                             "description": "須擁有者個別批准，方可進入",
                             "title": "私人"
@@ -1300,9 +1364,6 @@
                         "onsen": "日式溫泉"
                     }
                 },
-                "beauty": {
-                    "label": "商店種類"
-                },
                 "bench": {
                     "label": "長椅"
                 },
@@ -1340,6 +1401,9 @@
                     "label": "種類",
                     "placeholder": "預設"
                 },
+                "bridge/support": {
+                    "label": "種類"
+                },
                 "building": {
                     "label": "建築物"
                 },
@@ -1401,6 +1465,14 @@
                 "content": {
                     "label": "內容"
                 },
+                "conveying": {
+                    "label": "移動方向",
+                    "options": {
+                        "backward": "後向",
+                        "forward": "前向",
+                        "reversible": "可變換方向"
+                    }
+                },
                 "country": {
                     "label": "國"
                 },
@@ -1493,6 +1565,9 @@
                 "description": {
                     "label": "描述"
                 },
+                "design": {
+                    "label": "設計"
+                },
                 "devices": {
                     "label": "裝置",
                     "placeholder": "1, 2, 3..."
@@ -1533,11 +1608,19 @@
                     }
                 },
                 "direction_vertex": {
-                    "label": "方向"
+                    "label": "方向",
+                    "options": {
+                        "backward": "後向",
+                        "both": "雙向",
+                        "forward": "前向"
+                    }
                 },
                 "display": {
                     "label": "顯示"
                 },
+                "distance": {
+                    "label": "距離"
+                },
                 "dock": {
                     "label": "種類"
                 },
@@ -1588,20 +1671,9 @@
                 "fence_type": {
                     "label": "種類"
                 },
-                "fire_hydrant/position": {
-                    "label": "Position",
-                    "options": {
-                        "green": "草地",
-                        "lane": "å··",
-                        "parking_lot": "停車場",
-                        "sidewalk": "行人路"
-                    }
-                },
                 "fire_hydrant/type": {
-                    "label": "種類",
                     "options": {
                         "pillar": "柱狀/地上",
-                        "pond": "池塘",
                         "underground": "地下",
                         "wall": "牆上"
                     }
@@ -1610,7 +1682,7 @@
                     "label": "設備種類"
                 },
                 "fixme": {
-                    "label": "整好我"
+                    "label": "待修正"
                 },
                 "ford": {
                     "label": "類",
@@ -1619,6 +1691,9 @@
                 "frequency": {
                     "label": "操作頻率"
                 },
+                "from": {
+                    "label": "由"
+                },
                 "fuel": {
                     "label": "燃料"
                 },
@@ -1685,10 +1760,43 @@
                 "historic/civilization": {
                     "label": "古代文明"
                 },
+                "historic/wreck/date_sunk": {
+                    "label": "沉沒日期"
+                },
+                "historic/wreck/visible_at_high_tide": {
+                    "label": "漲潮時看到"
+                },
+                "historic/wreck/visible_at_low_tide": {
+                    "label": "退潮時看到"
+                },
                 "hoops": {
                     "label": "籃框數量",
                     "placeholder": "1, 2, 4..."
                 },
+                "horse_dressage": {
+                    "label": "盛裝舞步",
+                    "options": {
+                        "equestrian": "是",
+                        "undefined": "否"
+                    }
+                },
+                "horse_riding": {
+                    "label": "騎馬",
+                    "options": {
+                        "horse_riding": "是",
+                        "undefined": "否"
+                    }
+                },
+                "horse_scale": {
+                    "label": "騎馬難度"
+                },
+                "horse_stables": {
+                    "label": "馬廄",
+                    "options": {
+                        "stables": "是",
+                        "undefined": "否"
+                    }
+                },
                 "iata": {
                     "label": "萬國航空運輸協會（IATA）"
                 },
@@ -1708,6 +1816,9 @@
                 "indoor": {
                     "label": "室內"
                 },
+                "industrial": {
+                    "label": "種類"
+                },
                 "information": {
                     "label": "種類"
                 },
@@ -1730,9 +1841,6 @@
                 "internet_access/fee": {
                     "label": "互聯網費用"
                 },
-                "internet_access/ssid": {
-                    "label": "SSID (網絡名稱)"
-                },
                 "kerb": {
                     "label": "下斜路緣"
                 },
@@ -1749,6 +1857,9 @@
                     "label": "行車綫",
                     "placeholder": "1, 2, 3..."
                 },
+                "language_multi": {
+                    "label": "語言"
+                },
                 "layer": {
                     "label": "層",
                     "placeholder": "0"
@@ -1808,6 +1919,14 @@
                 "location": {
                     "label": "地點"
                 },
+                "location_pool": {
+                    "label": "位置",
+                    "options": {
+                        "indoor": "室內",
+                        "outdoor": "室外",
+                        "roof": "天台"
+                    }
+                },
                 "man_made": {
                     "label": "類別"
                 },
@@ -1820,6 +1939,9 @@
                 "map_type": {
                     "label": "種類"
                 },
+                "material": {
+                    "label": "物料"
+                },
                 "maxheight": {
                     "label": "最大高度",
                     "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
@@ -1829,6 +1951,7 @@
                     "placeholder": "40, 50, 60..."
                 },
                 "maxspeed/advisory": {
+                    "label": "建議限速",
                     "placeholder": "40, 50, 60..."
                 },
                 "maxstay": {
@@ -1931,7 +2054,9 @@
                 "oneway": {
                     "label": "單程",
                     "options": {
+                        "alternating": "單綫雙程",
                         "no": "否",
+                        "reversible": "可變換方向",
                         "undefined": "假設為否",
                         "yes": "是"
                     }
@@ -1939,7 +2064,9 @@
                 "oneway_yes": {
                     "label": "單程",
                     "options": {
+                        "alternating": "單綫雙程",
                         "no": "否",
+                        "reversible": "可變換方向",
                         "undefined": "假設為是",
                         "yes": "是"
                     }
@@ -1984,6 +2111,19 @@
                     "placeholder": "+852 12345678"
                 },
                 "piste/difficulty": {
+                    "label": "難度",
+                    "options": {
+                        "advanced": "高階",
+                        "easy": "容易",
+                        "expert": "專家級",
+                        "extreme": "極限級",
+                        "freeride": "自由滑行",
+                        "intermediate": "中階",
+                        "novice": "新手"
+                    },
+                    "placeholder": "容易、中階、 進階..."
+                },
+                "piste/difficulty_downhill": {
                     "label": "難度",
                     "options": {
                         "advanced": "進階 (黑鑽)",
@@ -1996,6 +2136,30 @@
                     },
                     "placeholder": "容易、中階、 進階..."
                 },
+                "piste/difficulty_nordic": {
+                    "label": "難度",
+                    "options": {
+                        "advanced": "高階 - 窄、斜或結冰路段，急彎",
+                        "easy": "容易 - 軟地、一小段斜的段",
+                        "expert": "專家 - 附近有危險地形",
+                        "intermediate": "中階 - 傾斜路段",
+                        "novice": "新手 - 平路、毋須花太多力氣"
+                    },
+                    "placeholder": "容易、中階、 進階..."
+                },
+                "piste/difficulty_skitour": {
+                    "label": "難度",
+                    "options": {
+                        "advanced": "高階 - S: 斜度 40-45°",
+                        "easy": "容易 - WS: 斜度 30-35°",
+                        "expert": "專家 - SS: 斜度 45–50°",
+                        "extreme": "極限 - EX: 斜度 >55°",
+                        "freeride": "自由滑行 - AS: 斜度 50–55°",
+                        "intermediate": "中等 - ZS: 斜度 35-40°",
+                        "novice": "新手 - L: 斜度 <30°"
+                    },
+                    "placeholder": "容易、中階、 進階..."
+                },
                 "piste/grooming": {
                     "label": "雪道種類",
                     "options": {
@@ -2010,6 +2174,7 @@
                 "piste/type": {
                     "label": "種類",
                     "options": {
+                        "connection": "連接",
                         "downhill": "滑降",
                         "hike": "徒步",
                         "ice_skate": "冰刀",
@@ -2058,15 +2223,38 @@
                 "railway": {
                     "label": "類別"
                 },
+                "railway/position": {
+                    "label": "里程碑位置",
+                    "placeholder": "距離準確至一個小數位 (123.4)"
+                },
+                "railway/signal/direction": {
+                    "label": "方向",
+                    "options": {
+                        "backward": "後向",
+                        "both": "雙向",
+                        "forward": "前向"
+                    }
+                },
                 "rating": {
                     "label": "電力功率"
                 },
                 "recycling_accepts": {
                     "label": "接受"
                 },
+                "recycling_type": {
+                    "label": "種類",
+                    "options": {
+                        "centre": "中心",
+                        "container": "回收箱"
+                    },
+                    "placeholder": "回收箱, 中心"
+                },
                 "ref": {
                     "label": "參考編號"
                 },
+                "ref/isil": {
+                    "label": "ISIL 編號"
+                },
                 "ref_aeroway_gate": {
                     "label": "登機閘編號"
                 },
@@ -2133,9 +2321,91 @@
                 "sanitary_dump_station": {
                     "label": "廁所污水處理"
                 },
+                "scuba_diving": {
+                    "label": "服務"
+                },
+                "seamark/beacon_isolated_danger/shape": {
+                    "label": "形狀"
+                },
+                "seamark/beacon_lateral/category": {
+                    "label": "分類",
+                    "options": {
+                        "danger_left": "左岸有危險",
+                        "danger_right": "右岸有危險",
+                        "port": "左舷",
+                        "starboard": "右舷"
+                    }
+                },
+                "seamark/beacon_lateral/colour": {
+                    "label": "顏色",
+                    "options": {
+                        "green": "綠",
+                        "grey": "灰",
+                        "red": "紅"
+                    }
+                },
+                "seamark/beacon_lateral/shape": {
+                    "label": "形狀"
+                },
+                "seamark/beacon_lateral/system": {
+                    "label": "制式",
+                    "options": {
+                        "cevni": "CEVNI",
+                        "iala-a": "IALA A",
+                        "iala-b": "IALA B",
+                        "other": "其他"
+                    }
+                },
+                "seamark/buoy_lateral/category": {
+                    "label": "分類",
+                    "options": {
+                        "danger_left": "左岸有危險",
+                        "danger_right": "右岸有危險",
+                        "port": "左舷",
+                        "starboard": "右舷"
+                    }
+                },
+                "seamark/buoy_lateral/colour": {
+                    "label": "顏色",
+                    "options": {
+                        "green": "綠",
+                        "green;red;green": "綠-紅-綠",
+                        "green;white;green;white": "綠-白-綠-白",
+                        "red": "紅",
+                        "red;green;red": "紅-綠-紅",
+                        "red;white;red;white": "紅-白-紅-白",
+                        "white": "白",
+                        "yellow": "黃"
+                    }
+                },
+                "seamark/buoy_lateral/shape": {
+                    "label": "形狀"
+                },
+                "seamark/buoy_lateral/system": {
+                    "label": "制式",
+                    "options": {
+                        "cevni": "CEVNI",
+                        "iala-a": "IALA A",
+                        "iala-b": "IALA B",
+                        "other": "其他"
+                    }
+                },
+                "seamark/mooring/category": {
+                    "label": "分類"
+                },
+                "seamark/type": {
+                    "label": "航海標"
+                },
+                "seamark/wreck/category": {
+                    "label": "分類"
+                },
                 "seasonal": {
                     "label": "季節性"
                 },
+                "seats": {
+                    "label": "座位",
+                    "placeholder": "2, 4, 6..."
+                },
                 "second_hand": {
                     "label": "售賣二手貨",
                     "options": {
@@ -2175,9 +2445,23 @@
                 "shop": {
                     "label": "種類"
                 },
+                "siren/purpose": {
+                    "label": "作用"
+                },
+                "siren/type": {
+                    "label": "種類",
+                    "options": {
+                        "electronic": "電子",
+                        "other": "其他",
+                        "pneumatic": "氣動"
+                    }
+                },
                 "site": {
                     "label": "類別"
                 },
+                "site_type": {
+                    "label": "地點類別"
+                },
                 "smoking": {
                     "label": "吸煙",
                     "options": {
@@ -2253,6 +2537,7 @@
                     "placeholder": "未知"
                 },
                 "structure_waterway": {
+                    "label": "構造",
                     "options": {
                         "tunnel": "隧道"
                     },
@@ -2290,9 +2575,18 @@
                 "surveillance/zone": {
                     "label": "監視區域"
                 },
-                "switch": {
+                "swimming_pool": {
                     "label": "種類"
                 },
+                "switch": {
+                    "label": "種類",
+                    "options": {
+                        "circuit_breaker": "斷路器",
+                        "disconnector": "切斷器",
+                        "earthing": " 接地斷路",
+                        "mechanical": "機械式"
+                    }
+                },
                 "tactile_paving": {
                     "label": "盲人引路徑"
                 },
@@ -2305,13 +2599,15 @@
                     },
                     "placeholder": "可以、不可、只可外賣…"
                 },
+                "to": {
+                    "label": "至"
+                },
                 "toilets/disposal": {
                     "label": "棄置",
                     "options": {
                         "bucket": "尿斗",
                         "chemical": "化學掩臭",
-                        "flush": "沖水式",
-                        "pitlatrine": "坑廁/旱廁"
+                        "flush": "沖水式"
                     }
                 },
                 "toll": {
@@ -2323,9 +2619,6 @@
                 "tourism": {
                     "label": "種類"
                 },
-                "tourism_attraction": {
-                    "label": "旅遊"
-                },
                 "tower/construction": {
                     "label": "建築物料",
                     "placeholder": "拉線、格狀、隱藏、..."
@@ -2350,9 +2643,28 @@
                 "traffic_calming": {
                     "label": "種類"
                 },
+                "traffic_sign": {
+                    "label": "交通標誌"
+                },
+                "traffic_sign/direction": {
+                    "label": "方向",
+                    "options": {
+                        "backward": "後向",
+                        "both": "雙向",
+                        "forward": "前向"
+                    }
+                },
                 "traffic_signals": {
                     "label": "訊號種類"
                 },
+                "traffic_signals/direction": {
+                    "label": "方向",
+                    "options": {
+                        "backward": "後向",
+                        "both": "雙向",
+                        "forward": "前向"
+                    }
+                },
                 "trail_visibility": {
                     "label": "路徑可見度",
                     "options": {
@@ -2366,7 +2678,17 @@
                     "placeholder": "優良、好、差勁..."
                 },
                 "transformer": {
-                    "label": "種類"
+                    "label": "種類",
+                    "options": {
+                        "auto": "自耦變壓器",
+                        "auxiliary": "輔助",
+                        "converter": "轉換器",
+                        "distribution": "配電器",
+                        "generator": "變電器",
+                        "phase_angle_regulator": "相位角整流器",
+                        "traction": " 牽引器",
+                        "yes": "未知"
+                    }
                 },
                 "trees": {
                     "label": "樹"
@@ -2375,6 +2697,20 @@
                     "label": "種類",
                     "placeholder": "預設"
                 },
+                "usage_rail": {
+                    "label": "用途種類",
+                    "options": {
+                        "branch": "分支",
+                        "industrial": "工業",
+                        "main": "主線",
+                        "military": "軍事",
+                        "test": "測試",
+                        "tourism": "觀光"
+                    }
+                },
+                "vending": {
+                    "label": "貨物種類"
+                },
                 "visibility": {
                     "label": "可見度",
                     "options": {
@@ -2383,8 +2719,32 @@
                         "street": "5 至 20米 (16 至 65呎)"
                     }
                 },
+                "volcano/status": {
+                    "label": "火山狀態",
+                    "options": {
+                        "active": "活火山",
+                        "dormant": "睡火山",
+                        "extinct": "死火山"
+                    }
+                },
                 "volcano/type": {
-                    "label": "火山種類"
+                    "label": "火山種類",
+                    "options": {
+                        "shield": "盾狀火山",
+                        "stratovolcano": "層狀火山"
+                    }
+                },
+                "voltage": {
+                    "label": "電壓"
+                },
+                "voltage/primary": {
+                    "label": "初級電壓"
+                },
+                "voltage/secondary": {
+                    "label": " 次級電壓"
+                },
+                "voltage/tertiary": {
+                    "label": "三次電壓"
                 },
                 "wall": {
                     "label": "種類"
@@ -2399,8 +2759,7 @@
                     "label": "種類"
                 },
                 "website": {
-                    "label": "網站",
-                    "placeholder": "http://example.com/"
+                    "label": "網站"
                 },
                 "wetland": {
                     "label": "種類"
@@ -2408,14 +2767,24 @@
                 "wheelchair": {
                     "label": "可通輪椅"
                 },
+                "wholesale": {
+                    "label": "批發"
+                },
                 "width": {
                     "label": "濶度(米)"
                 },
+                "wikidata": {
+                    "label": "維基資料"
+                },
                 "wikipedia": {
                     "label": "維基百科全書"
                 },
                 "windings": {
+                    "label": "繞組",
                     "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "繞組組態"
                 }
             },
             "presets": {
@@ -2657,6 +3026,10 @@
                     "name": "牙醫",
                     "terms": "牙醫診所,牙科診所,齒科"
                 },
+                "amenity/dive_centre": {
+                    "name": "潛水中心",
+                    "terms": "Dive Center,潛水中心"
+                },
                 "amenity/doctors": {
                     "name": "醫生",
                     "terms": "醫師"
@@ -2674,13 +3047,36 @@
                     "terms": "Driving School, 駕駛學院"
                 },
                 "amenity/embassy": {
-                    "name": "大使館",
-                    "terms": "Embassy,使館,大使館,領事館"
+                    "name": "大使館"
                 },
                 "amenity/fast_food": {
                     "name": "快餐店",
                     "terms": "Fast Food,快餐店,速食店"
                 },
+                "amenity/fast_food/burger": {
+                    "name": "漢堡快餐",
+                    "terms": "漢堡麭快餐,漢堡包快餐,漢堡包"
+                },
+                "amenity/fast_food/chicken": {
+                    "name": "雞快餐",
+                    "terms": "炸雞快餐,炸雞"
+                },
+                "amenity/fast_food/fish_and_chips": {
+                    "name": "炸魚及薯條快餐",
+                    "terms": "炸魚,薯條"
+                },
+                "amenity/fast_food/kebab": {
+                    "name": "土耳其烤肉快餐",
+                    "terms": "土耳其串燒,串燒烤肉,烤肉"
+                },
+                "amenity/fast_food/pizza": {
+                    "name": "薄餅快餐",
+                    "terms": "Pizza,意式薄餅,意大利薄餅"
+                },
+                "amenity/fast_food/sandwich": {
+                    "name": "三文治快餐",
+                    "terms": "三明治"
+                },
                 "amenity/ferry_terminal": {
                     "name": "客運碼頭"
                 },
@@ -2728,6 +3124,10 @@
                     "name": "學前照顧/幼稚園範圍",
                     "terms": "幼兒園,幼稚園用地,幼稚園"
                 },
+                "amenity/language_school": {
+                    "name": "語言學校",
+                    "terms": "語言學校,外文學校,外語學校"
+                },
                 "amenity/library": {
                     "name": "圖書館",
                     "terms": "Library,圖書館"
@@ -2740,6 +3140,14 @@
                     "name": "街市",
                     "terms": "Marketplace,市場,菜市場,街市"
                 },
+                "amenity/monastery": {
+                    "name": "寺院範圍",
+                    "terms": "道觀,寺廟,廟宇,道寺"
+                },
+                "amenity/money_transfer": {
+                    "name": "滙款中心",
+                    "terms": "滙款店,匯款"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "電單車停車位",
                     "terms": "摩托車停車場,電單車停車場"
@@ -2757,7 +3165,11 @@
                 },
                 "amenity/parking": {
                     "name": "停車場",
-                    "terms": "Car Parking,停車場"
+                    "terms": "Car Parking,停車場,泊車位,泊車場,停車位"
+                },
+                "amenity/parking/multi-storey": {
+                    "name": "多層停車場",
+                    "terms": "多層泊車場,停車場,泊車場"
                 },
                 "amenity/parking_entrance": {
                     "name": "停車場入口/出口",
@@ -2767,13 +3179,13 @@
                     "name": "泊車位",
                     "terms": "停車空間,泊車處,停車位,車位"
                 },
-                "amenity/pavilion": {
-                    "name": "亭",
-                    "terms": "Pavilion,亭"
+                "amenity/payment_centre": {
+                    "name": "繳費處",
+                    "terms": "付款處,付費處,繳費中心"
                 },
-                "amenity/pharmacy": {
-                    "name": "藥房",
-                    "terms": "Pharmacy,葯局,葯店,葯房,葯舖,藥局,藥店,藥房,藥舖"
+                "amenity/payment_terminal": {
+                    "name": "繳費終端機",
+                    "terms": "繳費機,付款機,收費機"
                 },
                 "amenity/place_of_worship": {
                     "name": "祟拜場所",
@@ -2783,22 +3195,10 @@
                     "name": "佛寺",
                     "terms": "Buddhist Temple,佛堂,佛寺,佛廟,和尚寺,寶殿,寺,寺廟,尼姑庵,尼庵,庵堂,廟,精舍,閣,靜院,觀音廟,觀音寺"
                 },
-                "amenity/place_of_worship/christian": {
-                    "name": "敎堂",
-                    "terms": "Christian,Church,基督敎堂,基督教堂,天主堂,天主敎堂,天主教堂,敎堂,教堂,聖堂"
-                },
                 "amenity/place_of_worship/hindu": {
                     "name": "印度廟",
                     "terms": "Hindu Temple, 印度教廟"
                 },
-                "amenity/place_of_worship/jewish": {
-                    "name": "猶太廟",
-                    "terms": "Synagogue,jewish,猶太寺,猶太廟,猶太教堂"
-                },
-                "amenity/place_of_worship/muslim": {
-                    "name": "清真寺",
-                    "terms": "Mosque,Muslim,回教寺,回教廟,清真廟,清真寺"
-                },
                 "amenity/place_of_worship/shinto": {
                     "name": "神道廟",
                     "terms": "Shinto Shrine, 神道教廟"
@@ -2848,13 +3248,16 @@
                     "terms": "Ranger Station,郊野公園管理站,郊野公園訪客中心"
                 },
                 "amenity/recycling": {
-                    "name": "回收桶",
-                    "terms": "Recycling Container, 回收箱"
+                    "name": "回收設施"
                 },
                 "amenity/recycling_centre": {
                     "name": "回收中心",
                     "terms": "Recycling Center, 廢物回收中心, 資源回收中心"
                 },
+                "amenity/recycling_container": {
+                    "name": "回收桶",
+                    "terms": "回收桶,三色桶,回收箱"
+                },
                 "amenity/register_office": {
                     "name": "人事登記處"
                 },
@@ -2862,6 +3265,78 @@
                     "name": "餐廳",
                     "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
                 },
+                "amenity/restaurant/american": {
+                    "name": "美式餐廳",
+                    "terms": "美國餐廳"
+                },
+                "amenity/restaurant/asian": {
+                    "name": "亞洲餐廳",
+                    "terms": "亞式餐廳"
+                },
+                "amenity/restaurant/chinese": {
+                    "name": "中式餐廳",
+                    "terms": "中國餐廳"
+                },
+                "amenity/restaurant/french": {
+                    "name": "法式餐廳",
+                    "terms": "法國餐廳"
+                },
+                "amenity/restaurant/german": {
+                    "name": "德式餐廳",
+                    "terms": "德國餐廳"
+                },
+                "amenity/restaurant/greek": {
+                    "name": "希臘式餐廳",
+                    "terms": "希臘餐廳"
+                },
+                "amenity/restaurant/indian": {
+                    "name": "印度式餐廳",
+                    "terms": "印度餐廳"
+                },
+                "amenity/restaurant/italian": {
+                    "name": "意式餐廳",
+                    "terms": "意大利餐廳"
+                },
+                "amenity/restaurant/japanese": {
+                    "name": "日式餐廳",
+                    "terms": "日本餐廳"
+                },
+                "amenity/restaurant/mexican": {
+                    "name": "墨西哥式餐廳",
+                    "terms": "墨西哥餐廳"
+                },
+                "amenity/restaurant/noodle": {
+                    "name": "麵食店",
+                    "terms": "麵食餐廳,麵店"
+                },
+                "amenity/restaurant/pizza": {
+                    "name": "薄餅餐廳",
+                    "terms": "意式薄餅餐廳,意大利薄餅餐廳"
+                },
+                "amenity/restaurant/seafood": {
+                    "name": "海鮮餐廳",
+                    "terms": "海鮮餐廳"
+                },
+                "amenity/restaurant/steakhouse": {
+                    "name": "扒房",
+                    "terms": "鋸扒,牛扒屋"
+                },
+                "amenity/restaurant/sushi": {
+                    "name": "壽司餐廳",
+                    "terms": "壽司店,廻轉壽司"
+                },
+                "amenity/restaurant/thai": {
+                    "name": "泰式餐廳",
+                    "terms": "泰國餐廳"
+                },
+                "amenity/restaurant/turkish": {
+                    "name": "土耳其式餐廳",
+                    "terms": "土耳其餐廳"
+                },
+                "amenity/restaurant/vietnamese": {
+                    "name": "越式餐廳",
+                    "terms": "越南餐廳"
+                },
                 "amenity/sanitary_dump_station": {
                     "name": "露營車廁所廢物收集",
                     "terms": "露營車廁所廢物收集"
@@ -2952,25 +3427,14 @@
                     "name": "飲品售賣機",
                     "terms": "飲料售賣機"
                 },
-                "amenity/vending_machine/excrement_bags": {
-                    "name": "排泄物袋售賣機",
-                    "terms": "糞便袋售賣機"
-                },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "女性衞生用品售賣機",
                     "terms": "Feminine Hygiene Vending Machine,女性用品售賣機"
                 },
-                "amenity/vending_machine/news_papers": {
-                    "name": "報紙售賣機"
-                },
                 "amenity/vending_machine/newspapers": {
                     "name": "報紙售賣機",
                     "terms": "Newspaper Vending Machine,報紙販賣機"
                 },
-                "amenity/vending_machine/parcel_pickup_dropoff": {
-                    "name": "包裹領件/投寄機",
-                    "terms": "包裹領件/投寄機"
-                },
                 "amenity/vending_machine/parking_tickets": {
                     "name": "泊車票售賣機",
                     "terms": "停車票售賣機"
@@ -3023,10 +3487,6 @@
                     "name": "機動遊戲機",
                     "terms": "Amusement Ride,機動遊戲"
                 },
-                "attraction/animal": {
-                    "name": "動物",
-                    "terms": "Animal,動物"
-                },
                 "attraction/big_wheel": {
                     "name": "摩天輪",
                     "terms": "Big Wheel,Ferris wheel"
@@ -3118,10 +3578,6 @@
                     "name": "樹籬",
                     "terms": "Hedge,樹籬"
                 },
-                "barrier/kerb": {
-                    "name": "路緣",
-                    "terms": "Kerb, 路邊石, 路緣石, 路邊"
-                },
                 "barrier/kissing_gate": {
                     "name": "單人轉門 ",
                     "terms": "Kissing Gate,單人轉門"
@@ -3154,10 +3610,6 @@
                     "name": "建築物",
                     "terms": "Building,屋宇,建築物"
                 },
-                "building/apartments": {
-                    "name": "公寓",
-                    "terms": "Apartments,公寓,分層屋宇"
-                },
                 "building/barn": {
                     "name": "穀倉",
                     "terms": "穀倉,糧倉"
@@ -3308,9 +3760,6 @@
                     "name": "排屋",
                     "terms": "行列式房屋,連棟式住宅"
                 },
-                "building/train_station": {
-                    "name": "火車站"
-                },
                 "building/university": {
                     "name": "大學建築物",
                     "terms": "大學校舍"
@@ -3412,7 +3861,7 @@
                 },
                 "craft/key_cutter": {
                     "name": "配匙店",
-                    "terms": "鑰匙店,鎖匙店 "
+                    "terms": "鑰匙店,鎖匙店"
                 },
                 "craft/locksmith": {
                     "name": "鎖匠"
@@ -3472,6 +3921,10 @@
                     "name": "棚架工程",
                     "terms": "搭棚"
                 },
+                "craft/sculptor": {
+                    "name": "雕像",
+                    "terms": "雕塑"
+                },
                 "craft/shoemaker": {
                     "name": "鞋匠",
                     "terms": "皮鞋匠"
@@ -3508,8 +3961,7 @@
                     "terms": "葡萄酒廠"
                 },
                 "embankment": {
-                    "name": "路堤",
-                    "terms": "Embankment,基堤,堤,堤壩,堤岸"
+                    "name": "路堤"
                 },
                 "emergency/ambulance_station": {
                     "name": "救護站",
@@ -3525,14 +3977,30 @@
                 "emergency/destination": {
                     "name": "緊急通道目的地"
                 },
+                "emergency/fire_alarm": {
+                    "name": "火警召喚",
+                    "terms": "火警召喚箱,火警鐘"
+                },
+                "emergency/fire_extinguisher": {
+                    "name": "滅火筒",
+                    "terms": "滅火器"
+                },
                 "emergency/fire_hydrant": {
                     "name": "消防栓",
                     "terms": "Fire Hydrant,消防栓,消防龍頭"
                 },
+                "emergency/first_aid_kit": {
+                    "name": "急救箱",
+                    "terms": "First Aid Kit,急救,救護,繃帶,醫療箱,medkit"
+                },
                 "emergency/life_ring": {
                     "name": "救生圈",
                     "terms": "Life Ring,救生水泡"
                 },
+                "emergency/lifeguard": {
+                    "name": "救生員",
+                    "terms": "救生員"
+                },
                 "emergency/no": {
                     "name": "非緊急通道"
                 },
@@ -3553,26 +4021,6 @@
                     "name": "入口/出口",
                     "terms": "出入口,出口,入口"
                 },
-                "footway/crossing": {
-                    "name": "行人過路處",
-                    "terms": "行人過路處"
-                },
-                "footway/crossing-raised": {
-                    "name": "升高的過路處",
-                    "terms": "Raised Street Crossing,升高的過路處"
-                },
-                "footway/crosswalk": {
-                    "name": "斑馬線",
-                    "terms": "行人過路線,行人過路處"
-                },
-                "footway/crosswalk-raised": {
-                    "name": "隆起的行人過路處",
-                    "terms": "Raised Pedestrian Crosswalk,隆起的行人過路處"
-                },
-                "footway/sidewalk": {
-                    "name": "行人路",
-                    "terms": "Sidewalk,行人路,行人道"
-                },
                 "ford": {
                     "name": "淺灘",
                     "terms": "水灘"
@@ -3593,14 +4041,6 @@
                     "name": "高爾夫球洞",
                     "terms": "Golf Hole,高爾夫球球洞"
                 },
-                "golf/lateral_water_hazard_area": {
-                    "name": "側面水障礙",
-                    "terms": "Lateral Water Hazard, 側面水障礙"
-                },
-                "golf/lateral_water_hazard_line": {
-                    "name": "側面水障礙",
-                    "terms": "Lateral Water Hazard, 側面水障礙"
-                },
                 "golf/rough": {
                     "name": "深草區",
                     "terms": "Rough,深草區"
@@ -3609,14 +4049,6 @@
                     "name": "發球區",
                     "terms": "Tee Box,發球區,開球區"
                 },
-                "golf/water_hazard_area": {
-                    "name": "水障礙",
-                    "terms": "Water Hazard,水障礙"
-                },
-                "golf/water_hazard_line": {
-                    "name": "水障礙",
-                    "terms": "Water Hazard, 水障礙"
-                },
                 "healthcare": {
                     "name": "醫療設施",
                     "terms": "Healthcare Facility,健康中心"
@@ -3680,29 +4112,10 @@
                     "name": "馬道",
                     "terms": "Bridle Path,馬徑,馬道,策騎徑"
                 },
-                "highway/bus_stop": {
-                    "name": "巴士站 / 月台"
-                },
                 "highway/corridor": {
                     "name": "室內走廊",
                     "terms": "室內通道"
                 },
-                "highway/crossing": {
-                    "name": "十字路口",
-                    "terms": "十字路口"
-                },
-                "highway/crossing-raised": {
-                    "name": "隆起的過路處",
-                    "terms": "Raised Street Crossing,隆起的過路處"
-                },
-                "highway/crosswalk": {
-                    "name": "行人過路處",
-                    "terms": "行人過路線"
-                },
-                "highway/crosswalk-raised": {
-                    "name": "隆起的行人過路處",
-                    "terms": "Raised Pedestrian Crosswalk,隆起的行人過路處"
-                },
                 "highway/cycleway": {
                     "name": "單車徑",
                     "terms": "Cycle Path,單車徑,自行車道"
@@ -3715,6 +4128,9 @@
                     "name": "行人徑",
                     "terms": "Foot Path,步行徑,行人徑"
                 },
+                "highway/footway/sidewalk": {
+                    "name": "行人路"
+                },
                 "highway/give_way": {
                     "name": "讓路標誌",
                     "terms": "讓車標誌"
@@ -3912,8 +4328,7 @@
                     "terms": "十字路口,交界處,交界"
                 },
                 "landuse": {
-                    "name": "土地利用",
-                    "terms": "土地利用"
+                    "name": "土地利用"
                 },
                 "landuse/allotments": {
                     "name": "社區園圃",
@@ -3924,8 +4339,7 @@
                     "terms": "Aquaculture,水產"
                 },
                 "landuse/basin": {
-                    "name": "盆地",
-                    "terms": "Basin,水池,盆地"
+                    "name": "盆地"
                 },
                 "landuse/brownfield": {
                     "name": "棕地",
@@ -3958,10 +4372,6 @@
                     "name": "農莊",
                     "terms": "Farmyard,農莊, 農場"
                 },
-                "landuse/forest": {
-                    "name": "森林",
-                    "terms": "Forest,森,森林"
-                },
                 "landuse/grass": {
                     "name": "草地",
                     "terms": "Grass,草地"
@@ -4083,8 +4493,7 @@
                     "terms": "Vineyard,葡萄園,酒莊"
                 },
                 "leisure": {
-                    "name": "消閒",
-                    "terms": "Leisure,休閑場所,休閒設施,消閒"
+                    "name": "消閒"
                 },
                 "leisure/adult_gaming_centre": {
                     "name": "成人遊戲中心",
@@ -4186,10 +4595,6 @@
                     "name": "美式足球場",
                     "terms": "American Football Field,美式足球場"
                 },
-                "leisure/pitch/baseball": {
-                    "name": "棒球場",
-                    "terms": "Baseball Diamond,棒球場"
-                },
                 "leisure/pitch/basketball": {
                     "name": "籃球場",
                     "terms": "Basketball Court,球場,籃球場"
@@ -4246,10 +4651,6 @@
                     "name": "度假勝地",
                     "terms": "Resort, 度假村"
                 },
-                "leisure/running_track": {
-                    "name": "賽道(田徑)",
-                    "terms": "Racetrack (Running), 賽跑道"
-                },
                 "leisure/slipway": {
                     "name": "船台",
                     "terms": "Slipway,船排,船架滑道,船臺,滑道,滑台"
@@ -4283,8 +4684,7 @@
                     "terms": "Line,綫,線"
                 },
                 "man_made": {
-                    "name": "人造",
-                    "terms": "Man Made,人造,人造構築,人造物"
+                    "name": "人造"
                 },
                 "man_made/adit": {
                     "name": "礦坑口",
@@ -4329,10 +4729,6 @@
                     "name": "天線塔",
                     "terms": "Mast,天線桿"
                 },
-                "man_made/observation": {
-                    "name": "瞭望臺",
-                    "terms": "Observation Tower,瞭望塔,瞭望臺"
-                },
                 "man_made/petroleum_well": {
                     "name": "油井",
                     "terms": "油井"
@@ -4361,10 +4757,6 @@
                     "name": "監視系統",
                     "terms": "Surveillance, 監察系統,閉路電視,保安系統"
                 },
-                "man_made/surveillance_camera": {
-                    "name": "監察攝像機",
-                    "terms": "Surveillance Camera, CCTV, 防盜相機"
-                },
                 "man_made/survey_point": {
                     "name": "測量點",
                     "terms": "Survey Point,測量點"
@@ -4414,8 +4806,7 @@
                     "terms": "Telecom Manhole,電訊人孔,電信沙井"
                 },
                 "natural": {
-                    "name": "自然景觀",
-                    "terms": "Natural,天然,自然,自然物件"
+                    "name": "自然景觀"
                 },
                 "natural/bare_rock": {
                     "name": "裸岩",
@@ -4489,10 +4880,6 @@
                     "name": "樹木",
                     "terms": "Tree,木,樹"
                 },
-                "natural/tree_row": {
-                    "name": "樹排",
-                    "terms": "樹行"
-                },
                 "natural/volcano": {
                     "name": "火山",
                     "terms": "火山"
@@ -4590,12 +4977,16 @@
                     "name": "電訊公司辦公室",
                     "terms": "Telecom Office,電信公司,電話公司寫字樓"
                 },
+                "office/therapist": {
+                    "name": "治療師辦公室",
+                    "terms": "Therapist,治療師辦公室,醫療師,治療師"
+                },
                 "office/travel_agent": {
                     "name": "旅行社"
                 },
-                "piste": {
-                    "name": "滑雪道",
-                    "terms": "滑雪道"
+                "office/water_utility": {
+                    "name": "水上設施辦公室",
+                    "terms": "Water Utility Office,滑水"
                 },
                 "place": {
                     "name": "地方"
@@ -4658,14 +5049,6 @@
                     "name": "發電機",
                     "terms": "Power Generator,發電機"
                 },
-                "power/generator/source_nuclear": {
-                    "name": "核子反應堆",
-                    "terms": "Nuclear Reactor,核子反應爐,核反應爐,核反應堆"
-                },
-                "power/generator/source_wind": {
-                    "name": "風力發電機",
-                    "terms": "Wind Turbine,風力渦輪,風力渦輪機"
-                },
                 "power/line": {
                     "name": "電纜",
                     "terms": "Power Line,供電綫,供電線,電線"
@@ -4804,9 +5187,6 @@
                     "name": "關係",
                     "terms": "Relation,關係,關系"
                 },
-                "roundabout": {
-                    "name": "迴旋處"
-                },
                 "route/ferry": {
                     "name": "渡輪航綫",
                     "terms": "Ferry Route,渡輪航線,航綫,航線"
@@ -4873,7 +5253,7 @@
                 },
                 "shop/bicycle": {
                     "name": "單車店",
-                    "terms": "Bicycle Shop,單車店,單車舖,自行車店,腳踏車店    "
+                    "terms": "Bicycle Shop,單車店,單車舖,自行車店,腳踏車店"
                 },
                 "shop/bookmaker": {
                     "name": "投注站",
@@ -4884,8 +5264,7 @@
                     "terms": "書局"
                 },
                 "shop/boutique": {
-                    "name": "時裝店",
-                    "terms": "Boutique,時裝店,服飾店,精品店,服裝店"
+                    "name": "時裝店"
                 },
                 "shop/butcher": {
                     "name": "肉舖",
@@ -4913,7 +5292,7 @@
                 },
                 "shop/charity": {
                     "name": "慈善商店",
-                    "terms": "Charity Store, "
+                    "terms": "Charity Store,"
                 },
                 "shop/cheese": {
                     "name": "芝士店",
@@ -5004,8 +5383,7 @@
                     "terms": "Produce Stand,檔,水果攤,農場,農產品攤檔"
                 },
                 "shop/fashion": {
-                    "name": "時裝店",
-                    "terms": "時裝店"
+                    "name": "時裝店"
                 },
                 "shop/fishmonger": {
                     "name": "魚檔"
@@ -5073,10 +5451,6 @@
                     "name": "室內設計店",
                     "terms": "室內設計店"
                 },
-                "shop/jewelry": {
-                    "name": "珠寶店",
-                    "terms": "Jeweler,珠寶店,珠寶舖,珠寶金行,首飾店,首飾舖,金舖"
-                },
                 "shop/kitchen": {
                     "name": "廚房設計店",
                     "terms": "廚房設計店"
@@ -5289,8 +5663,7 @@
                     "terms": "紅酒店,白酒店"
                 },
                 "tourism": {
-                    "name": "旅遊設施",
-                    "terms": "Tourism,旅行,旅遊"
+                    "name": "旅遊設施"
                 },
                 "tourism/alpine_hut": {
                     "name": "高山小屋",
@@ -5511,10 +5884,6 @@
                     "name": "建築群",
                     "terms": "一群建築"
                 },
-                "vertex": {
-                    "name": "其他",
-                    "terms": "Other,其他,其它"
-                },
                 "waterway": {
                     "name": "水道"
                 },
@@ -5551,8 +5920,7 @@
                     "terms": "River,江,江河,河,河流,河川"
                 },
                 "waterway/riverbank": {
-                    "name": "河岸",
-                    "terms": "Riverbank,江岸,河堤"
+                    "name": "河岸"
                 },
                 "waterway/sanitary_dump_station": {
                     "name": "船舶污水處理",
@@ -5585,7 +5953,6 @@
                 "attribution": {
                     "text": "條款和意見"
                 },
-                "description": "Premium DigitalGlobe 衛星圖",
                 "name": "DigitalGlobe Premium 航攝圖"
             },
             "DigitalGlobe-Premium-vintage": {
@@ -5598,7 +5965,6 @@
                 "attribution": {
                     "text": "條款和意見"
                 },
-                "description": "Standard DigitalGlobe 衛星圖",
                 "name": "DigitalGlobe Standard 航攝圖"
             },
             "DigitalGlobe-Standard-vintage": {
@@ -5677,8 +6043,11 @@
                 },
                 "name": "OSM 檢查器：標籤"
             },
-            "US-TIGER-Roads-2012": {
-                "name": "TIGER Roads 2012"
+            "SPW_ORTHO_LAST": {
+                "name": "SPW(allonie) 最新空照圖"
+            },
+            "SPW_PICC": {
+                "name": "SPW(allonie) PICC 數值圖"
             },
             "US-TIGER-Roads-2014": {
                 "description": "在縮放水平16以上，公共地圖數據乃來自美國人口普查。 在較低的縮放水平時，OpenStreetMap只包括自2006年之前的變更",
@@ -5688,6 +6057,27 @@
                 "description": "黃色 = 來自美國人口普查的公共地圖數據。紅色 = 在OpenStreetMap找不到數據",
                 "name": "TIGER Roads 2017"
             },
+            "US-TIGER-Roads-2018": {
+                "name": "TIGER Roads 2018"
+            },
+            "US_Forest_Service_roads_overlay": {
+                "name": "美國森林道路圖層"
+            },
+            "UrbISOrtho2016": {
+                "name": "UrbIS-Ortho 2016"
+            },
+            "UrbISOrtho2017": {
+                "name": "UrbIS-Ortho 2017"
+            },
+            "UrbISOrtho2018": {
+                "name": "UrbIS-Ortho 2018"
+            },
+            "UrbisAdmFR": {
+                "name": "UrbisAdm FR"
+            },
+            "UrbisAdmNL": {
+                "name": "UrbisAdm NL"
+            },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
                     "text": "© waymarkedtrails.org, OpenStreetMap 貢獻者，CC by-SA 3.0"
@@ -5731,11 +6121,69 @@
                 "description": "由 basemap.at 提供的 Orthofoto 圖層。geoimage.at 的 \"繼承者\"。",
                 "name": "basemap.at Orthofoto"
             },
-            "hike_n_bike": {
+            "finds.jp_KBN_2500": {
                 "attribution": {
-                    "text": "© OpenStreetMap 貢獻者"
+                    "text": "GSI KIBAN 2500"
+                },
+                "name": "日本 GSI KIBAN 2500"
+            },
+            "gsi.go.jp": {
+                "attribution": {
+                    "text": "GSI 日本"
                 },
-                "name": "遠足和單車"
+                "description": "日本 GSI 正射影像。通常比 bing 好，但有點舊。",
+                "name": "日本 GSI 正射影像"
+            },
+            "gsi.go.jp_std_map": {
+                "attribution": {
+                    "text": "GSI 日本"
+                }
+            },
+            "helsingborg-orto": {
+                "attribution": {
+                    "text": "© Helsingborg municipality"
+                },
+                "name": "Helsingborg Orthophoto"
+            },
+            "kalmar-orto-2014": {
+                "attribution": {
+                    "text": "© Kalmar municipality"
+                }
+            },
+            "kalmar-orto-2016": {
+                "attribution": {
+                    "text": "© Kalmar municipality"
+                }
+            },
+            "kalmar-orto-2018": {
+                "attribution": {
+                    "text": "© Kalmar municipality"
+                }
+            },
+            "kelkkareitit": {
+                "attribution": {
+                    "text": "© Kelkkareitit.fi"
+                }
+            },
+            "lantmateriet-orto1960": {
+                "attribution": {
+                    "text": "© Lantmäteriet, CC0"
+                }
+            },
+            "lantmateriet-orto1975": {
+                "attribution": {
+                    "text": "© Lantmäteriet, CC0"
+                }
+            },
+            "lantmateriet-topowebb": {
+                "attribution": {
+                    "text": "© Lantmäteriet, CC0"
+                }
+            },
+            "linkoping-orto": {
+                "attribution": {
+                    "text": "© Linköping municipality"
+                }
             },
             "mapbox_locator_overlay": {
                 "attribution": {
@@ -5769,6 +6217,11 @@
                 },
                 "name": "OpenStreetMap（德國格式）"
             },
+            "osmse-ekonomiska": {
+                "attribution": {
+                    "text": "© Lantmäteriet"
+                }
+            },
             "qa_no_address": {
                 "attribution": {
                     "text": "Simon Poole，資料 ©OpenStreetMap 貢獻者"
@@ -5781,9 +6234,21 @@
                 },
                 "name": "skobbler"
             },
+            "skoterleder": {
+                "attribution": {
+                    "text": "© Skoterleder.org"
+                },
+                "description": "Snowmobile 路徑",
+                "name": "Snowmobile 地圖瑞典"
+            },
             "stamen-terrain-background": {
                 "name": "Stamen 地形"
             },
+            "stockholm-orto": {
+                "attribution": {
+                    "text": "© Stockholm municipality, CC0"
+                }
+            },
             "tf-cycle": {
                 "attribution": {
                     "text": "地圖 © Thunderforest，資料 © OpenStreetMap 貢獻者"
@@ -5795,6 +6260,70 @@
                     "text": "地圖 © Thunderforest，資料 © OpenStreetMap 貢獻者"
                 },
                 "name": "Thunderforest Landscape"
+            },
+            "trafikverket-baninfo": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "瑞典鐵路網，包含支線",
+                "name": "Trafikverket Railway Network"
+            },
+            "trafikverket-baninfo-option": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "包含多個選項的地圖圖層的瑞典鐵路網",
+                "name": "Trafikverket Railway Network 選項"
+            },
+            "trafikverket-vagnat": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "Swedish NVDB 道路網絡",
+                "name": "Trafikverket Road Network"
+            },
+            "trafikverket-vagnat-extra": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                }
+            },
+            "trafikverket-vagnat-navn": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "Swedish NVDB 街道名稱",
+                "name": "Trafikverket Street Names"
+            },
+            "trafikverket-vagnat-option": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                }
+            }
+        },
+        "community": {
+            "bw-facebook": {
+                "name": "Mapping Botswana Facebook 專頁"
+            },
+            "osm-gh-facebook": {
+                "name": "OpenStreetMap Ghana Facebook 專頁",
+                "description": "Facebook 社群給對 OpenStreetMap 有興趣的人。"
+            },
+            "osm-mg-facebook": {
+                "name": "OpenStreetMap Madagascar Facebook 群組",
+                "description": "馬達加斯加 Facebook 社群給對 OpenStreetMap 有興趣的人。"
+            },
+            "OSM-India-Puducherry-Facebook": {
+                "name": "Free Software Hardware Movement - Facebook",
+                "description": "FSHM Facebook 專頁使你知道社群活動"
+            },
+            "OSM-MY-facebook": {
+                "name": "OpenStreetMap Malaysia Facebook 專頁"
+            },
+            "OSM-PH-facebook": {
+                "name": "OpenStreetMap PH Facebook 專頁"
+            },
+            "OSM-TH-facebook": {
+                "name": "OpenStreetMap TH Facebook 社群"
             }
         }
     }