X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d0dd5302acbc21db028abb05c319d753594fba31..d2ff1491b4b6f8fa3b64ab88414d0dbf01cc520e:/vendor/assets/iD/iD/locales/zh-TW.json

diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json
index acfde7cbf..c2611ca13 100644
--- a/vendor/assets/iD/iD/locales/zh-TW.json
+++ b/vendor/assets/iD/iD/locales/zh-TW.json
@@ -193,7 +193,8 @@
                 "restriction": "這些圖徽無法合併，因為它會危害到「{relation}」關係。",
                 "relation": "這些圖徽無法合併，因為它們有衝突的關係。",
                 "incomplete_relation": "這些物件不能合併，因為其中最少有一件未有完全下載。",
-                "conflicting_tags": "這些特徵並不能合儀，因為它們有彼此衝突的標籤。"
+                "conflicting_tags": "這些特徵並不能合儀，因為它們有彼此衝突的標籤。",
+                "paths_intersect": "這些圖徽無法合併，因為產生的路徑會自相交叉。"
             },
             "move": {
                 "title": "移動",
@@ -408,10 +409,13 @@
             "cancel": "取消",
             "changes": "{count}  變動數",
             "download_changes": "下載 osmChange 檔案",
+            "errors": "錯誤",
             "warnings": "警告",
             "modified": "已修改",
             "deleted": "已刪除",
             "created": "已建立",
+            "outstanding_errors_message": "請先解決所有的錯誤。仍有 {count} 錯誤。",
+            "comment_needed_message": "請先加上編輯變動註解。",
             "about_changeset_comments": "關於編輯變動",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
             "google_warning": "您在此留言中提到了 Google：請注意從 Google 地圖是嚴格禁止的。",
@@ -496,20 +500,34 @@
             "locating": "正在定位，請等待..."
         },
         "inspector": {
-            "no_documentation_combination": "這個標籤組合沒有可用的說明",
-            "no_documentation_key": "這個鍵值沒有可用的說明",
-            "documentation_redirect": "這份文件已經被重新導向至新頁面",
+            "zoom_to": {
+                "key": "Z",
+                "title": "縮放到這裡",
+                "tooltip_feature": "置中和縮放地圖到這圖徵。",
+                "tooltip_note": "置中和縮放地圖到這註解。",
+                "tooltip_data": "置中和縮放地圖到這資料。",
+                "tooltip_issue": "置中和縮放地圖到這問題。"
+            },
             "show_more": "顯示更多",
             "view_on_osm": "在 openstreetmap.org 中檢視",
+            "view_on_keepRight": "在 keepright.at 檢視",
             "all_fields": "全部欄位",
             "all_tags": "所有標籤",
             "all_members": "所有成員",
             "all_relations": "所有關係",
             "new_relation": "建立新關係...",
+            "choose_relation": "選擇父關係",
             "role": "角色",
             "choose": "選擇物件種類",
             "results": "{search} 的 {n} 個結果",
-            "reference": "在 OpenStreetMap Wiki 中檢閱",
+            "no_documentation_key": "沒有可用的文件。",
+            "edit_reference": "編輯/翻譯",
+            "wiki_reference": "觀看說明文件",
+            "wiki_en_reference": "觀看英文的說明文件",
+            "hidden_preset": {
+                "manual": "{features} 已隱藏。在地圖資料面板中啟用它們。",
+                "zoom": "{features} 已隱藏。拉近以啟用它們。"
+            },
             "back_tooltip": "修改物件",
             "remove": "移除",
             "search": "搜尋",
@@ -580,6 +598,14 @@
                     "tooltip": "從開放街圖而來的註記資料",
                     "title": "開放街圖註記"
                 },
+                "keepRight": {
+                    "tooltip": "自動從 keepright.at 偵測地圖問題",
+                    "title": "KeepRight 問題"
+                },
+                "improveOSM": {
+                    "tooltip": "由 improveosm.org 自動偵測到遺失資料",
+                    "title": "ImproveOSM 問題"
+                },
                 "custom": {
                     "tooltip": "拖曳資料檔案到頁面上，或點選按鈕以設定",
                     "title": "自訂地圖資料",
@@ -633,11 +659,11 @@
                 "tooltip": "輸電線、發電廠、變電所等。"
             },
             "past_future": {
-                "description": "過去/未來",
+                "description": "過去／未來圖徽",
                 "tooltip": "預定地，施工中，廢棄，拆除等。"
             },
             "others": {
-                "description": "其他",
+                "description": "其他圖徽",
                 "tooltip": "其他東西"
             }
         },
@@ -757,29 +783,363 @@
             "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": "選取一個可以適當地描述這個關係的圖徽類型。",
-            "many_deletions": "您正要刪除 {n} 個圖徽：{p} 個節點、{l} 條線段、{a} 個區域、{r} 個關係。您確定您要這麼做嗎？這將會把它們從每個人都看得到的 openstreetmap.org 的地圖上刪除。",
-            "tag_suggests_area": "{tag} 標籤所建議的線段應為區域，但這個不是一區域",
-            "deprecated_tags": "已棄用的標籤︰{tags}"
-        },
         "zoom": {
             "in": "拉近",
             "out": "拉遠"
         },
         "cannot_zoom": "在此模式下不能再縮小。",
         "full_screen": "啟動全螢幕",
+        "QA": {
+            "improveOSM": {
+                "title": " ImproveOSM 偵測",
+                "geometry_types": {
+                    "path": "路徑",
+                    "parking": "停車場",
+                    "road": "道路",
+                    "both": "道路和停車場"
+                },
+                "directions": {
+                    "east": "東",
+                    "north": "北",
+                    "northeast": "東北",
+                    "northwest": "西北",
+                    "south": "南",
+                    "southeast": "東南",
+                    "southwest": "西南",
+                    "west": "西"
+                },
+                "error_types": {
+                    "ow": {
+                        "title": "遺失的單行道",
+                        "description": "沿著選取的 {highway}，{num_trips} 中有 {percentage}% 記錄從 {from_node} 到 {to_node} 的旅程，也許遺失 \"oneway\" 標籤。"
+                    },
+                    "mr": {
+                        "title": "遺失幾何性質",
+                        "description": "{num_trips} 記錄的旅程資料，顯示也許這裡有未繪製的  {geometry_type}。 ",
+                        "description_alt": "從第三方而來的資料表示這裡可能有未繪製的 {geometry_type}。"
+                    },
+                    "tr": {
+                        "title": "遺失的轉彎限制",
+                        "description": "{num_trips} 中 {num_passed} 記錄  (travelling {travel_direction}) 的旅程中，有在 {junction} 從  {from_way} 到 {to_way}，也許有遺失的 \"{turn_restriction}\" 的限制。"
+                    }
+                }
+            },
+            "keepRight": {
+                "title": "KeepRIght 錯誤",
+                "detail_title": "錯誤",
+                "detail_description": "説明",
+                "comment": "評論",
+                "comment_placeholder": "輸入評論以與其他使用者分享。",
+                "close": "關閉(錯誤已修正)",
+                "ignore": "忽略(並非錯誤)",
+                "save_comment": "儲存評論",
+                "close_comment": "關閉並評論",
+                "ignore_comment": "忽略並評論",
+                "error_parts": {
+                    "this_node": "這個節點",
+                    "this_way": "這條路徑",
+                    "this_relation": "這個關聯",
+                    "this_oneway": "這條單行道",
+                    "this_highway": "這條公路",
+                    "this_railway": "這條鐵道",
+                    "this_waterway": "這個水路",
+                    "this_cycleway": "這條自行車道",
+                    "this_cycleway_footpath": "這條自行車道/人行道",
+                    "this_riverbank": "這個河濱",
+                    "this_crossing": "這個人行穿越道",
+                    "this_railway_crossing": "這個鐵路平交道",
+                    "this_bridge": "這條橋",
+                    "this_tunnel": "這個隧道",
+                    "this_boundary": "這個邊界",
+                    "this_turn_restriction": "這個轉彎限制",
+                    "this_roundabout": "這個圓環",
+                    "this_mini_roundabout": "這個小型迴旋處",
+                    "this_track": "這個土路",
+                    "this_feature": "這個圖徵",
+                    "highway": "公路",
+                    "railway": "鐵道",
+                    "waterway": "水道",
+                    "cycleway": "自行車道",
+                    "cycleway_footpath": "自行車道/人行道",
+                    "riverbank": "河濱",
+                    "place_of_worship": "禮拜場所",
+                    "pub": "酒館",
+                    "restaurant": "餐廳",
+                    "school": "學校",
+                    "university": "大學",
+                    "hospital": "醫院",
+                    "library": "圖書館",
+                    "theatre": "劇院",
+                    "courthouse": "法院",
+                    "bank": "銀行",
+                    "cinema": "電影院",
+                    "pharmacy": "藥房",
+                    "cafe": "咖啡廳",
+                    "fast_food": "快餐店",
+                    "fuel": "加油站",
+                    "from": "從",
+                    "to": "至",
+                    "left_hand": "左手",
+                    "right_hand": "右手"
+                },
+                "errorTypes": {
+                    "20": {
+                        "title": "同一地點有多個節點",
+                        "description": "這一地點有超過一個節點，Node IDs: {var1}。"
+                    },
+                    "30": {
+                        "title": "非閉合區域",
+                        "description": "{var1} 被標示為 \"{var2}\" 而且必須是封閉區域。"
+                    },
+                    "40": {
+                        "title": "不合理的單行道",
+                        "description": "{var2} 的第一個節點 {var1} 並沒有連接到其他路徑。"
+                    },
+                    "41": {
+                        "description": "{var2} 的最後一個節點 {var1} 並沒有連接到其他路徑。"
+                    },
+                    "42": {
+                        "description": "你無法到達 {var1}，因為其他到達的路徑都是單行道。"
+                    },
+                    "43": {
+                        "description": "你無法脫離 {var1}，因為其他到達的路徑都是單行道。"
+                    },
+                    "50": {
+                        "title": "幾乎是交叉",
+                        "description": "{var1} 非常接近，但沒有連接到路徑 {var2}。"
+                    },
+                    "60": {
+                        "title": "已棄用的標籤",
+                        "description": "{var1} 使用已棄用的標籤 \"{var2}\"。請使用 \"{var3}\" 替代。"
+                    },
+                    "70": {
+                        "title": "缺少標籤",
+                        "description": "{var1} 有空白標籤：\"{var2}\"。"
+                    },
+                    "71": {
+                        "description": "{var1} 並沒有標籤。"
+                    },
+                    "72": {
+                        "description": "{var1} 不屬於任何一項路徑且不具有任何標籤。"
+                    },
+                    "73": {
+                        "description": "{var1} 帶有 \"{var2}\" 標籤但未有 \"highway\" 標籤。"
+                    },
+                    "74": {
+                        "description": "{var1} 有空白標籤：\"{var2}\"。"
+                    },
+                    "75": {
+                        "description": "{var1} 有名稱 \"{var2}\" 但無其他標籤。"
+                    },
+                    "90": {
+                        "title": "高速公路缺少道路編號",
+                        "description": "因 {var1} 標記為高速公路， 故其應有 \"ref\" 、 \"nat_ref\" 或 \"int_ref\" 任一標籤。"
+                    },
+                    "100": {
+                        "title": "禮拜場所未標註所屬宗教",
+                        "description": "因 {var1} 標記為禮拜場所，故其應有宗教教派標籤。"
+                    },
+                    "110": {
+                        "title": "興趣點沒有名稱",
+                        "description": "因 {var1} 被標記為 \"{var2}\"，故此應有名稱標籤。"
+                    },
+                    "120": {
+                        "title": "沒有節點的路徑",
+                        "description": "{var1} 只有單一節點。"
+                    },
+                    "130": {
+                        "title": "未連結路徑",
+                        "description": "{var1} 沒有連接到地圖其他地方。"
+                    },
+                    "150": {
+                        "title": "缺少標籤的平交道",
+                        "description": "道路和鐵路交叉的 {var1} 需要被標為 \"railway=crossing\" 或是 \"railway=level_crossing\"。"
+                    },
+                    "160": {
+                        "title": "鐵路圖層衝突",
+                        "description": "{var1} 此處有不同層數的路徑 (如：隧道或橋樑) 互相連接。"
+                    },
+                    "170": {
+                        "title": "FIXME 標籤的項目",
+                        "description": "{var1} 帶有 FIXME 標籤： {var2}"
+                    },
+                    "180": {
+                        "title": "沒有類別的關係",
+                        "description": "{var1} 缺少 \"type\" 標籤。"
+                    },
+                    "190": {
+                        "title": "相交但沒有交插",
+                        "description": "{var1} 雖與 {var2} {var3} 相交，但其交叉點缺少路口交叉節點、橋樑或隧道。"
+                    },
+                    "200": {
+                        "title": "相互重疊的路徑",
+                        "description": "{var1} 重疊於 {var2} {var3} 之上。"
+                    },
+                    "210": {
+                        "title": "自我相交路徑",
+                        "description": "自我交叉的路徑有未明確的問題。"
+                    },
+                    "211": {
+                        "description": "{var1} 多次含有多於一個節點，節點如下： {var2} 。請注意這不一定代表錯誤。"
+                    },
+                    "212": {
+                        "description": "{var1} 僅含有兩個不同節略而其中一個節點被包含在内多於一次。"
+                    },
+                    "220": {
+                        "title": "拼寫錯誤的標籤",
+                        "description": "{var1} 被標記為 \"{var2}\" 但 \"{var3}\" 看似是屬於 \"{var4}\"。"
+                    },
+                    "221": {
+                        "description": "{var1} 帶有可能不符描述的標籤 \"{var2}\"。"
+                    },
+                    "230": {
+                        "title": "圖層衝突",
+                        "description": "{var1} 是一個不同層數路徑之交叉點。"
+                    },
+                    "231": {
+                        "description": "{var1} 是一個不同層數路徑 {var2} 之交叉點。",
+                        "layer": "(圖層: {layer})"
+                    },
+                    "232": {
+                        "description": "{var1} 被標記為 \"layer={var2}\"。雖其看似怪異但未必是錯誤。"
+                    },
+                    "270": {
+                        "title": "不尋常的高速公路連結",
+                        "description": "{var1} 是高速公路和其他不是 \"motorway\", \"motorway_link\", \"trunk\", \"rest_area\", 或是 \"construction\" 交叉的狀況。連結到 \"service\" 或是 \"unclassified\" 只有在 \"access=no/private\" 狀況才有效，或是連到高速高路服務區，會是有 \"service=parking_aisle\"。"
+                    },
+                    "280": {
+                        "title": "標界問題",
+                        "description": "這個標界有未指明的問題。"
+                    },
+                    "281": {
+                        "title": "標界缺少名稱",
+                        "description": "{var1} 缺少名稱。"
+                    },
+                    "282": {
+                        "title": "標界缺少邊界等級",
+                        "description": " {var1} 的標界並沒有效的 admin_level，請不要加混合的層級 (例如 \"6;7\")，請從最低的標界層級 admin_level 下標籤。"
+                    },
+                    "283": {
+                        "title": "標界不是一個閉合形狀",
+                        "description": "{var1} 的標界不是一個閉合形狀"
+                    },
+                    "284": {
+                        "title": "邊界已經分割",
+                        "description": "{var1} 的標界在此處分開。"
+                    },
+                    "285": {
+                        "title": "邊界 admin_level 太高了",
+                        "description": "{var1} 有 \"admin_level={var2}\"，但屬於比較低的 \"admin_level\"(例如較高的優先)；應該在所有的關聯中有最低的 \"admin_level\"。"
+                    },
+                    "290": {
+                        "title": "限制問題",
+                        "description": "這個限制有未指明的問題。"
+                    },
+                    "291": {
+                        "title": "限制遺失種類",
+                        "description": "{var1} 帶有無法辨識的限制類型。"
+                    },
+                    "292": {
+                        "title": "道路限制缺少 \"from\" 的路徑。",
+                        "description": "{var1} 擁有 {var2} 個 \"from\" 的成員，但該項應只有1個成員。"
+                    },
+                    "293": {
+                        "title": "道路限制缺少 \"to\" 的路徑。",
+                        "description": "{var1} 擁有 {var2} 個 \"to\" 的成員，但該項應只有1個成員。"
+                    },
+                    "294": {
+                        "title": "道路限制的 \"from\" 或 \"to\" 的成員並非路徑。",
+                        "description": "{var1} 擁有\"from\" 或 \"to\" 的成員，但該項應為路徑。{var2}。"
+                    },
+                    "295": {
+                        "title": "道路限制的 \"via\" 的成員並非終點。",
+                        "description": "{var1} 擁有 \"via\" (節點 {var2}) 並不是 \"{var3}\" (路徑 {var4}) 第一個或最後一個成員。"
+                    },
+                    "296": {
+                        "title": "不常見的限制角度",
+                        "description": "{var1} 擁有限制類型 \"{var2}\" ，但是角度是 {var3} 度，也許這種限制類型並不洽當？"
+                    },
+                    "297": {
+                        "title": "\"to\" 路徑方向錯誤",
+                        "description": "{var1} 並不符合往路徑 {var2} 的 \"to\" 方向"
+                    },
+                    "298": {
+                        "title": "冗餘的道路限制 - 單行道",
+                        "description": "{var1} 可能為冗餘標籤。項目已有 {var2} 的 \"oneway\" 單行道標籤限制進入。"
+                    },
+                    "300": {
+                        "title": "缺少最高速限",
+                        "description": "{var1}  缺少「最高速限」的標籤，而且也被標為高速公路、快速道路、主要道路或次要道路。"
+                    },
+                    "310": {
+                        "title": "圓環問題",
+                        "description": "這個圓環有未指明的問題。"
+                    },
+                    "311": {
+                        "title": "圓環並非閉合環狀",
+                        "description": "{var1} 屬於圓環的一部分，但是並非封閉的路線。(靠近圓環分離的行車道不應該被標為圓環)。"
+                    },
+                    "312": {
+                        "title": "圓環行車方向錯誤",
+                        "description": "如果 {var1} 在一個有 {var2} 交通規則的國家內，看來交通方向錯了。"
+                    },
+                    "313": {
+                        "title": "圓環有弱的連結",
+                        "description": "{var1} 僅有連接 {var2} 條道路。圓環一般而言會與 3 條或以上的道路相連。"
+                    },
+                    "320": {
+                        "title": "不當的連絡道連接",
+                        "description": "{var1} 被標為 \"{var2}\"，但是並沒有連到其他 \"{var3}\" 或是\"{var4}\"。"
+                    },
+                    "350": {
+                        "title": "不當的橋樑標籤",
+                        "description": "{var1} 並沒有像週遭的路徑那樣有共同的標籤，顯示橋樑的目標，應該有標籤： {var2}。"
+                    },
+                    "360": {
+                        "title": "缺少在地名稱標籤",
+                        "description": "{var1} 如果有在地名稱 \"name:XX={var2}\" 會更好，而 XX 顯示是在地名稱 \"{var2}\" 的語言。"
+                    },
+                    "370": {
+                        "title": "重覆地標",
+                        "description": "{var1} 擁有與附近路徑  {var2} {var3} 相同的標籤，而且看來是多餘的。",
+                        "including_the_name": "(含有名稱 {name})"
+                    },
+                    "380": {
+                        "title": "非運動使用的運動標籤",
+                        "description": "{var1} 被標為 \"{var2}\"，但沒有實體標籤 (例如 \"leisure\", \"building\", \"amenity\", 或是 \"highway\")。"
+                    },
+                    "390": {
+                        "title": "缺失道路種類",
+                        "description": "{var1} 缺少 \"tracktype\" 標籤。"
+                    },
+                    "400": {
+                        "title": "形狀問題",
+                        "description": "這個幾何形狀有未指明的問題。"
+                    },
+                    "401": {
+                        "title": "缺少轉彎限制",
+                        "description": "路徑 {var1} 和 {var2} 用很尖銳的角度連接，而且沒有 oneway 標籤或是轉彎限制防止轉彎。"
+                    },
+                    "402": {
+                        "title": "不合理的角度",
+                        "description": "{var1} 在此以一個陡急的角度彎曲。"
+                    },
+                    "410": {
+                        "title": "網站問題",
+                        "description": "聯絡網址和 URL 有未指名的問題。"
+                    },
+                    "411": {
+                        "description": "{var1} 也許有過期的 URL：{var2} 回傳 HTTP 狀態代碼 {var3}。"
+                    },
+                    "412": {
+                        "description": "{var1} 也許有過期的 URL：{var2} 包含怪怪的文字 \"{var3}\"。"
+                    },
+                    "413": {
+                        "description": "{var1} 也許有過期的 URL：{var2} 並沒有包含關鍵字 \"{var3}\"。"
+                    }
+                }
+            }
+        },
         "streetside": {
             "tooltip": "微軟的街景照片",
             "title": "照片覆蓋層 (Bing Streetside)",
@@ -988,7 +1348,7 @@
                 "sources": "[Bing 地圖](https://www.bing.com/maps/)影像是預設的背景影像。視你在編輯的地方，還有其他的影像來源，有些影像比較新或有更高的解析度，所以請常常檢查有些可用，選擇那個圖層是最好用的繪製地圖參考來源。",
                 "offsets_h": "調整空拍圖層偏移",
                 "offset": "有時候影像會與既有地圖資料有些偏移狀況，如果你看到道路或是建築相比背景影像有偏移狀況，也許影像並沒有對準，請別移動全部的資料來吻合背景影像。你可以在背景影像設定，藉由\"調整影像偏移\"調整背景來將影像吻合既有的資料。",
-                "offset_change": "點小三角形微幅調整影像，或是按住左鍵在灰色區域拖動，來調整影像。"
+                "offset_change": "點小三角形微幅調整影像，或是按住 {leftclick} 左鍵在灰色區域拖動，來調整影像。"
             },
             "streetlevel": {
                 "title": "街景照片",
@@ -1007,6 +1367,14 @@
                 "tracing": "GPS 軌跡並未傳到開放街圖 - 而最好的使用方式則是照著軌跡的指引，繪製你要新增的圖徵。",
                 "upload": "您也可以透過[上傳你的 GPS 資訊至 OpenStreetMap 開放街圖](https://www.openstreetmap.org/trace/create)以供其他使用者利用。"
             },
+            "qa": {
+                "title": "品質保証",
+                "intro": "*品質保証* (Q/A, Quality Assurance) 工具能找出開放街圖上，不適當地標籤，為連結的道路或是其他問題，圖客能藉此修復。要檢視現有的 Q/A 問題，,回擊 {data} **地圖資料**儀表板開啓特定 Q/A 圖層。",
+                "tools_h": "工具",
+                "tools": "目前支援以下的工具：[KeepRight](https://www.keepright.at/) 和[ImproveOSM](https://improveosm.org/en/)，之後  iD 將支援 [Osmose](https://osmose.openstreetmap.fr/)，未來將支援更多 Q/A 工具。",
+                "issues_h": "處理問題",
+                "issues": "處理 Q/A 問題類似處理註解。點選已存在的 Q/A 問題會埴滿整個側邊欄，像是問題種類以及相關的圖徵。每個工具都有其能耐，但是一般來說你可以回應和/或關閉問題。"
+            },
             "field": {
                 "restrictions": {
                     "title": "轉彎限制說明",
@@ -1046,6 +1414,201 @@
                 }
             }
         },
+        "issues": {
+            "title": "問題",
+            "key": "I",
+            "list_title": "({count}) 問題",
+            "errors": {
+                "list_title": "({count}) 錯誤"
+            },
+            "warnings": {
+                "list_title": "({count}) 警告"
+            },
+            "no_issues": {
+                "message": "所有東西都很好",
+                "info": "當你編輯時，任何問題都會在這裡顯示。"
+            },
+            "almost_junction": {
+                "message": "{feature} 很接近但是沒有連到 {feature2}",
+                "highway-highway": {
+                    "tip": "交叉的道路應該共享交叉連接點。"
+                }
+            },
+            "crossing_ways": {
+                "message": "{feature} 跨過 {feature2}",
+                "building-building": {
+                    "tip": "除非是不同層，不然建築不該交叉"
+                },
+                "building-highway": {
+                    "tip": "只有在使用橋樑、隧道、遮蓋或入口時，道路才能交叉建築。"
+                },
+                "building-railway": {
+                    "tip": "只有在使用橋樑或隧道時，鐵軌才能交叉建築。"
+                },
+                "building-waterway": {
+                    "tip": "只有使用隧道或位在不同層時，水路才能交叉建築。"
+                },
+                "highway-highway": {
+                    "tip": "只有在使用橋樑、隧道或交叉路口時，道路才能交叉。"
+                },
+                "highway-railway": {
+                    "tip": "只有在使用橋樑、隧道或平交道時，道路才能交叉鐵軌。"
+                },
+                "highway-waterway": {
+                    "tip": "只有在使用橋樑、隧道、或淺灘時，道路才能跨越水路。"
+                },
+                "railway-railway": {
+                    "tip": "交叉的鐵軌應當要連接，或是使用橋樑或隧道。"
+                },
+                "railway-waterway": {
+                    "tip": "只有在使用橋樑或隧道時，鐵軌才能交叉水路。"
+                },
+                "waterway-waterway": {
+                    "tip": "交叉的水路應當要連結，或是使用隧道。"
+                },
+                "tunnel-tunnel": {
+                    "tip": "交叉的隧道應當屬於不同層。"
+                },
+                "tunnel-tunnel_connectable": {
+                    "tip": "交叉的隧道應當連接或是使用不同層級。"
+                },
+                "bridge-bridge": {
+                    "tip": "交叉的橋樑應當使用不同圖層。"
+                },
+                "bridge-bridge_connectable": {
+                    "tip": "交叉的橋樑應當連接，或使用不同圖層。"
+                },
+                "indoor-indoor": {
+                    "tip": "交叉的室內圖徽應當使用不同圖層。"
+                },
+                "indoor-indoor_connectable": {
+                    "tip": "交叉的室內圖徽應當連接，或是使用不用層級。"
+                }
+            },
+            "deprecated_tag": {
+                "single": {
+                    "message": "{feature} 有過時的標籤 \"{tag}\""
+                },
+                "combination": {
+                    "message": "{feature} 有過時的標籤組合：{tag}"
+                },
+                "tip": "有些標籤已隨著時間流逝而被棄用，而且應當被取代。"
+            },
+            "disconnected_way": {
+                "highway": {
+                    "message": "{highway} 與其他道路和路徑斷開連接",
+                    "tip": "道路應當連到其他道路，或者建築入口。"
+                }
+            },
+            "generic_name": {
+                "message": "{feature} 有一般名稱 \"{name}\"",
+                "tip": "名稱應當是真實，圖徽實際在地的名稱。"
+            },
+            "many_deletions": {
+                "points-lines-areas": {
+                    "message": "刪除 {n} 圖徽： {p} 點，{l} 線段，和 {a} 區域"
+                },
+                "points-lines-areas-relations": {
+                    "message": "刪除 {n} 圖徽： {p} 點，{l} 線段， {a} 區域，和 {r} 關聯"
+                },
+                "tip": "只有冗餘或不存在的圖徽該被刪除。"
+            },
+            "missing_tag": {
+                "any": {
+                    "message": "{feature} 沒有標籤"
+                },
+                "descriptive": {
+                    "message": "{feature} 沒有描述性的標籤"
+                },
+                "specific": {
+                    "message": "{feature} 沒有 \"{tag}\" 標籤"
+                },
+                "tip": "圖徽必須有標籤來定義他們。"
+            },
+            "old_multipolygon": {
+                "message": "{multipolygon} 有誤標的標籤",
+                "tip": "多動多邊形應當標在他們的關聯，而非他們的外圍路徑。"
+            },
+            "tag_suggests_area": {
+                "message": "{feature} 依據標籤 \"{tag}\"，應當是封閉區域",
+                "tip": "區域必須有連結的端點。"
+            },
+            "fix": {
+                "connect_almost_junction": {
+                    "annotation": "接連相當靠近的圖徽"
+                },
+                "connect_crossing_features": {
+                    "annotation": "連接交叉的圖徽"
+                },
+                "connect_endpoints": {
+                    "title": "連接結束處",
+                    "annotation": "連接路徑的端點"
+                },
+                "connect_features": {
+                    "title": "連接圖徽"
+                },
+                "continue_from_start": {
+                    "title": "繼續從開始處繪製"
+                },
+                "continue_from_end": {
+                    "title": "繼續從結束處繪製"
+                },
+                "delete_feature": {
+                    "title": "刪除這個圖徶"
+                },
+                "move_tags": {
+                    "title": "移動這標籤",
+                    "annotation": "移動標籤"
+                },
+                "remove_deprecated_tag": {
+                    "annotation": "移除舊的標籤"
+                },
+                "remove_deprecated_tag_combo": {
+                    "annotation": "移除舊的標籤組合"
+                },
+                "remove_generic_name": {
+                    "title": "移除名稱",
+                    "annotation": "移除常用名稱"
+                },
+                "remove_tag": {
+                    "title": "移除這個標籤",
+                    "annotation": "移除標籤。"
+                },
+                "remove_tags": {
+                    "title": "移除標籤"
+                },
+                "reposition_features": {
+                    "title": "重新排列圖徽"
+                },
+                "select_preset": {
+                    "title": "選擇圖徽類型"
+                },
+                "tag_as_disconnected": {
+                    "title": "標示為未連接標籤",
+                    "annotation": "標示相當近的圖徽為未連接。"
+                },
+                "upgrade_tag": {
+                    "title": "更新標籤",
+                    "annotation": "更新舊的標籤"
+                },
+                "upgrade_tag_combo": {
+                    "title": "更新標籤",
+                    "annotation": "更新舊標籤組合"
+                },
+                "use_bridge_or_tunnel": {
+                    "title": "使用橋樑或隧道"
+                },
+                "use_different_layers": {
+                    "title": "使用不同階層"
+                },
+                "use_different_levels": {
+                    "title": "使用不同樓層"
+                },
+                "use_tunnel": {
+                    "title": "使用隧道"
+                }
+            }
+        },
         "intro": {
             "done": "完成",
             "ok": "OK",
@@ -1357,7 +1920,8 @@
                 },
                 "with_selected": {
                     "title": "選中圖徵",
-                    "edit_menu": "切換編輯選單"
+                    "edit_menu": "切換編輯選單",
+                    "zoom_to": "縮放到選取圖徵"
                 },
                 "vertex_selected": {
                     "title": "選中節點",
@@ -1452,8 +2016,11 @@
                 "category-building": {
                     "name": "建築物圖徵"
                 },
-                "category-golf": {
-                    "name": "高爾夫圖徵"
+                "category-golf-area": {
+                    "name": "高爾夫球圖徵"
+                },
+                "category-golf-line": {
+                    "name": "高爾夫球圖徵"
                 },
                 "category-landuse": {
                     "name": "土地利用圖徵"
@@ -1635,6 +2202,9 @@
                 "animal_shelter": {
                     "label": "動物"
                 },
+                "architect": {
+                    "label": "建築樣式"
+                },
                 "area/highway": {
                     "label": "種類"
                 },
@@ -1647,12 +2217,18 @@
                 "atm": {
                     "label": "自動櫃員機"
                 },
+                "attraction": {
+                    "label": "類型"
+                },
                 "backrest": {
                     "label": "椅背"
                 },
                 "barrier": {
                     "label": "種類"
                 },
+                "basin": {
+                    "label": "種類"
+                },
                 "bath/open_air": {
                     "label": "露天浴場"
                 },
@@ -1668,7 +2244,7 @@
                     }
                 },
                 "beauty": {
-                    "label": "商店類型"
+                    "label": "美容專門"
                 },
                 "bench": {
                     "label": "長凳"
@@ -1716,6 +2292,9 @@
                 "building": {
                     "label": "建築物"
                 },
+                "building/material": {
+                    "label": "材料"
+                },
                 "building_area": {
                     "label": "建築物"
                 },
@@ -1751,6 +2330,9 @@
                 "castle_type": {
                     "label": "種類"
                 },
+                "check_date": {
+                    "label": "最後檢查日期"
+                },
                 "clothes": {
                     "label": "服飾"
                 },
@@ -1791,6 +2373,10 @@
                 "country": {
                     "label": "國家"
                 },
+                "couplings": {
+                    "label": "接合子",
+                    "placeholder": "1, 2, 3..."
+                },
                 "covered": {
                     "label": "有蓋"
                 },
@@ -1877,12 +2463,30 @@
                 "denotation": {
                     "label": "表示"
                 },
+                "departures_board": {
+                    "label": "出發告示牌",
+                    "options": {
+                        "no": "無",
+                        "realtime": "即時",
+                        "timetable": "時刻表",
+                        "yes": "是"
+                    }
+                },
                 "description": {
                     "label": "描述"
                 },
                 "design": {
                     "label": "設計"
                 },
+                "destination/ref_oneway": {
+                    "label": "目的道路編號"
+                },
+                "destination/symbol_oneway": {
+                    "label": "目的地符號"
+                },
+                "destination_oneway": {
+                    "label": "目的地"
+                },
                 "devices": {
                     "label": "裝置",
                     "placeholder": "1, 2, 3..."
@@ -1890,6 +2494,9 @@
                 "diaper": {
                     "label": "有尿布台"
                 },
+                "diet_multi": {
+                    "label": "飲食類型"
+                },
                 "direction": {
                     "label": "方向 (順時針角度)",
                     "placeholder": "45、90、180、270"
@@ -1942,6 +2549,14 @@
                 "dock": {
                     "label": "碼頭種類"
                 },
+                "dog": {
+                    "label": "狗",
+                    "options": {
+                        "leashed": "只有牽繩套住",
+                        "no": "不允許",
+                        "yes": "允許"
+                    }
+                },
                 "drive_through": {
                     "label": "得來速"
                 },
@@ -1973,6 +2588,9 @@
                 "emergency": {
                     "label": "緊急"
                 },
+                "enforcement": {
+                    "label": "類型"
+                },
                 "entrance": {
                     "label": "種類"
                 },
@@ -1992,20 +2610,17 @@
                 "fence_type": {
                     "label": "種類"
                 },
-                "fire_hydrant/position": {
-                    "label": "位置",
-                    "options": {
-                        "green": "公共草皮",
-                        "lane": "巷弄",
-                        "parking_lot": "停車場",
-                        "sidewalk": "人行道"
-                    }
+                "fire_hydrant/diameter": {
+                    "label": "直徑（毫米、英呎或 letters）"
+                },
+                "fire_hydrant/pressure": {
+                    "label": "壓力（巴）"
                 },
                 "fire_hydrant/type": {
-                    "label": "種類",
+                    "label": "形狀",
                     "options": {
                         "pillar": "支柱式/地面式",
-                        "pond": "池塘",
+                        "pipe": "加蓋管",
                         "underground": "地下式",
                         "wall": "牆"
                     }
@@ -2029,6 +2644,9 @@
                 "frequency": {
                     "label": "運作頻率"
                 },
+                "frequency_electrified": {
+                    "label": "工作頻率"
+                },
                 "from": {
                     "label": "從"
                 },
@@ -2175,6 +2793,9 @@
                 "intermittent": {
                     "label": "週期性的"
                 },
+                "intermittent_yes": {
+                    "label": "週期性水流"
+                },
                 "internet_access": {
                     "label": "網際網絡存取",
                     "options": {
@@ -2191,6 +2812,17 @@
                 "internet_access/ssid": {
                     "label": "SSID (網路名稱)"
                 },
+                "junction/ref_oneway": {
+                    "label": "路口號碼"
+                },
+                "junction_line": {
+                    "label": "連接點",
+                    "options": {
+                        "circular": "號誌圓環",
+                        "jughandle": "槽化車道",
+                        "roundabout": "圓環"
+                    }
+                },
                 "kerb": {
                     "label": "路邊斜坡"
                 },
@@ -2313,6 +2945,10 @@
                 "memorial": {
                     "label": "類型"
                 },
+                "minspeed": {
+                    "label": "最低速限",
+                    "placeholder": "20, 30, 40..."
+                },
                 "monitoring_multi": {
                     "label": "監測"
                 },
@@ -2411,6 +3047,9 @@
                         "yes": "是"
                     }
                 },
+                "oneway/bicycle": {
+                    "label": "單行道 (單車)"
+                },
                 "oneway_yes": {
                     "label": "單程路",
                     "options": {
@@ -2421,6 +3060,9 @@
                         "yes": "是"
                     }
                 },
+                "opening_date": {
+                    "label": "預計開放日期"
+                },
                 "opening_hours": {
                     "label": "小時"
                 },
@@ -2449,9 +3091,6 @@
                         "underground": "地下"
                     }
                 },
-                "passenger_information_display": {
-                    "label": "乘客資訊顯示器"
-                },
                 "payment_multi": {
                     "label": "付款種類"
                 },
@@ -2675,6 +3314,9 @@
                 "restrictions": {
                     "label": "轉向限制"
                 },
+                "roof/colour": {
+                    "label": "屋頂顏色"
+                },
                 "rooms": {
                     "label": "房間數"
                 },
@@ -2696,6 +3338,9 @@
                     },
                     "placeholder": "登山旅行、越嶺縱走..."
                 },
+                "salt": {
+                    "label": "鹽份"
+                },
                 "sanitary_dump_station": {
                     "label": "廁所處理方式"
                 },
@@ -2961,6 +3606,9 @@
                 "surveillance/zone": {
                     "label": "監視區域"
                 },
+                "survey/date": {
+                    "label": "最後服務日期"
+                },
                 "swimming_pool": {
                     "label": "類型"
                 },
@@ -2985,6 +3633,9 @@
                     },
                     "placeholder": "可以, 不行, 只能外帶 ..."
                 },
+                "tidal": {
+                    "label": "潮汐"
+                },
                 "to": {
                     "label": "到"
                 },
@@ -3006,9 +3657,6 @@
                 "tourism": {
                     "label": "種類"
                 },
-                "tourism_attraction": {
-                    "label": "旅遊"
-                },
                 "tower/construction": {
                     "label": "建材",
                     "placeholder": "拉線、鋼格、偽裝、..."
@@ -3137,6 +3785,9 @@
                 "voltage/tertiary": {
                     "label": "三次電壓"
                 },
+                "voltage_electrified": {
+                    "label": "電壓"
+                },
                 "wall": {
                     "label": "種類"
                 },
@@ -3146,12 +3797,18 @@
                 "water_point": {
                     "label": "取水點"
                 },
+                "water_source": {
+                    "label": "水源"
+                },
+                "water_volume": {
+                    "label": "儲水量（立方公尺）"
+                },
                 "waterway": {
                     "label": "種類"
                 },
                 "website": {
                     "label": "網站",
-                    "placeholder": "http://example.com/"
+                    "placeholder": "https://example.com"
                 },
                 "wetland": {
                     "label": "種類"
@@ -3408,6 +4065,10 @@
                     "name": "時鐘",
                     "terms": "時鐘,鐘塔"
                 },
+                "amenity/clock/sundial": {
+                    "name": "日晷",
+                    "terms": "日晷"
+                },
                 "amenity/college": {
                     "name": "學院範圍",
                     "terms": "學院,學院用地,技術學院,獨立學院,學校,College Grounds,College"
@@ -3479,6 +4140,10 @@
                     "name": "炸肉串速食店",
                     "terms": "炸肉串店"
                 },
+                "amenity/fast_food/mexican": {
+                    "name": "墨西哥速食餐",
+                    "terms": "墨西哥快餐"
+                },
                 "amenity/fast_food/pizza": {
                     "name": "批薩快餐店",
                     "terms": "批薩店"
@@ -3598,8 +4263,12 @@
                     "terms": "繳費處"
                 },
                 "amenity/pharmacy": {
-                    "name": "藥房",
-                    "terms": "藥房,藥局"
+                    "name": "藥房櫃臺",
+                    "terms": "藥房櫃臺"
+                },
+                "amenity/photo_booth": {
+                    "name": "照相站",
+                    "terms": "照相站"
                 },
                 "amenity/place_of_worship": {
                     "name": "宗教祟拜場所",
@@ -3610,8 +4279,8 @@
                     "terms": "寺,廟,閣,寶殿"
                 },
                 "amenity/place_of_worship/christian": {
-                    "name": "教堂",
-                    "terms": "教堂,教會,聚會所"
+                    "name": "教會",
+                    "terms": "教會,基督教教會"
                 },
                 "amenity/place_of_worship/hindu": {
                     "name": "印度寺廟",
@@ -3619,11 +4288,11 @@
                 },
                 "amenity/place_of_worship/jewish": {
                     "name": "猶太教堂",
-                    "terms": "猶太會堂,synagogue"
+                    "terms": "猶太會堂"
                 },
                 "amenity/place_of_worship/muslim": {
                     "name": "清真寺",
-                    "terms": "清真寺,回教寺"
+                    "terms": "清真寺"
                 },
                 "amenity/place_of_worship/shinto": {
                     "name": "神社",
@@ -3890,8 +4559,8 @@
                     "terms": "扁平紀念幣販賣機,扁平紀念幣自動販賣機"
                 },
                 "amenity/vending_machine/excrement_bags": {
-                    "name": "糞便袋販賣機",
-                    "terms": "糞便袋自動販賣機,販賣機"
+                    "name": "大便丟棄袋",
+                    "terms": "排泄物丟棄袋"
                 },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "女性衛生用品自動販賣機",
@@ -3976,6 +4645,9 @@
                     "name": "路面材質",
                     "terms": "路面材質,路面"
                 },
+                "attraction": {
+                    "name": "旅遊地點"
+                },
                 "attraction/amusement_ride": {
                     "name": "遊樂園",
                     "terms": "遊樂場"
@@ -4144,8 +4816,8 @@
                     "terms": "建物"
                 },
                 "building/apartments": {
-                    "name": "公寓",
-                    "terms": "分層公寓"
+                    "name": "大樓建築物",
+                    "terms": "大樓建築物,大樓"
                 },
                 "building/barn": {
                     "name": "穀倉",
@@ -4346,6 +5018,10 @@
                     "name": "俱樂部",
                     "terms": "俱樂部,Club"
                 },
+                "club/sport": {
+                    "name": "運動俱樂部",
+                    "terms": "運動俱樂部,運動隊伍"
+                },
                 "craft": {
                     "name": "工藝",
                     "terms": "工藝"
@@ -4614,6 +5290,18 @@
                     "name": "沙坑",
                     "terms": "沙坑"
                 },
+                "golf/cartpath": {
+                    "name": "高爾夫球車道",
+                    "terms": "高爾夫球車道"
+                },
+                "golf/cartpath_service": {
+                    "name": "高爾夫球車道 / 服務道路",
+                    "terms": "高爾夫球車道 / 服務道路"
+                },
+                "golf/driving_range": {
+                    "name": "高爾夫球練習場",
+                    "terms": "高爾夫球練習場,練習場"
+                },
                 "golf/fairway": {
                     "name": "球道",
                     "terms": "球道"
@@ -4626,13 +5314,13 @@
                     "name": "球洞",
                     "terms": "球洞"
                 },
-                "golf/lateral_water_hazard_area": {
-                    "name": "側面水障礙區",
-                    "terms": "側面水障礙區"
+                "golf/lateral_water_hazard": {
+                    "name": "橫向水障礙",
+                    "terms": "橫向水障礙"
                 },
-                "golf/lateral_water_hazard_line": {
-                    "name": "側面水障礙區",
-                    "terms": "側面水障礙區"
+                "golf/path": {
+                    "name": "高爾夫步道",
+                    "terms": "高爾夫步道"
                 },
                 "golf/rough": {
                     "name": "深草區",
@@ -4642,13 +5330,9 @@
                     "name": "開球區",
                     "terms": "開球區"
                 },
-                "golf/water_hazard_area": {
-                    "name": "水障礙區",
-                    "terms": "水障礙區"
-                },
-                "golf/water_hazard_line": {
-                    "name": "水障礙區",
-                    "terms": "水障礙區"
+                "golf/water_hazard": {
+                    "name": "水障礙",
+                    "terms": "水障礙"
                 },
                 "healthcare": {
                     "name": "醫療設施",
@@ -4728,6 +5412,10 @@
                 "highway/bus_stop": {
                     "name": "公車站牌/公車月台"
                 },
+                "highway/construction": {
+                    "name": "閉路",
+                    "terms": "閉路"
+                },
                 "highway/corridor": {
                     "name": "室內走廊",
                     "terms": "室內通道"
@@ -5012,8 +5700,7 @@
                     "terms": "槽化車道,道路交叉,十字路口,丁字路,路"
                 },
                 "landuse": {
-                    "name": "土地利用",
-                    "terms": "土地利用,國土利用,使用分區"
+                    "name": "土地利用"
                 },
                 "landuse/allotments": {
                     "name": "社區農園",
@@ -5024,8 +5711,7 @@
                     "terms": "養殖漁業,水產養殖,Aquaculture"
                 },
                 "landuse/basin": {
-                    "name": "æ°´æ± ",
-                    "terms": "æ°´æ± "
+                    "name": "æ°´æ± "
                 },
                 "landuse/brownfield": {
                     "name": "棕色地帶",
@@ -5059,8 +5745,8 @@
                     "terms": "莊園"
                 },
                 "landuse/forest": {
-                    "name": "森林",
-                    "terms": "森林"
+                    "name": "受管理的森林",
+                    "terms": "受管理的森林,森林"
                 },
                 "landuse/garages": {
                     "name": "車庫用地",
@@ -5158,6 +5844,9 @@
                     "name": "育苗場",
                     "terms": "種苗中心"
                 },
+                "landuse/pond": {
+                    "name": "池塘"
+                },
                 "landuse/quarry": {
                     "name": "礦區",
                     "terms": "礦場,採礦場"
@@ -5174,10 +5863,17 @@
                     "name": "宗教設施用地",
                     "terms": "寺廟用地,教會用地,廟宇用地"
                 },
+                "landuse/reservoir": {
+                    "name": "貯水庫"
+                },
                 "landuse/residential": {
                     "name": "住宅用地",
                     "terms": "住宅區"
                 },
+                "landuse/residential/apartments": {
+                    "name": "公寓大樓",
+                    "terms": "公寓大樓,公寓"
+                },
                 "landuse/retail": {
                     "name": "零售區",
                     "terms": "零售區域,零售"
@@ -5187,8 +5883,7 @@
                     "terms": "酒莊"
                 },
                 "leisure": {
-                    "name": "休閒設施",
-                    "terms": "休閒設施,休閒娛樂"
+                    "name": "休閒設施"
                 },
                 "leisure/adult_gaming_centre": {
                     "name": "成人遊戲中心",
@@ -5342,6 +6037,10 @@
                     "name": "野餐桌",
                     "terms": "野餐桌"
                 },
+                "leisure/picnic_table/chess": {
+                    "name": "棋桌",
+                    "terms": "象棋桌,西洋棋桌"
+                },
                 "leisure/pitch": {
                     "name": "運動場地",
                     "terms": "運動場"
@@ -5350,6 +6049,10 @@
                     "name": "美式足球場",
                     "terms": "美式足球場"
                 },
+                "leisure/pitch/australian_football": {
+                    "name": "澳式足球場",
+                    "terms": "澳式足球場"
+                },
                 "leisure/pitch/badminton": {
                     "name": "羽毛球場",
                     "terms": "羽毛球場"
@@ -5382,6 +6085,10 @@
                     "name": "馬場",
                     "terms": "馬場"
                 },
+                "leisure/pitch/netball": {
+                    "name": "籃網球場",
+                    "terms": "籃網球場"
+                },
                 "leisure/pitch/rugby_league": {
                     "name": "聯盟式橄欖球",
                     "terms": "聯盟式橄欖球"
@@ -5422,10 +6129,6 @@
                     "name": "度假勝地",
                     "terms": "度假村"
                 },
-                "leisure/running_track": {
-                    "name": "操場(跑步)",
-                    "terms": "操場"
-                },
                 "leisure/sauna": {
                     "name": "桑拿",
                     "terms": "桑拿,芬蘭浴,三溫暖"
@@ -5438,6 +6141,10 @@
                     "name": "體育中心／設施",
                     "terms": "體育中心,體育設施"
                 },
+                "leisure/sports_centre/climbing": {
+                    "name": "攀岩場",
+                    "terms": "攀岩場"
+                },
                 "leisure/sports_centre/swimming": {
                     "name": "游泳池附屬設施",
                     "terms": "游泳池設施,游池附屬設施,游池設施"
@@ -5454,6 +6161,14 @@
                     "name": "操場(非摩托賽道)",
                     "terms": "操場(非摩托賽道), 操場"
                 },
+                "leisure/track/horse_racing": {
+                    "name": "賽道 (賽馬競賽)",
+                    "terms": "賽道 (賽馬)"
+                },
+                "leisure/track/running": {
+                    "name": "賽道 (跑步)",
+                    "terms": "賽道 (跑步)"
+                },
                 "leisure/water_park": {
                     "name": "水上樂園",
                     "terms": "水上公園,水上遊樂園"
@@ -5463,8 +6178,7 @@
                     "terms": "線"
                 },
                 "man_made": {
-                    "name": "人工設施",
-                    "terms": "人造構築,人造建築,人造設施"
+                    "name": "人工設施"
                 },
                 "man_made/adit": {
                     "name": "坑口",
@@ -5590,10 +6304,18 @@
                     "name": "塔",
                     "terms": "塔"
                 },
+                "man_made/tower/bell_tower": {
+                    "name": "鐘樓",
+                    "terms": "鐘樓"
+                },
                 "man_made/tower/communication": {
                     "name": "通訊塔",
                     "terms": "無線通訊塔"
                 },
+                "man_made/tower/minaret": {
+                    "name": "尖塔",
+                    "terms": "尖塔"
+                },
                 "man_made/tower/observation": {
                     "name": "瞭望塔",
                     "terms": "瞭望塔"
@@ -5639,8 +6361,7 @@
                     "terms": "電信公司人孔,電信人孔"
                 },
                 "natural": {
-                    "name": "自然景觀",
-                    "terms": "自然物件"
+                    "name": "自然景觀"
                 },
                 "natural/bare_rock": {
                     "name": "裸露的岩石",
@@ -5734,6 +6455,14 @@
                     "name": "æ°´",
                     "terms": "水體"
                 },
+                "natural/water/basin": {
+                    "name": "æ°´æ± ",
+                    "terms": "æ°´æ± "
+                },
+                "natural/water/canal": {
+                    "name": "運河",
+                    "terms": "運河"
+                },
                 "natural/water/lake": {
                     "name": "湖泊",
                     "terms": "湖"
@@ -5746,6 +6475,14 @@
                     "name": "水庫",
                     "terms": "水塘,貯水庫"
                 },
+                "natural/water/river": {
+                    "name": "河流",
+                    "terms": "河流,河川"
+                },
+                "natural/water/stream": {
+                    "name": "溪流",
+                    "terms": "溪流,小溪"
+                },
                 "natural/wetland": {
                     "name": "濕地",
                     "terms": "濕地,潮間帶"
@@ -5922,6 +6659,10 @@
                     "name": "下坡滑雪路線 ",
                     "terms": "下坡滑雪路線"
                 },
+                "piste/downhill/halfpipe": {
+                    "name": "半管",
+                    "terms": "U 型管"
+                },
                 "piste/hike": {
                     "name": "雪鞋或冬季健行步道",
                     "terms": "雪鞋或冬季健行步道"
@@ -6130,46 +6871,6 @@
                     "name": "變壓器",
                     "terms": "變壓器"
                 },
-                "public_transport/linear_platform": {
-                    "name": "轉運站 / 月台",
-                    "terms": "站牌,客運站牌,客運月台"
-                },
-                "public_transport/linear_platform_aerialway": {
-                    "name": "纜車站/月台",
-                    "terms": "纜車站,纜車月台"
-                },
-                "public_transport/linear_platform_bus": {
-                    "name": "公車站/公車月台",
-                    "terms": "公車月台"
-                },
-                "public_transport/linear_platform_ferry": {
-                    "name": "船運停船處 / 船運月台",
-                    "terms": "渡輪停船處,船運月台"
-                },
-                "public_transport/linear_platform_light_rail": {
-                    "name": "輕軌停車處/ 月台",
-                    "terms": "輕軌停車處,輕軌月台"
-                },
-                "public_transport/linear_platform_monorail": {
-                    "name": "單軌電車停車處 / 月台",
-                    "terms": "單軌電車停車處,"
-                },
-                "public_transport/linear_platform_subway": {
-                    "name": "捷運停車處 / 月台",
-                    "terms": "地鐵停車處,地鐵月台"
-                },
-                "public_transport/linear_platform_train": {
-                    "name": "火車停車處 / 月台",
-                    "terms": "火車停車處,火車月台"
-                },
-                "public_transport/linear_platform_tram": {
-                    "name": "街車停車處 / 月台",
-                    "terms": "街車停車處,街車月台"
-                },
-                "public_transport/linear_platform_trolleybus": {
-                    "name": "無軌電車停車處 / 月台",
-                    "terms": "無軌電車停車處,無軌電車月台"
-                },
                 "public_transport/platform": {
                     "name": "公車專用道停車處 / 月台",
                     "terms": "公車專用道停車處,公車專用道月台"
@@ -6524,6 +7225,10 @@
                     "name": "汽車維修店",
                     "terms": "汽車保養店"
                 },
+                "shop/caravan": {
+                    "name": "拖車經銷商",
+                    "terms": "拖車經銷商"
+                },
                 "shop/carpet": {
                     "name": "地毯店",
                     "terms": "地毯商店"
@@ -6632,6 +7337,14 @@
                     "name": "時尚店",
                     "terms": "時裝店,時常衣服店"
                 },
+                "shop/fireplace": {
+                    "name": "壁爐商店",
+                    "terms": "壁爐店"
+                },
+                "shop/fishing": {
+                    "name": "釣魚用品店",
+                    "terms": "釣魚用品店"
+                },
                 "shop/fishmonger": {
                     "name": "魚販"
                 },
@@ -6643,6 +7356,14 @@
                     "name": "表框店",
                     "terms": "表框店, 裱框店"
                 },
+                "shop/frozen_food": {
+                    "name": "冷凍食品",
+                    "terms": "冷凍食品"
+                },
+                "shop/fuel": {
+                    "name": "燃料店",
+                    "terms": "燃料店,加油站"
+                },
                 "shop/funeral_directors": {
                     "name": "生命禮儀公司",
                     "terms": "禮儀公司"
@@ -6702,6 +7423,10 @@
                     "name": "家庭用品店",
                     "terms": "家居用品店"
                 },
+                "shop/hunting": {
+                    "name": "打獵用品店",
+                    "terms": "打獵用品店"
+                },
                 "shop/interior_decoration": {
                     "name": "室內設計店",
                     "terms": "室內設計店"
@@ -6933,6 +7658,10 @@
                     "name": "鐘錶行",
                     "terms": "手錶店"
                 },
+                "shop/water": {
+                    "name": "飲用水商店",
+                    "terms": "飲用水商店"
+                },
                 "shop/water_sports": {
                     "name": "水上活動/泳具店",
                     "terms": "水上活動/游泳用品店"
@@ -6954,8 +7683,7 @@
                     "terms": "酒店"
                 },
                 "tourism": {
-                    "name": "旅遊設施",
-                    "terms": "旅遊設施"
+                    "name": "旅遊設施"
                 },
                 "tourism/alpine_hut": {
                     "name": "高山小屋",
@@ -7141,6 +7869,10 @@
                     "name": "行政界線",
                     "terms": "行政邊界"
                 },
+                "type/enforcement": {
+                    "name": "強制",
+                    "terms": "強制"
+                },
                 "type/multipolygon": {
                     "name": "多重多邊形"
                 },
@@ -7300,8 +8032,7 @@
                     "terms": "河川"
                 },
                 "waterway/riverbank": {
-                    "name": "河床",
-                    "terms": "河岸"
+                    "name": "河床"
                 },
                 "waterway/sanitary_dump_station": {
                     "name": "污水處理放流管",
@@ -7567,6 +8298,20 @@
                 "description": "日本 GSI 正射影像。通常比 bing 好，但有點老舊。",
                 "name": "日本 GSI 正射影像"
             },
+            "gsi.go.jp_airphoto": {
+                "attribution": {
+                    "text": "GSI 日本"
+                },
+                "description": "日本 GSI 航空照片。並未完全正射，但比 GSI 正射影像新且／或覆蓋範圍不同。",
+                "name": "日本 GSI 航空照片"
+            },
+            "gsi.go.jp_seamlessphoto": {
+                "attribution": {
+                    "text": "GSI 日本無縫照片"
+                },
+                "description": "日本 GSI 無縫照片影像，具有最新 GSI ortho，航空影像，災後影像等組合。",
+                "name": "日本 GSI 無縫照片影像"
+            },
             "gsi.go.jp_std_map": {
                 "attribution": {
                     "text": "GSI 日本"
@@ -7867,6 +8612,20 @@
                 "description": "改進印尼的開放街圖",
                 "extendedDescription": "在印尼畫地圖嗎？有問題，想要與社群互動？來 {Url} 加入我們，歡迎所有人。"
             },
+            "osm-iran-aparat": {
+                "name": "開放街圖伊朗阿帕拉特",
+                "description": "訂閱我們的頻道 {url}",
+                "extendedDescription": "這裡有開放街圖相關的影片資源，主要用波斯文。"
+            },
+            "osm-iran-forum": {
+                "name": "開放街圖伊朗網頁論壇",
+                "description": "開放街圖伊朗網頁論壇",
+                "extendedDescription": "伊朗開放街圖使用者的網頁論壇，請自由發問以及與其他人討論！"
+            },
+            "osm-iran-telegram": {
+                "name": "開放街圖伊朗 Telegram",
+                "description": "觀迎加入 Telegram 頻道  {url}，我們伊朗的開放街圖參與者也有超級群組，請到我們的頻道關於部分找到連結。"
+            },
             "OSM-japan-facebook": {
                 "name": "開放街圖日本社群",
                 "description": "日本圖客和開放街圖使用者"
@@ -7883,10 +8642,6 @@
                 "name": "開放街圖日本",
                 "description": "日本圖客和開放街圖使用者"
             },
-            "OSM-korea-telegram": {
-                "name": "開放街圖南韓 Telegram 頻道",
-                "description": "南韓開放街圖貢獻者、社群和使用者分享和討論的非官方頻道。"
-            },
             "OSM-MY-facebook": {
                 "name": "開放街圖馬來西亞 Facebook",
                 "description": "討論任何跟開放街圖相關的事物！"
@@ -7914,6 +8669,14 @@
                 "description": "改進尼泊爾的開放街圖",
                 "extendedDescription": "在尼泊爾畫地圖嗎？有問題，想要與社群互動？來 {Url} 加入我們，歡迎所有人。"
             },
+            "OSM-Asia-mailinglist": {
+                "name": "開放街圖亞洲郵件論壇",
+                "description": "Talk-asia 是亞洲社群的官方郵件論壇"
+            },
+            "osm-asia-telegram": {
+                "name": "開放街圖亞洲 Telegram",
+                "description": "加入我們這個大家庭：{url}"
+            },
             "OSM-PH-facebook": {
                 "name": "開放街圖菲律賓 Facebook",
                 "description": "歡迎來到開放街圖菲律賓，我們歡迎所有菲律賓人貢獻一己之力到開放街圖計畫。"
@@ -7938,10 +8701,14 @@
                 "name": "開放街圖 RU Telegram",
                 "description": "開放街圖俄羅斯 Telegram 聊天群組"
             },
-            "OSM-LKA-facebook": {
+            "OSM-south-korea-telegram": {
+                "name": "OSM 南韓 Telegram",
+                "description": "南韓的開放街圖貢獻者、社群與使用者的分享與討論的非官方頻道。"
+            },
+            "OSM-sri-lanka-facebook": {
                 "name": "開放街圖斯里蘭卡",
-                "description": "改進斯里蘭卡的開放街圖",
-                "extendedDescription": "在斯里蘭卡畫地圖嗎？有問題，想要與社群互動？來  {Url} 加入我們，歡迎所有人。"
+                "description": "在斯里蘭卡改善開放街圖",
+                "extendedDescription": "在斯里蘭卡製圖嗎？有問題想要聯絡這裡的社群嗎？在 {Url} 上加入我們。歡迎所有人！"
             },
             "OSM-TW-facebook": {
                 "name": "開放街圖台灣社群",
@@ -8226,6 +8993,10 @@
                 "name": "開放街圖挪威郵件論壇",
                 "description": "在挪威的圖客與 OpenStreetMap 使用者、開發者與愛好者的郵件論壇"
             },
+            "no-telegram": {
+                "name": "在 Telegram 上的 @OSM_no",
+                "description": "開放街圖挪威 Telegram 聊天室"
+            },
             "OSM-PL-facebook-group": {
                 "name": "開放街圖波蘭 Facebook 社團",
                 "description": "波蘭的開放街圖圖客和使用者社團"