X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7dbf8d83369cb73929080c4ba23fdd7dcd0184df..7ee554ed64d67cee025e3a5c80ba9404b01b407f:/vendor/assets/iD/iD/locales/zh-CN.json

diff --git a/vendor/assets/iD/iD/locales/zh-CN.json b/vendor/assets/iD/iD/locales/zh-CN.json
index e9155a366..9668c3bbc 100644
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -1,20 +1,69 @@
 {
     "zh-CN": {
+        "icons": {
+            "download": "下载",
+            "information": "信息",
+            "remove": "删除",
+            "undo": "复原",
+            "zoom_to": "缩放至",
+            "copy": "复制",
+            "open_wikidata": "在 wikidata.org 上打开",
+            "favorite": "收藏"
+        },
+        "toolbar": {
+            "inspect": "检查",
+            "undo_redo": "撤销 / 重做",
+            "recent": "最近",
+            "favorites": "收藏",
+            "add_feature": "添加要素"
+        },
         "modes": {
+            "add_feature": {
+                "title": "添加一个要素",
+                "description": "搜索要添加到地图的要素。",
+                "key": "Tab",
+                "result": "{count} 个结果",
+                "results": "{count} 个结果"
+            },
             "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"
+            },
+            "add_preset": {
+                "title": "添加 {feature}",
+                "point": {
+                    "title": "添加 {feature} 为点"
+                },
+                "line": {
+                    "title": "添加 {feature} 为线"
+                },
+                "area": {
+                    "title": "添加 {feature} 为区域"
+                },
+                "building": {
+                    "title": "添加 {feature} 为建筑物"
+                }
             },
             "browse": {
                 "title": "浏览",
@@ -27,7 +76,7 @@
                 "tail": "点击以为这线段添加更多节点。点击其他线段以连接它们，点击两下以完成绘制线段。"
             },
             "drag_node": {
-                "connected_to_hidden": "无法编辑，因为其与一隐藏要素相连。"
+                "connected_to_hidden": "该要素与某一隐藏要素相连，无法编辑。"
             }
         },
         "operations": {
@@ -35,13 +84,14 @@
                 "annotation": {
                     "point": "添加点。",
                     "vertex": "添加节点到路径。",
-                    "relation": "添加关系。"
+                    "relation": "添加关系。",
+                    "note": "添加笔记。"
                 }
             },
             "start": {
                 "annotation": {
                     "line": "开始绘制线。",
-                    "area": "开始绘制面状要素。"
+                    "area": "开始绘制区域。"
                 }
             },
             "continue": {
@@ -75,32 +125,45 @@
                     "line": "使线环状化。",
                     "area": "将区域变成圆形。"
                 },
-                "not_closed": "它不是首尾相接的线，无法将其环状化。",
-                "too_large": "由于可见部分不足，无法将其环状化。",
-                "connected_to_hidden": "无法将其环状化，由于其与一隐藏要素相连。"
+                "not_closed": "该要素不是一个闭合环，无法将其环状化。",
+                "too_large": "该要素的可见部分不足，无法将其环状化。",
+                "connected_to_hidden": "该要素与某一隐藏要素相连，无法将其环状化。",
+                "not_downloaded": "该要素的一部分未被下载，无法将其环状化。"
             },
             "orthogonalize": {
                 "title": "直角化",
                 "description": {
+                    "vertex": "直角化该角落。",
                     "line": "将这条线上的弯角转化成直角。",
                     "area": "将这个区域上的弯角转化成直角。"
                 },
-                "key": "S",
+                "key": "Q",
                 "annotation": {
+                    "vertex": "直角化一个角落。",
                     "line": "已将线段上的弯角换成直角。",
                     "area": "已将区域的弯角换成直角。"
                 },
-                "not_squarish": "因为它不是近似方形的，这不能被直角化。",
-                "too_large": "因为可见部分不足，不能变成方形。",
-                "connected_to_hidden": "该对象无法直角化，因为其与一隐藏要素相连。"
+                "end_vertex": "该点为端点，无法将其所在角化为直角。",
+                "square_enough": "无法使其更为直角化。",
+                "not_squarish": "该要素不是近似方形的，无法将其直角化。",
+                "too_large": "该要素的可见部分不足，无法将其直角化。",
+                "connected_to_hidden": "该要素与一隐藏要素相连，无法将其直角化。",
+                "not_downloaded": "该要素的一部分未被下载，无法将其直角化。"
             },
             "straighten": {
                 "title": "拉直",
-                "description": "把这一条线拉直。",
+                "description": {
+                    "points": "拉直这些点。",
+                    "line": "拉直该线。"
+                },
                 "key": "S",
-                "annotation": "拉直线。",
-                "too_bendy": "因为它弯曲太多，无法被拉直。",
-                "connected_to_hidden": "该线不能取直，因为其与一隐藏要素相连。"
+                "annotation": {
+                    "points": "拉直多个点。",
+                    "line": "拉直线。"
+                },
+                "too_bendy": "该要素过于弯曲，无法将其拉直。",
+                "connected_to_hidden": "该要素与一隐藏要素连接，无法将其拉直。",
+                "not_downloaded": "该要素的一部分未被下载，无法将其拉直。"
             },
             "delete": {
                 "title": "删除",
@@ -117,20 +180,51 @@
                     "multiple": "删除了 {n} 个要素。"
                 },
                 "too_large": {
-                    "single": "该要素暂不能删除，因为该要素在当前视角可视部分太少。",
-                    "multiple": "这些要素暂不能删除，因为其在当前视角可视部分不足。"
+                    "single": "该要素的可见部分不足，无法将其删除。",
+                    "multiple": "这些要素的可见部分不足，无法将它们删除。"
                 },
                 "incomplete_relation": {
-                    "single": "因该要素未完全下载，所以无法被删除。",
-                    "multiple": "因这些要素未完全下载，所以无法被删除。"
+                    "single": "该要素未全部下载，无法将其删除。",
+                    "multiple": "这些要素未全部下载，无法将它们删除。"
                 },
                 "part_of_relation": {
-                    "single": "因该要素是更大关系中的一部分，所以无法被删除。您必须先将其从关系中移除。",
-                    "multiple": "因这些要素是更大关系中的一部分，所以无法被删除。您必须先将它们从关系中移除。"
+                    "single": "该要素为更大关系的一部分，无法将其删除。您必须先将其从关系中移除。",
+                    "multiple": "这些要素是更大关系中的一部分，无法将它们删除。您必须先将它们从关系中移除。"
                 },
                 "connected_to_hidden": {
-                    "single": "因该要素与某个隐藏的要素相连，所以无法被删除。",
-                    "multiple": "因这些要素与某些隐藏的要素相连，所以无法被删除。"
+                    "single": "该要素与某一隐藏要素相连，无法将其删除。",
+                    "multiple": "这些要素与某些隐藏要素相连，无法将它们删除。"
+                },
+                "not_downloaded": {
+                    "single": "该要素的一部分未被下载，无法将其删除。",
+                    "multiple": "这些要素的一部分未被下载，无法将它们删除。"
+                },
+                "has_wikidata_tag": {
+                    "single": "该要素存在维基数据的标签，无法将其删除。",
+                    "multiple": "这些要素存在维基数据的标签，无法将它们删除。"
+                }
+            },
+            "downgrade": {
+                "title": "降级",
+                "description": {
+                    "building_address": "移除所有与地址和建筑物无关的标签。",
+                    "building": "移除所有非建筑物标签。",
+                    "address": "移除所有非地址标签。"
+                },
+                "annotation": {
+                    "building": {
+                        "single": "降级一要素至普通建筑物。",
+                        "multiple": "降级{n}个要素至普通建筑物。"
+                    },
+                    "address": {
+                        "single": "降级一要素至地址。",
+                        "multiple": "降级{n}个要素至地址。"
+                    },
+                    "multiple": "降级{n}个要素。"
+                },
+                "has_wikidata_tag": {
+                    "single": "该要素存在维基数据的标签，无法将其降级。",
+                    "multiple": "这些要素存在维基数据的标签，无法将它们降级。"
                 }
             },
             "add_member": {
@@ -139,22 +233,47 @@
             "delete_member": {
                 "annotation": "从关系中删除了一个成员。"
             },
+            "reorder_members": {
+                "annotation": "重新排序关系的成员。"
+            },
             "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": "分离",
                 "description": "将这些线/区域相互分离。",
+                "line": {
+                    "description": "将该路径从其他要素中断开连接。"
+                },
+                "area": {
+                    "description": "将该区域从其他要素中断开连接。"
+                },
                 "key": "D",
                 "annotation": "将线或区域分离。",
-                "not_connected": "没有足够的线/面来分离。",
-                "connected_to_hidden": "无法分离，因为其与一隐藏要素相连。",
-                "relation": "无法分离，因为它与一个关系的成员间相连。"
+                "too_large": {
+                    "single": "该要素的可见部分不足，无法将其分离。"
+                },
+                "not_connected": "没有足够的线/区域来分离。",
+                "not_downloaded": "该要素的一部分未被下载，无法将其分离。",
+                "connected_to_hidden": "该要素与某一隐藏要素相连，无法将其分离。",
+                "relation": "该要素与某个关系的成员相连，无法将其分离。"
             },
             "merge": {
                 "title": "合并",
@@ -163,9 +282,11 @@
                 "annotation": "已合并 {n} 个要素。",
                 "not_eligible": "这些要素不可以合并。",
                 "not_adjacent": "这些要素的结束节点并未相连，无法将其合并。",
-                "restriction": "这些要素不能被合并，因为其中至少有一个要素是某个“{relation}”关系的成员。",
-                "incomplete_relation": "此要素暂未下载完成，无法合并。",
-                "conflicting_tags": "这些要素不能被合并，因为它们的某些标签具有冲突的值。"
+                "restriction": "这些要素不能被合并，因为这样会破坏 “{relation}” 关系。",
+                "relation": "这些要素不能被合并，因为其有冲突的关系成员。",
+                "incomplete_relation": "这些要素未全部下载，无法将它们合并。",
+                "conflicting_tags": "这些要素的标签含有一些冲突的值，无法将它们合并。",
+                "paths_intersect": "这些要素无法被合并，因为生成的路径将会自相交。"
             },
             "move": {
                 "title": "移动",
@@ -182,16 +303,20 @@
                     "multiple": "移动了多个要素。"
                 },
                 "incomplete_relation": {
-                    "single": "因该要素未完全下载，所以无法被移动。",
-                    "multiple": "因这些要素未完全下载，所以无法被移动。"
+                    "single": "该要素未全部下载，无法移动。",
+                    "multiple": "这些要素未全部下载，无法移动。"
                 },
                 "too_large": {
-                    "single": "因该要素的可见部分不足，所以无法被移动。",
-                    "multiple": "因这些要素的可见部分不足，所以无法被移动。"
+                    "single": "该要素的可见部分不足，无法移动。",
+                    "multiple": "这些要素的可见部分不足，无法移动。"
                 },
                 "connected_to_hidden": {
-                    "single": "因该要素与某个隐藏的要素相连，所以无法被移动。",
-                    "multiple": "因这些要素与某些隐藏的要素相连，所以无法被移动。"
+                    "single": "该要素与某一隐藏要素相连，无法移动。",
+                    "multiple": "这些要素与某些隐藏要素相连，无法移动。"
+                },
+                "not_downloaded": {
+                    "single": "该要素的一部分未被下载，无法移动。",
+                    "multiple": "这些要素的一部分未被下载，无法移动。"
                 }
             },
             "reflect": {
@@ -224,16 +349,20 @@
                     }
                 },
                 "incomplete_relation": {
-                    "single": "因该要素未完全下载，所以无法被翻转。",
-                    "multiple": "因这些要素未完全下载，所以无法被翻转。"
+                    "single": "该要素未全部下载，无法将其翻转。",
+                    "multiple": "这些要素未全部下载，无法将它们翻转。"
                 },
                 "too_large": {
-                    "single": "因该要素的可见部分不足，所以无法被翻转。",
-                    "multiple": "因这些要素的可见部分不足，所以无法被翻转。"
+                    "single": "该要素的可见部分不足，无法将其翻转。",
+                    "multiple": "这些要素的可见部分不足，无法将它们翻转。"
                 },
                 "connected_to_hidden": {
-                    "single": "因该要素与某个隐藏的要素相连，所以无法被翻转。",
-                    "multiple": "因这些要素与某些隐藏的要素相连，所以无法被翻转。"
+                    "single": "该要素与某一隐藏要素相连，无法将其翻转。",
+                    "multiple": "这些要素与某些隐藏要素相连，无法将它们翻转。"
+                },
+                "not_downloaded": {
+                    "single": "该要素的一部分未被下载，无法将其翻转。",
+                    "multiple": "这些要素的一部分未被下载，无法将它们翻转。"
                 }
             },
             "rotate": {
@@ -249,16 +378,20 @@
                     "multiple": "旋转多个要素。"
                 },
                 "incomplete_relation": {
-                    "single": "因该要素未完全下载，所以无法旋转。",
-                    "multiple": "因这些要素未完全下载，所以无法旋转。"
+                    "single": "该要素未全部下载，无法旋转。",
+                    "multiple": "这些要素未全部下载，无法旋转。"
                 },
                 "too_large": {
-                    "single": "因该要素的可见部分不足，所以无法旋转。",
-                    "multiple": "因这些要素的可见部分不足，所以无法旋转。"
+                    "single": "该要素的可见部分不足，无法旋转。",
+                    "multiple": "这些要素的可见部分不足，无法旋转。"
                 },
                 "connected_to_hidden": {
-                    "single": "因该要素与某个隐藏的要素相连，所以无法旋转。",
-                    "multiple": "因这些要素与某些隐藏的要素相连，所以无法旋转。"
+                    "single": "该要素与某一隐藏要素相连，无法旋转。",
+                    "multiple": "这些要素与某些隐藏要素相连，无法旋转。"
+                },
+                "not_downloaded": {
+                    "single": "该要素的一部分未被下载，无法旋转。",
+                    "multiple": "这些要素的一部分未被下载，无法旋转。"
                 }
             },
             "reverse": {
@@ -271,24 +404,54 @@
                 "title": "分割",
                 "description": {
                     "line": "在此节点上将这条线分割成两条线。",
-                    "area": "将这个面的边界一分为二。",
-                    "multiple": "在这一节点将线/面的边界一分为二。"
+                    "area": "将这个区域的边界一分为二。",
+                    "multiple": "在这一节点将线/区域的边界一分为二。"
                 },
                 "key": "X",
                 "annotation": {
                     "line": "切割一条线。",
-                    "area": "分割面要素的边界。",
-                    "multiple": "分割{n}项线段/面的边界。"
+                    "area": "分割区域的边界。",
+                    "multiple": "分割{n}个线/区域的边界。"
                 },
                 "not_eligible": "不能在线段的首尾进行分割。",
                 "multiple_ways": "太多线段，未能进行分割。",
-                "connected_to_hidden": "无法打断，因为其与一隐藏要素相连。"
+                "connected_to_hidden": "该要素与某一隐藏要素相连，无法分割。"
             },
             "restriction": {
                 "annotation": {
                     "create": "添加转向限制",
                     "delete": "删除转向限制"
                 }
+            },
+            "extract": {
+                "title": "提取",
+                "key": "E",
+                "description": {
+                    "vertex": {
+                        "single": "将该节点从其父路径/区域中提取出。"
+                    },
+                    "area": {
+                        "single": "从该区域中提取节点。"
+                    }
+                },
+                "annotation": {
+                    "single": "提取节点。"
+                },
+                "too_large": {
+                    "area": {
+                        "single": "该区域的可见部分不足，无法从中提取节点。"
+                    }
+                },
+                "restriction": {
+                    "vertex": {
+                        "single": "该点无法被提取，因为这样会破坏 \"{relation}\" 关系。"
+                    }
+                },
+                "connected_to_hidden": {
+                    "vertex": {
+                        "single": "该点与某一隐藏要素相连，无法被提取。"
+                    }
+                }
             }
         },
         "restriction": {
@@ -349,6 +512,10 @@
         "loading_auth": "正在连接 OpenStreetMap...",
         "report_a_bug": "反馈 BUG",
         "help_translate": "帮助改进翻译",
+        "sidebar": {
+            "key": "`",
+            "tooltip": "切换侧边栏。"
+        },
         "feature_info": {
             "hidden_warning": "{count}个隐藏要素",
             "hidden_details": "以下要素目前被隐藏：{details}"
@@ -361,17 +528,20 @@
         },
         "commit": {
             "title": "上传至 OpenStreetMap",
-            "upload_explanation": "您上传的修改将会在所有使用 OpenStreetMap 数据的地图上可见。",
-            "upload_explanation_with_user": "{user}，您上传的修改将会在所有使用 OpenStreetMap 数据的地图上可见。",
+            "upload_explanation": "您上传的更改将会在所有使用 OpenStreetMap 数据的地图上可见。",
+            "upload_explanation_with_user": "{user}，您上传的更改将会在所有使用 OpenStreetMap 数据的地图上可见。",
             "request_review": "我想要让其他人复核我的编辑。",
             "save": "上传",
             "cancel": "取消",
-            "changes": "{count}个变更",
+            "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 Maps 中复制信息是被严格禁止的。",
@@ -402,12 +572,18 @@
                 "key": "H",
                 "title": "历史",
                 "selected": "已选择 {n} 个",
+                "no_history": "无历史记录（新要素）",
                 "version": "版本",
                 "last_edit": "最近编辑",
                 "edited_by": "编辑者",
                 "changeset": "变更集合",
                 "unknown": "未知",
-                "link_text": "在 openstreetmap.org 上的历史记录"
+                "link_text": "在 openstreetmap.org 上的历史记录",
+                "note_no_history": "无历史记录（新笔记）",
+                "note_comments": "评论数",
+                "note_created_date": "创建时间",
+                "note_created_user": "创建者",
+                "note_link_text": "在 openstreetmap.org 上的笔记"
             },
             "location": {
                 "key": "L",
@@ -437,7 +613,8 @@
             "vertex": "顶点",
             "line": "线",
             "area": "区域",
-            "relation": "关系"
+            "relation": "关系",
+            "note": "笔记"
         },
         "geocoder": {
             "search": "在全球搜索...",
@@ -449,20 +626,35 @@
             "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": "所有关系",
+            "add_to_relation": "添加至一个关系",
             "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": "搜索",
@@ -489,7 +681,10 @@
             "way": "路径",
             "relation": "关系",
             "location": "位置",
-            "add_fields": "添加字段："
+            "add_fields": "添加字段：",
+            "lock": {
+                "suggestion": "\"{label}\" 字段已锁定，因为存在维基数据的标签。你可以删除或在“所有标签”内编辑它。"
+            }
         },
         "background": {
             "title": "背景",
@@ -500,11 +695,10 @@
             "best_imagery": "此地最知名的影像数据源",
             "switch": "切换回该底图",
             "custom": "自定义",
-            "custom_button": "编辑自定义背景",
-            "custom_prompt": "输入地图瓦片URL地址。有效的参数有：\n   - {zoom} 或 {z}, {x}, {y} 作为 Z/X/Y 坐标系\n   - {-y} 或 {ty} 作为翻转的 TMS 算法 Y 坐标\n   - {u} 作为四叉树坐标编码\n   - {switch:a,b,c} 作为 DNS 服务器解析的并行连接子域\n\n示例：\n{example}",
             "overlays": "叠加图层",
             "imagery_source_faq": "影像信息 / 报告问题",
             "reset": "重置",
+            "reset_all": "重置全部",
             "display_options": "显示设定",
             "brightness": "亮度",
             "contrast": "对比度",
@@ -527,12 +721,45 @@
                 "osm": {
                     "tooltip": "来自 OpenStreetMap 的地图数据",
                     "title": "OpenStreetMap 数据"
+                },
+                "notes": {
+                    "tooltip": "来自 OpenStreetMap 的笔记",
+                    "title": "OpenStreetMap 笔记"
+                },
+                "keepRight": {
+                    "tooltip": "自动使用 keepright.at 探测地图问题",
+                    "title": "KeepRight 问题"
+                },
+                "improveOSM": {
+                    "tooltip": "使用 improveosm.org 自动探测缺失数据",
+                    "title": "ImproveOSM 问题"
+                },
+                "custom": {
+                    "tooltip": "将数据文件拖放到页面上，或点击按钮设置",
+                    "title": "自定义地图数据",
+                    "zoom": "缩放到数据"
                 }
             },
             "fill_area": "填充区域",
             "map_features": "地图要素",
             "autohidden": "这些要素已被自动隐藏，因为屏幕中的要素过多。请放大再编辑。",
-            "osmhidden": "由于禁用的 OpenStreetMap 数据图层，这些要素已被自动隐藏。"
+            "osmhidden": "由于 OpenStreetMap 数据图层已被禁用，这些要素已被自动隐藏。"
+        },
+        "photo_overlays": {
+            "title": "照片叠加层",
+            "traffic_signs": {
+                "title": "交通标志"
+            },
+            "photo_type": {
+                "flat": {
+                    "title": "平面照片",
+                    "tooltip": "传统照片"
+                },
+                "panoramic": {
+                    "title": "全景照片",
+                    "tooltip": "360° 照片"
+                }
+            }
         },
         "feature": {
             "points": {
@@ -555,6 +782,14 @@
                 "description": "建筑物",
                 "tooltip": "建筑物，遮蔽处，车库等。"
             },
+            "building_parts": {
+                "description": "建筑部分",
+                "tooltip": "3D 建筑和屋顶部件"
+            },
+            "indoor": {
+                "description": "室内要素",
+                "tooltip": "房间、走廊、楼梯等"
+            },
             "landuse": {
                 "description": "土地利用要素",
                 "tooltip": "森林，农田，公园，居民地，商用地等。"
@@ -571,16 +806,24 @@
                 "description": "铁路要素",
                 "tooltip": "铁路"
             },
+            "pistes": {
+                "description": "滑雪道",
+                "tooltip": "滑雪坡、雪橇道、滑冰道等"
+            },
+            "aerialways": {
+                "description": "架空要素",
+                "tooltip": "升降椅、缆车、滑索道等"
+            },
             "power": {
                 "description": "电力要素",
                 "tooltip": "输电线，发电厂，变电所等。"
             },
             "past_future": {
-                "description": "过去/未来",
+                "description": "历史/未来要素",
                 "tooltip": "规划，在建，废弃，拆毁等。"
             },
             "others": {
-                "description": "其他",
+                "description": "其他要素",
                 "tooltip": "其他东西"
             }
         },
@@ -592,16 +835,39 @@
             },
             "partial": {
                 "description": "部分填充",
-                "tooltip": "仅在面的内部边界附近填充区域。（推荐初学者使用）"
+                "tooltip": "仅在区域内的边界附近填充。（推荐初学者使用）"
             },
             "full": {
                 "description": "全部填充",
-                "tooltip": "区域全部填充绘制。"
+                "tooltip": "在区域内全部填充。"
+            }
+        },
+        "settings": {
+            "custom_background": {
+                "tooltip": "编辑自定义背景",
+                "header": "自定义背景设置",
+                "instructions": "输入地图瓦片URL地址。有效的参数有：\n   {zoom} 或 {z}, {x}, {y} 作为 Z/X/Y 坐标系\n   {-y} 或 {ty} 作为翻转的 TMS 算法 Y 坐标\n   {u} 作为四叉树坐标编码\n   {switch:a,b,c} 作为 DNS 服务器解析的并行连接子域\n\n示例：\n{example}",
+                "template": {
+                    "placeholder": "输入URL地址"
+                }
+            },
+            "custom_data": {
+                "tooltip": "编辑自定义数据层",
+                "header": "自定义地图数据设置",
+                "file": {
+                    "instructions": "选择一个本地数据文件。支持的格式如下：\n   .gpx, .kml, .geojson, .json",
+                    "label": "浏览文件"
+                },
+                "or": "或者",
+                "url": {
+                    "instructions": "输入数据文件 URL 或瓦片 URL 模版。有效参数为：\n   {zoom}/{z}, {x}, {y} 作为 Z/X/Y 瓦片坐标系",
+                    "placeholder": "输入一个URL"
+                }
             }
         },
         "restore": {
             "heading": "您有未保存的更改",
-            "description": "您在上一次编辑时有未保存的修改，您想恢复这些修改吗？",
+            "description": "您在上一次编辑时有未保存的更改，您想恢复这些更改吗？",
             "restore": "恢复我的修改",
             "reset": "丢弃我的修改"
         },
@@ -614,7 +880,7 @@
             "unknown_error_details": "请确保您已连接到互联网。",
             "uploading": "正在向 OpenStreetMap 上传更改……",
             "conflict_progress": "正在检查冲突：第 {num} / {total} 处",
-            "unsaved_changes": "您有未保存的修改",
+            "unsaved_changes": "您有未保存的更改",
             "conflict": {
                 "header": "调解编辑冲突",
                 "count": "第{num}处冲突，共{total}处",
@@ -639,15 +905,24 @@
             }
         },
         "success": {
-            "edited_osm": "编辑了 OSM！",
             "just_edited": "您刚刚编辑了 OpenStreetMap！",
-            "view_on_osm": "在 OSM 上查看",
-            "facebook": "分享到Facebook",
-            "twitter": "分享到 Twitter",
-            "google": "分享到 Google+",
-            "help_html": "您的修改将会在几分钟内出现在“标准”图层上，其他图层和某些要素可能需要更长的处理时间。",
+            "thank_you": "感谢您改进地图。",
+            "thank_you_location": "感谢您改进 {where} 周边的地图。",
+            "thank_you_where": {
+                "format": "{region}{separator}{place}",
+                "separator": " "
+            },
+            "help_html": "您的更改将会在几分钟内于 OpenStreetMap 上显示。其他地图可能需要更长的时间接收更新。 ",
             "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 上查看更改",
+            "changeset_id": "您的变更集合 #: {changeset_id}",
+            "like_osm": "喜欢 OpenStreetMap 吗？不妨与更多人联系：",
+            "more": "更多",
+            "events": "事件",
+            "languages": "语言：{languages}",
+            "missing": "该列表有遗漏的信息？",
+            "tell_us": "告诉我们！"
         },
         "confirm": {
             "okay": "确定",
@@ -657,7 +932,7 @@
             "welcome": "欢迎使用 OpenStreetMap iD 编辑器",
             "text": "iD 编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是 {version} 版本。欲知详情，请浏览 {website} 及在 {github} 报告程序错误。",
             "walkthrough": "开始演练",
-            "start": "现在就编辑"
+            "start": "立即编辑"
         },
         "source_switch": {
             "live": "实况模式",
@@ -672,53 +947,414 @@
             "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": "切换全屏",
-        "gpx": {
-            "local_layer": "本地文件",
-            "drag_drop": "将.gpx、.geojson或.kml文件拖放到页面上，或单击右侧的按钮浏览",
-            "zoom": "缩放到图层",
-            "browse": "浏览文件"
+        "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}，所以这里可能缺少一个单行线标签。"
+                    },
+                    "mr": {
+                        "title": "缺少几何形状",
+                        "description": "在该区域的 {num_trips} 个旅行记录表明此处可能有 {geometry_type} 未被绘制。",
+                        "description_alt": "来自第三方的数据表明此处可能有 {geometry_type} 未被绘制。"
+                    },
+                    "tr": {
+                        "title": "缺少转向限制",
+                        "description": "{num_trips} 个朝{travel_direction}方向的旅行记录中的 {num_passed} 个在 {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": "在这个地点有多个节点。节点 ID: {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} 是一个高速公路和 非“高速公路”、“高速公路连接路”、“干线道路”、“服务区”或“在建”道路 的交叉口。与“辅助道路”或“未分级道路”的连接仅在其具有 \"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": "限制缺少“起始”路径",
+                        "description": "{var1} 拥有 {var2} 个“起始”成员，但它应该有且仅有一个。"
+                    },
+                    "293": {
+                        "title": "限制缺少“结束”路径",
+                        "description": "{var1} 拥有 {var2} 个“结束”成员，但它应该有且仅有一个。"
+                    },
+                    "294": {
+                        "title": "“起始”或“结束”限制不是一条路径",
+                        "description": "{var1} 拥有“起始”或“结束”成员并且须是路径。{var2}。"
+                    },
+                    "295": {
+                        "title": "限制“仅由”不是一个端点",
+                        "description": "{var1} 拥有一个“经由” (节点 {var2})，但它并非 \"{var3}\" (路径 {var4}) 的第一个或最后一个成员。"
+                    },
+                    "296": {
+                        "title": "少见的限制角度",
+                        "description": "{var1} 存在限制类型 \"{var2}\"，但其角度为 {var3} 度。也许该限制类型并不合适？"
+                    },
+                    "297": {
+                        "title": "结束路径方向错误",
+                        "description": "{var1} 与结束路径 {var2} 方向不符。"
+                    },
+                    "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} 在此处以非常尖锐的角度连接，但没有单行线标签或转向限制以防止转向。"
+                    },
+                    "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}\"。"
+                    }
+                }
+            }
         },
-        "mapillary_images": {
-            "tooltip": "来自Mapillary的街景照片",
-            "title": "照片叠加层 (Mapillary)"
+        "streetside": {
+            "tooltip": "来自微软公司的街景照片",
+            "title": "必应 Streetside",
+            "report": "报告该图像的隐私问题",
+            "view_on_bing": "在必应地图上查看",
+            "hires": "高分辨率"
         },
-        "mapillary_signs": {
-            "tooltip": "来自Mapillary的交通标志 (需开启照片叠加层)",
-            "title": "交通标志叠加层 (Mapillary)"
+        "mapillary_images": {
+            "tooltip": "来自Mapillary的街景照片"
         },
         "mapillary": {
+            "title": "Mapillary",
+            "signs": {
+                "tooltip": "来自 Mapillary 的交通标志"
+            },
             "view_on_mapillary": "在Mapillary上查看这张图片"
         },
         "openstreetcam_images": {
-            "tooltip": "来自 OpenStreetCam 的街道等级照片",
-            "title": "照片覆盖（OpenStreetCam）"
+            "tooltip": "来自 OpenStreetCam 的街道等级照片"
         },
         "openstreetcam": {
+            "title": "OpenStreetCam",
             "view_on_openstreetcam": "在 OpenStreetCam 上查看该图像"
         },
+        "note": {
+            "note": "笔记",
+            "title": "编辑笔记",
+            "anonymous": "匿名用户",
+            "closed": "(已关闭)",
+            "commentTitle": "评论",
+            "status": {
+                "opened": "创建于 {when}",
+                "reopened": "重启于 {when}",
+                "commented": "评论于 {when}",
+                "closed": "关闭于 {when}"
+            },
+            "newComment": "发表新评论",
+            "inputPlaceholder": "输入评论并分享给其他用户。",
+            "close": "解决笔记",
+            "open": "重启笔记",
+            "comment": "评论",
+            "close_comment": "解决并评论",
+            "open_comment": "重启并评论",
+            "report": "举报",
+            "new": "新笔记",
+            "newDescription": "描述该处的问题或错误。",
+            "save": "保存笔记",
+            "login": "你必须登录才能修改或评论该笔记。",
+            "upload_explanation": "你的评论将会对所有 OpenStreetMap 用户公开可见。",
+            "upload_explanation_with_user": "{user}，你的评论将会对所有 OpenStreetMap 用户公开可见。"
+        },
         "help": {
             "title": "帮助",
             "key": "H",
@@ -740,7 +1376,7 @@
                 "navigation_zoom": "您可以滚动鼠标滚轮或触摸板来放大或缩小地图，也可以按下地图侧面的{plus}/{minus}按键。您也可以使用键盘上的`+`、`-`按键。",
                 "features_h": "地图要素",
                 "features": "我们使用*要素*（*feature*）这个词来描述出现在地图上的事物，例如道路、建筑或兴趣点。任何真实世界的实物均可在 OpenStreetMap 上被映射为一个要素。地图要素在地图上使用*点*、*线*或*区域*进行表示。",
-                "nodes_ways": "在 OpenStreetmap 中，点又被称为*节点*，而线和区域又被称为*路径*。"
+                "nodes_ways": "在 OpenStreetMap 中，点有时被称为 *节点* ，线和区域有时被称为 *路径* 。"
             },
             "editing": {
                 "title": "编辑和保存",
@@ -756,26 +1392,116 @@
                 "save": "点击 {save} **保存** 以完成您的编辑并发送至 OpenStreetMap。请您牢记：要经常保存您的编辑！",
                 "save_validation": "在保存界面，您有机会再次检查您所做的编辑。iD 也会做相应的基本检查确保无数据缺失，并且会在不适当的地方提供有用的建议或警告。",
                 "upload_h": "上传",
-                "upload": "在上传您所做的修改之前，您必须输入一段 [修改集合注释](https://wiki.openstreetmap.org/wiki/Good_changeset_comments) 。接着点击 **上传** 将您的编辑发送至 OpenStreetMap，之后它们将会被合并到地图并且对所有人公开可见。",
+                "upload": "在上传您所做的更改之前，您必须输入一段 [变更集合注释](https://wiki.openstreetmap.org/wiki/Good_changeset_comments)。接着点击 **上传** 将您的编辑发送至 OpenStreetMap，之后它们将会被合并到地图并且对所有人公开可见。",
                 "backups_h": "自动备份",
                 "backups": "如果您一时无法结束您的编辑，例如您的计算机宕机或者关闭了浏览器标签页，您所做的编辑仍会被保存在浏览器存储中。您可以稍后回来（在相同的计算机和浏览器上），然后由 iD 恢复您之前的编辑。",
                 "keyboard_h": "键盘快捷键",
                 "keyboard": "您可以按下 `?` 键以查看键盘快捷键列表。"
             },
             "feature_editor": {
-                "title": "要素编辑器"
+                "title": "要素编辑器",
+                "intro": "*要素编辑器* 显示在地图旁边，允许您查看和编辑所选要素的全部信息。",
+                "definitions": "顶端部分显示要素的类型。中间部分包含 *字段* (*fields*)，用来显示诸如名称或地址等要素属性。",
+                "type_h": "要素类型",
+                "type": "您可以点击要素类型将要素更改为其他类型。任何在现实中的存在的事物都可以被添加至 OpenStreetMap，因此有数以千计的要素类型可供选择。",
+                "type_picker": "类型选项框显示了最常见的要素类型，例如公园、医院、餐厅、道路和建筑物。您可以通过在搜索框中键入来查找任何内容。您还可以点击要素类型旁边的 {inspect} **信息** 图标以了解更多有关信息。",
+                "fields_h": "字段",
+                "fields_all_fields": "“所有字段”部分包含所有您可以编辑的要素细节。在 OpenStreetMap 中，所有字段都是选填的，如果您不确定，可以将字段留空。",
+                "fields_example": "每种要素类型都会显示不同的字段。例如，道路会显示路面铺设和限制速度等字段，而餐厅则会显示食物类型以及营业时间等字段。",
+                "fields_add_field": "您还可以点击“添加字段”下拉列表增加更多的字段，例如描述、维基百科链接和轮椅通道等等。",
+                "tags_h": "标签",
+                "tags_all_tags": "在字段部分的下方，您可以展开“所有标签”部分，以编辑选中要素的任何 OpenStreetMap *标签* (*tags*)。每个标签都包含一个 *键* (*key*) 和 *值* (*value*)，用来定义所有存储在 OpenStreetMap 中的要素。",
+                "tags_resources": "编辑要素的标签时需要具备一定水平的 OpenStreetMap 知识。您应该查阅像 [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page) 或 [Taginfo](https://taginfo.openstreetmap.org/) 等资源来了解更多关于认可的 OpenStreetMap 标签操作。"
             },
             "points": {
-                "title": "点"
+                "title": "点",
+                "intro": "*点* (*Points*) 可用于表示商店、餐厅和纪念碑等要素。它们标记一个特定的位置，并描述那里有什么。",
+                "add_point_h": "添加点",
+                "add_point": "要添加一个点，点击地图上方工具栏的 {point} **点** 按钮，或者按快捷键 `1`。鼠标将会改显示为十字形状。",
+                "add_point_finish": "要在地图上放置新点，将鼠标移到该点应处的位置，然后 {leftclick} 左键点击或按 `空格`。",
+                "move_point_h": "移动点",
+                "move_point": "要移动一个点，将鼠标放在该点上，然后 {leftclick} 左键点击并拖动点直到新的位置。",
+                "delete_point_h": "删除点",
+                "delete_point": "删除现实世界中不存在的要素是被允许的。在 OpenStreetMap 中删除要素意味着它将会从每个人使用的地图中移除，所以您应该在删除前确保它真的已不复存在。",
+                "delete_point_command": "要删除一个点，{rightclick} 右键点击选中该点以显示编辑菜单，然后选择 {delete} **删除** 指令。"
             },
             "lines": {
-                "title": "线"
+                "title": "线",
+                "intro": "*线* (*Lines*) 可用于表示道路、铁路和河流等要素。线应在要素所占据的中心线上绘制。",
+                "add_line_h": "添加线",
+                "add_line": "要添加线，点击地图上方工具栏的 {line} **线** 按钮，或者按快捷键 `2`。鼠标将会改显示为十字形状。",
+                "add_line_draw": "接下来，将鼠标移到线开始的位置，然后 {leftclick} 左键点击或按 `空格` 键开始放置节点。继续沿线点击或按 `空格` 键放置更多节点。在绘制过程中，您可以放大或拖动地图以添加更多细节。",
+                "add_line_finish": "要结束绘制线，请按 `{return}` 或再次点击最后一个节点。",
+                "modify_line_h": "修改线",
+                "modify_line_dragnode": "通常您会见到形状不正确的线，例如与背景影像不匹配的道路。要调整线的形状，请先 {leftclick} 左键点击以选中它，所有线的节点都将呈现为小圆点。之后您可以拖动节点到更好的位置。",
+                "modify_line_addnode": "您还可以通过在线上 {leftclick}**x2** 双击或拖动节点之间的中点小三角来为一条线创建新的节点。",
+                "connect_line_h": "连接线",
+                "connect_line": "正确连接道路对地图和对其提供行车路线至关重要。",
+                "connect_line_display": "道路之间的连接点以灰色圆点显示。线的端点如果没有连接任何东西，则以较大的白色圆点显示。",
+                "connect_line_drag": "要将线连接到另一要素，请拖动该线的其中一个节点到另一要素上，直到两个要素吸附在一起。提示：您可以按住 `{alt}` 键以防止节点连接到其他要素。",
+                "connect_line_tag": "如果您知道连接点是交通信号灯或人行横道，则可以通过选中该点并使用要素编辑器选择正确的要素类型来添加它们。",
+                "disconnect_line_h": "分离线",
+                "disconnect_line_command": "要断开道路和另一要素的连接，请 {rightclick} 右键点击连接节点，然后在编辑菜单中选择 {disconnect} **分离** 指令。",
+                "move_line_h": "移动线",
+                "move_line_command": "要移动整条线，请 {rightclick} 右键点击该线，然后从编辑菜单中选择 {move} **移动** 指令。最后移动鼠标，并 {leftclick} 左键点击以将该线放在新位置。",
+                "move_line_connected": "已连接到其他要素的线在您移动到新位置时将会继续保持连接状态。iD 可能会阻止您将线移到与另一已连接的线交叉。",
+                "delete_line_h": "删除线",
+                "delete_line": "如果一条线完全不正确，例如现实世界中不存在的道路，则可以删除它。删除要素时要留意：您使用的背景影像可能已过时，一些看起来错误的道路可能只是最近建造的。",
+                "delete_line_command": "要删除线，请 {rightclick} 右键点击选中该线以显示编辑菜单，然后选择 {delete} **删除** 指令。"
             },
             "areas": {
-                "title": "区域"
+                "title": "区域",
+                "intro": "*区域* (*Areas*) 可用于表示湖泊、建筑物和住宅区等要素的边界。区域应围绕要素所占据的边缘进行勾画，例如围绕建筑物的底部。",
+                "point_or_area_h": "点还是区域？",
+                "point_or_area": "许多要素可以表示为点或区域。您应尽可能将建筑物和住宅轮廓绘制成区域。将点放置在建筑物区域内以表示建筑物内的商业、便利设施和其他要素。",
+                "add_area_h": "添加区域",
+                "add_area_command": "要添加区域，点击地图上方工具栏的 {area} **区域** 按钮，或者按快捷键 `3`。鼠标将会改显示为十字形状。",
+                "add_area_draw": "接下来，将鼠标移到要素的其中一角，然后 {leftclick} 左键点击或按 `空格` 键开始放置节点。继续沿着区域的外边缘点击或按 `空格` 键放置更多节点。在绘制过程中，您可以放大或拖动地图以添加更多细节。",
+                "add_area_finish": "要结束绘制区域，请按 `{return}` 或再次点击第一个或最后一个节点。",
+                "square_area_h": "直角化区域",
+                "square_area_command": "许多诸如建筑物等区域要素都有直角。要对区域直角化，请 {rightclick} 右键点击区域的边缘，然后在编辑菜单中选择 {orthogonalize} **直角化** 指令。",
+                "modify_area_h": "修改区域",
+                "modify_area_dragnode": "通常您会见到形状不正确的区域，例如与背景影像不匹配的建筑物。要调整区域的形状，请先 {leftclick} 左键点击以选中它，所有区域的节点都将呈现为小圆点。之后您可以拖动节点到更好的位置。",
+                "modify_area_addnode": "您还可以通过 {leftclick}**x2** 双击区域边缘或拖动节点之间的中点小三角来沿区域创建新的节点。",
+                "delete_area_h": "删除区域",
+                "delete_area": "如果某个区域完全不正确，例如现实世界中不存在的建筑物，则可以删除它。删除要素时要留意：您使用的背景影像可能已过时，一些看起来错误的建筑物可能只是最近建造的。",
+                "delete_area_command": "要删除区域，请 {rightclick} 右键点击选中该区域以显示编辑菜单，然后选择 {delete} **删除** 指令。"
             },
             "relations": {
-                "title": "关系"
+                "title": "关系",
+                "intro": "*关系* (*Relation*) 是 OpenStreetMap 中一种特殊类型的要素，它将其他要素组合在一起。属于关系的要素称为 *成员* (*members*)，每个成员在关系中可以有个 *角色* (*role*)。",
+                "edit_relation_h": "编辑关系",
+                "edit_relation": "在要素编辑器的底部，您可以展开“所有关系”部分以查看所选要素是否为任何关系的成员。然后您可以点击关系以选择和编辑。",
+                "edit_relation_add": "要向关系添加要素，请选择该要素，然后在要素编辑器 \"所有关系\" 中点击 {plus} 添加按钮。您可以从附近关系的列表中进行选择，或选择 \"新关系…\" 选项。",
+                "edit_relation_delete": "您还可以点击 {delete} **删除** 按钮从关系中删除所选要素。如果您删除了关系中的所有成员，则将自动删除该关系。",
+                "maintain_relation_h": "维护关系",
+                "maintain_relation": "在大部分情况下，iD 会在您编辑时自动维护关系。在替换要素时，您应留意其可能是某关系的成员。例如，如果您删除一段道路并绘制一段新的道路来替换它，则应将新段添加到与原道路相同的关系（线路和转向限制等）。",
+                "relation_types_h": "关系类型",
+                "multipolygon_h": "复合多边形",
+                "multipolygon": "*复合多边形* (*multipolygon*) 关系是单/多个 *外部* (*outer*) 要素和单/多个 *内部* (*inner*) 要素的组合。外部要素定义复合多边形的外部边缘，内部要素定义复合多边形内部切割出的子区域或孔洞。",
+                "multipolygon_create": "要创建一个复合多边形，以中间带有洞的建筑物为例，先将外部边缘绘制成区域，然后将内部边缘绘制成路径或不同类型的区域。之后 `{shift}`+{leftclick} 左键点击选中全部要素，{rightclick} 右键点击以显示编辑菜单，最后选择 {merge} **合并** 指令。",
+                "multipolygon_merge": "合并多个路径或区域将创建新的以所有选定区域为成员的复合多边形关系。iD 将依据要素互相包含的关系自动选择内部和外部角色。",
+                "turn_restriction_h": "转向限制",
+                "turn_restriction": "*转向限制* (*turn restriction*) 关系是一组位于交叉路口的几个路段。转向限制包含一条 *起始* (*from*) 道路、*经由* (*via*) 节点或道路和一条 *结束* (*to*) 道路。",
+                "turn_restriction_field": "要编辑转向限制，先选择一个由两条或多条道路相交的交叉节点。要素编辑器将显示一个特殊的 \"转向限制\" 字段，其中包含该交叉路口的模型。",
+                "turn_restriction_editing": "在 \"转向限制\" 字段中，点击选择一条“起始”道路，并查看是否允许或限制转向至任何“结束”道路。您可以点击转向图标在允许和限制之间切换。iD 将自动创建关系，并根据您的选择设定起始、经由和结束角色。",
+                "route_h": "线路",
+                "route": "*线路* (*route*) 关系是能形成线路网络的单/多个路径要素的组合，例如公共汽车线路、列车线路或公路线路。",
+                "route_add": "要向线路关系添加要素，请选择该要素并向下滚动到要素编辑器的 \"所有关系\" 部分，然后点击 {plus} 添加按钮将此要素添加到附近的现有关系或新关系中。",
+                "boundary_h": "边界",
+                "boundary": "*边界* (*boundary*) 关系是能构成行政区域界线的单/多个路径要素的组合。",
+                "boundary_add": "要向边界关系添加要素，请选择该要素并向下滚动到要素编辑器的 \"所有关系\" 部分，然后点击 {plus} 添加按钮将此要素添加到附近的现有关系或新关系中。"
+            },
+            "notes": {
+                "title": "笔记",
+                "intro": "*笔记* (*Notes*) 用于提醒其他用户某个要素需要修复或注意。笔记标记地图上的一个特定位置。要查看现有的笔记或添加新笔记，点击 {data} **地图数据** 面板以启用 OpenStreetMap 笔记图层。",
+                "add_note_h": "添加笔记",
+                "add_note": "要添加新笔记，请点击地图上方 {note} **笔记** 按钮，或者按快捷键 `4`。鼠标将会改显示为十字形状。要在地图上放置新的笔记，将鼠标放在笔记应处的位置，然后 {leftclick} 左键点击或者按 `空格`。",
+                "move_note": "只有新笔记才可移动。要移动新笔记，将鼠标放在该笔记上，然后 {leftclick} 左键点击并拖动笔记直到新的位置。",
+                "update_note_h": "关闭、重启和评论",
+                "update_note": "现有的笔记可以通过关闭、重启或添加评论来更新。关闭一个笔记表示其问题已得到解决。重启一个笔记表示原问题未得到解决。",
+                "save_note_h": "保存笔记",
+                "save_note": "您必须通过点击笔记评论下方的按钮单独保存任何笔记的编辑。注意笔记编辑 **不会** 包含在您上传到 OpenStreetMap 的变更集合中。"
             },
             "imagery": {
                 "title": "背景影像",
@@ -785,14 +1511,32 @@
                 "sources": "[必应地图](https://www.bing.com/maps/) 卫星图层被设定为默认背景影像。基于您编辑的所处位置，也会有其他影像可供使用。其中有些会较新或有更高清晰度，所以建议先检查哪个图层最适合作为绘图参考。",
                 "offsets_h": "调整影像偏移",
                 "offset": "有时候影像相较于准确地图数据会有轻微的偏移。如果您看见大量的道路或建筑物偏移了背景影像，那可能是由影像不正确导致，这时请不要全部移动它们来匹配背景。相反，您可以在背景设置的底部找到“调整影像偏移”版块，通过增加偏移来调整背景，从而使它与既有数据吻合。",
-                "offset_change": "点击小三角以微小的幅度调整影像偏移；或者在灰色矩形内按住鼠标左键并拖动，以校准影像。"
+                "offset_change": "点击小三角以微小的幅度调整影像偏移；或者在灰色矩形内按住 {leftclick} 鼠标左键并拖动，以校准影像。"
             },
             "streetlevel": {
-                "title": "街景照片"
+                "title": "街景照片",
+                "intro": "街景照片适合用来绘制交通标志、商店和其他无法通过卫星和航空影像看到的细节。iD 编辑器支持 [必应 Streetside](https://www.microsoft.com/en-us/maps/streetside)、[Mapillary](https://www.mapillary.com) 和 [OpenStreetCam](https://www.openstreetcam.org) 的街景照片。",
+                "using_h": "使用街景照片",
+                "using": "要使用街景照片绘制地图，点击地图侧边的 {data} **地图数据** 面板以启用或禁用可用的照片图层。",
+                "photos": "当启用时，照片图层会沿着照片序列显示一条线。在较高的缩放等级，圆圈代表着每张照片的位置；在更高的缩放等级，还会有锥形表示拍摄照片时相机的朝向。",
+                "viewer": "当您点击其中一个照片位置时，照片查看器将显示在地图的底部。照片查看器内含图像序列中前进和后退的操作。它也会显示拍摄该图像的作者的用户名、拍摄日期以及查看原始图像的站点链接。"
             },
             "gps": {
                 "title": "GPS 轨迹",
-                "upload": "您也可以[将您的 GPS 数据上传至 OpenStreetMap](https://www.openstreetmap.org/trace/create) 以供他人使用。"
+                "intro": "收集的 GPS 轨迹是 OpenStreetMap 的重要数据来源。本编辑器支持计算机本地 *.gpx*, *.geojson* 和 *.kml* 文件。您可以使用智能手机、运动手表或其他 GPS 设备收集 GPS 轨迹。",
+                "survey": "关于如何使用 GPS 设备，请参阅 [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).",
+                "using_h": "使用 GPS 轨迹",
+                "using": "要使用 GPS 轨迹绘制地图，请将数据文件拖放到地图编辑器中。如果成功识别，它将会在地图上显示为亮紫色的线。点击地图侧边的 {data} **地图数据** 面板可启用、禁用或缩放您的 GPS 数据。",
+                "tracing": "GPS 轨迹不会发送到 OpenStreetMap - 使用它的最佳方式是在绘制地图时，将它作为添加新要素的指导。",
+                "upload": "您也可以 [将您的 GPS 数据上传至 OpenStreetMap](https://www.openstreetmap.org/trace/create) 以供他人使用。"
+            },
+            "qa": {
+                "title": "质量保证",
+                "intro": "*质量保证* (Quality Assurance, Q/A) 工具可以搜寻不正确的标签、断开的道路以及其他 OpenStreetMap 的问题以供绘图者修复。要查看现有的 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 问题与处理笔记相似。点击其中一个标记，然后在侧边栏中查看问题详情。每个工具都有自己的功能，但通常您可以评论和/或关闭问题。"
             },
             "field": {
                 "restrictions": {
@@ -800,8 +1544,419 @@
                     "about": {
                         "title": "关于",
                         "about": "本字段允许您浏览并修改转向限制。一个包含选中的交叉路口以及其邻近连接的道路的模型将会被显示。",
-                        "from_via_to": "一个转向限制总是包含：一条 **从... 路径**（起始路径）、一条 **至... 路径**（结束路径） 和一个 **经由节点** 或单/多条 **经由路径**。"
+                        "from_via_to": "一个转向限制总是包含：一条 **从... 路径**（起始路径）、一条 **至... 路径**（结束路径） 和一个 **经由节点** 或单/多条 **经由路径**。",
+                        "maxdist": "\"{distField}\" 滑块可控制搜索其他连接道路的距离。",
+                        "maxvia": "\"{viaField}\" 滑块可调整搜索中可包含的经由路径数。（提示：越简单越好）"
+                    },
+                    "inspecting": {
+                        "title": "检查",
+                        "about": "将鼠标悬停在任意 **起始** 部分以查看其是否有任何转向限制。每个可能的 **结束** 部分将会被绘制为彩色阴影，用来显示是否存在限制。",
+                        "from_shadow": "{fromShadow} **起始部分**",
+                        "allow_shadow": "{allowShadow} **允许通行**",
+                        "restrict_shadow": "{restrictShadow} **禁止通行**",
+                        "only_shadow": "{onlyShadow} **仅限通行**",
+                        "restricted": "“禁止”表明存在一个转向限制，例如“禁止左转”。",
+                        "only": "“仅限”表明车辆途径该道路时只能做出该选择，例如“仅限直行”。"
+                    },
+                    "modifying": {
+                        "title": "修改",
+                        "about": "要修改转向限制，首先点击任意 **起始** 部分以选择它。选定的部分将会不断闪烁，同时所有可能的 **结束** 部分都将以转向图标显示。",
+                        "indicators": "然后，点击转向图标以在“允许”、“限制”和“仅限”中切换。",
+                        "allow_turn": "{allowTurn} **允许通行**",
+                        "restrict_turn": "{restrictTurn} **禁止通行**",
+                        "only_turn": "{onlyTurn} **仅限通行**"
+                    },
+                    "tips": {
+                        "title": "提示",
+                        "simple": "**简单的限制比复杂的更好。**",
+                        "simple_example": "例如，如果一个转向限制能用经由节点创建，就避免在该限制中使用较复杂的经由路径。",
+                        "indirect": "**有些限制会显示“(间接)”文字并绘制得更淡。**",
+                        "indirect_example": "存在这些限制是因为附近的另一个限制。例如，一个“仅限直行”限制将会间接地在交叉路口的其他道路上创建“禁止转向”限制。",
+                        "indirect_noedit": "您不能编辑间接的限制。相反，您可以编辑邻近的直接限制。"
+                    }
+                }
+            }
+        },
+        "issues": {
+            "title": "问题",
+            "key": "I",
+            "list_title": "问题 ({count})",
+            "errors": {
+                "list_title": "错误 ({count})"
+            },
+            "warnings": {
+                "list_title": "警告 ({count})"
+            },
+            "rules": {
+                "title": "规则"
+            },
+            "no_issues": {
+                "message": {
+                    "everything": "暂无问题",
+                    "everything_in_view": "视野内暂无问题",
+                    "edits": "您的编辑暂无问题",
+                    "edits_in_view": "您的编辑在视野内暂无问题"
+                },
+                "hidden_issues": {
+                    "none": "检测到的问题将会在此处显示",
+                    "elsewhere": "别处的问题：{count}",
+                    "other_features": "其他要素的问题：{count}",
+                    "other_features_elsewhere": "其他或别处要素的问题：{count}",
+                    "disabled_rules": "已禁用规则的问题：{count}",
+                    "disabled_rules_elsewhere": "别处已禁用规则的问题：{count}",
+                    "ignored_issues": "忽略的问题：{count}",
+                    "ignored_issues_elsewhere": "别处忽略的问题：{count}"
+                }
+            },
+            "options": {
+                "what": {
+                    "title": "检查：",
+                    "edited": "我的编辑",
+                    "all": "全部要素"
+                },
+                "where": {
+                    "title": "位置：",
+                    "visible": "视野内",
+                    "all": "全部地点"
+                }
+            },
+            "suggested": "建议更新：",
+            "enable_all": "启用全部",
+            "disable_all": "禁用全部",
+            "reset_ignored": "重置忽略 ({count})",
+            "fix_one": {
+                "title": "修复"
+            },
+            "fix_all": {
+                "title": "修复全部",
+                "annotation": "修复多个验证问题。"
+            },
+            "almost_junction": {
+                "title": "几乎为交叉点",
+                "message": "{feature} 与 {feature2} 极为接近却并未相交",
+                "tip": "查找可与邻近要素相连接的要素",
+                "self": {
+                    "message": "{feature} 的末端与其本身极为接近但并未相连"
+                },
+                "highway-highway": {
+                    "reference": "相交的道路应共享一个交叉节点。"
+                }
+            },
+            "close_nodes": {
+                "title": "相近的节点",
+                "tip": "查找多余和拥挤的节点",
+                "message": "{way} 中的两个节点非常接近",
+                "reference": "路径中多余的点应被合并或分开。",
+                "detached": {
+                    "message": "{feature} 与 {feature2} 过于接近",
+                    "reference": "分开的节点不应共享同一位置。"
+                }
+            },
+            "crossing_ways": {
+                "title": "相交的路径",
+                "message": "{feature} 与 {feature2} 相交",
+                "tip": "查找未正确相交的要素",
+                "building-building": {
+                    "reference": "除不同图层情况下，建筑物不应相交。"
+                },
+                "building-highway": {
+                    "reference": "穿越建筑物的道路应使用桥梁、隧道、有上盖或出入口。"
+                },
+                "building-railway": {
+                    "reference": "穿越建筑物的铁路应使用桥梁或隧道。"
+                },
+                "building-waterway": {
+                    "reference": "穿越建筑物的航道应使用隧道或不同图层。"
+                },
+                "highway-highway": {
+                    "reference": "相交的道路应使用桥梁、隧道或交叉路口。"
+                },
+                "highway-railway": {
+                    "reference": "与铁路相交的道路应使用桥梁、隧道或铁路道口。"
+                },
+                "highway-waterway": {
+                    "reference": "与航道相交的道路应使用桥梁、隧道或过水路面。"
+                },
+                "railway-railway": {
+                    "reference": "相交的铁路应互相连接或使用桥梁或隧道。"
+                },
+                "railway-waterway": {
+                    "reference": "与航道相交的铁路应使用桥梁或隧道。"
+                },
+                "waterway-waterway": {
+                    "reference": "相交的航道应互相连接或使用隧道。"
+                },
+                "tunnel-tunnel": {
+                    "reference": "相交的隧道应使用不同图层。"
+                },
+                "tunnel-tunnel_connectable": {
+                    "reference": "相交的隧道应互相连接或使用不同图层。"
+                },
+                "bridge-bridge": {
+                    "reference": "相交的桥梁应使用不同图层。"
+                },
+                "bridge-bridge_connectable": {
+                    "reference": "相交的桥梁应互相连接或使用不同图层。"
+                },
+                "indoor-indoor": {
+                    "reference": "相交的室内要素应使用不同楼层数。"
+                },
+                "indoor-indoor_connectable": {
+                    "reference": "相交的室内要素应互相连接或使用不同楼层数。"
+                }
+            },
+            "disconnected_way": {
+                "title": "断开的路径",
+                "tip": "查找无法导航的道路、小路和渡轮航线",
+                "routable": {
+                    "message": {
+                        "multiple": "{count} 个可导航要素仅彼此连接。"
+                    },
+                    "reference": "所有的道路、小路和渡轮航线应连接并形成一个导航网络。"
+                },
+                "highway": {
+                    "message": "{highway} 与其他道路和路径断开连接"
+                }
+            },
+            "fixme_tag": {
+                "title": "\"Fix Me\" 请求",
+                "message": "{feature} 存在一个 \"Fix Me\" 请求",
+                "tip": "查找含有 \"fixme\" 标签的要素",
+                "reference": "\"fixme\" 标签表明绘图者对某个要素需要帮助。"
+            },
+            "generic_name": {
+                "title": "可疑的名称",
+                "message": "{feature} 存在一个可疑的名称 \"{name}\"",
+                "tip": "查找含有笼统或可疑名称的要素",
+                "reference": "名称应为要素的实际名称。"
+            },
+            "incompatible_source": {
+                "title": "可疑的来源",
+                "tip": "查找含有可疑来源标签的要素",
+                "google": {
+                    "feature": {
+                        "message": "{feature} 列出谷歌作为数据来源"
+                    },
+                    "reference": "谷歌的产品具有所有权，不得用于参考。"
+                }
+            },
+            "invalid_format": {
+                "title": "无效的格式",
+                "tip": "查找含有无效格式的标签",
+                "email": {
+                    "message": "{feature} 存在一个无效电子邮件地址。",
+                    "message_multi": "{feature} 存在多个无效电子邮件地址。",
+                    "reference": "电子邮件地址必须类似于 \"user@example.com\"。"
+                },
+                "website": {
+                    "message": "{feature} 存在一个无效网址。",
+                    "message_multi": "{feature} 存在多个无效网址。",
+                    "reference": "网址应该以 \"http\" 或 \"https\" 为开头。"
+                }
+            },
+            "missing_role": {
+                "title": "缺少成员",
+                "message": "{member} 不是 {relation} 的成员",
+                "tip": "查找缺失或含有错误成员的关系",
+                "multipolygon": {
+                    "reference": "复合多边形的成员必须具有内部和外部角色。"
+                }
+            },
+            "missing_tag": {
+                "title": "缺少标签",
+                "tip": "查找缺失描述性标签的要素",
+                "reference": "要素必须具有定义它们的标签。",
+                "any": {
+                    "message": "{feature} 没有标签"
+                },
+                "descriptive": {
+                    "message": "{feature} 没有描述性标签"
+                },
+                "relation_type": {
+                    "message": "{feature} 是一个没有类型的关系"
+                }
+            },
+            "old_multipolygon": {
+                "message": "{multipolygon} 存在错误放置的标签",
+                "reference": "复合多边形应被标记在它们的关系上，而不是它们的外围路径。"
+            },
+            "outdated_tags": {
+                "title": "过时的标签",
+                "message": "{feature} 存在过时的标签",
+                "tip": "查找含有弃用的标签且可以更新的要素",
+                "reference": "有些标签会随时间推移而被更换，应予以改进。",
+                "incomplete": {
+                    "message": "{feature} 存在不完整的标签",
+                    "reference": "某些要素应有额外的标签。"
+                },
+                "noncanonical_brand": {
+                    "message": "{feature} 看起来像是个品牌名称但没有规范的标签",
+                    "reference": "同一品牌的所有要素都应该以相同方式标记。"
+                }
+            },
+            "private_data": {
+                "title": "私人信息",
+                "tip": "查找可能含有私人信息的要素",
+                "reference": "不应标记个人电话号码等敏感数据。",
+                "contact": {
+                    "message": "{feature} 的标签可能含有私人联系信息"
+                }
+            },
+            "tag_suggests_area": {
+                "title": "标记为区域的线",
+                "message": "基于 {feature} 的标签 \"{tag}\"，其应为一个封闭的区域。",
+                "tip": "查找可标记为区域的线要素",
+                "reference": "区域必须具有相连的端点。"
+            },
+            "unknown_road": {
+                "message": "{feature} 没有类别",
+                "reference": "没有指定类别的道路可能不会出现在地图或路线中。"
+            },
+            "impossible_oneway": {
+                "title": "不可能的单行线",
+                "tip": "查找单行线要素的路线问题",
+                "waterway": {
+                    "connected": {
+                        "start": {
+                            "message": "{feature} 从连接的水路中流出"
+                        },
+                        "end": {
+                            "message": "{feature} 流向连接的水路"
+                        },
+                        "reference": "水路应全部沿同一方向流动。"
                     }
+                },
+                "highway": {
+                    "start": {
+                        "message": "{feature} 无法抵达",
+                        "reference": "单行线道路必须通过其他道路进入。"
+                    },
+                    "end": {
+                        "message": "{feature} 没有出路",
+                        "reference": "单行线道路必须通向其他道路。"
+                    }
+                }
+            },
+            "unsquare_way": {
+                "title": "不方正的角落 (上至 {val}°)",
+                "message": "{feature} 存在不方正的角落",
+                "tip": "查找含有不方正的角落且可以改进的要素",
+                "buildings": {
+                    "reference": "含有不方正角落的建筑物通常可以更精确的绘制。"
+                }
+            },
+            "fix": {
+                "connect_almost_junction": {
+                    "annotation": "连接极相近要素。"
+                },
+                "connect_crossing_features": {
+                    "annotation": "连接相交要素。"
+                },
+                "connect_endpoints": {
+                    "title": "连接首尾节点",
+                    "annotation": "连接路径的首尾节点。"
+                },
+                "connect_feature": {
+                    "title": "连接该要素"
+                },
+                "connect_features": {
+                    "title": "连接这些要素"
+                },
+                "continue_from_start": {
+                    "title": "从起始节点继续绘制"
+                },
+                "continue_from_end": {
+                    "title": "从末端节点继续绘制"
+                },
+                "delete_feature": {
+                    "title": "删除此要素"
+                },
+                "ignore_issue": {
+                    "title": "忽略此问题"
+                },
+                "merge_close_vertices": {
+                    "annotation": "合并极为接近的节点至路径。"
+                },
+                "merge_points": {
+                    "title": "合并这些点"
+                },
+                "move_points_apart": {
+                    "title": "将这些点分开"
+                },
+                "move_tags": {
+                    "title": "移动标签",
+                    "annotation": "移动标签。"
+                },
+                "remove_from_relation": {
+                    "title": "从关系中删除"
+                },
+                "remove_generic_name": {
+                    "title": "删除名称",
+                    "annotation": "删除笼统名称。"
+                },
+                "remove_private_info": {
+                    "annotation": "删除私人信息。"
+                },
+                "remove_proprietary_data": {
+                    "title": "移除全部专有数据"
+                },
+                "remove_tag": {
+                    "title": "删除标签",
+                    "annotation": "删除标签。"
+                },
+                "remove_tags": {
+                    "title": "删除标签"
+                },
+                "reposition_features": {
+                    "title": "更改要素位置"
+                },
+                "reverse_feature": {
+                    "title": "反转该要素"
+                },
+                "select_preset": {
+                    "title": "选择一个要素类型"
+                },
+                "select_road_type": {
+                    "title": "选择一个道路类型"
+                },
+                "set_as_inner": {
+                    "title": "设为内部成员"
+                },
+                "set_as_outer": {
+                    "title": "设为外部成员"
+                },
+                "square_feature": {
+                    "title": "直角化该要素"
+                },
+                "tag_as_disconnected": {
+                    "title": "标记为断开连接",
+                    "annotation": "标记极相近要素为断开连接。"
+                },
+                "tag_as_unsquare": {
+                    "title": "标记为不方正",
+                    "annotation": "标记一路径存在非直角的角落。"
+                },
+                "tag_this_as_higher": {
+                    "title": "上移该图层"
+                },
+                "tag_this_as_lower": {
+                    "title": "下移该图层"
+                },
+                "upgrade_tags": {
+                    "title": "改进标签",
+                    "annotation": "改进旧标签。"
+                },
+                "use_bridge_or_tunnel": {
+                    "title": "使用桥梁或隧道"
+                },
+                "use_different_layers": {
+                    "title": "使用不同图层"
+                },
+                "use_different_levels": {
+                    "title": "使用不同楼层数"
+                },
+                "use_tunnel": {
+                    "title": "使用隧道"
                 }
             }
         },
@@ -972,7 +2127,7 @@
                 "add_name": "在 OpenStreetMap 中，所有的字段都是选填的，如果您不确定的话，让字段留空也是可以的。{br}让我们假设您对当地这间咖啡馆有所了解，并且知道它的名称。 **为这间咖啡馆添加名称。**",
                 "add_close": "要素编辑器会自动记住您所有的改动。 **当您添加了名称后，按下 Esc 键、回车键或点击 {button} 按钮来关闭要素编辑器。**",
                 "reselect": "很多时候，点会已经存在，但是信息有错误或不完整。我们可以编辑已经存在的点。 **点击选中您刚才创建的咖啡馆。**",
-                "update": "让我们给这间咖啡馆加入更多的细节。您可以更改它的名称、添加菜肴或填写地址。 **更改咖啡馆的细节。**",
+                "update": "让我们给这间咖啡馆加入更多的细节。您可以更改它的名称、添加菜系或填写地址。 **更改咖啡馆的细节。**",
                 "update_close": "**当您完成更新咖啡馆后，按下 Esc 键、回车键或点击 {button} 按钮来关闭要素编辑器。**",
                 "rightclick": "您可以右键点击任意要素来显示 *编辑菜单* ，它显示可以使用的编辑操作列表。 **右键点击您创建的点来显示编辑菜单。**",
                 "delete": "删除现实世界中不存在的要素是被允许的。{br}在 OpenStreetMap 中删除要素意味着它将会从每个人使用的地图中移除，所以您应该在删除前确保它真的已不复存在。 **点击 {button} 按钮来删除该点。**",
@@ -981,9 +2136,9 @@
             },
             "areas": {
                 "title": "区域",
-                "add_playground": "*区域* 用来显示诸如湖泊、建筑物或居民区等要素的边界。{br}他们亦可作为一种更细致的绘制方式，以替代普通地用点来标记的方式。 **点击 {button} 区域按钮来添加一个新的区域。**",
+                "add_playground": "*区域* 用来显示诸如湖泊、建筑物或居民区等要素的边界。{br}他们亦可作为相较于用点来标记要素而言更为细致的绘制方式。 **点击 {button} 区域按钮来添加一个新的区域。**",
                 "start_playground": "让我们用描绘一个区域的方式来添加这个游乐场吧。区域是通过在要素的外部轮廓上放置若干 *节点* 来描绘。 **点击或按空格键，在游乐场的其中一角放置一个起始节点。**",
-                "continue_playground": "继续在游乐场的轮廓上放置更多的节点来绘制该区域。如果遇到既有的人行道，你也可以将区域连接到人行道上。{br}提示：您可以按下{alt}键以防止节点连接到其他要素上。 **继续绘制游乐场区域。**",
+                "continue_playground": "继续在游乐场的轮廓上放置更多的节点来绘制该区域。如果遇到既有的人行道，您也可以将区域连接到人行道上。{br}提示：您可以按下{alt}键以防止节点连接到其他要素上。 **继续绘制游乐场区域。**",
                 "finish_playground": "按回车键、或再次点击起始/结束节点来结束绘制该区域。 **完成勾画该游乐场的轮廓。**",
                 "search_playground": "**搜索 '{preset}' 。**",
                 "choose_playground": "**在列表中选择 {preset} 。**",
@@ -1025,7 +2180,7 @@
             },
             "buildings": {
                 "title": "建筑物",
-                "add_building": "OpenStreetMap 是世界上最大的建筑物数据库。{br}您可以通过勾画未被标记的建筑物来帮助改进该数据库。 **点击 {button} 面按钮来添加一个新的区域。**",
+                "add_building": "OpenStreetMap 是世界上最大的建筑物数据库。{br}您可以通过勾画未被标记的建筑物来帮助改进该数据库。 **点击 {button} 区域按钮来添加一个新的区域。**",
                 "start_building": "让我们通过勾画这个房屋的轮廓来添加它。{br}建筑物应该尽可能准确地勾画在他们的底部周围。 **点击或按空格键，在建筑物的一处角落放置一个起始节点。**",
                 "continue_building": "继续在建筑物的轮廓上添加一些更多的节点。别忘您还可以放大地图来添加更多细节。{br}按回车键、或再次点击起始/结束节点来结束绘制建筑物。 **完成勾画建筑物的轮廓。**",
                 "retry_building": "看起来您在建筑物角落上放置节点时遇到了困难。请重试！",
@@ -1036,7 +2191,7 @@
                 "square_building": "如果能使您刚才创建的房屋拥有完美的直角那就更好了。 **点击 {button} 按钮使建筑物轮廓直角化。**",
                 "retry_square": "您并未点击直角化按钮。请重试。",
                 "done_square": "看见了建筑物的边角是如何规整的吗？让我们学习另一个有用的小技巧。",
-                "add_tank": "接下来我们将勾画这个圆形储罐的轮廓。 **点击 {button} 面按钮来添加一个新的区域。**",
+                "add_tank": "接下来我们将勾画这个圆形储罐的轮廓。 **点击 {button} 区域按钮来添加一个新的区域。**",
                 "start_tank": "不用担心，您不需要画出一个完美的圆。只需要在储罐上画一个区域，使其节点接触到储罐的边缘。 **点击或按空格键，在储罐的边缘处放置一个起始节点。**",
                 "continue_tank": "在其边缘处添加一些更多的节点。之后圆将会创建在您勾画的节点外部。{br}按回车键、或再次点击起始/结束节点来结束绘制该区域。 **完成勾画该储罐的轮廓。**",
                 "search_tank": "**搜索 '{preset}' 。**",
@@ -1103,7 +2258,9 @@
                     "background_switch": "切换回上一背景",
                     "map_data": "显示地图数据设置",
                     "fullscreen": "进入全屏模式",
+                    "sidebar": "切换侧边栏",
                     "wireframe": "切换线框模式",
+                    "osm_data": "切换 OpenStreetMap 数据",
                     "minimap": "切换小地图"
                 },
                 "selecting": {
@@ -1115,7 +2272,8 @@
                 },
                 "with_selected": {
                     "title": "对选中的要素",
-                    "edit_menu": "切换编辑菜单"
+                    "edit_menu": "切换编辑菜单",
+                    "zoom_to": "缩放至选中的要素"
                 },
                 "vertex_selected": {
                     "title": "对选中的节点",
@@ -1130,10 +2288,13 @@
                 "title": "编辑",
                 "drawing": {
                     "title": "绘制",
+                    "focus_add_feature": "在要素搜索框中键入",
                     "add_point": "'增加 点' 模式",
                     "add_line": "'增加 线' 模式",
                     "add_area": "'增加区域' 模式",
-                    "place_point": "放置一个点",
+                    "add_note": "'增加笔记' 模式",
+                    "add_favorite": "添加一个收藏的要素",
+                    "place_point": "放置一个节点或一条笔记",
                     "disable_snap": "按住以禁用节点吸附",
                     "stop_line": "完成绘制线段或区域"
                 },
@@ -1142,11 +2303,13 @@
                     "continue_line": "在选中节点上继续绘制线",
                     "merge": "合并选中的要素",
                     "disconnect": "在选中节点上分离要素",
+                    "extract": "从要素中提取节点",
                     "split": "在选中节点上分割线",
                     "reverse": "反转线的方向",
                     "move": "移动选中的要素",
                     "rotate": "旋转选中的要素",
-                    "orthogonalize": "将线拉直 / 将区域变方",
+                    "orthogonalize": "将线或区域上的弯角换成直角",
+                    "straighten": "将线或多个点拉直",
                     "circularize": "将闭合的线或区域变成圆形",
                     "reflect_long": "沿要素的长轴翻转",
                     "reflect_short": "沿要素的短轴翻转",
@@ -1195,6 +2358,11 @@
             "coordinate": "{coordinate}{direction}",
             "coordinate_pair": "{latitude}, {longitude}"
         },
+        "wikidata": {
+            "identifier": "标识符",
+            "label": "标签",
+            "description": "描述"
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
@@ -1209,13 +2377,7 @@
                 "category-landuse": {
                     "name": "土地用途"
                 },
-                "category-natural-area": {
-                    "name": "自然"
-                },
-                "category-natural-line": {
-                    "name": "自然"
-                },
-                "category-natural-point": {
+                "category-natural": {
                     "name": "自然"
                 },
                 "category-path": {
@@ -1227,17 +2389,26 @@
                 "category-restriction": {
                     "name": "限制"
                 },
-                "category-road": {
-                    "name": "道路"
+                "category-road_major": {
+                    "name": "大型道路"
+                },
+                "category-road_minor": {
+                    "name": "小型道路"
+                },
+                "category-road_service": {
+                    "name": "服务性道路"
                 },
                 "category-route": {
                     "name": "线路"
                 },
-                "category-water-area": {
-                    "name": "水体"
+                "category-utility": {
+                    "name": "公共设施"
                 },
-                "category-water-line": {
+                "category-water": {
                     "name": "水体"
+                },
+                "category-waterway": {
+                    "name": "æ°´è·¯"
                 }
             },
             "fields": {
@@ -1245,11 +2416,11 @@
                     "label": "允许通行",
                     "options": {
                         "designated": {
-                            "description": "只限标志指定或特定本地法律容许的人士、车辆进入",
+                            "description": "只限标志指定或地方规定允许的车辆驶入",
                             "title": "指定"
                         },
                         "destination": {
-                            "description": "只限前往目的地人士进入",
+                            "description": "仅限驻地车辆驶入",
                             "title": "目的地"
                         },
                         "dismount": {
@@ -1261,15 +2432,16 @@
                             "title": "禁止"
                         },
                         "permissive": {
-                            "description": "容许进入，直至拥有者撤回许可",
+                            "description": "容许驶入，直至拥有者撤回许可",
                             "title": "默许"
                         },
+                        "permit": {
+                            "description": "仅限凭证驶入"
+                        },
                         "private": {
-                            "description": "须拥有者个别批准，方可进入",
                             "title": "私人"
                         },
                         "yes": {
-                            "description": "按法律及路权，有权使用",
                             "title": "允许"
                         }
                     },
@@ -1290,25 +2462,25 @@
                     "placeholders": {
                         "block_number": "街区编号",
                         "block_number!jp": "街区号",
-                        "city": "地级市/自治州",
+                        "city": "地级市/地区/自治州/盟",
                         "city!jp": "市/镇/村/东京都特别区",
                         "city!vn": "市/镇",
                         "conscriptionnumber": "123号",
                         "country": "国家",
                         "county": "郡",
                         "county!jp": "郡 (日本)",
-                        "district": "市辖区/县/县级市",
+                        "district": "市辖区/县级市/县/自治县/自治旗/旗/特区/林区",
                         "district!vn": "郡/镇/区",
                         "floor": "楼层",
                         "hamlet": "村庄",
                         "housename": "房屋名称",
                         "housenumber": "123号",
                         "housenumber!jp": "楼号/地段号",
-                        "neighbourhood": "小区",
+                        "neighbourhood": "社区",
                         "neighbourhood!jp": "丁目/字/小字",
                         "place": "地方",
                         "postcode": "邮政编码",
-                        "province": "省/自治区/特别行政区",
+                        "province": "省/自治区/特别行政区/直辖市",
                         "province!jp": "日本县",
                         "quarter": "地方",
                         "quarter!jp": "大字/町",
@@ -1367,6 +2539,9 @@
                 "agrarian": {
                     "label": "产品"
                 },
+                "air_conditioning": {
+                    "label": "空调"
+                },
                 "amenity": {
                     "label": "类型"
                 },
@@ -1379,6 +2554,9 @@
                 "animal_shelter": {
                     "label": "收留动物类型"
                 },
+                "architect": {
+                    "label": "建筑设计师"
+                },
                 "area/highway": {
                     "label": "类型"
                 },
@@ -1391,12 +2569,21 @@
                 "atm": {
                     "label": "自动提款机（ATM）"
                 },
+                "attraction": {
+                    "label": "类型"
+                },
                 "backrest": {
                     "label": "长椅"
                 },
+                "bar": {
+                    "label": "吧台"
+                },
                 "barrier": {
                     "label": "类型"
                 },
+                "basin": {
+                    "label": "类型"
+                },
                 "bath/open_air": {
                     "label": "露天"
                 },
@@ -1412,7 +2599,7 @@
                     }
                 },
                 "beauty": {
-                    "label": "商店类型"
+                    "label": "美容专业"
                 },
                 "bench": {
                     "label": "长凳"
@@ -1435,6 +2622,9 @@
                 "board_type": {
                     "label": "类型"
                 },
+                "booth": {
+                    "label": "岗亭，小屋"
+                },
                 "boules": {
                     "label": "类型"
                 },
@@ -1451,9 +2641,19 @@
                     "label": "类型",
                     "placeholder": "默认"
                 },
+                "bridge/support": {
+                    "label": "类型"
+                },
                 "building": {
                     "label": "建筑物"
                 },
+                "building/levels_building": {
+                    "label": "楼层数",
+                    "placeholder": "2, 4, 6..."
+                },
+                "building/material": {
+                    "label": "材质"
+                },
                 "building_area": {
                     "label": "建筑物"
                 },
@@ -1483,9 +2683,15 @@
                     "label": "容量",
                     "placeholder": "50, 100, 200..."
                 },
+                "cash_in": {
+                    "label": "货币兑换"
+                },
                 "castle_type": {
                     "label": "类型"
                 },
+                "check_date": {
+                    "label": "最近检查时间"
+                },
                 "clothes": {
                     "label": "服饰"
                 },
@@ -1495,8 +2701,11 @@
                 "collection_times": {
                     "label": "收取时间"
                 },
+                "colour": {
+                    "label": "颜色"
+                },
                 "comment": {
-                    "label": "修改集合注释",
+                    "label": "变更集合注释",
                     "placeholder": "请简要说明您的贡献 (必填)"
                 },
                 "communication_multi": {
@@ -1505,6 +2714,9 @@
                 "construction": {
                     "label": "类型"
                 },
+                "consulate": {
+                    "label": "类型"
+                },
                 "contact/webcam": {
                     "label": "网络摄像机地址",
                     "placeholder": "http://example.com/"
@@ -1512,9 +2724,20 @@
                 "content": {
                     "label": "内容"
                 },
+                "conveying": {
+                    "label": "移动方向",
+                    "options": {
+                        "backward": "向后",
+                        "forward": "向前",
+                        "reversible": "可反转"
+                    }
+                },
                 "country": {
                     "label": "国家"
                 },
+                "couplings": {
+                    "placeholder": "1, 2, 3..."
+                },
                 "covered": {
                     "label": "有上盖"
                 },
@@ -1586,6 +2809,9 @@
                         "cycleway:right": "右侧"
                     }
                 },
+                "dance/style": {
+                    "label": "舞蹈类型"
+                },
                 "date": {
                     "label": "日期"
                 },
@@ -1598,9 +2824,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..."
@@ -1608,6 +2855,15 @@
                 "diaper": {
                     "label": "有尿布台"
                 },
+                "diet_multi": {
+                    "label": "饮食种类"
+                },
+                "diplomatic": {
+                    "label": "类型"
+                },
+                "diplomatic/services": {
+                    "label": "服务"
+                },
                 "direction": {
                     "label": "方向 (度顺时针)",
                     "placeholder": "45, 90, 180, 270"
@@ -1641,25 +2897,44 @@
                     }
                 },
                 "direction_vertex": {
-                    "label": "方向",
                     "options": {
                         "backward": "向后",
                         "both": "双向 / 全部",
                         "forward": "向前"
                     }
                 },
+                "dispensing": {
+                    "label": "开处方药"
+                },
                 "display": {
                     "label": "表盘显示类型"
                 },
+                "distance": {
+                    "label": "距离"
+                },
                 "dock": {
                     "label": "类型"
                 },
+                "dog": {
+                    "label": "狗",
+                    "options": {
+                        "leashed": "仅限牵狗绳",
+                        "no": "不允许",
+                        "yes": "允许"
+                    }
+                },
+                "door": {
+                    "label": "门"
+                },
+                "door_type": {
+                    "label": "类型"
+                },
                 "drive_through": {
                     "label": "免下车"
                 },
                 "duration": {
                     "label": "乘坐时长",
-                    "placeholder": "00:00"
+                    "placeholder": "hh:mm"
                 },
                 "electrified": {
                     "label": "电气化",
@@ -1682,15 +2957,27 @@
                     "label": "类型",
                     "placeholder": "默认"
                 },
+                "embassy": {
+                    "label": "类型"
+                },
                 "emergency": {
                     "label": "急诊"
                 },
+                "emergency_combo": {
+                    "label": "类型"
+                },
+                "enforcement": {
+                    "label": "类型"
+                },
                 "entrance": {
                     "label": "类型"
                 },
                 "except": {
                     "label": "异常"
                 },
+                "faces": {
+                    "label": "面数"
+                },
                 "fax": {
                     "label": "传真",
                     "placeholder": "+31 42 123 4567"
@@ -1701,30 +2988,41 @@
                 "fence_type": {
                     "label": "类型"
                 },
-                "fire_hydrant/position": {
-                    "label": "位置",
-                    "options": {
-                        "green": "绿地",
-                        "lane": "车道",
-                        "parking_lot": "停车场",
-                        "sidewalk": "人行道"
-                    }
+                "fire_hydrant/diameter": {
+                    "label": "直径 (mm, in 或字母)"
+                },
+                "fire_hydrant/pressure": {
+                    "label": "水压 (bar)"
                 },
                 "fire_hydrant/type": {
-                    "label": "类型",
+                    "label": "形状",
                     "options": {
                         "pillar": "支柱/地上",
-                        "pond": "池塘",
                         "underground": "地下",
                         "wall": "墙"
                     }
                 },
+                "fireplace": {
+                    "label": "壁炉"
+                },
+                "fishing": {
+                    "label": "钓鱼"
+                },
                 "fitness_station": {
                     "label": "器械种类"
                 },
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "flag/type": {
+                    "label": "旗帜类型"
+                },
+                "floating": {
+                    "label": "漂浮"
+                },
+                "flood_prone": {
+                    "label": "易涝"
+                },
                 "ford": {
                     "label": "类型",
                     "placeholder": "默认"
@@ -1732,6 +3030,12 @@
                 "frequency": {
                     "label": "工作频率"
                 },
+                "frequency_electrified": {
+                    "label": "工作频率"
+                },
+                "from": {
+                    "label": "起点"
+                },
                 "fuel": {
                     "label": "油站"
                 },
@@ -1769,6 +3073,9 @@
                 "grape_variety": {
                     "label": "葡萄品种"
                 },
+                "guest_house": {
+                    "label": "类型"
+                },
                 "handicap": {
                     "label": "手工店",
                     "placeholder": "1-18"
@@ -1789,6 +3096,12 @@
                 "height": {
                     "label": "高度 (米)"
                 },
+                "height_building": {
+                    "label": "建筑物高度 (米)"
+                },
+                "highspeed": {
+                    "label": "高速"
+                },
                 "highway": {
                     "label": "类型"
                 },
@@ -1798,12 +3111,54 @@
                 "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": "马背骑行难度",
+                    "options": {
+                        "common": "简单：没有难度或障碍。（默认）",
+                        "critical": "临界：仅适用于有经验的骑手和马匹。有主要的障碍。需要仔细检查桥梁。",
+                        "dangerous": "危险：仅适用于在天气好的时候，非常有经验的骑手和马匹。需要下马。",
+                        "demanding": "谨慎：不平缓的路面，偶尔有困难的路径。",
+                        "difficult": "困难：狭窄并裸露的路径。可能有需要跨越的障碍物和狭窄的通道。",
+                        "impossible": "无法通行：不适合马匹的路径或桥梁。路径太过狭窄，有不足的支撑物，和如梯子般的障碍。会有生命危险。"
+                    },
+                    "placeholder": "简单, 困难, 危险..."
+                },
+                "horse_stables": {
+                    "label": "骑马练习",
+                    "options": {
+                        "stables": "是",
+                        "undefined": "否"
+                    }
+                },
                 "iata": {
-                    "label": "IATA(国际航空运输协会)"
+                    "label": "IATA (国际航空运输协会)"
                 },
                 "icao": {
                     "label": "ICAO(国际民航组织)"
@@ -1821,6 +3176,12 @@
                 "indoor": {
                     "label": "室内"
                 },
+                "indoor_type": {
+                    "label": "类型"
+                },
+                "industrial": {
+                    "label": "类型"
+                },
                 "information": {
                     "label": "类型"
                 },
@@ -1830,6 +3191,9 @@
                 "intermittent": {
                     "label": "断流现象"
                 },
+                "intermittent_yes": {
+                    "label": "断流现象"
+                },
                 "internet_access": {
                     "label": "互联网接入",
                     "options": {
@@ -1844,11 +3208,28 @@
                     "label": "上网费用"
                 },
                 "internet_access/ssid": {
-                    "label": "SSID (网络名称)"
+                    "label": "Wi-Fi 网络名称"
+                },
+                "interval": {
+                    "label": "间隔"
+                },
+                "junction/ref_oneway": {
+                    "label": "匝道编号"
+                },
+                "junction_line": {
+                    "label": "交叉口",
+                    "options": {
+                        "circular": "信号控制环岛",
+                        "jughandle": "壶柄式连接路",
+                        "roundabout": "环岛"
+                    }
                 },
                 "kerb": {
                     "label": "路缘"
                 },
+                "kerb/height": {
+                    "label": "高度"
+                },
                 "label": {
                     "label": "标识"
                 },
@@ -1862,6 +3243,9 @@
                     "label": "车道数目",
                     "placeholder": "1, 2, 3..."
                 },
+                "language_multi": {
+                    "label": "语言"
+                },
                 "layer": {
                     "label": "图层",
                     "placeholder": "0"
@@ -1915,24 +3299,44 @@
                     "label": "楼层数",
                     "placeholder": "2, 4, 6..."
                 },
+                "liaison": {
+                    "label": "类型"
+                },
                 "lit": {
                     "label": "照明设施"
                 },
                 "location": {
                     "label": "位置"
                 },
+                "location_pool": {
+                    "label": "位置",
+                    "options": {
+                        "indoor": "室内",
+                        "outdoor": "户外",
+                        "roof": "屋顶"
+                    }
+                },
+                "lock": {
+                    "label": "船闸"
+                },
                 "man_made": {
                     "label": "类型"
                 },
                 "manhole": {
                     "label": "类型"
                 },
+                "manufacturer": {
+                    "label": "制造商"
+                },
                 "map_size": {
                     "label": "范围"
                 },
                 "map_type": {
                     "label": "类型"
                 },
+                "material": {
+                    "label": "材质"
+                },
                 "maxheight": {
                     "label": "限制高度",
                     "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
@@ -1941,15 +3345,29 @@
                     "label": "限制速度",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "label": "建议限速",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "可停留时间"
                 },
                 "maxweight": {
-                    "label": "最大重量"
+                    "label": "限制质量"
+                },
+                "maxweight_bridge": {
+                    "label": "限制质量"
                 },
                 "memorial": {
                     "label": "类型"
                 },
+                "microbrewery": {
+                    "label": "手工啤酒"
+                },
+                "minspeed": {
+                    "label": "最低限速",
+                    "placeholder": "20, 30, 40..."
+                },
                 "mtb/scale": {
                     "label": "山地自行车骑行难度",
                     "options": {
@@ -1972,16 +3390,16 @@
                         "3": "困难(黑色钻石型)",
                         "4": "极端困难(双重黑色钻石型)"
                     },
-                    "placeholder": "简单,中等,困难..."
+                    "placeholder": "简单, 中等, 困难..."
                 },
                 "mtb/scale/uphill": {
                     "label": "山地自行车上坡难度",
                     "options": {
-                        "0": "0：平均坡度小于10％时，有碎石/夯实的地面，没有障碍物",
+                        "0": "0：平均坡度小于10％，有碎石/夯实的地面，没有障碍物",
                         "1": "1：平均坡度小于15％，有碎石/夯实的地面，有些许障碍物",
-                        "2": "2：平均坡度小于20，坚实的地面，拳头大的石头/树根",
-                        "3": "3：平均坡度25％，多变的平面，拳头大的石头/树墙",
-                        "4": "4：平均坡度小于30％时，很糟的路面状况，大石头/树墙",
+                        "2": "2：平均坡度小于20%，坚实的地面，拳头大的石头/树根",
+                        "3": "3：平均坡度小于25％，多变的平面，拳头大的石头/树墙",
+                        "4": "4：平均坡度小于30％，很糟的路面状况，大石头/树墙",
                         "5": "5：很陡，单车得牵行或扛车"
                     },
                     "placeholder": "0, 1, 2, 3..."
@@ -2039,20 +3457,29 @@
                     "label": "单行线",
                     "options": {
                         "no": "否",
+                        "reversible": "可更换方向",
                         "undefined": "假定为否",
                         "yes": "是"
                     }
                 },
+                "oneway/bicycle": {
+                    "label": "单行线 (自行车)"
+                },
                 "oneway_yes": {
                     "label": "单行线",
                     "options": {
                         "no": "否",
+                        "reversible": "可更换方向",
                         "undefined": "假定为是",
                         "yes": "是"
                     }
                 },
+                "opening_date": {
+                    "label": "预计开放日期"
+                },
                 "opening_hours": {
-                    "label": "开放时间"
+                    "label": "开放时间",
+                    "placeholder": "未知"
                 },
                 "operator": {
                     "label": "经营者"
@@ -2082,6 +3509,9 @@
                 "payment_multi": {
                     "label": "支付类型"
                 },
+                "payment_multi_fee": {
+                    "label": "支付类型"
+                },
                 "phases": {
                     "label": "相数",
                     "placeholder": "1, 2, 3..."
@@ -2093,13 +3523,9 @@
                 "piste/difficulty": {
                     "label": "困难",
                     "options": {
-                        "advanced": "进阶(黑色钻石型)",
-                        "easy": "容易(绿圈)",
-                        "expert": "专家(双重黑色钻石型)",
-                        "extreme": "极端困难(需要攀登工具)",
-                        "freeride": "自由滑行(场地外)",
-                        "intermediate": "中阶(蓝方块)",
-                        "novice": "新手(教学)"
+                        "advanced": "高级",
+                        "easy": "简单",
+                        "expert": "专家"
                     },
                     "placeholder": "容易，中阶，进阶"
                 },
@@ -2138,6 +3564,9 @@
                     "label": "输出功率",
                     "placeholder": "500 MW, 1000 MW, 2000 MW..."
                 },
+                "playground": {
+                    "label": "类型"
+                },
                 "playground/baby": {
                     "label": "婴儿车"
                 },
@@ -2170,7 +3599,6 @@
                     "placeholder": "距离，精确到一位小数 (123.4)"
                 },
                 "railway/signal/direction": {
-                    "label": "方向",
                     "options": {
                         "backward": "向后",
                         "both": "双向 / 全部",
@@ -2180,6 +3608,11 @@
                 "recycling_accepts": {
                     "label": "接受"
                 },
+                "recycling_type": {
+                    "options": {
+                        "container": "回收容器"
+                    }
+                },
                 "ref": {
                     "label": "编号"
                 },
@@ -2202,6 +3635,9 @@
                 "ref_road_number": {
                     "label": "道路编号"
                 },
+                "ref_room_number": {
+                    "label": "房间编号"
+                },
                 "ref_route": {
                     "label": "路线编号"
                 },
@@ -2222,12 +3658,30 @@
                 "religion": {
                     "label": "宗教"
                 },
+                "reservation": {
+                    "label": "预订",
+                    "options": {
+                        "no": "不接受",
+                        "recommended": "推荐",
+                        "required": "必需",
+                        "yes": "接受"
+                    }
+                },
+                "resource": {
+                    "label": "资源"
+                },
                 "restriction": {
                     "label": "类型"
                 },
                 "restrictions": {
                     "label": "转向限制"
                 },
+                "roof/colour": {
+                    "label": "屋顶颜色"
+                },
+                "room": {
+                    "label": "类型"
+                },
                 "rooms": {
                     "label": "房间数"
                 },
@@ -2249,12 +3703,66 @@
                     },
                     "placeholder": "山地徒步，高山远足..."
                 },
+                "salt": {
+                    "label": "咸水"
+                },
                 "sanitary_dump_station": {
                     "label": "厕所废物"
                 },
+                "screen": {
+                    "label": "屏幕数",
+                    "placeholder": "1, 4, 8…"
+                },
+                "scuba_diving": {
+                    "label": "服务"
+                },
+                "seamark/beacon_isolated_danger/shape": {
+                    "label": "形状"
+                },
+                "seamark/beacon_lateral/category": {
+                    "label": "分类",
+                    "options": {
+                        "danger_left": "左侧危险",
+                        "danger_right": "右侧危险"
+                    }
+                },
+                "seamark/beacon_lateral/colour": {
+                    "label": "颜色",
+                    "options": {
+                        "green": "绿色",
+                        "grey": "灰色",
+                        "red": "红色"
+                    }
+                },
+                "seamark/beacon_lateral/shape": {
+                    "label": "形状"
+                },
+                "seamark/beacon_lateral/system": {
+                    "label": "系统",
+                    "options": {
+                        "other": "其它"
+                    }
+                },
+                "seamark/buoy_lateral/category": {
+                    "label": "分类"
+                },
+                "seamark/buoy_lateral/system": {
+                    "options": {
+                        "other": "其它"
+                    }
+                },
+                "seamark/mooring/category": {
+                    "label": "分类"
+                },
+                "seamark/type": {
+                    "label": "导航标志"
+                },
                 "seasonal": {
                     "label": "具备季节性"
                 },
+                "seats": {
+                    "label": "座位"
+                },
                 "second_hand": {
                     "label": "出售二手商品",
                     "options": {
@@ -2264,6 +3772,9 @@
                     },
                     "placeholder": "是，否，仅"
                 },
+                "self_service": {
+                    "label": "自助服务"
+                },
                 "service": {
                     "label": "类型"
                 },
@@ -2294,9 +3805,15 @@
                 "shop": {
                     "label": "类型"
                 },
+                "siren/type": {
+                    "label": "类型"
+                },
                 "site": {
                     "label": "类型"
                 },
+                "site_type": {
+                    "label": "站点类型"
+                },
                 "smoking": {
                     "label": "吸烟",
                     "options": {
@@ -2321,7 +3838,7 @@
                         "very_bad": "轻量化：低负重越野车辆",
                         "very_horrible": "越野专用：拖拉机，全地形越野车"
                     },
-                    "placeholder": "轴承，轮胎，越野"
+                    "placeholder": "轴承, 轮胎, 越野..."
                 },
                 "social_facility": {
                     "label": "类型"
@@ -2342,7 +3859,7 @@
                     "label": "赛车项目"
                 },
                 "sport_racing_nonmotor": {
-                    "label": "非机动竞速项目"
+                    "label": "运动项目"
                 },
                 "stars": {
                     "label": "星级"
@@ -2360,6 +3877,9 @@
                         "minor": "次要道路"
                     }
                 },
+                "street_cabinet": {
+                    "label": "类型"
+                },
                 "structure": {
                     "label": "结构",
                     "options": {
@@ -2410,8 +3930,15 @@
                 "surveillance/zone": {
                     "label": "监控区"
                 },
+                "swimming_pool": {
+                    "label": "类型"
+                },
                 "switch": {
-                    "label": "开关类型"
+                    "label": "开关类型",
+                    "options": {
+                        "circuit_breaker": "断路器",
+                        "earthing": "接地"
+                    }
                 },
                 "tactile_paving": {
                     "label": "人行道视障引导设施"
@@ -2425,15 +3952,30 @@
                     },
                     "placeholder": "是，否，仅限外卖"
                 },
+                "target": {
+                    "label": "目标国"
+                },
+                "tidal": {
+                    "label": "处于潮间带"
+                },
+                "to": {
+                    "label": "终点"
+                },
                 "toilets/disposal": {
                     "label": "排污方式",
                     "options": {
                         "bucket": "粪桶",
                         "chemical": "化学厕所",
                         "flush": "冲水式",
-                        "pitlatrine": "旱厕/茅厕"
+                        "pitlatrine": "旱厕"
                     }
                 },
+                "toilets/handwashing": {
+                    "label": "洗手处"
+                },
+                "toilets/position": {
+                    "label": "位置"
+                },
                 "toll": {
                     "label": "收费"
                 },
@@ -2443,9 +3985,6 @@
                 "tourism": {
                     "label": "类型"
                 },
-                "tourism_attraction": {
-                    "label": "类型"
-                },
                 "tower/construction": {
                     "label": "结构",
                     "placeholder": "拉线式, 镂空钢架, 隐藏式 ..."
@@ -2462,7 +4001,7 @@
                         "grade4": "近柔性铺面：土壤，砂土与草地混合其他刚性材质",
                         "grade5": "柔性铺面：只有土壤，砂土与草地"
                     },
-                    "placeholder": "坚硬地面，硬物铺面，软铺面"
+                    "placeholder": "坚硬地面, 硬物铺面, 软铺面..."
                 },
                 "trade": {
                     "label": "类型"
@@ -2470,11 +4009,20 @@
                 "traffic_calming": {
                     "label": "类型"
                 },
+                "traffic_sign": {
+                    "label": "交通标志"
+                },
+                "traffic_sign/direction": {
+                    "options": {
+                        "backward": "向后",
+                        "both": "双向 / 全部",
+                        "forward": "向前"
+                    }
+                },
                 "traffic_signals": {
                     "label": "类型"
                 },
                 "traffic_signals/direction": {
-                    "label": "方向",
                     "options": {
                         "backward": "向后",
                         "both": "双向 / 全部",
@@ -2509,10 +4057,27 @@
                 "trees": {
                     "label": "树林"
                 },
+                "trench": {
+                    "label": "类型"
+                },
+                "trolley_wire": {
+                    "label": "架空电车线"
+                },
                 "tunnel": {
                     "label": "类型",
                     "placeholder": "默认"
                 },
+                "usage_rail": {
+                    "label": "使用类型",
+                    "options": {
+                        "branch": "支线",
+                        "industrial": "工业",
+                        "main": "主线",
+                        "military": "军用",
+                        "test": "测试线",
+                        "tourism": "观光线"
+                    }
+                },
                 "vending": {
                     "label": "商品类型"
                 },
@@ -2552,6 +4117,9 @@
                 "voltage/tertiary": {
                     "label": "三次电压"
                 },
+                "voltage_electrified": {
+                    "label": "电压"
+                },
                 "wall": {
                     "label": "类型"
                 },
@@ -2561,12 +4129,15 @@
                 "water_point": {
                     "label": "饮水点"
                 },
+                "water_volume": {
+                    "label": "蓄水量 (m³)"
+                },
                 "waterway": {
                     "label": "类型"
                 },
                 "website": {
                     "label": "网站",
-                    "placeholder": "http://example.com/"
+                    "placeholder": "https://example.com"
                 },
                 "wetland": {
                     "label": "类型"
@@ -2580,6 +4151,9 @@
                 "width": {
                     "label": "宽度 (米)"
                 },
+                "wikidata": {
+                    "label": "维基数据"
+                },
                 "wikipedia": {
                     "label": "维基百科"
                 },
@@ -2609,6 +4183,10 @@
                     "name": "广告牌",
                     "terms": "广告牌,广告,牌"
                 },
+                "advertising/column": {
+                    "name": "广告柱",
+                    "terms": "广告,广告柱,广告亭,广告牌,柱"
+                },
                 "aerialway": {
                     "name": "缆车线路"
                 },
@@ -2633,7 +4211,7 @@
                     "terms": "物资缆车"
                 },
                 "aerialway/magic_carpet": {
-                    "name": "魔毯电梯",
+                    "name": "滑雪场魔毯传送带",
                     "terms": "魔毯,传送带式电梯"
                 },
                 "aerialway/mixed_lift": {
@@ -2682,6 +4260,10 @@
                     "name": "直升机场",
                     "terms": "直升机场,直升机坪"
                 },
+                "aeroway/jet_bridge": {
+                    "name": "登机桥",
+                    "terms": "登机桥,廊桥,登机,登机廊桥,空桥,廊桥,航站楼"
+                },
                 "aeroway/runway": {
                     "name": "机场跑道",
                     "terms": "机场,跑道,飞机,飞机场,滑行,起飞,飞行,降落"
@@ -2695,7 +4277,7 @@
                     "terms": "机场航站楼"
                 },
                 "amenity": {
-                    "name": "便利设施"
+                    "name": "设施"
                 },
                 "amenity/animal_boarding": {
                     "name": "动物寄养机构",
@@ -2746,8 +4328,7 @@
                     "terms": "自行车维修工具站"
                 },
                 "amenity/biergarten": {
-                    "name": "啤酒花园",
-                    "terms": "啤酒花园"
+                    "name": "啤酒花园"
                 },
                 "amenity/boat_rental": {
                     "name": "船舶租赁处",
@@ -2755,14 +4336,18 @@
                 },
                 "amenity/bureau_de_change": {
                     "name": "货币兑换",
-                    "terms": "货币兑换"
+                    "terms": "货币兑换,货币,兑换,外币,人民币,银行,钱,汇率,牌价"
                 },
                 "amenity/bus_station": {
                     "name": "公交车站 / 枢纽站"
                 },
                 "amenity/cafe": {
                     "name": "咖啡馆",
-                    "terms": "咖啡厅,茶座,小餐馆,咖啡,小餐厅"
+                    "terms": "咖啡,茶,咖啡厅,咖啡馆,茶座,摩卡,拿铁,馥芮白,玛奇朵,卡布奇诺,红茶,黄茶,清茶,青茶,绿茶,花茶,黑茶,白茶,乌龙,咖啡豆,餐馆,餐厅"
+                },
+                "amenity/car_pooling": {
+                    "name": "拼车",
+                    "terms": "拼车"
                 },
                 "amenity/car_rental": {
                     "name": "汽车租赁",
@@ -2808,6 +4393,10 @@
                     "name": "时钟",
                     "terms": "时钟,钟表,钟"
                 },
+                "amenity/clock/sundial": {
+                    "name": "日晷",
+                    "terms": "日晷,日晷钟,晷影,晷影器,影子,晷针,日规"
+                },
                 "amenity/college": {
                     "name": "学院",
                     "terms": "学院,大学,院校,大专,校园,学校,学习"
@@ -2835,6 +4424,9 @@
                     "name": "牙科医院",
                     "terms": "牙科,医院,牙医,牙,牙齿,治疗,医疗,医生"
                 },
+                "amenity/dive_centre": {
+                    "name": "潜水中心"
+                },
                 "amenity/doctors": {
                     "name": "医师",
                     "terms": "医生,医师,护士,医院,医护,医疗,治疗,办公室,技师"
@@ -2852,13 +4444,36 @@
                     "terms": "驾校,汽车,车,教练,驾驶,驾照,学校,交通,运输,培训,学习"
                 },
                 "amenity/embassy": {
-                    "name": "使馆",
-                    "terms": "使馆,大使馆,领事馆"
+                    "name": "使馆"
                 },
                 "amenity/fast_food": {
                     "name": "快餐店",
                     "terms": "快餐店"
                 },
+                "amenity/fast_food/burger": {
+                    "name": "汉堡快餐",
+                    "terms": "汉堡,汉堡店,快餐,快餐店,餐厅,早餐,午餐,午饭,中饭,食物,晚餐,晚饭,食物,美食,得来速"
+                },
+                "amenity/fast_food/chicken": {
+                    "name": "鸡肉快餐",
+                    "terms": "鸡肉,鸡,炸鸡,炸鸡店,快餐,快餐店,餐厅,早餐,早饭,午餐,午饭,中饭,食物,晚餐,晚饭,食物,美食,得来速"
+                },
+                "amenity/fast_food/donut": {
+                    "name": "甜甜圈快餐",
+                    "terms": "甜甜圈,快餐,快餐店,餐厅,咖啡厅,咖啡馆,咖啡,早饭,早饭,早午饭,午饭,中饭,食物,美食"
+                },
+                "amenity/fast_food/mexican": {
+                    "name": "墨西哥快餐",
+                    "terms": "墨西哥,墨式,快餐,快餐店,塔克,塔可,玉米卷,玉米薄饼,餐厅,早餐,早饭,午餐,午饭,中饭,食物,晚餐,晚饭,食物,美食,得来速"
+                },
+                "amenity/fast_food/pizza": {
+                    "name": "披萨快餐",
+                    "terms": "披萨,批萨,匹萨,比萨,薄饼,快餐,快餐店,披萨店,餐厅,午餐,午饭,中饭,食物,晚餐,晚饭,食物,美食,得来速"
+                },
+                "amenity/fast_food/sandwich": {
+                    "name": "三明治快餐",
+                    "terms": "三明治,三文治,快餐,快餐店,餐厅,早餐,早饭,午餐,午饭,中饭,食物,晚餐,晚饭,美食,得来速"
+                },
                 "amenity/ferry_terminal": {
                     "name": "轮船渡口 / 码头"
                 },
@@ -2906,10 +4521,17 @@
                     "name": "幼儿园",
                     "terms": "幼儿园,学前班,托儿所,幼稚园,学校,校园,学习"
                 },
+                "amenity/language_school": {
+                    "name": "语言学校"
+                },
                 "amenity/library": {
                     "name": "图书馆",
                     "terms": "图书馆"
                 },
+                "amenity/love_hotel": {
+                    "name": "爱情宾馆",
+                    "terms": "爱情,情趣,性爱,寻欢,爱情宾馆"
+                },
                 "amenity/marketplace": {
                     "name": "市场",
                     "terms": "市场,菜市场"
@@ -2920,7 +4542,7 @@
                 },
                 "amenity/music_school": {
                     "name": "音乐学校",
-                    "terms": "音乐学校,艺术学校"
+                    "terms": "音乐,乐曲,歌唱,唱歌,合唱,学校,学院,培训,艺术,学习"
                 },
                 "amenity/nightclub": {
                     "name": "夜总会",
@@ -2930,8 +4552,10 @@
                     "name": "疗养院"
                 },
                 "amenity/parking": {
-                    "name": "停车场",
-                    "terms": "停车"
+                    "name": "停车场"
+                },
+                "amenity/parking/multi-storey": {
+                    "name": "多层停车场"
                 },
                 "amenity/parking_entrance": {
                     "name": "车库出入口",
@@ -2941,13 +4565,9 @@
                     "name": "停车位",
                     "terms": "停车空间,停车场地,停车位"
                 },
-                "amenity/pavilion": {
-                    "name": "休息亭",
-                    "terms": "休息,亭,阁楼"
-                },
-                "amenity/pharmacy": {
-                    "name": "药店",
-                    "terms": "药房,药店"
+                "amenity/photo_booth": {
+                    "name": "自助拍照机",
+                    "terms": "拍照机,照相机,拍照,照相,自助,自动,照相馆,照相亭,证件,证件照,护照,快照,照片,照"
                 },
                 "amenity/place_of_worship": {
                     "name": "礼拜场所",
@@ -2957,22 +4577,10 @@
                     "name": "佛教寺庙",
                     "terms": "寺庙,佛堂,和尚寺,尼姑庵,佛教,宗教,庙宇,礼拜,寺观,寺院,佛寺,梵刹,禅林,净院"
                 },
-                "amenity/place_of_worship/christian": {
-                    "name": "基督教堂",
-                    "terms": "教堂"
-                },
                 "amenity/place_of_worship/hindu": {
                     "name": "印度教寺庙",
                     "terms": "印度教,宗教,寺庙,庙宇,神社,神祇,祭祀,崇奉,礼拜,吠陀"
                 },
-                "amenity/place_of_worship/jewish": {
-                    "name": "犹太教堂",
-                    "terms": "犹太教堂,犹太寺"
-                },
-                "amenity/place_of_worship/muslim": {
-                    "name": "清真寺",
-                    "terms": "清真寺,回教寺,伊斯兰,寺庙,寺坊,庙宇,礼拜,拜倒,宗教,清真,麦斯吉德,哲马尔提"
-                },
                 "amenity/place_of_worship/shinto": {
                     "name": "神道教神社",
                     "terms": "神道教,日本,神社,社屋,拜殿,宗教,寺庙,庙宇,神祇,祭祀,崇奉,礼拜,祈福,牌坊,鸟居"
@@ -3021,10 +4629,16 @@
                     "name": "野郊访客处",
                     "terms": "野郊访客处"
                 },
+                "amenity/recycling": {
+                    "name": "资源回收设施"
+                },
                 "amenity/recycling_centre": {
                     "name": "回收站",
                     "terms": "回收站,回收中心,循环中心,资源回收中心"
                 },
+                "amenity/recycling_container": {
+                    "name": "回收容器"
+                },
                 "amenity/register_office": {
                     "name": "民政登记处"
                 },
@@ -3032,6 +4646,78 @@
                     "name": "餐馆",
                     "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼,美食,饭馆,食堂,食物,吃,美食,食肆,菜馆"
                 },
+                "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": "厕所卸污处"
@@ -3083,8 +4769,8 @@
                     "name": "游泳池"
                 },
                 "amenity/taxi": {
-                    "name": "出租车站",
-                    "terms": "出租车站,的士站,计程车站"
+                    "name": "出租车停车处",
+                    "terms": "出租车停车处,的士停车处,计程车停车处"
                 },
                 "amenity/telephone": {
                     "name": "电话",
@@ -3098,6 +4784,14 @@
                     "name": "厕所",
                     "terms": "厕所,公厕,洗手间"
                 },
+                "amenity/toilets/disposal/flush": {
+                    "name": "冲水式厕所",
+                    "terms": "厕所,公厕,洗手间,马桶,WC"
+                },
+                "amenity/toilets/disposal/pitlatrine": {
+                    "name": "旱厕",
+                    "terms": "旱厕,坑厕,蹲坑厕所,蹲坑,茅坑"
+                },
                 "amenity/townhall": {
                     "name": "市政府",
                     "terms": "市政府,市政厅,大会堂"
@@ -3112,46 +4806,62 @@
                 },
                 "amenity/vending_machine/cigarettes": {
                     "name": "香烟售货机",
-                    "terms": "香烟售货机,香烟贩卖机"
+                    "terms": "香烟,烟草,售货,售卖,自助,付货,零售,贩卖,售货机,贩卖机"
+                },
+                "amenity/vending_machine/coffee": {
+                    "name": "咖啡售货机",
+                    "terms": "咖啡,摩卡,拿铁,馥芮白,玛奇朵,卡布奇诺,咖啡豆,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机,饮品,饮料,水"
                 },
                 "amenity/vending_machine/condoms": {
                     "name": "避孕套售货机",
-                    "terms": "避孕套售货机,避孕套贩卖机"
+                    "terms": "计生用品,避孕套,安全套,避孕,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
                 },
                 "amenity/vending_machine/drinks": {
                     "name": "饮料售货机",
-                    "terms": "饮料售货机,饮品售货机,饮品贩卖机"
+                    "terms": "饮料,饮品,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机,水,矿泉水,果汁,汽水,咖啡,奶茶,茶"
                 },
-                "amenity/vending_machine/excrement_bags": {
-                    "name": "粪便袋售货机",
-                    "terms": "粪便袋售货机"
+                "amenity/vending_machine/electronics": {
+                    "name": "电器售货机",
+                    "terms": "电器,电子,元件,器件,充电器,电线,充电线,插头,耳机,手机,平板,插头,插座,接口,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "纪念币压制机",
+                    "terms": "纪念币,硬币,压制,纪念品,零钱,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
                 },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "女性卫生用品售货机",
-                    "terms": "女,女性,避孕套,安全套,月经,棉条,卫生巾,卫生,私人,售货,售卖,贩卖,自助,自动,付货,零售"
+                    "terms": "女,女性,避孕套,安全套,月经,棉条,卫生巾,卫生,私人,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
                 },
-                "amenity/vending_machine/news_papers": {
-                    "name": "报纸售货机"
+                "amenity/vending_machine/food": {
+                    "name": "食物售货机",
+                    "terms": "食物,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机,吃,食"
                 },
-                "amenity/vending_machine/newspapers": {
-                    "name": "自动售报机",
-                    "terms": "报,报纸,售货,售卖,自助,自动,付货,零售"
+                "amenity/vending_machine/fuel": {
+                    "name": "油泵"
                 },
-                "amenity/vending_machine/parcel_pickup_dropoff": {
-                    "name": "行李提取/装卸机",
-                    "terms": "行李提取机,行李装卸机"
+                "amenity/vending_machine/ice_cream": {
+                    "name": "冰淇淋售货机",
+                    "terms": "冰淇淋,冰激淋,冰激凌,冰淇凌,冷饮,雪糕,冰沙,冰砖,冰棒,棒冰,售货,售卖,贩卖,售货机,自助,自动,付货,零售"
+                },
+                "amenity/vending_machine/newspapers": {
+                    "name": "报纸售货机",
+                    "terms": "报,报纸,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
                 },
                 "amenity/vending_machine/parking_tickets": {
                     "name": "停车缴费机",
-                    "terms": "停车缴费机,停车售票机"
+                    "terms": "停车,停车场,缴费,售票,缴费机,售票机"
                 },
                 "amenity/vending_machine/public_transport_tickets": {
                     "name": "公共交通售票机",
-                    "terms": "公共交通售票机"
+                    "terms": "售票,车票,售票处,贩卖,售票机,售货机,自助,自动,票,票务,公共交通,公交,巴士,地铁,火车,电车,轮船,渡轮"
+                },
+                "amenity/vending_machine/stamps": {
+                    "name": "邮票售货机",
+                    "terms": "邮票,邮局,邮费,售货,售卖,贩卖,售货机,自助,自动,付货,零售"
                 },
                 "amenity/vending_machine/sweets": {
                     "name": "零食售货机",
-                    "terms": "零食贩卖机"
+                    "terms": "零食,点心,小食,售货,售卖,贩卖,售货机,自助,自动,付货,零售,食物"
                 },
                 "amenity/veterinary": {
                     "name": "动物医院",
@@ -3183,20 +4893,19 @@
                 },
                 "area": {
                     "name": "区域",
-                    "terms": "区域"
+                    "terms": "区域,面"
                 },
                 "area/highway": {
                     "name": "道路表面",
                     "terms": "道路表面"
                 },
+                "attraction": {
+                    "name": "景点"
+                },
                 "attraction/amusement_ride": {
                     "name": "游乐设施",
                     "terms": "游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点,大摆锤,狂欢节"
                 },
-                "attraction/animal": {
-                    "name": "动物",
-                    "terms": "动物,动物园,生物,老虎,狮子,熊,猴,猿,鹿,龟,蛙,鳄,蛇,鸟,兽,牛,羊,豹,鼬,鼠,狸,鹤,鹳,鹅,雁,鸠,鸡,两栖,乐园,景点,游乐设施"
-                },
                 "attraction/big_wheel": {
                     "name": "摩天轮",
                     "terms": "摩天轮,大转轮,观览车,观景台,法利士,费里斯,巨轮,俯瞰,远眺,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
@@ -3221,6 +4930,10 @@
                     "name": "跳楼机",
                     "terms": "跳楼机,跳楼,自由落体,蹦极,太空梭,垂直极限,天地双雄,穿越云霄,大怒神,下落,下坠,坠落,跌落,高塔,飞天,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
                 },
+                "attraction/maze": {
+                    "name": "迷宫",
+                    "terms": "迷宫,景点,旅游,游乐设施,游乐"
+                },
                 "attraction/pirate_ship": {
                     "name": "海盗船",
                     "terms": "海盗船,海盗,鬼魂,摆动,谷底,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
@@ -3288,6 +5001,14 @@
                     "name": "树篱",
                     "terms": "树篱"
                 },
+                "barrier/kerb": {
+                    "name": "路缘",
+                    "terms": "路缘,路缘石,立缘石,路缘带,路肩,边缘,行车带,人行道,无障碍,公路,马路"
+                },
+                "barrier/kerb/lowered": {
+                    "name": "下降式路缘",
+                    "terms": "路缘,路缘石,平缘石,路缘带,路肩,边缘,行车带,人行道,无障碍,公路,马路"
+                },
                 "barrier/kissing_gate": {
                     "name": "单人转门",
                     "terms": "单人转门"
@@ -3321,13 +5042,17 @@
                     "terms": "建筑物，屋宇"
                 },
                 "building/apartments": {
-                    "name": "住宅楼",
-                    "terms": "公寓,住宅楼"
+                    "name": "公寓楼",
+                    "terms": "公寓楼,公寓,住宅,住所,建筑,建筑物"
                 },
                 "building/barn": {
                     "name": "谷仓",
                     "terms": "粮仓,畜棚,库房"
                 },
+                "building/boathouse": {
+                    "name": "船库",
+                    "terms": "船,船库,船坞,船屋,停船,仓库,码头,避风塘"
+                },
                 "building/bunker": {
                     "name": "煤仓"
                 },
@@ -3347,6 +5072,9 @@
                     "name": "教堂建筑",
                     "terms": "教堂建筑"
                 },
+                "building/civic": {
+                    "name": "民用建筑"
+                },
                 "building/college": {
                     "name": "学院建筑",
                     "terms": "学院,建筑,教学楼,实验室,校舍,宿舍,大学,院校,大专,校园,学校,学习"
@@ -3371,8 +5099,8 @@
                     "name": "入口/出口"
                 },
                 "building/garage": {
-                    "name": "车库(单个)",
-                    "terms": "车库"
+                    "name": "独立车库",
+                    "terms": "车库,私人车库,独立车库"
                 },
                 "building/garages": {
                     "name": "车库(连排)",
@@ -3436,12 +5164,15 @@
                 },
                 "building/shed": {
                     "name": "储物木屋",
-                    "terms": "储物间, 小木屋"
+                    "terms": "储物间,小木屋,木屋"
                 },
                 "building/stable": {
                     "name": "马厩",
                     "terms": "马厩,马屋,马房"
                 },
+                "building/stadium": {
+                    "name": "体育场建筑"
+                },
                 "building/static_caravan": {
                     "name": "固定房车",
                     "terms": "固定房车,房车"
@@ -3451,7 +5182,11 @@
                     "terms": "屋列,房列,一列房,一列屋"
                 },
                 "building/train_station": {
-                    "name": "列车站"
+                    "name": "火车站建筑"
+                },
+                "building/transportation": {
+                    "name": "公共交通建筑",
+                    "terms": "公交,公共交通,终点站,总站,火车站,车站,交通,运输,大楼,建筑,建筑物"
                 },
                 "building/university": {
                     "name": "大学建筑",
@@ -3461,6 +5196,10 @@
                     "name": "仓库",
                     "terms": "仓库,货栈"
                 },
+                "building_part": {
+                    "name": "建筑部分",
+                    "terms": "屋顶,楼顶,三维建筑,3D建筑"
+                },
                 "camp_site/camp_pitch": {
                     "name": "宿营位",
                     "terms": "宿营位,露营位,野营位,露营地,野营地,露营场,野营场,露营,野营,野营场地,露营场地,宿营地,宿营,扎营,帐篷,野外,荒野,郊野,郊外,度假"
@@ -3531,7 +5270,7 @@
                 },
                 "craft/electronics_repair": {
                     "name": "电子用品修理商店",
-                    "terms": "电子修理商店,电子用品修理点"
+                    "terms": "电子修理商店,电子用品修理点,家电维修"
                 },
                 "craft/gardener": {
                     "name": "园艺工",
@@ -3618,6 +5357,10 @@
                     "name": "脚手架搭建工",
                     "terms": "脚手架搭建工,搭脚手架的人"
                 },
+                "craft/sculptor": {
+                    "name": "雕塑工作室",
+                    "terms": "雕塑,雕塑家,工作室,手艺,工艺,艺术,艺术品,雕刻,石膏,树脂,粘土,黏土"
+                },
                 "craft/shoemaker": {
                     "name": "鞋匠",
                     "terms": "鞋匠,制鞋店"
@@ -3654,8 +5397,10 @@
                     "terms": "酒庄,酒厂"
                 },
                 "embankment": {
-                    "name": "堤岸",
-                    "terms": "堤,堤坝,堤岸,路堤"
+                    "name": "堤岸"
+                },
+                "emergency": {
+                    "name": "应急要素"
                 },
                 "emergency/ambulance_station": {
                     "name": "救护站",
@@ -3675,10 +5420,16 @@
                     "name": "消防栓",
                     "terms": "消防栓"
                 },
+                "emergency/first_aid_kit": {
+                    "name": "急救包"
+                },
                 "emergency/life_ring": {
                     "name": "救生圈",
                     "terms": "救生圈,橡皮圈,应急,救生,游泳"
                 },
+                "emergency/lifeguard": {
+                    "name": "救生员"
+                },
                 "emergency/no": {
                     "name": "紧急设施：关闭"
                 },
@@ -3699,26 +5450,6 @@
                     "name": "入口/出口",
                     "terms": "入口/出口,出入口"
                 },
-                "footway/crossing": {
-                    "name": "人行横道",
-                    "terms": "路口"
-                },
-                "footway/crossing-raised": {
-                    "name": "抬高的人行横道",
-                    "terms": "人行横道,速度,减速,交通稳静化"
-                },
-                "footway/crosswalk": {
-                    "name": "人行横道",
-                    "terms": "人行横道,斑马线"
-                },
-                "footway/crosswalk-raised": {
-                    "name": "抬高的人行横道",
-                    "terms": "人行横道,斑马线,速度,减速,交通稳静化"
-                },
-                "footway/sidewalk": {
-                    "name": "路边人行道",
-                    "terms": "路边人行道,人行道,便道,走道"
-                },
                 "ford": {
                     "name": "过水路面",
                     "terms": "过水路面,浅滩,漫水桥,垫脚石"
@@ -3739,14 +5470,6 @@
                     "name": "高尔夫球洞",
                     "terms": "高尔夫球洞"
                 },
-                "golf/lateral_water_hazard_area": {
-                    "name": "高尔夫侧面水障碍区",
-                    "terms": "高尔夫侧面水障碍水体,水障碍,侧面水障碍,水障碍区"
-                },
-                "golf/lateral_water_hazard_line": {
-                    "name": "高尔夫侧面水障碍",
-                    "terms": "高尔夫侧面水障碍,水障碍,侧面水障碍,水障碍区"
-                },
                 "golf/rough": {
                     "name": "高尔夫深草区",
                     "terms": "高尔夫深草区"
@@ -3755,14 +5478,6 @@
                     "name": "高尔夫开球区",
                     "terms": "高尔夫开球区,开球区,发球台"
                 },
-                "golf/water_hazard_area": {
-                    "name": "高尔夫水障碍区",
-                    "terms": "高尔夫水障碍水体,水障碍,正面水障碍,水障碍区"
-                },
-                "golf/water_hazard_line": {
-                    "name": "高尔夫水障碍",
-                    "terms": "高尔夫水障碍,水障碍,正面水障碍,水障碍区"
-                },
                 "healthcare": {
                     "name": "医疗机构",
                     "terms": "医疗,诊所,机构,卫生,医院,医务,医生,治疗,门诊,急诊,病,健康,保健,外科"
@@ -3791,6 +5506,10 @@
                     "name": "临终安养院",
                     "terms": "临终,善终,安宁,宁养,安养,关怀,保守,疾病,病房,垂死,致命,癌症,晚期,末期,死亡,诊所,医院,医学,医疗,疗法,卫生"
                 },
+                "healthcare/laboratory": {
+                    "name": "医学实验室",
+                    "terms": "医学,医学院,实验室,实验,研究所,研究院,医疗,血"
+                },
                 "healthcare/midwife": {
                     "name": "助产士",
                     "terms": "接产,看产,助产,生育,妊娠,分娩,孕,产妇,稳婆,产婆,收生,执妈,婴儿,妇科,妇产科,诊所,医院,医学,医疗,疗法,卫生,护士"
@@ -3835,27 +5554,37 @@
                     "terms": "导向,巴士,导轨,导轮,胶轮,公交,公交车,轨道"
                 },
                 "highway/bus_stop": {
-                    "name": "公交车站 / 站台"
+                    "name": "公交站"
+                },
+                "highway/construction": {
+                    "name": "道路关闭",
+                    "terms": "关闭,封闭,施工,在建,绕道,封路,修路,挖路"
                 },
                 "highway/corridor": {
                     "name": "室内走廊",
                     "terms": "室内走廊,室内步行街"
                 },
-                "highway/crossing": {
-                    "name": "路口",
-                    "terms": "路口"
+                "highway/crossing/marked": {
+                    "name": "人行横道 (有标线)",
+                    "terms": "人行横道,斑马线"
                 },
-                "highway/crossing-raised": {
-                    "name": "抬高的街道十字路口",
-                    "terms": "人行横道,速度,减速,交通稳静化"
+                "highway/crossing/marked-raised": {
+                    "name": "人行横道 (有标线/抬升)",
+                    "terms": "人行横道,斑马线,抬升,减速台,减速带,减速"
                 },
-                "highway/crosswalk": {
-                    "name": "人行横道",
+                "highway/crossing/unmarked": {
+                    "name": "人行横道 (无标线)",
                     "terms": "人行横道"
                 },
-                "highway/crosswalk-raised": {
-                    "name": "抬高的人行横道",
-                    "terms": "人行横道,斑马线,速度,减速,交通稳静化"
+                "highway/crossing/unmarked-raised": {
+                    "name": "人行横道 (无标线/抬升)",
+                    "terms": "人行横道,抬升,减速台,减速带,减速"
+                },
+                "highway/crossing/zebra": {
+                    "name": "人行横道 (有标线)"
+                },
+                "highway/crossing/zebra-raised": {
+                    "name": "人行横道 (有标线/抬升)"
                 },
                 "highway/cycleway": {
                     "name": "自行车道",
@@ -3869,6 +5598,32 @@
                     "name": "步行道路",
                     "terms": "步行径"
                 },
+                "highway/footway/marked": {
+                    "name": "人行横道 (有标线)",
+                    "terms": "人行横道,斑马线"
+                },
+                "highway/footway/marked-raised": {
+                    "name": "人行横道 (有标线/抬升)",
+                    "terms": "人行横道,斑马线,抬升,减速台,减速带,减速"
+                },
+                "highway/footway/sidewalk": {
+                    "name": "人行道",
+                    "terms": "人行道,人行通道,路缘,路边,路牙,盲道"
+                },
+                "highway/footway/unmarked": {
+                    "name": "人行横道 (无标线)",
+                    "terms": "人行横道"
+                },
+                "highway/footway/unmarked-raised": {
+                    "name": "人行横道 (无标线/抬升)",
+                    "terms": "人行横道,抬升,减速台,减速带,减速"
+                },
+                "highway/footway/zebra": {
+                    "name": "人行横道 (有标线)"
+                },
+                "highway/footway/zebra-raised": {
+                    "name": "人行横道 (有标线/抬升)"
+                },
                 "highway/give_way": {
                     "name": "让行标志",
                     "terms": "让行标志,减速让行标志"
@@ -3877,13 +5632,16 @@
                     "name": "生活性街道",
                     "terms": "居住街道"
                 },
+                "highway/milestone": {
+                    "name": "公路里程碑"
+                },
                 "highway/mini_roundabout": {
                     "name": "小型环岛",
                     "terms": "小型环岛"
                 },
                 "highway/motorway": {
                     "name": "高速公路",
-                    "terms": "高速公路"
+                    "terms": "高速公路,高速,道路,路,公路,快速路,干道,马路"
                 },
                 "highway/motorway_junction": {
                     "name": "高速公路交界处/出口",
@@ -3891,26 +5649,27 @@
                 },
                 "highway/motorway_link": {
                     "name": "高速公路连接路",
-                    "terms": "高速公路连接路"
+                    "terms": "高速公路连接路,连接路,匝道,高速,道路,路,公路,快速路,干道,马路"
                 },
                 "highway/path": {
                     "name": "小道",
-                    "terms": "路径"
+                    "terms": "小路,小径"
                 },
                 "highway/pedestrian_area": {
                     "name": "行人区域（广场）",
                     "terms": "公交,公交站,公交车,巴士,大巴,客车,车站,站台"
                 },
                 "highway/pedestrian_line": {
-                    "name": "步行街"
+                    "name": "步行街",
+                    "terms": "步行街,广场,人行道,步道,购物中心"
                 },
                 "highway/primary": {
                     "name": "主要道路",
-                    "terms": "主要道路"
+                    "terms": "主要道路,道路,路,公路,大道,高架路,干道,快速路,马路"
                 },
                 "highway/primary_link": {
                     "name": "主要道路连接路",
-                    "terms": "主要道路连接路"
+                    "terms": "主要道路连接路,连接路,匝道,道路,路,公路,大道,高架路,干道,快速路,马路"
                 },
                 "highway/raceway": {
                     "name": "跑道(赛车)",
@@ -3918,7 +5677,7 @@
                 },
                 "highway/residential": {
                     "name": "住宅区道路",
-                    "terms": "住宅区道路"
+                    "terms": "住宅区道路,道路,路,街道,街,公路,马路,小型道路,城区道路"
                 },
                 "highway/rest_area": {
                     "name": "休息区",
@@ -3926,23 +5685,23 @@
                 },
                 "highway/road": {
                     "name": "未知种类道路",
-                    "terms": "未知种类道路"
+                    "terms": "未知种类道路,路,道路,街道,马路"
                 },
                 "highway/secondary": {
                     "name": "次要道路",
-                    "terms": "次要道路"
+                    "terms": "次要道路,道路,路,公路,大道,高架路,马路"
                 },
                 "highway/secondary_link": {
                     "name": "次要道路连接路",
-                    "terms": "次要道路连接路"
+                    "terms": "次要道路连接路,连接路,匝道,道路,路,公路,大道,高架路,马路"
                 },
                 "highway/service": {
                     "name": "辅助道路",
-                    "terms": "辅助道路"
+                    "terms": "辅助道路,小路,服务性道路,路,街道,道路,马路"
                 },
                 "highway/service/alley": {
-                    "name": "窄路 (机动车通行)",
-                    "terms": "胡同,巷,弄堂,里弄,小巷,巷,弄,巷弄（可通行机动车）"
+                    "name": "窄路/巷",
+                    "terms": "胡同,巷,弄堂,里弄,小巷,弄,窄路,巷弄（可通行机动车）"
                 },
                 "highway/service/drive-through": {
                     "name": "免下车",
@@ -3972,6 +5731,9 @@
                     "name": "阶梯",
                     "terms": "楼梯,台阶"
                 },
+                "highway/steps/conveying": {
+                    "name": "自动扶梯"
+                },
                 "highway/stop": {
                     "name": "停车标志",
                     "terms": "停标志"
@@ -3982,15 +5744,15 @@
                 },
                 "highway/tertiary": {
                     "name": "三级道路",
-                    "terms": "三级道路"
+                    "terms": "三级道路,道路,路,公路,马路"
                 },
                 "highway/tertiary_link": {
                     "name": "三级道路连接路",
-                    "terms": "三级道路连接路"
+                    "terms": "三级道路连接路,连接路,匝道,道路,路,公路,马路"
                 },
                 "highway/track": {
                     "name": "未铺设路面的车径",
-                    "terms": "未铺设路面的车径"
+                    "terms": "车径,小路,土路,泥路,山路,马道,马路,消防道路,农场道路,牧场道路,路,道路,4x4,4wd,四驱,吉普"
                 },
                 "highway/traffic_mirror": {
                     "name": "道路反光镜",
@@ -4000,13 +5762,17 @@
                     "name": "交通信号灯",
                     "terms": "红绿灯"
                 },
+                "highway/trailhead": {
+                    "name": "小径起点",
+                    "terms": "小径起点,起点,路径,登山,远足,小路,小径,踪迹,登山口,终点,山地车,山地自行车,跋涉,长途旅行"
+                },
                 "highway/trunk": {
                     "name": "干线道路",
-                    "terms": "干线道路,干道"
+                    "terms": "干线公路,道路,路,公路,干道,大道,快速路,国道,高架路,马路"
                 },
                 "highway/trunk_link": {
                     "name": "干线道路连接路",
-                    "terms": "干线道路连接路"
+                    "terms": "干线公路连接路,连接路,匝道,道路,路,公路,干道,大道,快速路,国道,高架路,马路"
                 },
                 "highway/turning_circle": {
                     "name": "环岛",
@@ -4018,7 +5784,7 @@
                 },
                 "highway/unclassified": {
                     "name": "小型/未分级道路",
-                    "terms": "小型/未分级道路"
+                    "terms": "道路,道路,路,公路,街道,马路,小型道路,未分级道路"
                 },
                 "historic": {
                     "name": "历史地点",
@@ -4037,8 +5803,12 @@
                     "terms": "城堡"
                 },
                 "historic/memorial": {
-                    "name": "纪念碑",
-                    "terms": "纪念"
+                    "name": "纪念物",
+                    "terms": "纪念,纪念碑,纪念物,碑,墓碑,墓志铭,墓石,绊脚石,绊脚坎,奠基石,奠基,牌匾,蓝色牌匾,雕像,石刻,纪念堂,战争纪念,回忆"
+                },
+                "historic/memorial/plaque": {
+                    "name": "纪念牌匾",
+                    "terms": "牌匾,金石,纪念牌匾,纪念物,纪念碑,纪念,铭文,箴铭,刻字,墓志铭,墓志,遗址"
                 },
                 "historic/monument": {
                     "name": "纪念堂",
@@ -4060,13 +5830,24 @@
                     "name": "路旁神龛",
                     "terms": "路边神社"
                 },
+                "internet_access/wlan": {
+                    "name": "无线热点"
+                },
                 "junction": {
                     "name": "交叉口",
                     "terms": "交通枢纽,路口"
                 },
+                "junction/circular": {
+                    "name": "信号控制环岛"
+                },
+                "junction/jughandle": {
+                    "name": "壶柄式连接路"
+                },
+                "junction/roundabout": {
+                    "name": "环岛"
+                },
                 "landuse": {
-                    "name": "土地用途",
-                    "terms": "土地用途,土地使用"
+                    "name": "土地用途"
                 },
                 "landuse/allotments": {
                     "name": "公共花园",
@@ -4077,8 +5858,7 @@
                     "terms": "水产养殖,水产业"
                 },
                 "landuse/basin": {
-                    "name": "æ°´æ± ",
-                    "terms": "æ°´æ± "
+                    "name": "æ°´æ± "
                 },
                 "landuse/brownfield": {
                     "name": "棕土",
@@ -4098,7 +5878,7 @@
                 },
                 "landuse/construction": {
                     "name": "建设用地",
-                    "terms": "建筑物"
+                    "terms": "建设,建造,施工,工地,在建,建筑,构筑,构建,承建,用地,建设用地"
                 },
                 "landuse/farm": {
                     "name": "农田"
@@ -4112,8 +5892,8 @@
                     "terms": "农庄"
                 },
                 "landuse/forest": {
-                    "name": "森林",
-                    "terms": "森林"
+                    "name": "人工林",
+                    "terms": "人工林,森林,树林,林业,木材,树木,施业林,经营林,砍伐"
                 },
                 "landuse/grass": {
                     "name": "草坪",
@@ -4136,7 +5916,8 @@
                     "terms": "废料场"
                 },
                 "landuse/industrial/slaughterhouse": {
-                    "name": "屠宰场"
+                    "name": "屠宰场",
+                    "terms": "屠宰,屠宰场,宰杀,牲畜,牛,猪,鸡,羊,肉,禽"
                 },
                 "landuse/landfill": {
                     "name": "垃圾填埋区",
@@ -4148,7 +5929,7 @@
                 },
                 "landuse/military": {
                     "name": "军事区",
-                    "terms": "军事用地, 军事区域"
+                    "terms": "军事用地,军事区域"
                 },
                 "landuse/military/airfield": {
                     "name": "军用机场",
@@ -4158,34 +5939,18 @@
                     "name": "军营",
                     "terms": "军营,虎帐,兵营,军队,部队,步兵,驻扎,营房"
                 },
-                "landuse/military/bunker": {
-                    "name": "军事碉堡",
-                    "terms": "军事碉堡,碉堡"
-                },
-                "landuse/military/checkpoint": {
-                    "name": "检查点",
-                    "terms": "检查点,检查站,检查,边检"
-                },
                 "landuse/military/danger_area": {
-                    "name": "危险区域",
+                    "name": "军事危险区域",
                     "terms": "危险区"
                 },
                 "landuse/military/naval_base": {
                     "name": "海军基地",
                     "terms": "海军,基地"
                 },
-                "landuse/military/nuclear_explosion_site": {
-                    "name": "核爆地点",
-                    "terms": "核爆"
-                },
                 "landuse/military/obstacle_course": {
                     "name": "障碍训练场",
                     "terms": "障碍,训练场"
                 },
-                "landuse/military/office": {
-                    "name": "军事办公室",
-                    "terms": "军事办公室"
-                },
                 "landuse/military/range": {
                     "name": "军事靶场",
                     "terms": "军事,靶场,靶子"
@@ -4202,6 +5967,9 @@
                     "name": "苗圃",
                     "terms": "苗圃,育苗室,温室"
                 },
+                "landuse/pond": {
+                    "name": "池塘"
+                },
                 "landuse/quarry": {
                     "name": "矿场",
                     "terms": "矿场"
@@ -4215,12 +5983,20 @@
                     "terms": "绿地"
                 },
                 "landuse/religious": {
-                    "name": "宗教场所"
+                    "name": "宗教场所",
+                    "terms": "宗教,国教,信仰,崇拜,基督教,天主教,东正教,佛教,伊斯兰教,印度教,儒教,道教,神道教,本教,锡克教,场所"
+                },
+                "landuse/reservoir": {
+                    "name": "水库"
                 },
                 "landuse/residential": {
                     "name": "居民区",
                     "terms": "住宅小区"
                 },
+                "landuse/residential/apartments": {
+                    "name": "公寓区",
+                    "terms": "公寓区,楼区,公寓楼,公寓,住宅,住宅区,住所,套间"
+                },
                 "landuse/retail": {
                     "name": "零售场所",
                     "terms": "零售场所"
@@ -4230,13 +6006,16 @@
                     "terms": "葡萄园,酒庄"
                 },
                 "leisure": {
-                    "name": "休闲场所",
-                    "terms": "休闲场所"
+                    "name": "休闲场所"
                 },
                 "leisure/adult_gaming_centre": {
                     "name": "成人街机厅",
                     "terms": "成人街机厅,成人街机店"
                 },
+                "leisure/beach_resort": {
+                    "name": "海滩度假区",
+                    "terms": "海滩,沙滩,海岸,河滩,湖滨,沙子,沙,度假,度假区,游泳,冲浪"
+                },
                 "leisure/bird_hide": {
                     "name": "观鸟点",
                     "terms": "观鸟点,观鸟屋,鸟屋"
@@ -4253,6 +6032,10 @@
                     "name": "舞厅",
                     "terms": "舞厅,舞蹈,舞蹈房,舞池,跳舞"
                 },
+                "leisure/dancing_school": {
+                    "name": "舞蹈学校",
+                    "terms": "舞蹈,跳舞,舞,芭蕾,探戈,爵士,学校,学院,培训,拉丁舞,艺术,学习"
+                },
                 "leisure/dog_park": {
                     "name": "狗公园",
                     "terms": "狗公园,狗狗公园"
@@ -4261,6 +6044,9 @@
                     "name": "火塘",
                     "terms": "火塘,火炉,火坑,火堆"
                 },
+                "leisure/fishing": {
+                    "name": "钓鱼地点"
+                },
                 "leisure/fitness_centre": {
                     "name": "健身房/健身中心",
                     "terms": "健身房,健身中心,体操房,体育馆"
@@ -4305,6 +6091,9 @@
                     "name": "自然保护区",
                     "terms": "自然保护区"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "室外座位"
+                },
                 "leisure/park": {
                     "name": "公园",
                     "terms": "公园"
@@ -4321,9 +6110,11 @@
                     "name": "美式足球场",
                     "terms": "美式足球场"
                 },
+                "leisure/pitch/badminton": {
+                    "name": "羽毛球场"
+                },
                 "leisure/pitch/baseball": {
-                    "name": "棒球场",
-                    "terms": "棒球场"
+                    "name": "棒球场"
                 },
                 "leisure/pitch/basketball": {
                     "name": "篮球场",
@@ -4381,12 +6172,9 @@
                     "name": "度假区",
                     "terms": "度假,度假区,度假胜地,度假村,旅游,娱乐场,休闲"
                 },
-                "leisure/running_track": {
-                    "name": "跑道(跑步)",
-                    "terms": "跑步,跑道,操场,跑"
-                },
                 "leisure/sauna": {
-                    "name": "桑拿"
+                    "name": "桑拿",
+                    "terms": "桑拿,桑拿房,桑拿浴,浴室,蒸汽,按摩"
                 },
                 "leisure/slipway": {
                     "name": "船台",
@@ -4404,6 +6192,10 @@
                     "name": "体育场",
                     "terms": "体育,体育场"
                 },
+                "leisure/swimming_area": {
+                    "name": "自然游泳区域",
+                    "terms": "潜水,水,游泳"
+                },
                 "leisure/swimming_pool": {
                     "name": "游泳池",
                     "terms": "游泳池"
@@ -4412,6 +6204,13 @@
                     "name": "赛道(非机动竞速项目)",
                     "terms": "赛道,跑道,竞速"
                 },
+                "leisure/track/running": {
+                    "name": "体育跑道",
+                    "terms": "跑道,田径,跑步,跑,马拉松,冲刺,竞走,健身,操场跑道"
+                },
+                "leisure/track/running_point": {
+                    "name": "体育跑道"
+                },
                 "leisure/water_park": {
                     "name": "水上乐园",
                     "terms": "水上乐园,水上公园"
@@ -4421,13 +6220,16 @@
                     "terms": "线"
                 },
                 "man_made": {
-                    "name": "人造物",
-                    "terms": "人造物"
+                    "name": "人造物"
                 },
                 "man_made/adit": {
                     "name": "坑道入口",
                     "terms": "坑道入口,矿道入口"
                 },
+                "man_made/antenna": {
+                    "name": "天线杆塔",
+                    "terms": "天线,天线杆,天线塔,电话,通讯,手机,无线电,电视,广播,频道,电台,信号塔"
+                },
                 "man_made/breakwater": {
                     "name": "防波堤",
                     "terms": "避风塘,避风港"
@@ -4471,9 +6273,9 @@
                     "name": "通讯天线杆",
                     "terms": "通讯天线杆,无线电杆,电线杆,杆"
                 },
-                "man_made/observation": {
-                    "name": "瞭望塔",
-                    "terms": "瞭望塔"
+                "man_made/observatory": {
+                    "name": "天文台",
+                    "terms": "天文台,天文,天象,天体,观测,气象台,瞭望台,望远镜,观星,星星,光学,射电"
                 },
                 "man_made/petroleum_well": {
                     "name": "油井",
@@ -4483,6 +6285,10 @@
                     "name": "码头",
                     "terms": "码头"
                 },
+                "man_made/pier/floating": {
+                    "name": "浮动码头",
+                    "terms": "浮动码头,码头,船坞,泊区,泊位,停泊,靠岸,港区"
+                },
                 "man_made/pipeline": {
                     "name": "管道",
                     "terms": "管道"
@@ -4503,10 +6309,6 @@
                     "name": "监视器",
                     "terms": "监视器,监控,探头,监视探头"
                 },
-                "man_made/surveillance_camera": {
-                    "name": "监视摄像机",
-                    "terms": "监视摄像机,监控摄像机,监控,监视,摄像机,摄像头,探头,照相机,相机"
-                },
                 "man_made/survey_point": {
                     "name": "测量点",
                     "terms": "测量点"
@@ -4515,6 +6317,9 @@
                     "name": "塔",
                     "terms": "塔"
                 },
+                "man_made/tower/communication": {
+                    "name": "通信塔"
+                },
                 "man_made/wastewater_plant": {
                     "name": "污水处理厂",
                     "terms": "污水处理厂"
@@ -4525,7 +6330,7 @@
                 },
                 "man_made/water_well": {
                     "name": "水井",
-                    "terms": "水井, 取水点"
+                    "terms": "水井,取水点"
                 },
                 "man_made/water_works": {
                     "name": "供水厂",
@@ -4556,8 +6361,7 @@
                     "terms": "井盖,井,检查,人孔,手机,盖,通讯,通信,移动,联通,电信,电话,洞,孔,下水道,基站"
                 },
                 "natural": {
-                    "name": "自然",
-                    "terms": "自然"
+                    "name": "自然"
                 },
                 "natural/bare_rock": {
                     "name": "岩石",
@@ -4599,6 +6403,10 @@
                     "name": "荒野",
                     "terms": "荒野"
                 },
+                "natural/mud": {
+                    "name": "淤泥",
+                    "terms": "泥,淤泥,泥土,湿地,泥巴,淤渣,烂泥,土"
+                },
                 "natural/peak": {
                     "name": "山峰",
                     "terms": "山峰"
@@ -4633,7 +6441,7 @@
                 },
                 "natural/tree_row": {
                     "name": "树列",
-                    "terms": "树列,树阵,一排树"
+                    "terms": "树列,一列树,一排树,树阵,树"
                 },
                 "natural/volcano": {
                     "name": "火山",
@@ -4643,6 +6451,14 @@
                     "name": "水体",
                     "terms": "æ°´"
                 },
+                "natural/water/basin": {
+                    "name": "æ°´æ± ",
+                    "terms": "水池,水库,蓄水池,人工水池,下水道,排水沟,溢流,雨水池"
+                },
+                "natural/water/canal": {
+                    "name": "运河",
+                    "terms": "运河,支流,水路,水道,河,河流,水,航运"
+                },
                 "natural/water/lake": {
                     "name": "湖泊",
                     "terms": "湖泊"
@@ -4655,6 +6471,14 @@
                     "name": "水库",
                     "terms": "水库"
                 },
+                "natural/water/river": {
+                    "name": "æ²³",
+                    "terms": "河流,河,江,浜,水道,水路,支流,溪流,水流,水,泉流"
+                },
+                "natural/water/stream": {
+                    "name": "溪流",
+                    "terms": "溪流,溪,小溪,支流,涧流,细流,流,涧,水渠,渠,泉流,泉,水流,水"
+                },
                 "natural/wetland": {
                     "name": "湿地",
                     "terms": "湿地"
@@ -4672,27 +6496,35 @@
                     "terms": "办公室,写字楼"
                 },
                 "office/accountant": {
-                    "name": "会计师事务所"
+                    "name": "会计师事务所",
+                    "terms": "会计,事务所,会计师,审计,会计,咨询,税务,账"
                 },
                 "office/administrative": {
                     "name": "行政楼"
                 },
                 "office/adoption_agency": {
-                    "name": "领养中介"
+                    "name": "领养中介",
+                    "terms": "领养,收养,孤儿,孤儿院,留守"
                 },
                 "office/advertising_agency": {
-                    "name": "广告中介"
+                    "name": "广告中介",
+                    "terms": "广告,营销,中介,机构,市场营销,盈利,营利,传媒"
                 },
                 "office/architect": {
                     "name": "建筑事务所",
                     "terms": "建筑事务所"
                 },
                 "office/association": {
-                    "name": "非盈利机构办公室",
+                    "name": "非营利机构办公室",
                     "terms": "非盈利机构办公室"
                 },
                 "office/charity": {
-                    "name": "慈善机构"
+                    "name": "慈善机构",
+                    "terms": "慈善,公益,基金,基金会,捐款,机构,组织,非营利,非盈利,非公募"
+                },
+                "office/company": {
+                    "name": "企业公司",
+                    "terms": "公司,企业,办公室"
                 },
                 "office/coworking": {
                     "name": "共享办公空间",
@@ -4707,7 +6539,8 @@
                     "terms": "就业机构"
                 },
                 "office/energy_supplier": {
-                    "name": "电力公司"
+                    "name": "电力公司",
+                    "terms": "电力,电源,电,能源,煤气,天然气,电网,公司"
                 },
                 "office/estate_agent": {
                     "name": "地产代理",
@@ -4718,7 +6551,8 @@
                     "terms": "金融机构"
                 },
                 "office/forestry": {
-                    "name": "林务管理"
+                    "name": "林务管理",
+                    "terms": "护林,林务,保护,林业,树林,森林,巡逻,林"
                 },
                 "office/foundation": {
                     "name": "基金办公室",
@@ -4737,14 +6571,16 @@
                     "terms": "税局"
                 },
                 "office/guide": {
-                    "name": "导游机构"
+                    "name": "导游机构",
+                    "terms": "导游,旅行,旅行社,旅游,游览,潜水,登山,爬山"
                 },
                 "office/insurance": {
                     "name": "保险公司",
                     "terms": "保险公司"
                 },
                 "office/it": {
-                    "name": "IT公司"
+                    "name": "IT公司",
+                    "terms": "电脑,信息,科技,信息科技,软件,工程,编程,计算机,公司,it"
                 },
                 "office/lawyer": {
                     "name": "律师事务所",
@@ -4754,7 +6590,8 @@
                     "name": "公证处"
                 },
                 "office/moving_company": {
-                    "name": "搬家公司"
+                    "name": "搬家公司",
+                    "terms": "搬家,搬床,搬场,动迁,装修"
                 },
                 "office/newspaper": {
                     "name": "报社",
@@ -4765,7 +6602,8 @@
                     "terms": "非政府组织"
                 },
                 "office/notary": {
-                    "name": "公证处"
+                    "name": "公证处",
+                    "terms": "公证,公证处,契约,保证,签名,学历,学位,成绩,刑事,婚姻,出生,委托,遗嘱,遗产,继承,声明,机构,抽奖,拍卖,证据"
                 },
                 "office/physician": {
                     "name": "医生"
@@ -4775,17 +6613,20 @@
                     "terms": "政党"
                 },
                 "office/private_investigator": {
-                    "name": "私家侦探事务所"
+                    "name": "私家侦探事务所",
+                    "terms": "侦探,私家,私家侦探,私人,侦查,侦察,民商,调查,推理,行踪,诈骗,取证,警察,警官"
                 },
                 "office/quango": {
-                    "name": "准非政府组织"
+                    "name": "准非政府组织",
+                    "terms": "非政府,民意,民间,政府,组织,自治,自主,非盈利,非营利"
                 },
                 "office/research": {
                     "name": "研究所",
                     "terms": "研究所"
                 },
                 "office/tax_advisor": {
-                    "name": "税务顾问机构"
+                    "name": "税务顾问机构",
+                    "terms": "税,税务,税收,经济,顾问,机构"
                 },
                 "office/telecommunication": {
                     "name": "电信办公室",
@@ -4799,11 +6640,8 @@
                     "name": "旅行社"
                 },
                 "office/water_utility": {
-                    "name": "水务设施机构"
-                },
-                "piste": {
-                    "name": "滑雪道",
-                    "terms": "滑雪道"
+                    "name": "水务设施机构",
+                    "terms": "水务,水源,设施,机构,水,自来水,废水,污水"
                 },
                 "place": {
                     "name": "地点"
@@ -4922,25 +6760,21 @@
                 "power": {
                     "name": "电力"
                 },
+                "power/cable/underground": {
+                    "name": "地下电缆",
+                    "terms": "电缆,缆线,线缆,地下电缆,地下线缆,输电,电线,电力,发电,导线,电,输电线"
+                },
                 "power/generator": {
                     "name": "发电机",
                     "terms": "发电机"
                 },
-                "power/generator/source_nuclear": {
-                    "name": "核反应堆",
-                    "terms": "原子能,核,原子核,核电站,反应堆,链式,核裂变,发电,发电机,反应器,反应机,铀,核化学,中子"
-                },
-                "power/generator/source_wind": {
-                    "name": "风力涡轮机",
-                    "terms": "风能,风轮机,涡轮,发电机,发电器,风力,风车,风,发电"
-                },
                 "power/line": {
-                    "name": "输电线",
-                    "terms": "输电线"
+                    "name": "超高压输电线",
+                    "terms": "输电线,输电,超高压,高电压,高压线,高压电线,高压,架空,电线,电力,电缆,缆线,线缆,发电,导线,电"
                 },
                 "power/minor_line": {
-                    "name": "次要输电线",
-                    "terms": "次要输电线"
+                    "name": "高压输电线",
+                    "terms": "输电线,输电,配电,低电压,中电压,低压,低压线,低压,高压线,高压电线,架空,电线,电力,电缆,缆线,线缆,发电,导线,电"
                 },
                 "power/plant": {
                     "name": "发电厂",
@@ -4965,85 +6799,78 @@
                     "name": "变压器",
                     "terms": "变电所"
                 },
-                "public_transport/linear_platform": {
-                    "name": "公共交通站 / 站台",
-                    "terms": "公共交通,车站,站台"
+                "public_transport/platform": {
+                    "name": "公共交通站台",
+                    "terms": "站台,月台,车站,公共交通,交通"
                 },
-                "public_transport/linear_platform_aerialway": {
-                    "name": "缆车站 / 站台",
-                    "terms": "缆车,空中列车,车站,站台"
+                "public_transport/platform/aerialway": {
+                    "name": "缆车站台",
+                    "terms": "缆车,空中列车,车站,站台,月台,公共交通,交通"
                 },
-                "public_transport/linear_platform_bus": {
-                    "name": "公交车站 / 站台",
-                    "terms": "公交,公交站,公交车,巴士,大巴,客车,车站,站台"
+                "public_transport/platform/aerialway_point": {
+                    "name": "缆车站 / 站台"
                 },
-                "public_transport/linear_platform_ferry": {
-                    "name": "轮船渡口 / 站台",
-                    "terms": "轮船,渡轮,渡口,车站,站台"
+                "public_transport/platform/bus": {
+                    "name": "公交站台",
+                    "terms": "公交,公交站,公交车,巴士,大巴,客车,车站,站台,月台,公共交通,交通"
                 },
-                "public_transport/linear_platform_light_rail": {
-                    "name": "轻轨站 / 站台",
-                    "terms": "轻轨,地铁,捷运,铁路,车站,站台,月台"
+                "public_transport/platform/bus_point": {
+                    "name": "公交站",
+                    "terms": "公交,公交站,车站,公交车,巴士,大巴,客车,巴士站,公交停靠站,公共交通,交通"
                 },
-                "public_transport/linear_platform_monorail": {
-                    "name": "单轨列车站 / 站台",
-                    "terms": "单轨,列车,车站,站台,月台"
+                "public_transport/platform/ferry": {
+                    "name": "轮船站台",
+                    "terms": "轮船,渡轮,渡口,车站,站台,公共交通,交通"
                 },
-                "public_transport/linear_platform_subway": {
-                    "name": "地铁站 / 站台",
-                    "terms": "地铁,轻轨,捷运,铁路,车站,站台,月台"
+                "public_transport/platform/ferry_point": {
+                    "name": "轮船渡口 / 站台"
                 },
-                "public_transport/linear_platform_train": {
-                    "name": "列车站 / 站台",
-                    "terms": "列车,火车,动车,高铁,铁路,车站,站台,月台"
+                "public_transport/platform/light_rail": {
+                    "name": "轻轨站台",
+                    "terms": "轻轨,地铁,捷运,铁路,车站,站台,月台,公共交通,交通"
                 },
-                "public_transport/linear_platform_tram": {
-                    "name": "有轨电车站 / 站台",
-                    "terms": "电车,有轨电车,车站,站台"
+                "public_transport/platform/light_rail_point": {
+                    "name": "轻轨站 / 站台"
                 },
-                "public_transport/linear_platform_trolleybus": {
-                    "name": "无轨电车站 / 站台",
-                    "terms": "电车,无轨电车,车站,站台"
+                "public_transport/platform/monorail": {
+                    "name": "单轨列车站台",
+                    "terms": "单轨,轻轨,列车,车站,站台,月台,公共交通,交通"
                 },
-                "public_transport/platform": {
-                    "name": "公共交通站 / 站台",
-                    "terms": "公共交通,车站,站台"
+                "public_transport/platform/monorail_point": {
+                    "name": "单轨列车站 / 站台"
                 },
-                "public_transport/platform_aerialway": {
-                    "name": "缆车站 / 站台",
-                    "terms": "缆车,空中列车,车站,站台"
+                "public_transport/platform/subway": {
+                    "name": "地铁站台",
+                    "terms": "地铁,轻轨,捷运,铁路,车站,站台,月台,公共交通,交通,地下铁"
                 },
-                "public_transport/platform_bus": {
-                    "name": "公交车站 / 站台",
-                    "terms": "公交,公交站,公交车,巴士,大巴,客车,车站,站台"
+                "public_transport/platform/subway_point": {
+                    "name": "地铁站 / 站台"
                 },
-                "public_transport/platform_ferry": {
-                    "name": "轮船渡口 / 站台",
-                    "terms": "轮船,渡轮,渡口,车站,站台"
+                "public_transport/platform/train": {
+                    "name": "火车站台",
+                    "terms": "列车,火车,动车,高铁,铁路,车站,站台,月台,公共交通,交通"
                 },
-                "public_transport/platform_light_rail": {
-                    "name": "轻轨站 / 站台",
-                    "terms": "轻轨,地铁,捷运,铁路,车站,站台,月台"
+                "public_transport/platform/train_point": {
+                    "name": "火车站 / 站台"
                 },
-                "public_transport/platform_monorail": {
-                    "name": "单轨列车站 / 站台",
-                    "terms": "单轨,列车,车站,站台,月台"
+                "public_transport/platform/tram": {
+                    "name": "有轨电车站台",
+                    "terms": "有轨电车,轻轨,轻轨站,电车,电车站,站台,月台,公共交通,交通,有轨,轻铁"
                 },
-                "public_transport/platform_subway": {
-                    "name": "地铁站 / 站台",
-                    "terms": "地铁,轻轨,捷运,铁路,车站,站台,月台"
+                "public_transport/platform/tram_point": {
+                    "name": "有轨电车站 / 站台"
                 },
-                "public_transport/platform_train": {
-                    "name": "列车站 / 站台",
-                    "terms": "列车,火车,动车,高铁,铁路,车站,站台,月台"
+                "public_transport/platform/trolleybus": {
+                    "name": "无轨电车站台",
+                    "terms": "电车,无轨电车,电车站,公交,公交站,公交车,巴士,站台,月台,公共交通,交通,无轨"
                 },
-                "public_transport/platform_tram": {
-                    "name": "有轨电车站 / 站台",
-                    "terms": "电车,有轨电车,车站,站台"
+                "public_transport/platform/trolleybus_point": {
+                    "name": "无轨电车站",
+                    "terms": "电车,无轨电车,电车站,公交,公交站,公交车,巴士,公共交通,交通,无轨"
                 },
-                "public_transport/platform_trolleybus": {
-                    "name": "无轨电车站 / 站台",
-                    "terms": "电车,无轨电车,车站,站台"
+                "public_transport/platform_point": {
+                    "name": "公共交通站 / 站台",
+                    "terms": "站台,月台,公共交通,车站"
                 },
                 "public_transport/station": {
                     "name": "公共交通车站",
@@ -5144,6 +6971,10 @@
                     "name": "铁路挡车器",
                     "terms": "止冲器,末端,缓冲器,缓冲,停车,减速,挡车,停止,轨道,股道,铁轨,铁路,路轨,火车,列车,站台"
                 },
+                "railway/construction": {
+                    "name": "在建铁路",
+                    "terms": "在建铁路,建设,建造,铁路,施工,工地,在建,承建,铁轨,轨道"
+                },
                 "railway/crossing": {
                     "name": "铁路道口 (人行道)",
                     "terms": "铁路道口,平交道口,铁路道口(人行道)"
@@ -5188,12 +7019,16 @@
                     "terms": "窄轨铁路,铁路"
                 },
                 "railway/platform": {
-                    "name": "火车站 / 站台"
+                    "name": "火车站台"
                 },
                 "railway/rail": {
                     "name": "标准铁路",
                     "terms": "铁轨"
                 },
+                "railway/rail/highspeed": {
+                    "name": "高速铁路",
+                    "terms": "高铁,高速铁路,子弹头列车,动车,列车,铁路"
+                },
                 "railway/signal": {
                     "name": "铁路信号机",
                     "terms": "色灯,信号机,信号,灯,信号灯,红绿灯,表示器,轨道,股道,铁轨,铁路,路轨,火车,列车,调车,进站,出站"
@@ -5228,9 +7063,6 @@
                     "name": "关系",
                     "terms": "关系"
                 },
-                "roundabout": {
-                    "name": "环岛"
-                },
                 "route/ferry": {
                     "name": "航线",
                     "terms": "航线,轮渡,渡轮,渡船,渡口,摆渡"
@@ -5308,8 +7140,7 @@
                     "terms": "书店,书城"
                 },
                 "shop/boutique": {
-                    "name": "精品店",
-                    "terms": "精品店"
+                    "name": "精品店"
                 },
                 "shop/butcher": {
                     "name": "肉店",
@@ -5357,7 +7188,7 @@
                 },
                 "shop/coffee": {
                     "name": "咖啡豆/粉店",
-                    "terms": "咖啡豆店,咖啡粉店"
+                    "terms": "咖啡,咖啡豆,咖啡粉,商店,摩卡,拿铁,馥芮白,玛奇朵,卡布奇诺"
                 },
                 "shop/computer": {
                     "name": "电脑店",
@@ -5428,8 +7259,7 @@
                     "terms": "农产直销店"
                 },
                 "shop/fashion": {
-                    "name": "服装店",
-                    "terms": "服装店,潮流服饰店"
+                    "name": "服装店"
                 },
                 "shop/fishmonger": {
                     "name": "海产店"
@@ -5497,10 +7327,6 @@
                     "name": "室内装饰店",
                     "terms": "室内装饰店"
                 },
-                "shop/jewelry": {
-                    "name": "珠宝店",
-                    "terms": "珠宝店"
-                },
                 "shop/kiosk": {
                     "name": "售货亭",
                     "terms": "售货亭,报刊亭,书报亭,售卖"
@@ -5513,6 +7339,10 @@
                     "name": "洗衣店",
                     "terms": "洗衣店"
                 },
+                "shop/laundry/self_service": {
+                    "name": "自助洗衣店",
+                    "terms": "洗衣,洗衣房,洗衣店,洗衣间,自助,洗衣服,洗衣机,投币洗衣"
+                },
                 "shop/leather": {
                     "name": "皮具店",
                     "terms": "皮具店"
@@ -5526,8 +7356,8 @@
                     "terms": "彩票店,彩票购买点"
                 },
                 "shop/mall": {
-                    "name": "商场",
-                    "terms": "商场"
+                    "name": "购物中心",
+                    "terms": "商场,购物中心"
                 },
                 "shop/massage": {
                     "name": "按摩店",
@@ -5549,6 +7379,10 @@
                     "name": "摩托车店",
                     "terms": "摩托车行,摩托车"
                 },
+                "shop/motorcycle_repair": {
+                    "name": "摩托车修理店",
+                    "terms": "摩托车修理店"
+                },
                 "shop/music": {
                     "name": "音乐店",
                     "terms": "音乐店"
@@ -5655,7 +7489,7 @@
                 },
                 "shop/tea": {
                     "name": "茶叶商店",
-                    "terms": "茶叶商店,茶店"
+                    "terms": "茶,茶叶,茶店,茶品,红茶,黄茶,清茶,青茶,绿茶,花茶,黑茶,白茶,乌龙,商店"
                 },
                 "shop/ticket": {
                     "name": "售票处",
@@ -5717,7 +7551,8 @@
                     "terms": "武器店"
                 },
                 "shop/wholesale": {
-                    "name": "批发市场"
+                    "name": "批发市场",
+                    "terms": "批发,市场,超市,商业,零售,商场,卖场,商城,商品,百货,服装,农贸,菜场,农场"
                 },
                 "shop/window_blind": {
                     "name": "百叶窗店",
@@ -5727,9 +7562,12 @@
                     "name": "酒品商店",
                     "terms": "酒品商店,酒店,酒楼,酒坊"
                 },
+                "telecom/data_center": {
+                    "name": "数据中心",
+                    "terms": "数据,电脑系统存储,计算机,计算机科学,电脑,服务器,云端,电信,通信"
+                },
                 "tourism": {
-                    "name": "旅游设施",
-                    "terms": "旅行,旅游设施"
+                    "name": "旅游设施"
                 },
                 "tourism/alpine_hut": {
                     "name": "高山小屋",
@@ -5747,9 +7585,17 @@
                     "name": "艺术品",
                     "terms": "艺术,壁画,雕塑,雕刻,雕像,人像,塑像,油画,绘画,石像,写真,浮雕,画像,街头艺术,颜料"
                 },
+                "tourism/artwork/sculpture": {
+                    "name": "雕塑",
+                    "terms": "雕塑,塑像"
+                },
+                "tourism/artwork/statue": {
+                    "name": "塑像",
+                    "terms": "塑像,像,雕像"
+                },
                 "tourism/attraction": {
                     "name": "旅游名胜",
-                    "terms": "旅游名胜"
+                    "terms": "旅游名胜,景点"
                 },
                 "tourism/camp_site": {
                     "name": "宿营场地",
@@ -5768,7 +7614,7 @@
                     "terms": "美术馆,画廊,艺术中心"
                 },
                 "tourism/guest_house": {
-                    "name": "招待所",
+                    "name": "客栈",
                     "terms": "招待所,旅馆,宾馆"
                 },
                 "tourism/hostel": {
@@ -5820,12 +7666,25 @@
                     "terms": "景点"
                 },
                 "tourism/wilderness_hut": {
-                    "name": "野外住宿小屋"
+                    "name": "野外住宿小屋",
+                    "terms": "野外,郊野,荒郊,野营,宿营,营地,探险,旅游,小屋,木屋,草屋,屋,住宿"
                 },
                 "tourism/zoo": {
                     "name": "动物园",
                     "terms": "动物园"
                 },
+                "tourism/zoo/petting": {
+                    "name": "儿童动物园",
+                    "terms": "儿童动物园,宠养,社区动物园,农场动物,动物园"
+                },
+                "tourism/zoo/safari": {
+                    "name": "野生动物园",
+                    "terms": "野生动物园,动物园"
+                },
+                "tourism/zoo/wildlife": {
+                    "name": "土著动物园",
+                    "terms": "土著动物,土著,本地,动物园"
+                },
                 "traffic_calming": {
                     "name": "交通减速设置",
                     "terms": "车辆减速措施"
@@ -5874,40 +7733,52 @@
                     "name": "行政区边界",
                     "terms": "行政边界"
                 },
+                "type/enforcement": {
+                    "name": "执行措施",
+                    "terms": "执行,规定,规则,措施,法规,交通,交通规定,交通规则,交通法规,超速,限速,测速,检查,检查站,测速照相"
+                },
                 "type/multipolygon": {
                     "name": "复合多边形"
                 },
+                "type/public_transport/stop_area_group": {
+                    "name": "公共交通站点群",
+                    "terms": "公共交通站点群,站点,网络"
+                },
                 "type/restriction": {
                     "name": "限制",
                     "terms": "限制"
                 },
                 "type/restriction/no_left_turn": {
                     "name": "禁止左转",
-                    "terms": "禁止左转弯"
+                    "terms": "左转,禁止左转,不许左转,允许右转,允许直行,允许掉头"
                 },
                 "type/restriction/no_right_turn": {
                     "name": "禁止右转",
-                    "terms": "禁止右转弯"
+                    "terms": "右转,禁止右转,不许右转,允许左转,允许直行,允许掉头"
                 },
                 "type/restriction/no_straight_on": {
                     "name": "禁止直行",
-                    "terms": "禁止直行"
+                    "terms": "直行,禁止直行,不许直行,允许左转,允许掉头,允许右转"
                 },
                 "type/restriction/no_u_turn": {
                     "name": "禁止掉头",
-                    "terms": "禁止掉头"
+                    "terms": "掉头,禁止掉头,不许掉头,允许左转,允许直行,允许右转"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "仅左转",
-                    "terms": "仅左转"
+                    "name": "仅限左转",
+                    "terms": "左转,仅左转,大转,禁止右转,禁止直行,禁止掉头"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "仅右转",
-                    "terms": "仅右转"
+                    "name": "仅限右转",
+                    "terms": "右转,仅右转,小转,禁止左转,禁止直行,禁止掉头"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "禁止转向",
-                    "terms": "禁止转向"
+                    "name": "仅限直行",
+                    "terms": "直行,仅直行,禁止左转,禁止右转,禁止掉头"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "仅限掉头",
+                    "terms": "掉头,仅掉头,禁止左转,禁止直行,禁止右转"
                 },
                 "type/route": {
                     "name": "线路",
@@ -5945,6 +7816,10 @@
                     "name": "轻轨线路",
                     "terms": "轻轨,地铁,捷运,地下铁,火车,电车,列车,铁路,线路,路线"
                 },
+                "type/route/monorail": {
+                    "name": "单轨列车路线",
+                    "terms": "单轨列车路线,单轨列车"
+                },
                 "type/route/pipeline": {
                     "name": "管道线路",
                     "terms": "管道路线,管线,路线,线路"
@@ -5985,10 +7860,6 @@
                     "name": "æ°´è·¯",
                     "terms": "水路,水系,水道,航道,水沟,河道,河流,流域,水体,水域"
                 },
-                "vertex": {
-                    "name": "其它",
-                    "terms": "其它"
-                },
                 "waterway": {
                     "name": "航道"
                 },
@@ -6000,9 +7871,13 @@
                     "name": "运河",
                     "terms": "运河"
                 },
+                "waterway/canal/lock": {
+                    "name": "船闸",
+                    "terms": "船闸,水闸,运河,闸室,航道,闸门"
+                },
                 "waterway/dam": {
                     "name": "水坝",
-                    "terms": "水坝"
+                    "terms": "水坝,大坝"
                 },
                 "waterway/ditch": {
                     "name": "水沟",
@@ -6020,13 +7895,16 @@
                     "name": "船舶加油站",
                     "terms": "船舶加油站,加油,船,航海"
                 },
+                "waterway/lock_gate": {
+                    "name": "闸门",
+                    "terms": "闸门,闸首,水闸,船闸,运河,水阀,阀门"
+                },
                 "waterway/river": {
                     "name": "æ²³",
                     "terms": "江,河流,川"
                 },
                 "waterway/riverbank": {
-                    "name": "å ¤",
-                    "terms": "岸,畔,河岸,河堤,河畔"
+                    "name": "å ¤"
                 },
                 "waterway/sanitary_dump_station": {
                     "name": "航船卸污站",
@@ -6063,30 +7941,32 @@
                 "attribution": {
                     "text": "条款与反馈"
                 },
-                "description": "DigitalGlobe 优质卫星影像",
                 "name": "DigitalGlobe 优质影像"
             },
             "DigitalGlobe-Premium-vintage": {
                 "attribution": {
                     "text": "使用条款与意见反馈"
                 },
-                "description": "影像边界和拍摄日期。标签会在缩放到14层级或更高时显示。",
+                "description": "影像边界和拍摄日期。标签会在缩放到13层级或更高时显示。",
                 "name": "DigitalGlobe 优质影像年份"
             },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "条款与反馈"
                 },
-                "description": "DigitalGlobe 标准卫星影像",
                 "name": "DigitalGlobe 标准影像"
             },
             "DigitalGlobe-Standard-vintage": {
                 "attribution": {
                     "text": "使用条款与意见反馈"
                 },
-                "description": "影像边界和拍摄日期。标签会在缩放到14层级或更高时显示。",
+                "description": "影像边界和拍摄日期。标签会在缩放到13层级或更高时显示。",
                 "name": "DigitalGlobe 标准影像年份"
             },
+            "EOXAT2018CLOUDLESS": {
+                "description": "经后期处理的 Sentinel 卫星影像。",
+                "name": "eox.at 2018 无云"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "条款和反馈"
@@ -6115,6 +7995,18 @@
                 "description": "卫星和航空影像",
                 "name": "Mapbox 卫星"
             },
+            "Maxar-Premium": {
+                "attribution": {
+                    "text": "条款与反馈"
+                },
+                "name": "Maxer 优质影像 (Beta)"
+            },
+            "Maxar-Standard": {
+                "attribution": {
+                    "text": "条款与反馈"
+                },
+                "name": "Maxar 标准影像 (Beta)"
+            },
             "OSM_Inspector-Addresses": {
                 "attribution": {
                     "text": "© Geofabrik 有限公司, OpenStreetMap 贡献者, 署名-相同方式共享"
@@ -6157,9 +8049,6 @@
                 },
                 "name": "OSM查看器：标签"
             },
-            "US-TIGER-Roads-2012": {
-                "name": "TIGER 道路 2012"
-            },
             "US-TIGER-Roads-2014": {
                 "description": "在缩放等级16级以上是来自美国人口调查局的公共领域地图数据。低缩放等级下仅包含自2006年以来的变更，不含已纳入 OpenStreetMap 的变更。",
                 "name": "TIGER 道路 2014"
@@ -6168,6 +8057,14 @@
                 "description": "黄色 = 来自美国人口调查局的公共领域地图数据。红色 = 在 OpenStreetMap 中找不到数据。",
                 "name": "TIGER 道路 2017"
             },
+            "US-TIGER-Roads-2018": {
+                "description": "黄色 = 来自美国人口调查局的公共领域地图数据。红色 = 在 OpenStreetMap 中找不到数据。",
+                "name": "TIGER 道路 2018"
+            },
+            "US_Forest_Service_roads_overlay": {
+                "description": "公路：绿色线框 = 未分级。棕色线框 = 未铺设路面。表面：沙砾 = 浅棕色填充，沥青 = 黑色，已铺设 = 灰色，土地 = 白色，混凝土 = 蓝色，草地 = 绿色。季节性 = 白色条状",
+                "name": "美国森林道路叠加层"
+            },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
                     "text": "© waymarkedtrails.org, OpenStreetMap 贡献者, 署名-相同方式共享 3.0"
@@ -6202,7 +8099,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "基于政府数据的奥地利底图",
+                "description": "基于政府数据的奥地利底图。",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6212,12 +8109,6 @@
                 "description": "由 basemap.at 提供的正射影像图层，接替 geoimage.at 影像图层。",
                 "name": "basemap.at 正射影像"
             },
-            "hike_n_bike": {
-                "attribution": {
-                    "text": "© OpenStreetMap 贡献者"
-                },
-                "name": "徒步与自行车"
-            },
             "mapbox_locator_overlay": {
                 "attribution": {
                     "text": "条款与反馈"
@@ -6264,7 +8155,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "地图瓦片由 Stamen 设计，并以 署名 3.0 协议授权"
+                    "text": "地图瓦片由 Stamen 设计，并以 署名 3.0 协议授权。数据由 OpenStreetMap 提供并采用开放数据共享开放数据库许可协议 (ODbL) 授权。"
                 },
                 "name": "Stamen 地形"
             },
@@ -6280,6 +8171,523 @@
                 },
                 "name": "Thunderforest 地貌"
             }
+        },
+        "community": {
+            "cape-coast-youthmappers": {
+                "name": "海岸角大学 YouthMappers",
+                "description": "在 Twitter 上关注我们：{url}",
+                "extendedDescription": "此为加纳海岸角大学在 Youth Mappers 上的官方章节。我们热爱地图、开放数据以及帮助弱势群体。"
+            },
+            "osm-gh-facebook": {
+                "name": "OpenStreetMap 加纳 Facebook 主页",
+                "description": "为对 OpenStreetMap 感兴趣的用户准备的 Facebook 小组。",
+                "extendedDescription": "位于加纳的绘图者社区，在加纳宣传 OpenStreetMap 以及人道主义 OpenStreetMap 团队 (HOT) 项目。加入我们。"
+            },
+            "osm-gh-twitter": {
+                "name": "OpenStreetMap 加纳 Twitter 主页",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "talk-gh": {
+                "name": "Talk-gh 邮件列表",
+                "description": "Talk-gh 是为加纳 OSM 社区准备的官方邮件列表"
+            },
+            "osm-mg-facebook": {
+                "name": "OpenStreetMap 马达加斯加 Facebook 小组",
+                "description": "为对 OpenStreetMap 感兴趣的用户准备的马达加斯加 Facebook 小组。"
+            },
+            "talk-mg": {
+                "name": "Talk-mg 邮件列表",
+                "description": "位于马达加斯加的 OpenStreetMap 贡献者、社区和用户分享和讨论的地方。"
+            },
+            "OSM-BGD-facebook": {
+                "name": "OpenStreetMap 孟加拉国",
+                "description": "改进位于孟加拉国的 OpenStreetMap",
+                "extendedDescription": "在孟加拉国绘图？有任何疑问，想要与当地的社区交流？在 {url} 加入我们。欢迎所有人！"
+            },
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap 印度 - 共同参与的街区绘图",
+                "description": "改进位于印度的 OpenStreetMap",
+                "extendedDescription": "在印度绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！",
+                "events": {
+                    "sotmasia2018": {
+                        "name": "State of the Map 亚洲 2018",
+                        "description": "加入位于印度的 State of the Map 亚洲的2018年 OpenStreetMap 地区活动。",
+                        "where": "印度管理学院，印度班加罗尔"
+                    }
+                }
+            },
+            "OSM-india-mailinglist": {
+                "name": "OpenStreetMap 印度邮件列表",
+                "description": "Talk-in 是为印度社区准备的官方邮件列表"
+            },
+            "OSM-india-twitter": {
+                "name": "OpenStreetMap 印度 Twitter",
+                "description": "我们之间仅差一条推文：{url}"
+            },
+            "osm-india-website": {
+                "name": "OpenStreetMap 印度"
+            },
+            "OSM-India-Puducherry-Facebook": {
+                "name": "自由软硬件运动 (FSHM) - Facebook",
+                "description": "在 FSHM Facebook 主页上了解更多社区事件和活动"
+            },
+            "OSM-India-Puducherry-Matrix": {
+                "name": "自由软硬件运动 (FSHM) - Matrix"
+            },
+            "OSM-IDN-facebook": {
+                "name": "OpenStreetMap 印度尼西亚",
+                "description": "改进位于印度尼西亚的 OpenStreetMap",
+                "extendedDescription": "在印度尼西亚绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            },
+            "OSM-japan-facebook": {
+                "name": "OpenStreetMap 日本社区",
+                "description": "在日本的绘图者和 OpenStreetMap 用户"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "OpenStreetMap 日本邮件列表",
+                "description": "Talk-ja 是为日本社区准备的官方邮件列表"
+            },
+            "OSM-japan-twitter": {
+                "name": "OpenStreetMap 日本 Twitter",
+                "description": "Twitter 上的#标签：{url}"
+            },
+            "OSM-japan-website": {
+                "name": "OpenStreetMap 日本",
+                "description": "位于日本的绘图者和 OpenStreetMap 用户"
+            },
+            "OSM-MY-forum": {
+                "name": "OpenStreetMap 马来西亚论坛",
+                "description": "官方 OpenStreetMap 马来西亚论坛"
+            },
+            "OSM-MY-matrix": {
+                "name": "OpenStreetMap 马来西亚 Riot 频道",
+                "description": "欢迎所有的绘图者！在 {signupUrl} 上注册。"
+            },
+            "OSM-MNG-facebook": {
+                "name": "OpenStreetMap 蒙古",
+                "description": "改进位于蒙古的 OpenStreetMap",
+                "extendedDescription": "在蒙古绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            },
+            "OSM-MMR-facebook": {
+                "name": "OpenStreetMap 缅甸",
+                "description": "改进位于缅甸的 OpenStreetMap",
+                "extendedDescription": "在缅甸绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            },
+            "OSM-Nepal-facebook": {
+                "name": "OpenStreetMap 尼泊尔",
+                "description": "改进位于尼泊尔的 OpenStreetMap",
+                "extendedDescription": "在尼泊尔绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            },
+            "OSM-Asia-mailinglist": {
+                "name": "OpenStreetMap 亚洲邮件列表",
+                "description": "Talk-asia 是亚洲社区的官方邮件列表"
+            },
+            "osm-asia-telegram": {
+                "name": "OpenStreetMap 亚洲 Telegram",
+                "description": "加入我们的大家庭：{url}"
+            },
+            "OSM-PH-facebook": {
+                "name": "OpenStreetMap 菲律宾 Facebook"
+            },
+            "OSM-PH-mailinglist": {
+                "name": "Talk-ph 邮件列表",
+                "description": "讨论在菲律宾 OpenStreetMap 的邮件列表"
+            },
+            "OSM-PH-slack": {
+                "name": "OpenStreetMap 菲律宾 Slack",
+                "description": "欢迎所有人加入！在 {signupUrl} 上注册。"
+            },
+            "OSM-PH-telegram": {
+                "name": "OpenStreetMap 菲律宾 Telegram",
+                "description": "为在菲律宾的 OpenStreetMap 贡献者和伙伴们准备的非官方 Telegram 本地社区"
+            },
+            "OSM-RU-forum": {
+                "name": "OpenStreetMap 俄罗斯论坛",
+                "description": "OpenStreetMap 俄罗斯网络论坛"
+            },
+            "OSM-RU-telegram": {
+                "name": "OpenStreetMap 俄罗斯 Telegram",
+                "description": "OpenStreetMap 俄罗斯 Telegram 交流"
+            },
+            "OSM-TW-facebook": {
+                "name": "OpenStreetMap 台湾社区",
+                "description": "绘图者和 OpenStreetMap 用户用以讨论中国台湾省事务的 Facebook 小组。"
+            },
+            "OSM-TW-mailinglist": {
+                "name": "OpenStreetMap 台湾邮件列表",
+                "description": "Talk-tw 是社区讨论关于中国台湾省事务的官方邮件列表"
+            },
+            "at-forum": {
+                "name": "OpenStreetMap 奥地利论坛"
+            },
+            "at-mailinglist": {
+                "name": "Talk-at 邮件列表",
+                "description": "Talk-at 是奥地利 OpenStreetMap 社区的官方邮件列表"
+            },
+            "at-twitter": {
+                "name": "OpenStreetMap 奥地利 Twitter",
+                "description": "OpenStreetMap 奥地利 Twitter 主页：{url}"
+            },
+            "osmgraz-twitter": {
+                "name": "OSM 格拉茨社区 Twitter 主页",
+                "description": "OpenStreetMap 格拉茨社区 Twitter 主页"
+            },
+            "osm-at": {
+                "name": "OpenStreetMap 奥地利",
+                "description": "位于奥地利的 OpenStreetMap 信息平台"
+            },
+            "byosm": {
+                "name": "OpenStreetMap 白俄罗斯",
+                "description": "OpenStreetMap 白俄罗斯 Telegram 交流"
+            },
+            "be-facebook": {
+                "name": "OpenStreetMap 比利时社区"
+            },
+            "be-forum": {
+                "name": "OpenStreetMap 比利时论坛",
+                "description": "OpenStreetMap 比利时网络论坛"
+            },
+            "be-mailinglist": {
+                "name": "Talk-be 邮件列表"
+            },
+            "be-twitter": {
+                "name": "OpenStreetMap 比利时 Twitter"
+            },
+            "talk-cz-mailinglist": {
+                "description": "Talk-cz 是捷克 OpenStreetMap 社区的官方邮件列表"
+            },
+            "fr-facebook": {
+                "name": "OpenStreetMap 法国 Facebook 主页",
+                "description": "OpenStreetMap 法国 Facebook 主页"
+            },
+            "fr-forum": {
+                "name": "OpenStreetMap 法国网络论坛",
+                "description": "OpenStreetMap 法国网络论坛"
+            },
+            "fr-irc": {
+                "name": "OpenStreetMap 法国 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-fr"
+            },
+            "fr-mailinglist": {
+                "name": "Talk-fr 邮件列表",
+                "description": "Talk-fr 邮件列表"
+            },
+            "fr-twitter": {
+                "name": "OpenStreetMap 法国 Twitter 主页",
+                "description": "OpenStreetMap 法国 Twitter 主页：{url}"
+            },
+            "de-berlin-mailinglist": {
+                "name": "柏林邮件列表",
+                "description": "此为柏林 OSM 社区的邮件列表"
+            },
+            "de-berlin-meetup": {
+                "name": "OpenStreetMap 柏林-勃兰登堡见面会",
+                "description": "位于柏林区域的绘图者和 OpenStreetMap 用户"
+            },
+            "de-berlin-telegram": {
+                "name": "@osmberlin Telegram 主页",
+                "description": "OpenStreetMap 柏林 Telegram 交流"
+            },
+            "de-berlin-twitter": {
+                "name": "OpenStreetMap 柏林 Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "de-forum": {
+                "name": "OpenStreetMap 德国论坛",
+                "description": "OpenStreetMap 德国网络论坛"
+            },
+            "de-irc": {
+                "name": "OpenStreetMap 德国 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-de"
+            },
+            "de-mailinglist": {
+                "name": "Talk-de 邮件列表",
+                "description": "Talk-de 是德国 OpenStreetMap 社区的官方邮件列表"
+            },
+            "osm-de": {
+                "name": "OpenStreetMap 德国",
+                "description": "位于德国的 OpenStreetMap 信息平台"
+            },
+            "it-facebook": {
+                "name": "OpenStreetMap 意大利 Facebook",
+                "description": "在 Facebook 上加入 OpenStreetMap 意大利社区"
+            },
+            "it-irc": {
+                "name": "OpenStreetMap 意大利 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-it"
+            },
+            "it-mailinglist": {
+                "name": "Talk-it 邮件列表",
+                "description": "Talk-it 是意大利 OpenStreetMap 社区的官方邮件列表"
+            },
+            "it-twitter": {
+                "name": "OpenStreetMap 意大利 Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "OSM-Rome-meetup": {
+                "description": "在罗马地区改进 OpenStreetMap"
+            },
+            "South-Tyrol-Mailing-List": {
+                "name": "南蒂罗尔 OpenStreetMap 邮件列表"
+            },
+            "talk-it-lazio": {
+                "name": "OpenStreetMap 意大利拉齐奥",
+                "description": "欢迎所有人加入！在 {signupUrl} 上注册。",
+                "extendedDescription": "罗马和拉齐奥大区的邮件列表"
+            },
+            "Trentino-Mailing-List": {
+                "name": "特伦蒂诺 OpenStreetMap 邮件列表"
+            },
+            "no-forum": {
+                "name": "OpenStreetMap 挪威网络论坛",
+                "description": "OpenStreetMap 挪威网络论坛"
+            },
+            "no-irc": {
+                "name": "OpenStreetMap 挪威 IRC"
+            },
+            "no-mailinglist": {
+                "name": "OpenStreetMap 挪威邮件列表",
+                "description": "为位于挪威的绘图者和 OpenStreetMap 用户、开发者与爱好者准备的邮件列表"
+            },
+            "OSM-PL-facebook-group": {
+                "name": "OpenStreetMap 波兰 Facebook 小组"
+            },
+            "OSM-ES-mailinglist": {
+                "name": "Talk-es 邮件列表",
+                "description": "讨论在西班牙 OpenStreetMap 的邮件列表"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes Telegram 主页",
+                "description": "OpenStreetMap 西班牙 Telegram 交流"
+            },
+            "osm-se": {
+                "name": "OpenStreetMap.se"
+            },
+            "se-facebook": {
+                "name": "OpenStreetMap 瑞典 Facebook",
+                "description": "OpenStreetMap 瑞典 Facebook 主页"
+            },
+            "se-forum": {
+                "name": "OpenStreetMap 瑞典网络论坛",
+                "description": "OpenStreetMap 瑞典网络论坛"
+            },
+            "se-irc": {
+                "name": "OpenStreetMap 瑞典 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm.se"
+            },
+            "se-mailinglist": {
+                "name": "Talk-se 邮件列表",
+                "description": "讨论在瑞典 OpenStreetMap 的邮件列表"
+            },
+            "se-twitter": {
+                "name": "OpenStreetMap 瑞典 Twitter 页面",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "Nottingham-OSM-pub-meetup": {
+                "name": "东米德兰（诺丁汉）月度酒吧见面会",
+                "description": "东米德兰绘图者和用户的社交聚会",
+                "extendedDescription": "该小组自2011年3月开始举行会议，地点最初在诺丁汉，近几年在德比，或不时在东米德兰的其他地方举行。这些虽是社交聚会，但却是来询问涉及地区或只是普通的 OSM 特定问题的好地方。在夏季，我们通常会在会场附近进行一小时的小型测绘。整个团队都对关于公共优先权的测绘有着特殊的兴趣，并且不时为此而召开绘图会议。"
+            },
+            "gb-mailinglist": {
+                "name": "Talk-gb 邮件列表",
+                "description": "Talk-gb 是英国(包括北爱尔兰) OSM 社区的主要交流论坛"
+            },
+            "gb-irc": {
+                "name": "OpenStreetMap 英国 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-gb"
+            },
+            "OSM-CA-Slack": {
+                "name": "OSM-CA Slack",
+                "description": "欢迎所有人加入！在 {signupUrl} 上注册。"
+            },
+            "OSM-Vancouver-meetup": {
+                "name": "OpenStreetMap 温哥华",
+                "description": "位于不列颠哥伦比亚省温哥华的绘图者和 OpenStreetMap 用户"
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap 美国 Slack",
+                "description": "欢迎所有人加入！在 {signupUrl} 上注册。"
+            },
+            "OSM-US": {
+                "name": "OpenStreetMap 美国",
+                "description": "我们助长并改善位于美国的 OpenStreetMap。",
+                "extendedDescription": "我们通过召开年度会议、提供社区资源、建立合伙关系以及推广来支持 OpenStreetMap。在此处加入 OpenStreetMap 美国：{signupUrl}"
+            },
+            "OSM-Utah": {
+                "name": "OpenStreetMap 犹他州",
+                "description": "位于盐湖城区域的绘图者和 OpenStreetMap 用户"
+            },
+            "OSM-Wyoming": {
+                "name": "OpenStreetMap 怀俄明州",
+                "description": "位于怀俄明州的绘图者和 OpenStreetMap 用户"
+            },
+            "PHXGeo-twitter": {
+                "name": "PHXGeo Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "Western-Slope-facebook": {
+                "name": "西坡 OSM Facebook"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Maptime 澳大利亚 Slack",
+                "description": "在 {signupUrl} 上注册"
+            },
+            "talk-au": {
+                "name": "Talk-au 邮件列表",
+                "description": "澳大利亚绘图者交流的地方"
+            },
+            "OSM-AR-facebook": {
+                "name": "OpenStreetMap 阿根廷 Facebook",
+                "description": "在 Facebook 上加入 OpenStreetMap 阿根廷社区",
+                "extendedDescription": "当地社区的新闻"
+            },
+            "OSM-AR-forum": {
+                "name": "OpenStreetMap 阿根廷网络论坛",
+                "description": "加入 OpenStreetMap 阿根廷网络论坛",
+                "extendedDescription": "长篇或重要讨论的理想地。回应时间较慢。"
+            },
+            "OSM-AR-irc": {
+                "name": "OpenStreetMap 阿根廷 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-ar",
+                "extendedDescription": "您可以在社区中找到最为极客的用户。"
+            },
+            "OSM-AR-mailinglist": {
+                "name": "Talk-ar 邮件列表",
+                "description": "历史邮件列表。如今几乎不再使用。"
+            },
+            "OSM-AR-telegram": {
+                "name": "OpenStreetMap 阿根廷 Telegram",
+                "description": "在 Telegram 上加入 OpenStreetMap 阿根廷社区",
+                "extendedDescription": "全社区最活跃的频道，专为聊天和问题速答而准备。欢迎每个人加入！"
+            },
+            "OSM-AR-twitter": {
+                "name": "OpenStreetMap 阿根廷 Twitter",
+                "description": "在 Twitter 上关注我们：{url}",
+                "extendedDescription": "当地社区和 OpenStreetMap 大体的新闻"
+            },
+            "OSM-BO-mailinglist": {
+                "name": "Talk-bo 邮件列表",
+                "description": "Talk-bo 是玻利维亚 OpenStreetMap 社区的官方邮件列表",
+                "extendedDescription": "在玻利维亚绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            },
+            "Bahia-telegram": {
+                "name": "OpenStreetMap 巴伊亚 Telegram 小组",
+                "description": "在 Telegram 上加入 OpenStreetMap 巴伊亚社区",
+                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
+            },
+            "OSM-br-mailinglist": {
+                "name": "Talk-br 邮件列表",
+                "description": "讨论在巴西 OpenStreetMap 的邮件列表"
+            },
+            "OSM-br-telegram": {
+                "name": "OpenStreetMap 巴西 Telegram",
+                "description": "在 Telegram 上加入 OpenStreetMap 巴西社区",
+                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
+            },
+            "OSM-br-twitter": {
+                "name": "OpenStreetMap 巴西 Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "OSM-CL-facebook": {
+                "name": "OpenStreetMap 智利 Facebook",
+                "description": "在 Facebook 上加入 OpenStreetMap 智利社区",
+                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
+            },
+            "OSM-CL-mailinglist": {
+                "name": "Talk-cl 邮件列表",
+                "description": "讨论在智利 OpenStreetMap 的邮件列表"
+            },
+            "OSM-CL-telegram": {
+                "name": "OpenStreetMap 智利 Telegram",
+                "description": "在 Telegram 上加入 OpenStreetMap 智利社区",
+                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
+            },
+            "OSM-CL-twitter": {
+                "name": "OpenStreetMap 智利 Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "OSM-CO-facebook": {
+                "name": "OpenStreetMap 哥伦比亚 Facebook",
+                "description": "在 Facebook 上加入 OpenStreetMap 哥伦比亚社区",
+                "extendedDescription": "加入社区来了解更多 OpenStreetMap。欢迎每个人的到来！"
+            },
+            "OSM-CO-mailinglist": {
+                "name": "Talk-co 邮件列表",
+                "description": "讨论在哥伦比亚 OpenStreetMap 的邮件列表"
+            },
+            "OSM-CO-twitter": {
+                "name": "OpenStreetMap 哥伦比亚 Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "OSM-CO": {
+                "name": "OpenStreetMap 哥伦比亚",
+                "description": "关于 OpenStreetMap 哥伦比亚社区和 OSMCo 基金会的新闻"
+            },
+            "OSM-PE-facebook": {
+                "name": "OpenStreetMap 秘鲁 Facebook",
+                "description": "在 Facebook 上加入 OpenStreetMap 秘鲁社区"
+            },
+            "OSM-PE-mailinglist": {
+                "name": "Talk-pe 邮件列表",
+                "description": "OpenStreetMap 秘鲁社区官方邮件列表"
+            },
+            "OSM-PE-matrix": {
+                "name": "OpenStreetMap 秘鲁 Matrix 交流",
+                "description": "在 Matrix 上与 OpenStreetMap 秘鲁社区的其他成员交流。"
+            },
+            "OSM-PE-telegram": {
+                "name": "OpenStreetMap 秘鲁 Telegram",
+                "description": "在 Telegram 上加入 OpenStreetMap 秘鲁社区"
+            },
+            "OSM-PE-twitter": {
+                "name": "OpenStreetMap 秘鲁 Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "OSM-PE": {
+                "name": "OpenStreetMap 秘鲁",
+                "description": "关于 OpenStreetMap 秘鲁社区的新闻和资源"
+            },
+            "OSM-Discord": {
+                "name": "OpenStreetMap Discord",
+                "description": "通过 Discord 与其他绘图者联系"
+            },
+            "OSM-Facebook": {
+                "name": "OpenStreetMap Facebook 主页",
+                "description": "在 Facebook 上喜欢我们并接收关于 OpenStreetMap 新闻和更新。"
+            },
+            "OSM-help": {
+                "name": "OpenStreetMap 帮助",
+                "description": "在 OSM 社区驱动的问答网站上提问并得到解答。",
+                "extendedDescription": "{url} 为所有人提供关于 OpenStreetMap 的帮助。无论您是新手绘图者或者有任何技术问题，都来找我们帮助吧！"
+            },
+            "OSM-IRC": {
+                "name": "OpenStreetMap IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap Reddit 社区",
+                "description": "/r/openstreetmap/ 是了解更多关于 OpenStreetMap 的好地方。来尽管问我们吧！"
+            },
+            "OSM-Telegram": {
+                "name": "OpenStreetMap Telegram 群组",
+                "description": "加入 OpenStreetMap Telegram 全球大群：{url}"
+            },
+            "OSM-Twitter": {
+                "name": "OpenStreetMap Twitter 主页",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "OSMF": {
+                "name": "OpenStreetMap 基金会 (OSMF)",
+                "description": "OSMF 是总部位于英国的非营利组织，用于支持 OpenStreetMap 项目。",
+                "extendedDescription": "OSMF 通过筹款、维护为网站提供动力的服务器、组织年度 State of the Map 会议以及协调维护网站的志愿者来支持 OpenStreetMap。您可以通过点击该链接成为 OSMF 的一员以展示您的支持并为 OpenStreetMap 的未来发声：{signupUrl}",
+                "events": {
+                    "sotm2018": {
+                        "name": "State of the Map 2018",
+                        "description": "加入我们为期3天在意大利米兰举办的年度全球 OpenStreetMap 会议，与社区中的每个人相聚并进行交流、分享和学习。",
+                        "where": "意大利米兰"
+                    }
+                }
+            }
         }
     }
 }
\ No newline at end of file