X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/be0e33862fedbf02e52a9e126cac31dfb5775b43..e37008c7bf8614d806e7d15eafbe7dba91d0cbc7:/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 90ba2284a..d13bd9058 100644
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -7,28 +7,63 @@
             "undo": "复原",
             "zoom_to": "缩放至",
             "copy": "复制",
-            "open_wikidata": "在 wikidata.org 上打开"
+            "view_on": "在 {domain} 上查看",
+            "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": "在地图上单击，开始绘制一个区域，如公园、湖泊或建筑物。"
+                "description": "添加区域（公园、建筑物和湖泊等）到地图上。",
+                "tail": "在地图上单击，开始绘制一个区域，如公园、湖泊或建筑物。",
+                "filter_tooltip": "区域"
             },
             "add_line": {
                 "title": "线",
-                "description": "添加公路、街道、人行道、河渠或其他线到地图上。",
-                "tail": "在地图上单击，开始绘制一条道路，小道或路线。"
+                "description": "添加线（公路、人行道和河道等）到地图上。",
+                "tail": "在地图上单击，开始绘制一条道路，小道或路线。",
+                "filter_tooltip": "线"
             },
             "add_point": {
                 "title": "点",
-                "description": "添加餐馆、纪念碑、邮筒或其他点到地图上。",
-                "tail": "在地图上单击，添加一个点。"
+                "description": "添加点（餐馆、纪念碑和信箱等）到地图上。",
+                "tail": "在地图上单击，添加一个点。",
+                "filter_tooltip": "点"
             },
             "add_note": {
                 "title": "笔记",
+                "label": "添加笔记",
                 "description": "发现有问题的地方？告知其他绘图者。",
-                "tail": "在地图上点击，添加一条笔记。"
+                "tail": "在地图上点击，添加一条笔记。",
+                "key": "N"
+            },
+            "add_preset": {
+                "title": "添加 {feature}",
+                "point": {
+                    "title": "添加 {feature} 为点"
+                },
+                "line": {
+                    "title": "添加 {feature} 为线"
+                },
+                "area": {
+                    "title": "添加 {feature} 为区域"
+                },
+                "building": {
+                    "title": "添加 {feature} 为建筑物"
+                }
             },
             "browse": {
                 "title": "浏览",
@@ -41,7 +76,7 @@
                 "tail": "点击以为这线段添加更多节点。点击其他线段以连接它们，点击两下以完成绘制线段。"
             },
             "drag_node": {
-                "connected_to_hidden": "无法编辑，因为其与一隐藏要素相连。"
+                "connected_to_hidden": "该要素与某一隐藏要素相连，无法编辑。"
             }
         },
         "operations": {
@@ -90,32 +125,77 @@
                     "line": "使线环状化。",
                     "area": "将区域变成圆形。"
                 },
-                "not_closed": "它不是首尾相接的线，无法将其环状化。",
-                "too_large": "由于可见部分不足，无法将其环状化。",
-                "connected_to_hidden": "无法将其环状化，由于其与一隐藏要素相连。"
+                "not_closed": "该要素不是一个闭合环，无法将其环状化。",
+                "too_large": "该要素的可见部分不足，无法将其环状化。",
+                "connected_to_hidden": "该要素与某一隐藏要素相连，无法将其环状化。",
+                "not_downloaded": "该要素的一部分未被下载，无法将其环状化。",
+                "already_circular": "该要素已近似圆形，无法将其环状化。"
             },
             "orthogonalize": {
                 "title": "直角化",
                 "description": {
-                    "line": "将这条线上的弯角转化成直角。",
-                    "area": "将这个区域上的弯角转化成直角。"
+                    "corner": {
+                        "single": "直角化该角落。",
+                        "multiple": "直角化这些角落。"
+                    },
+                    "feature": {
+                        "single": "直角化该要素的角落。",
+                        "multiple": "直角化这些要素的角落。"
+                    }
                 },
-                "key": "S",
+                "key": "Q",
                 "annotation": {
-                    "line": "已将线段上的弯角换成直角。",
-                    "area": "已将区域的弯角换成直角。"
+                    "corner": {
+                        "single": "直角化一个角落。",
+                        "multiple": "直角化多个角落。"
+                    },
+                    "feature": {
+                        "single": "直角化一个要素的角落。",
+                        "multiple": "直角化多个要素的角落。"
+                    }
                 },
-                "not_squarish": "因为它不是近似方形的，这不能被直角化。",
-                "too_large": "因为可见部分不足，不能变成方形。",
-                "connected_to_hidden": "该对象无法直角化，因为其与一隐藏要素相连。"
+                "multiple_blockers": {
+                    "multiple": "由于多个原因，无法将其所在角化为直角。"
+                },
+                "end_vertex": {
+                    "single": "该点为端点，无法将其所在角化为直角。",
+                    "multiple": "这些点为端点，无法将其所在角化为直角。"
+                },
+                "square_enough": {
+                    "single": "无法使其更为直角化。",
+                    "multiple": "无法使其更为直角化。"
+                },
+                "not_squarish": {
+                    "single": "该要素不是近似方形的，无法将其直角化。",
+                    "multiple": "这些要素不是近似方形的，无法将其直角化。"
+                },
+                "too_large": {
+                    "single": "该要素的可见部分不足，无法将其直角化。",
+                    "multiple": "这些要素的可见部分不足，无法将其直角化。"
+                },
+                "connected_to_hidden": {
+                    "single": "该要素与一隐藏要素相连，无法将其直角化。",
+                    "multiple": "这些要素与某些隐藏要素相连，无法将其直角化。"
+                },
+                "not_downloaded": {
+                    "single": "该要素有一部分未被下载，无法将其直角化。",
+                    "multiple": "这些要素有一部分未被下载，无法将其直角化。"
+                }
             },
             "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": "删除",
@@ -132,20 +212,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": {
@@ -154,6 +265,9 @@
             "delete_member": {
                 "annotation": "从关系中删除了一个成员。"
             },
+            "reorder_members": {
+                "annotation": "重新排序关系的成员。"
+            },
             "connect": {
                 "annotation": {
                     "from_vertex": {
@@ -177,11 +291,21 @@
             "disconnect": {
                 "title": "分离",
                 "description": "将这些线/区域相互分离。",
+                "line": {
+                    "description": "将该路径从其他要素中断开连接。"
+                },
+                "area": {
+                    "description": "将该区域从其他要素中断开连接。"
+                },
                 "key": "D",
                 "annotation": "将线或区域分离。",
+                "too_large": {
+                    "single": "该要素的可见部分不足，无法将其分离。"
+                },
                 "not_connected": "没有足够的线/区域来分离。",
-                "connected_to_hidden": "无法分离，因为其与一隐藏要素相连。",
-                "relation": "无法分离，因为它与一个关系的成员间相连。"
+                "not_downloaded": "该要素的一部分未被下载，无法将其分离。",
+                "connected_to_hidden": "该要素与某一隐藏要素相连，无法将其分离。",
+                "relation": "该要素与某个关系的成员相连，无法将其分离。"
             },
             "merge": {
                 "title": "合并",
@@ -192,8 +316,8 @@
                 "not_adjacent": "这些要素的结束节点并未相连，无法将其合并。",
                 "restriction": "这些要素不能被合并，因为这样会破坏 “{relation}” 关系。",
                 "relation": "这些要素不能被合并，因为其有冲突的关系成员。",
-                "incomplete_relation": "此要素暂未下载完成，无法合并。",
-                "conflicting_tags": "这些要素不能被合并，因为它们的某些标签具有冲突的值。",
+                "incomplete_relation": "这些要素未全部下载，无法将它们合并。",
+                "conflicting_tags": "这些要素的标签含有一些冲突的值，无法将它们合并。",
                 "paths_intersect": "这些要素无法被合并，因为生成的路径将会自相交。"
             },
             "move": {
@@ -211,16 +335,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": {
@@ -253,16 +381,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": {
@@ -278,23 +410,39 @@
                     "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": {
                 "title": "反转",
-                "description": "使这条线的方向反转。",
+                "description": {
+                    "point": "翻转该点的方向。",
+                    "points": "翻转这些点的方向。",
+                    "line": "使这条线的方向反转。",
+                    "lines": "使这些线的方向反转。",
+                    "features": "翻转这些要素的方向。"
+                },
                 "key": "V",
-                "annotation": "反转了一条线。"
+                "annotation": {
+                    "point": "反转了一个点。",
+                    "points": "反转了多个点。",
+                    "line": "反转了一条线。",
+                    "lines": "反转了多条线。",
+                    "features": "反转了多个要素。"
+                }
             },
             "split": {
                 "title": "分割",
@@ -311,7 +459,7 @@
                 },
                 "not_eligible": "不能在线段的首尾进行分割。",
                 "multiple_ways": "太多线段，未能进行分割。",
-                "connected_to_hidden": "无法打断，因为其与一隐藏要素相连。"
+                "connected_to_hidden": "该要素与某一隐藏要素相连，无法分割。"
             },
             "restriction": {
                 "annotation": {
@@ -319,13 +467,35 @@
                     "delete": "删除转向限制"
                 }
             },
-            "detach_node": {
-                "title": "隔离",
+            "extract": {
+                "title": "提取",
                 "key": "E",
-                "description": "将该节点从路径/区域中隔离。",
-                "annotation": "从父路径/区域中隔离了一个节点。",
-                "restriction": "该节点无法被隔离，因为这样会破坏“{relation}”关系。",
-                "connected_to_hidden": "该节点无法被隔离，因为其与一隐藏要素相连。"
+                "description": {
+                    "vertex": {
+                        "single": "将该节点从其父路径/区域中提取出。"
+                    },
+                    "area": {
+                        "single": "从该区域中提取节点。"
+                    }
+                },
+                "annotation": {
+                    "single": "提取节点。"
+                },
+                "too_large": {
+                    "area": {
+                        "single": "该区域的可见部分不足，无法从中提取节点。"
+                    }
+                },
+                "restriction": {
+                    "vertex": {
+                        "single": "该点无法被提取，因为这样会破坏 \"{relation}\" 关系。"
+                    }
+                },
+                "connected_to_hidden": {
+                    "vertex": {
+                        "single": "该点与某一隐藏要素相连，无法被提取。"
+                    }
+                }
             }
         },
         "restriction": {
@@ -378,7 +548,8 @@
             "translate": "翻译",
             "localized_translation_label": "多语言名称",
             "localized_translation_language": "选择语言",
-            "localized_translation_name": "名称"
+            "localized_translation_name": "名称",
+            "language_and_code": "{language} ({code})"
         },
         "zoom_in_edit": "放大地图以编辑",
         "login": "登录",
@@ -394,11 +565,14 @@
             "hidden_warning": "{count}个隐藏要素",
             "hidden_details": "以下要素目前被隐藏：{details}"
         },
-        "status": {
-            "error": "无法连接到 API。",
-            "offline": "API 已下线，请稍后再尝试编辑。",
-            "readonly": "API 目前处于只读状态，您需要等候一段时间才能保存您的更改。",
-            "rateLimit": "该接口是限制匿名连接的。您可以通过登录来解决这个问题。"
+        "osm_api_status": {
+            "message": {
+                "error": "无法连接到 OpenStreetMap API。你的编辑在本地是安全的。请检查你的网络连接。",
+                "offline": "OpenStreetMap API 当前离线。你的编辑在本地是安全的。请稍后再来。",
+                "readonly": "OpenStreetMap API 当前为只读状态。你可以继续编辑，但需要等待一段时间才能保存。",
+                "rateLimit": "OpenStreetMap API 限制了匿名连接。你可以通过登录来解决此问题。"
+            },
+            "retry": "重试"
         },
         "commit": {
             "title": "上传至 OpenStreetMap",
@@ -492,7 +666,6 @@
         },
         "geocoder": {
             "search": "在全球搜索...",
-            "no_results_visible": "在可见地图区域没有结果",
             "no_results_worldwide": "没有找到结果"
         },
         "geolocate": {
@@ -515,6 +688,7 @@
             "all_tags": "所有标签",
             "all_members": "所有成员",
             "all_relations": "所有关系",
+            "add_to_relation": "添加至一个关系",
             "new_relation": "新关系...",
             "choose_relation": "选择一个父关系",
             "role": "角色",
@@ -569,8 +743,9 @@
             "switch": "切换回该底图",
             "custom": "自定义",
             "overlays": "叠加图层",
-            "imagery_source_faq": "影像信息 / 报告问题",
+            "imagery_problem_faq": "报告影像问题",
             "reset": "重置",
+            "reset_all": "重置全部",
             "display_options": "显示设定",
             "brightness": "亮度",
             "contrast": "对比度",
@@ -581,8 +756,12 @@
                 "tooltip": "显示一个大范围的地图来帮助定位当前显示的区域",
                 "key": "/"
             },
+            "panel": {
+                "description": "显示细节面板",
+                "tooltip": "显示高级背景信息"
+            },
             "fix_misalignment": "调整影像偏移",
-            "offset": "在下面的灰色区域拖动来调整影像偏移，或输入以米为单位的偏移量。"
+            "offset": "拖动下方的灰色区域来调整影像偏移，或以米为单位输入偏移值。"
         },
         "map_data": {
             "title": "地图数据",
@@ -612,10 +791,35 @@
                     "zoom": "缩放到数据"
                 }
             },
-            "fill_area": "填充区域",
+            "style_options": "样式设定",
+            "highlight_edits": {
+                "key": "G"
+            },
             "map_features": "地图要素",
             "autohidden": "这些要素已被自动隐藏，因为屏幕中的要素过多。请放大再编辑。",
-            "osmhidden": "由于禁用的 OpenStreetMap 数据图层，这些要素已被自动隐藏。"
+            "osmhidden": "由于 OpenStreetMap 数据图层已被禁用，这些要素已被自动隐藏。"
+        },
+        "visual_diff": {
+            "highlight_edits": {
+                "description": "高亮更改",
+                "tooltip": "高亮已编辑的要素"
+            }
+        },
+        "photo_overlays": {
+            "title": "照片叠加层",
+            "traffic_signs": {
+                "title": "交通标志"
+            },
+            "photo_type": {
+                "flat": {
+                    "title": "平面照片",
+                    "tooltip": "传统照片"
+                },
+                "panoramic": {
+                    "title": "全景照片",
+                    "tooltip": "360° 照片"
+                }
+            }
         },
         "feature": {
             "points": {
@@ -638,6 +842,14 @@
                 "description": "建筑物",
                 "tooltip": "建筑物，遮蔽处，车库等。"
             },
+            "building_parts": {
+                "description": "建筑部分",
+                "tooltip": "3D 建筑和屋顶部件"
+            },
+            "indoor": {
+                "description": "室内要素",
+                "tooltip": "房间、走廊、楼梯等"
+            },
             "landuse": {
                 "description": "土地利用要素",
                 "tooltip": "森林，农田，公园，居民地，商用地等。"
@@ -654,6 +866,14 @@
                 "description": "铁路要素",
                 "tooltip": "铁路"
             },
+            "pistes": {
+                "description": "滑雪道",
+                "tooltip": "滑雪坡、雪橇道、滑冰道等"
+            },
+            "aerialways": {
+                "description": "架空要素",
+                "tooltip": "升降椅、缆车、滑索道等"
+            },
             "power": {
                 "description": "电力要素",
                 "tooltip": "输电线，发电厂，变电所等。"
@@ -705,15 +925,28 @@
                 }
             }
         },
+        "preferences": {
+            "title": "偏好设置",
+            "description": "偏好设置",
+            "key": "P",
+            "privacy": {
+                "title": "隐私",
+                "privacy_link": "查看 iD 的隐私政策",
+                "third_party_icons": {
+                    "description": "显示第三方图标",
+                    "tooltip": "取消勾选此框以避免从第三方站点（如维基共享资源、Facebook 或 Twitter 等）加载图标。"
+                }
+            }
+        },
         "restore": {
             "heading": "您有未保存的更改",
-            "description": "您在上一次编辑时有未保存的修改，您想恢复这些修改吗？",
-            "restore": "恢复我的修改",
-            "reset": "丢弃我的修改"
+            "description": "您在上一次编辑时有未保存的更改，您想恢复这些更改吗？",
+            "restore": "恢复更改",
+            "reset": "放弃更改"
         },
         "save": {
             "title": "保存",
-            "help": "复审更改，然后上传至 OpenStreetMap 供其他用户查看。",
+            "help": "检查更改，并上传至 OpenStreetMap 对所有人公开。",
             "no_changes": "没有待保存变更。",
             "error": "尝试保存时发生错误。",
             "status_code": "服务器返回的状态代码{code}",
@@ -748,7 +981,11 @@
             "just_edited": "您刚刚编辑了 OpenStreetMap！",
             "thank_you": "感谢您改进地图。",
             "thank_you_location": "感谢您改进 {where} 周边的地图。",
-            "help_html": "您的更改将会在几分钟内于 OpenStreetMap 上显示。其他地图可能需要更长的时间接收更新。 ",
+            "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",
             "view_on_osm": "在 OSM 上查看更改",
@@ -757,7 +994,7 @@
             "more": "更多",
             "events": "事件",
             "languages": "语言：{languages}",
-            "missing": "该列表有遗漏的信息？",
+            "missing": "列表里有遗漏的信息？",
             "tell_us": "告诉我们！"
         },
         "confirm": {
@@ -767,8 +1004,11 @@
         "splash": {
             "welcome": "欢迎使用 OpenStreetMap iD 编辑器",
             "text": "iD 编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是 {version} 版本。欲知详情，请浏览 {website} 及在 {github} 报告程序错误。",
-            "walkthrough": "开始演练",
-            "start": "现在就编辑"
+            "privacy_update": "我们最近更新了隐私政策。",
+            "privacy_policy": "iD 的隐私政策",
+            "privacy": "{updateMessage} 使用此软件，即表示您同意此  {privacyLink} 协议。",
+            "walkthrough": "开始教程",
+            "start": "立即编辑"
         },
         "source_switch": {
             "live": "实况模式",
@@ -905,11 +1145,11 @@
                         "description": "你无法脱离 {var1} 因为所有汇向它的路径都是单行线。"
                     },
                     "50": {
-                        "title": "接近于交叉点",
-                        "description": "{var1} 与路径 {var2} 极为接近却并未相交。"
+                        "title": "几乎为交叉点",
+                        "description": "{var1} 与路径 {var2} 极为接近却并未相连。"
                     },
                     "60": {
-                        "title": "不赞成的标签",
+                        "title": "弃用的标签",
                         "description": "{var1} 使用了不赞成的标签 \"{var2}\"。请改用 \"{var3}\"。"
                     },
                     "70": {
@@ -1142,27 +1382,72 @@
         },
         "streetside": {
             "tooltip": "来自微软公司的街景照片",
-            "title": "照片叠加层 (必应 Streetside)",
+            "title": "必应 Streetside",
             "report": "报告该图像的隐私问题",
             "view_on_bing": "在必应地图上查看",
             "hires": "高分辨率"
         },
         "mapillary_images": {
-            "tooltip": "来自Mapillary的街景照片",
-            "title": "照片叠加层 (Mapillary)"
+            "tooltip": "来自Mapillary的街景照片"
         },
-        "mapillary_signs": {
-            "tooltip": "来自Mapillary的交通标志 (需开启照片叠加层)",
-            "title": "交通标志叠加层 (Mapillary)"
+        "mapillary_map_features": {
+            "title": "地图要素",
+            "tooltip": "来自 Mapillary 的地图要素",
+            "request_data": "数据请求",
+            "construction": {
+                "flat": {
+                    "crosswalk_plain": "普通人行横道"
+                }
+            },
+            "marking": {
+                "discrete": {
+                    "crosswalk_zebra": "斑马线"
+                }
+            },
+            "object": {
+                "banner": "横幅",
+                "bench": "长凳",
+                "bike_rack": "自行车架",
+                "billboard": "广告牌",
+                "catch_basin": "雨水渠",
+                "cctv_camera": "闭路电视摄像机",
+                "fire_hydrant": "消防栓",
+                "mailbox": "ä¿¡ç®±",
+                "manhole": "人孔",
+                "phone_booth": "电话亭",
+                "sign": {
+                    "advertisement": "广告牌",
+                    "information": "信息栏",
+                    "store": "商店招牌"
+                },
+                "street_light": "路灯",
+                "support": {
+                    "utility_pole": "电线杆"
+                },
+                "traffic_cone": "交通锥",
+                "traffic_light": {
+                    "cyclists": "自行车交通信号灯",
+                    "general_horizontal": "水平交通信号灯",
+                    "general_single": "单头交通信号灯",
+                    "general_upright": "垂直交通信号灯",
+                    "other": "交通信号灯",
+                    "pedestrians": "行人交通信号灯"
+                },
+                "trash_can": "垃圾桶"
+            }
         },
         "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": {
@@ -1201,7 +1486,7 @@
                 "open_data_h": "开放数据",
                 "open_data": "您在这个地图上做出的编辑会对所有使用 OpenStreetMap 的用户可见。您的编辑可以基于个人知识、实地调查、航空拍摄图片或者街景照片。从商业来源，例如谷歌地图这样的来源复制信息是被 [严格禁止](https://www.openstreetmap.org/copyright) 的。",
                 "before_start_h": "在您开始之前",
-                "before_start": "您在开始编辑之前应当先了解熟悉 OpenStreetMap 和本编辑器。iD 包含了一个导览教程，可以帮助您了解编辑 OpenStreetMap 的基本知识。请点击屏幕上的“开始演练”按钮以开始教程——这只会占用您大概 15 分钟。",
+                "before_start": "您在开始编辑之前应当先了解熟悉 OpenStreetMap 和本编辑器。iD 包含了一个导览教程，可以帮助您了解编辑 OpenStreetMap 的基本知识。点击屏幕上的“开始教程”按钮即可进入，并且只需占用您大概 15 分钟。",
                 "open_source_h": "开放源代码",
                 "open_source": "iD 编辑器是一个合作开放源代码项目，您正在使用的版本是 {version}。其源代码 [在 GitHub](https://github.com/openstreetmap/iD) 上可找到。",
                 "open_source_help": "您可以帮助 iD [翻译文本](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) 或者 [报告问题](https://github.com/openstreetmap/iD/issues)。"
@@ -1424,116 +1709,298 @@
             "warnings": {
                 "list_title": "警告 ({count})"
             },
+            "rules": {
+                "title": "规则"
+            },
+            "user_resolved_issues": "您的更改所解决的问题",
+            "warnings_and_errors": "警告和错误",
             "no_issues": {
-                "message": "看起来一切正常",
-                "info": "在您编辑时遇到的任何问题都将显示在此处"
+                "message": {
+                    "everything": "暂无问题",
+                    "everything_in_view": "视野内暂无问题",
+                    "edits": "您的编辑暂无问题",
+                    "edits_in_view": "您的编辑在视野内暂无问题",
+                    "no_edits": "您暂未作出任何编辑"
+                },
+                "hidden_issues": {
+                    "none": "检测到的问题将会在此处显示",
+                    "elsewhere": "别处的问题：{count}",
+                    "everything_else": "其他所有问题：{count}",
+                    "everything_else_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": {
-                "message": "{feature} 与 {feature2} 极为接近却并未相交",
+                "title": "几乎为交叉点",
+                "message": "{feature} 与 {feature2} 极为接近却并未相连",
+                "tip": "查找可与邻近要素相连接的要素",
+                "self": {
+                    "message": "{feature} 的末端与其本身极为接近但并未相连"
+                },
                 "highway-highway": {
-                    "tip": "相交的道路应共享一个交叉节点。"
+                    "reference": "相交的道路应共享一个交叉节点。"
+                }
+            },
+            "close_nodes": {
+                "title": "相近的节点",
+                "tip": "查找多余和拥挤的节点",
+                "message": "{way} 中的两个节点非常接近",
+                "reference": "路径中多余的点应被合并或分开。",
+                "detached": {
+                    "message": "{feature} 与 {feature2} 过于接近",
+                    "reference": "分开的节点不应共享同一位置。"
                 }
             },
             "crossing_ways": {
+                "title": "相交的路径",
                 "message": "{feature} 与 {feature2} 相交",
+                "tip": "查找未正确相交的要素",
                 "building-building": {
-                    "tip": "除不同图层情况下，建筑物不应相交。"
+                    "reference": "除不同图层情况下，建筑物不应相交。"
                 },
                 "building-highway": {
-                    "tip": "穿越建筑物的道路应使用桥梁、隧道、有上盖或出入口。"
+                    "reference": "穿越建筑物的道路应使用桥梁、隧道或不同图层。"
                 },
                 "building-railway": {
-                    "tip": "穿越建筑物的铁路应使用桥梁或隧道。"
+                    "reference": "穿越建筑物的铁路应使用桥梁、隧道或不同图层。"
                 },
                 "building-waterway": {
-                    "tip": "穿越建筑物的航道应使用隧道或不同图层。"
+                    "reference": "穿越建筑物的航道应使用隧道或不同图层。"
                 },
                 "highway-highway": {
-                    "tip": "相交的道路应使用桥梁、隧道或交叉路口。"
+                    "reference": "相交的道路应使用桥梁、隧道或交叉路口。"
                 },
                 "highway-railway": {
-                    "tip": "与铁路相交的道路应使用桥梁、隧道或铁路道口。"
+                    "reference": "与铁路相交的道路应使用桥梁、隧道或铁路道口。"
                 },
                 "highway-waterway": {
-                    "tip": "与航道相交的道路应使用桥梁、隧道或过水路面。"
+                    "reference": "与航道相交的道路应使用桥梁、隧道或过水路面。"
                 },
                 "railway-railway": {
-                    "tip": "相交的铁路应互相连接或使用桥梁或隧道。"
+                    "reference": "相交的铁路应互相连接或使用桥梁或隧道。"
                 },
                 "railway-waterway": {
-                    "tip": "与航道相交的铁路应使用桥梁或隧道。"
+                    "reference": "与航道相交的铁路应使用桥梁或隧道。"
                 },
                 "waterway-waterway": {
-                    "tip": "相交的航道应互相连接或使用隧道。"
+                    "reference": "相交的航道应互相连接或使用隧道。"
                 },
                 "tunnel-tunnel": {
-                    "tip": "相交的隧道应使用不同图层。"
+                    "reference": "相交的隧道应使用不同图层。"
                 },
                 "tunnel-tunnel_connectable": {
-                    "tip": "相交的隧道应互相连接或使用不同图层。"
+                    "reference": "相交的隧道应互相连接或使用不同图层。"
                 },
                 "bridge-bridge": {
-                    "tip": "相交的桥梁应使用不同图层。"
+                    "reference": "相交的桥梁应使用不同图层。"
                 },
                 "bridge-bridge_connectable": {
-                    "tip": "相交的桥梁应互相连接或使用不同图层。"
+                    "reference": "相交的桥梁应互相连接或使用不同图层。"
                 },
                 "indoor-indoor": {
-                    "tip": "相交的室内要素应使用不同楼层数。"
+                    "reference": "相交的室内要素应使用不同楼层数。"
                 },
                 "indoor-indoor_connectable": {
-                    "tip": "相交的室内要素应互相连接或使用不同楼层数。"
+                    "reference": "相交的室内要素应互相连接或使用不同楼层数。"
                 }
             },
-            "deprecated_tag": {
-                "single": {
-                    "message": "{feature} 存在一个过时的标签 \"{tag}\""
-                },
-                "combination": {
-                    "message": "{feature} 存在一个过时的标签组合：{tags}"
-                },
-                "tip": "有些标签会随时间推移而被弃用，应予以更换。"
-            },
             "disconnected_way": {
+                "title": "断开的路径",
+                "tip": "查找无法导航的道路、小路和渡轮航线",
+                "routable": {
+                    "message": {
+                        "multiple": "{count} 个可导航要素仅彼此连接。"
+                    },
+                    "reference": "所有的道路、小路和渡轮航线应连接并形成一个导航网络。"
+                },
                 "highway": {
-                    "message": "{highway} 与其他道路和路径断开连接",
-                    "tip": "道路应当与其他道路或建筑入口连接。"
+                    "message": "{highway} 与其他道路和路径断开连接"
                 }
             },
+            "fixme_tag": {
+                "message": "{feature} 存在一个 \"Fix Me\" 请求",
+                "reference": "\"fixme\" 标签表明绘图者对某个要素需要帮助。"
+            },
             "generic_name": {
-                "message": "{feature} 存在一个笼统的名称 \"{name}\"",
-                "tip": "名称应为要素的实际名称。"
+                "message": "{feature} 存在一个可疑的名称 \"{name}\"",
+                "message_language": "{feature} 存在一个可疑的{language}名称 \"{name}\"",
+                "reference": "名称应为要素的实际名称。"
+            },
+            "help_request": {
+                "title": "协助请求",
+                "tip": "查找他人请求协助的要素"
+            },
+            "incompatible_source": {
+                "title": "可疑的来源",
+                "tip": "查找含有可疑来源标签的要素",
+                "google": {
+                    "feature": {
+                        "message": "{feature} 列出谷歌作为数据来源"
+                    },
+                    "reference": "谷歌的产品具有所有权，不得用于参考。"
+                }
             },
-            "many_deletions": {
-                "points-lines-areas": {
-                    "message": "将要删除 {n} 个要素：{p} 个点、{l} 根线和 {a} 个区域"
-                },
-                "points-lines-areas-relations": {
-                    "message": "将要删除 {n} 个要素：{p} 个点、{l} 根线、{a} 个区域和 {r} 个关系"
-                },
-                "tip": "只有多余或不存在的要素才应被删除。"
+            "incorrect_name": {
+                "message": "{feature} 存在一个错误的名称 \"{name}\"",
+                "message_language": "{feature} 存在一个错误的{language}名称 \"{name}\""
+            },
+            "invalid_format": {
+                "title": "无效的格式",
+                "tip": "查找含有无效格式的标签",
+                "email": {
+                    "message": "{feature} 存在一个无效电子邮件地址。",
+                    "message_multi": "{feature} 存在多个无效电子邮件地址。",
+                    "reference": "电子邮件地址必须类似于 \"user@example.com\"。"
+                }
+            },
+            "mismatched_geometry": {
+                "title": "不符合的几何形状",
+                "tip": "查找含有冲突标签和几何形状的要素"
+            },
+            "missing_role": {
+                "title": "缺少成员",
+                "message": "{member} 不是 {relation} 的成员",
+                "tip": "查找缺失或含有错误成员的关系",
+                "multipolygon": {
+                    "reference": "复合多边形的成员必须具有内部和外部角色。"
+                }
             },
             "missing_tag": {
+                "title": "缺少标签",
+                "tip": "查找缺失描述性标签的要素",
+                "reference": "要素必须具有定义它们的标签。",
                 "any": {
                     "message": "{feature} 没有标签"
                 },
                 "descriptive": {
                     "message": "{feature} 没有描述性标签"
                 },
-                "specific": {
-                    "message": "{feature} 没有 \"{tag}\" 标签"
-                },
-                "tip": "要素必须具有定义它们的标签。"
+                "relation_type": {
+                    "message": "{feature} 是一个没有类型的关系"
+                }
             },
             "old_multipolygon": {
                 "message": "{multipolygon} 存在错误放置的标签",
-                "tip": "复合多边形应被标记在它们的关系上，而不是它们的外围路径。"
+                "reference": "复合多边形应被标记在它们的关系上，而不是它们的外围路径。"
+            },
+            "outdated_tags": {
+                "title": "过时的标签",
+                "message": "{feature} 存在过时的标签",
+                "tip": "查找含有弃用的标签且可以更新的要素",
+                "reference": "有些标签会随时间推移而被更换，应予以改进。",
+                "incomplete": {
+                    "message": "{feature} 存在不完整的标签",
+                    "reference": "某些要素应有额外的标签。"
+                },
+                "noncanonical_brand": {
+                    "message": "{feature} 看起来像是个品牌名称但没有规范的标签",
+                    "message_incomplete": "{feature} 看起来像是个品牌名称但没有规范的标签",
+                    "reference": "同一品牌的所有要素都应该以相同方式标记。"
+                }
+            },
+            "point_as_vertex": {
+                "message": "{feature} 根据其标签不应该作为单独的点",
+                "reference": "一些要素不应该作为线或区域的一部分"
+            },
+            "private_data": {
+                "title": "私人信息",
+                "tip": "查找可能含有私人信息的要素",
+                "reference": "不应标记个人电话号码等敏感数据。",
+                "contact": {
+                    "message": "{feature} 的标签可能含有私人联系信息"
+                }
+            },
+            "suspicious_name": {
+                "title": "可疑的名称",
+                "tip": "查找含有笼统或可疑名称的要素"
             },
             "tag_suggests_area": {
                 "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": "单行线道路必须通向其他道路。"
+                    }
+                }
+            },
+            "unclosed_multipolygon_part": {
+                "message": "{feature} 存在一个未闭合的部分",
+                "reference": "复合多边形的所有内部及外部成员都应首尾相连。"
+            },
+            "unsquare_way": {
+                "title": "不方正的角落 (上至 {val}°)",
+                "message": "{feature} 存在不方正的角落",
+                "tip": "查找含有不方正的角落且可以改进的要素",
+                "buildings": {
+                    "reference": "含有不方正角落的建筑物通常可以更精确的绘制。"
+                }
+            },
+            "vertex_as_point": {
+                "message": "{feature} 根据其标签不应该作为线或区域的一部分",
+                "reference": "一些要素不应该作为单独的点"
             },
             "fix": {
+                "add_a_bridge": {
+                    "title": "创建一座桥梁",
+                    "annotation": "创建一座桥梁。"
+                },
+                "add_a_tunnel": {
+                    "title": "创建一条隧道",
+                    "annotation": "创建一条隧道。"
+                },
+                "address_the_concern": {
+                    "title": "解决问题"
+                },
                 "connect_almost_junction": {
                     "annotation": "连接极相近要素。"
                 },
@@ -1544,9 +2011,15 @@
                     "title": "连接首尾节点",
                     "annotation": "连接路径的首尾节点。"
                 },
+                "connect_feature": {
+                    "title": "连接该要素"
+                },
                 "connect_features": {
                     "title": "连接这些要素"
                 },
+                "connect_using_ford": {
+                    "title": "使用过水路面连接"
+                },
                 "continue_from_start": {
                     "title": "从起始节点继续绘制"
                 },
@@ -1556,20 +2029,40 @@
                 "delete_feature": {
                     "title": "删除此要素"
                 },
+                "extract_point": {
+                    "title": "提取节点。"
+                },
+                "ignore_issue": {
+                    "title": "忽略此问题"
+                },
+                "merge_close_vertices": {
+                    "annotation": "合并极为接近的节点至路径。"
+                },
+                "merge_points": {
+                    "title": "合并这些点"
+                },
+                "move_points_apart": {
+                    "title": "将这些点分开"
+                },
                 "move_tags": {
                     "title": "移动标签",
                     "annotation": "移动标签。"
                 },
-                "remove_deprecated_tag": {
-                    "annotation": "删除一个旧标签。"
-                },
-                "remove_deprecated_tag_combo": {
-                    "annotation": "删除一个旧标签组合。"
+                "remove_from_relation": {
+                    "title": "从关系中删除"
                 },
                 "remove_generic_name": {
-                    "title": "删除名称",
                     "annotation": "删除笼统名称。"
                 },
+                "remove_mistaken_name": {
+                    "annotation": "删除了一个错误名称。"
+                },
+                "remove_private_info": {
+                    "annotation": "删除私人信息。"
+                },
+                "remove_proprietary_data": {
+                    "title": "移除全部专有数据"
+                },
                 "remove_tag": {
                     "title": "删除标签",
                     "annotation": "删除标签。"
@@ -1577,35 +2070,56 @@
                 "remove_tags": {
                     "title": "删除标签"
                 },
+                "remove_the_name": {
+                    "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": "标记极相近要素为断开连接。"
                 },
-                "upgrade_tag": {
-                    "title": "改进此标签",
-                    "annotation": "改进一个旧标签。"
+                "tag_as_unsquare": {
+                    "title": "标记为不方正",
+                    "annotation": "标记一路径存在非直角的角落。"
                 },
-                "upgrade_tag_combo": {
-                    "title": "改进这些标签",
-                    "annotation": "改进一个旧标签组合。"
+                "tag_this_as_higher": {
+                    "title": "上移该图层"
                 },
-                "use_bridge_or_tunnel": {
-                    "title": "使用桥梁或隧道"
+                "tag_this_as_lower": {
+                    "title": "下移该图层"
+                },
+                "upgrade_tags": {
+                    "title": "改进标签",
+                    "annotation": "改进旧标签。"
                 },
                 "use_different_layers": {
                     "title": "使用不同图层"
                 },
+                "use_different_layers_or_levels": {
+                    "title": "使用不同图层或楼层"
+                },
                 "use_different_levels": {
                     "title": "使用不同楼层数"
-                },
-                "use_tunnel": {
-                    "title": "使用隧道"
                 }
             }
         },
@@ -1852,7 +2366,7 @@
             },
             "startediting": {
                 "title": "开始编辑",
-                "help": "您现在已经学会编辑 OpenStreetMap 了！{br}您可以在任何时候点击 {button} 帮助按钮或按下{key}键来重放该教程或查看更多参考文档。",
+                "help": "您已经学会编辑 OpenStreetMap 了！{br}点击 {button} 帮助按钮（或按 '{key}' 键），您可以随时重温该教程，也可以浏览更多参考文档。",
                 "shortcuts": "您可以通过按下{key}键来查看命令列表及相应快捷键。",
                 "save": "不要忘了定期保存您的修改！",
                 "start": "开始绘制地图！"
@@ -1903,13 +2417,17 @@
                 },
                 "display_options": {
                     "title": "显示设定",
-                    "background": "显示背景设置",
+                    "background": "切换背景影像面板",
                     "background_switch": "切换回上一背景",
-                    "map_data": "显示地图数据设置",
+                    "map_data": "切换地图数据面板",
+                    "issues": "切换验证问题面板",
+                    "preferences": "切换用户偏好设置面板",
                     "fullscreen": "进入全屏模式",
                     "sidebar": "切换侧边栏",
                     "wireframe": "切换线框模式",
-                    "minimap": "切换小地图"
+                    "osm_data": "切换 OpenStreetMap 数据",
+                    "minimap": "切换小地图",
+                    "highlight_edits": "高亮未保存的编辑"
                 },
                 "selecting": {
                     "title": "选择要素",
@@ -1949,12 +2467,13 @@
                     "continue_line": "在选中节点上继续绘制线",
                     "merge": "合并选中的要素",
                     "disconnect": "在选中节点上分离要素",
-                    "detach_node": "将选中的节点从其父路径/区域中隔离",
+                    "extract": "从要素中提取节点",
                     "split": "在选中节点上分割线",
-                    "reverse": "反转线的方向",
+                    "reverse": "反转选中的要素",
                     "move": "移动选中的要素",
                     "rotate": "旋转选中的要素",
-                    "orthogonalize": "将线拉直 / 将区域变方",
+                    "orthogonalize": "将线或区域上的弯角换成直角",
+                    "straighten": "将线或多个点拉直",
                     "circularize": "将闭合的线或区域变成圆形",
                     "reflect_long": "沿要素的长轴翻转",
                     "reflect_short": "沿要素的短轴翻转",
@@ -2016,22 +2535,13 @@
                 "category-building": {
                     "name": "建筑"
                 },
-                "category-golf-area": {
-                    "name": "高尔夫"
-                },
-                "category-golf-line": {
+                "category-golf": {
                     "name": "高尔夫"
                 },
                 "category-landuse": {
                     "name": "土地用途"
                 },
-                "category-natural-area": {
-                    "name": "自然"
-                },
-                "category-natural-line": {
-                    "name": "自然"
-                },
-                "category-natural-point": {
+                "category-natural": {
                     "name": "自然"
                 },
                 "category-path": {
@@ -2043,8 +2553,14 @@
                 "category-restriction": {
                     "name": "限制"
                 },
-                "category-road": {
-                    "name": "道路"
+                "category-road_major": {
+                    "name": "大型道路"
+                },
+                "category-road_minor": {
+                    "name": "小型道路"
+                },
+                "category-road_service": {
+                    "name": "服务性道路"
                 },
                 "category-route": {
                     "name": "线路"
@@ -2052,11 +2568,11 @@
                 "category-utility": {
                     "name": "公共设施"
                 },
-                "category-water-area": {
+                "category-water": {
                     "name": "水体"
                 },
-                "category-water-line": {
-                    "name": "水体"
+                "category-waterway": {
+                    "name": "æ°´è·¯"
                 }
             },
             "fields": {
@@ -2084,16 +2600,20 @@
                             "title": "默许"
                         },
                         "permit": {
-                            "description": "仅限凭证驶入"
+                            "description": "仅限凭证驶入",
+                            "title": "许可证"
                         },
                         "private": {
+                            "description": "仅当在个人持有拥有者的允许时才许可通行",
                             "title": "私人"
                         },
                         "yes": {
+                            "description": "法律赋予的通行权",
                             "title": "允许"
                         }
                     },
                     "placeholder": "未知",
+                    "terms": "通行,进入,允许,许可,私人,公共",
                     "types": {
                         "access": "全部交通方式",
                         "bicycle": "自行车",
@@ -2102,22 +2622,37 @@
                         "motor_vehicle": "汽车"
                     }
                 },
+                "access_aisle": {
+                    "label": "类型"
+                },
                 "access_simple": {
-                    "label": "允许进入"
+                    "label": "允许进入",
+                    "terms": "通行,进入,允许,许可,私人,公共"
+                },
+                "addr/interpolation": {
+                    "label": "类型",
+                    "options": {
+                        "all": "全部",
+                        "alphabetic": "按字母顺序",
+                        "even": "偶数",
+                        "odd": "奇数"
+                    }
                 },
                 "address": {
                     "label": "地址",
                     "placeholders": {
                         "block_number": "街区编号",
                         "block_number!jp": "街区号",
-                        "city": "地级市/地区/自治州/盟",
-                        "city!jp": "市/镇/村/东京都特别区",
+                        "city": "城市",
+                        "city!cn": "地级市/地区/自治州/盟",
+                        "city!jp": "市/町/村/东京都区部",
                         "city!vn": "市/镇",
                         "conscriptionnumber": "123号",
                         "country": "国家",
                         "county": "郡",
-                        "county!jp": "郡 (日本)",
-                        "district": "市辖区/县级市/县/自治县/自治旗/旗/特区/林区",
+                        "county!jp": "日本郡",
+                        "district": "行政区",
+                        "district!cn": "市辖区/县/县级市/旗",
                         "district!vn": "郡/镇/区",
                         "floor": "楼层",
                         "hamlet": "村庄",
@@ -2128,7 +2663,8 @@
                         "neighbourhood!jp": "丁目/字/小字",
                         "place": "地方",
                         "postcode": "邮政编码",
-                        "province": "省/自治区/特别行政区/直辖市",
+                        "province": "省",
+                        "province!cn": "省/自治区/直辖市/特别行政区",
                         "province!jp": "日本县",
                         "quarter": "地方",
                         "quarter!jp": "大字/町",
@@ -2139,7 +2675,8 @@
                         "suburb": "地区",
                         "suburb!jp": "行政区",
                         "unit": "单元"
-                    }
+                    },
+                    "terms": "地址,方位,住址,居所,地点,住处"
                 },
                 "admin_level": {
                     "label": "行政级别"
@@ -2187,6 +2724,10 @@
                 "agrarian": {
                     "label": "产品"
                 },
+                "air_conditioning": {
+                    "label": "空调",
+                    "terms": "空调,制冷,制热,冷藏"
+                },
                 "amenity": {
                     "label": "类型"
                 },
@@ -2200,7 +2741,8 @@
                     "label": "收留动物类型"
                 },
                 "architect": {
-                    "label": "建筑设计师"
+                    "label": "建筑设计师",
+                    "terms": "建筑设计师,建筑家,设计师"
                 },
                 "area/highway": {
                     "label": "类型"
@@ -2217,9 +2759,29 @@
                 "attraction": {
                     "label": "类型"
                 },
+                "baby_feeding": {
+                    "label": "婴儿护理区",
+                    "options": {
+                        "no": "无",
+                        "room": "专用房间",
+                        "yes": "标记空间"
+                    },
+                    "terms": "婴儿,哺乳,乳,喂养,护理,保育,养育,母亲"
+                },
+                "baby_seat": {
+                    "label": "婴儿座椅"
+                },
+                "backcountry": {
+                    "label": "偏远地区",
+                    "terms": "偏远地区,山区"
+                },
                 "backrest": {
                     "label": "长椅"
                 },
+                "bar": {
+                    "label": "吧台",
+                    "terms": "吧台,酒吧"
+                },
                 "barrier": {
                     "label": "类型"
                 },
@@ -2244,13 +2806,24 @@
                     "label": "美容专业"
                 },
                 "bench": {
-                    "label": "长凳"
+                    "label": "长凳",
+                    "terms": "长凳,长椅,座位,座椅,坐,凳,椅"
                 },
                 "bicycle_parking": {
                     "label": "类型"
                 },
                 "bin": {
-                    "label": "垃圾箱"
+                    "label": "垃圾箱",
+                    "terms": "垃圾箱,垃圾桶,垃圾筒"
+                },
+                "blind": {
+                    "label": "助盲设施",
+                    "options": {
+                        "limited": "有限制",
+                        "no": "否",
+                        "yes": "是"
+                    },
+                    "terms": "盲人,盲,视障,视觉障碍,失明,瞎"
                 },
                 "blood_components": {
                     "label": "血液成分",
@@ -2264,8 +2837,14 @@
                 "board_type": {
                     "label": "类型"
                 },
+                "bollard": {
+                    "label": "类型"
+                },
                 "booth": {
-                    "label": "岗亭，小屋"
+                    "label": "岗亭,小屋"
+                },
+                "bottle": {
+                    "label": "瓶子灌装"
                 },
                 "boules": {
                     "label": "类型"
@@ -2274,10 +2853,12 @@
                     "label": "类型"
                 },
                 "brand": {
-                    "label": "品牌"
+                    "label": "品牌",
+                    "terms": "品牌,牌子,商标"
                 },
                 "brewery": {
-                    "label": "生啤酒"
+                    "label": "生啤酒",
+                    "terms": "生啤,生啤酒,啤酒"
                 },
                 "bridge": {
                     "label": "类型",
@@ -2287,13 +2868,31 @@
                     "label": "类型"
                 },
                 "building": {
-                    "label": "建筑物"
+                    "label": "建筑物",
+                    "terms": "建筑物,建筑,结构,房子"
+                },
+                "building/levels": {
+                    "label": "楼层数",
+                    "placeholder": "2, 4, 6...",
+                    "terms": "楼层,层数"
+                },
+                "building/levels/underground": {
+                    "label": "地下楼层数",
+                    "placeholder": "2, 4, 6...",
+                    "terms": "地下室,地下楼层,楼层,层数"
+                },
+                "building/levels_building": {
+                    "label": "楼层数",
+                    "placeholder": "2, 4, 6...",
+                    "terms": "楼层数,楼层,层数"
                 },
                 "building/material": {
-                    "label": "材质"
+                    "label": "材质",
+                    "terms": "材质,材料,原料"
                 },
                 "building_area": {
-                    "label": "建筑物"
+                    "label": "建筑物",
+                    "terms": "建筑物,建筑,结构,房子"
                 },
                 "bunker_type": {
                     "label": "类型"
@@ -2319,7 +2918,8 @@
                 },
                 "capacity": {
                     "label": "容量",
-                    "placeholder": "50, 100, 200..."
+                    "placeholder": "50, 100, 200...",
+                    "terms": "容量,容纳,容积"
                 },
                 "cash_in": {
                     "label": "货币兑换"
@@ -2327,6 +2927,19 @@
                 "castle_type": {
                     "label": "类型"
                 },
+                "changing_table": {
+                    "label": "尿布台"
+                },
+                "charge_fee": {
+                    "label": "服务费金额",
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…",
+                    "terms": "服务费,收费,费用,费,金额,收款"
+                },
+                "charge_toll": {
+                    "label": "收费金额",
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…",
+                    "terms": "收费,费用,费,服务费,金额,收款"
+                },
                 "check_date": {
                     "label": "最近检查时间"
                 },
@@ -2340,18 +2953,29 @@
                     "label": "收取时间"
                 },
                 "colour": {
-                    "label": "颜色"
+                    "label": "颜色",
+                    "terms": "颜色,色彩,色"
                 },
                 "comment": {
                     "label": "变更集合注释",
                     "placeholder": "请简要说明您的贡献 (必填)"
                 },
                 "communication_multi": {
-                    "label": "通讯类型"
+                    "label": "通讯类型",
+                    "terms": "通讯类型"
+                },
+                "connectivity": {
+                    "label": "连接性"
                 },
                 "construction": {
                     "label": "类型"
                 },
+                "consulate": {
+                    "label": "类型"
+                },
+                "consulting": {
+                    "label": "专长"
+                },
                 "contact/webcam": {
                     "label": "网络摄像机地址",
                     "placeholder": "http://example.com/"
@@ -2360,16 +2984,29 @@
                     "label": "内容"
                 },
                 "conveying": {
-                    "label": "移动方向"
+                    "label": "移动方向",
+                    "options": {
+                        "backward": "向后",
+                        "forward": "向前",
+                        "reversible": "可反转"
+                    }
+                },
+                "conveying_escalator": {
+                    "label": "自动扶梯"
                 },
                 "country": {
                     "label": "国家"
                 },
+                "country_flag": {
+                    "label": "旗帜国"
+                },
                 "couplings": {
+                    "label": "连接口",
                     "placeholder": "1, 2, 3..."
                 },
                 "covered": {
-                    "label": "有上盖"
+                    "label": "有上盖",
+                    "terms": "上盖,覆盖,遮挡"
                 },
                 "craft": {
                     "label": "种类"
@@ -2388,11 +3025,16 @@
                 "crossing": {
                     "label": "类型"
                 },
+                "crossing/island": {
+                    "label": "安全岛"
+                },
                 "cuisine": {
-                    "label": "菜系"
+                    "label": "菜系",
+                    "terms": "菜系,菜肴,菜式"
                 },
                 "currency_multi": {
-                    "label": "货币类型"
+                    "label": "货币类型",
+                    "terms": "货币类型,纸币,钞票,硬币,零钱,现金"
                 },
                 "cutting": {
                     "label": "类型",
@@ -2434,6 +3076,7 @@
                         }
                     },
                     "placeholder": "无",
+                    "terms": "自行车道,单车道,自行车,单车",
                     "types": {
                         "cycleway:left": "左侧",
                         "cycleway:right": "右侧"
@@ -2446,16 +3089,28 @@
                     "label": "日期"
                 },
                 "delivery": {
-                    "label": "外卖配送"
+                    "label": "外卖配送",
+                    "terms": "外卖,配送"
                 },
                 "denomination": {
-                    "label": "教派"
+                    "label": "教派",
+                    "terms": "教派,派别"
                 },
                 "denotation": {
                     "label": "树木指示性"
                 },
+                "departures_board": {
+                    "label": "到站显示屏/牌",
+                    "options": {
+                        "no": "无",
+                        "realtime": "实时",
+                        "timetable": "时刻表",
+                        "yes": "有"
+                    }
+                },
                 "description": {
-                    "label": "描述"
+                    "label": "描述",
+                    "terms": "描述,概括,概要,总结"
                 },
                 "design": {
                     "label": "指定"
@@ -2464,7 +3119,8 @@
                     "label": "目的地道路编号"
                 },
                 "destination/symbol_oneway": {
-                    "label": "目的地标识"
+                    "label": "目的地标识",
+                    "terms": "目的地,目的地标示,出口标志,出口标识,出口标牌,标志,标识,标牌"
                 },
                 "destination_oneway": {
                     "label": "目的地"
@@ -2473,11 +3129,19 @@
                     "label": "设备数量",
                     "placeholder": "1, 2, 3..."
                 },
-                "diaper": {
-                    "label": "有尿布台"
+                "diameter": {
+                    "label": "直径",
+                    "placeholder": "5 mm, 10 cm, 15 in…"
                 },
                 "diet_multi": {
-                    "label": "饮食种类"
+                    "label": "饮食种类",
+                    "terms": "饮食种类,食物偏好,饮食,素食,无麸质,无麸,果食,清真,洁食,无乳糖,肉食,鱼素,生食"
+                },
+                "diplomatic": {
+                    "label": "类型"
+                },
+                "diplomatic/services": {
+                    "label": "服务"
                 },
                 "direction": {
                     "label": "方向 (度顺时针)",
@@ -2512,7 +3176,7 @@
                     }
                 },
                 "direction_vertex": {
-                    "label": "方向",
+                    "label": "影响方位",
                     "options": {
                         "backward": "向后",
                         "both": "双向 / 全部",
@@ -2528,6 +3192,9 @@
                 "distance": {
                     "label": "距离"
                 },
+                "disused/railway": {
+                    "label": "类型"
+                },
                 "dock": {
                     "label": "类型"
                 },
@@ -2537,14 +3204,30 @@
                         "leashed": "仅限牵狗绳",
                         "no": "不允许",
                         "yes": "允许"
-                    }
+                    },
+                    "terms": "狗,犬,宠物,动物"
+                },
+                "door": {
+                    "label": "门"
+                },
+                "door_type": {
+                    "label": "类型"
+                },
+                "drink_multi": {
+                    "label": "饮料"
+                },
+                "drinking_water": {
+                    "label": "可饮用",
+                    "terms": "可饮用,饮用"
                 },
                 "drive_through": {
-                    "label": "免下车"
+                    "label": "免下车",
+                    "terms": "免下车,得来速"
                 },
                 "duration": {
                     "label": "乘坐时长",
-                    "placeholder": "hh:mm"
+                    "placeholder": "hh:mm",
+                    "terms": "时长,持续时间,期间"
                 },
                 "electrified": {
                     "label": "电气化",
@@ -2557,19 +3240,27 @@
                     "placeholder": "架空接触线、第三轨供电…"
                 },
                 "elevation": {
-                    "label": "海拔"
+                    "label": "海拔",
+                    "terms": "海拔,标高,高度"
                 },
                 "email": {
                     "label": "Email",
-                    "placeholder": "example@example.com"
+                    "placeholder": "example@example.com",
+                    "terms": "email,邮箱,邮件,电邮,电子邮箱,电子邮件,邮箱地址"
                 },
                 "embankment": {
                     "label": "类型",
                     "placeholder": "默认"
                 },
+                "embassy": {
+                    "label": "类型"
+                },
                 "emergency": {
                     "label": "急诊"
                 },
+                "emergency_combo": {
+                    "label": "类型"
+                },
                 "enforcement": {
                     "label": "类型"
                 },
@@ -2579,19 +3270,35 @@
                 "except": {
                     "label": "异常"
                 },
+                "expected_rcn_route_relations": {
+                    "label": "相邻自行车节点"
+                },
+                "expected_rwn_route_relations": {
+                    "label": "相邻步行节点"
+                },
                 "faces": {
                     "label": "面数"
                 },
                 "fax": {
                     "label": "传真",
-                    "placeholder": "+31 42 123 4567"
+                    "placeholder": "+31 42 123 4567",
+                    "terms": "传真,传真机"
                 },
                 "fee": {
-                    "label": "费用"
+                    "label": "费用",
+                    "terms": "费用,服务费,收费,费,金额,收款"
                 },
                 "fence_type": {
                     "label": "类型"
                 },
+                "fire_hydrant/diameter": {
+                    "label": "直径 (mm, in 或字母)",
+                    "terms": "直径 (mm, in 或字母)"
+                },
+                "fire_hydrant/pressure": {
+                    "label": "水压 (bar)",
+                    "terms": "水压,压力"
+                },
                 "fire_hydrant/type": {
                     "label": "形状",
                     "options": {
@@ -2603,19 +3310,32 @@
                 "fireplace": {
                     "label": "壁炉"
                 },
+                "fishing": {
+                    "label": "钓鱼"
+                },
                 "fitness_station": {
                     "label": "器械种类"
                 },
                 "fixme": {
-                    "label": "Fix Me"
+                    "label": "Fix Me",
+                    "terms": "fixme,帮助,请求,修复我"
                 },
                 "flag/type": {
                     "label": "旗帜类型"
                 },
+                "floating": {
+                    "label": "漂浮"
+                },
+                "flood_prone": {
+                    "label": "易涝"
+                },
                 "ford": {
                     "label": "类型",
                     "placeholder": "默认"
                 },
+                "fountain": {
+                    "label": "类型"
+                },
                 "frequency": {
                     "label": "工作频率"
                 },
@@ -2631,6 +3351,9 @@
                 "fuel_multi": {
                     "label": "燃料类型"
                 },
+                "gambling": {
+                    "label": "游戏"
+                },
                 "gauge": {
                     "label": "轨距"
                 },
@@ -2656,12 +3379,19 @@
                 "generator/type": {
                     "label": "类型"
                 },
+                "gnis/feature_id": {
+                    "label": "GNIS 要素 ID",
+                    "terms": "GNIS"
+                },
                 "government": {
                     "label": "类型"
                 },
                 "grape_variety": {
                     "label": "葡萄品种"
                 },
+                "guest_house": {
+                    "label": "类型"
+                },
                 "handicap": {
                     "label": "手工店",
                     "placeholder": "1-18"
@@ -2682,6 +3412,12 @@
                 "height": {
                     "label": "高度 (米)"
                 },
+                "height_building": {
+                    "label": "建筑物高度 (米)"
+                },
+                "highspeed": {
+                    "label": "高速"
+                },
                 "highway": {
                     "label": "类型"
                 },
@@ -2737,11 +3473,14 @@
                         "undefined": "否"
                     }
                 },
+                "hot_water": {
+                    "label": "热水"
+                },
                 "iata": {
-                    "label": "IATA (国际航空运输协会)"
+                    "label": "IATA 机场代码"
                 },
                 "icao": {
-                    "label": "ICAO(国际民航组织)"
+                    "label": "ICAO 机场代码"
                 },
                 "incline": {
                     "label": "斜度"
@@ -2756,9 +3495,16 @@
                 "indoor": {
                     "label": "室内"
                 },
+                "indoor_type": {
+                    "label": "类型"
+                },
                 "industrial": {
                     "label": "类型"
                 },
+                "informal": {
+                    "label": "非正式",
+                    "terms": "非正式,随便"
+                },
                 "information": {
                     "label": "类型"
                 },
@@ -2785,7 +3531,10 @@
                     "label": "上网费用"
                 },
                 "internet_access/ssid": {
-                    "label": "SSID (网络名称)"
+                    "label": "Wi-Fi 网络名称"
+                },
+                "interval": {
+                    "label": "间隔"
                 },
                 "junction/ref_oneway": {
                     "label": "匝道编号"
@@ -2801,6 +3550,9 @@
                 "kerb": {
                     "label": "路缘"
                 },
+                "kerb/height": {
+                    "label": "高度"
+                },
                 "label": {
                     "label": "标识"
                 },
@@ -2866,9 +3618,12 @@
                 "level": {
                     "label": "楼层"
                 },
-                "levels": {
-                    "label": "楼层数",
-                    "placeholder": "2, 4, 6..."
+                "level_semi": {
+                    "label": "楼层",
+                    "terms": "楼层,层数"
+                },
+                "liaison": {
+                    "label": "类型"
                 },
                 "lit": {
                     "label": "照明设施"
@@ -2884,21 +3639,42 @@
                         "roof": "屋顶"
                     }
                 },
+                "lock": {
+                    "label": "船闸"
+                },
+                "lockable": {
+                    "label": "可上锁",
+                    "terms": "上锁,锁"
+                },
                 "man_made": {
                     "label": "类型"
                 },
                 "manhole": {
                     "label": "类型"
                 },
+                "manufacturer": {
+                    "label": "制造商"
+                },
                 "map_size": {
                     "label": "范围"
                 },
                 "map_type": {
                     "label": "类型"
                 },
+                "mapillary": {
+                    "label": "Mapillary 图像 ID",
+                    "terms": "Mapillary 图像 ID,Mapillary"
+                },
+                "marker": {
+                    "label": "类型"
+                },
                 "material": {
                     "label": "材质"
                 },
+                "max_age": {
+                    "label": "最高年龄",
+                    "terms": "最高年龄,最大年龄,年龄上限"
+                },
                 "maxheight": {
                     "label": "限制高度",
                     "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
@@ -2915,11 +3691,21 @@
                     "label": "可停留时间"
                 },
                 "maxweight": {
-                    "label": "最大重量"
+                    "label": "限制质量"
+                },
+                "maxweight_bridge": {
+                    "label": "限制质量"
                 },
                 "memorial": {
                     "label": "类型"
                 },
+                "microbrewery": {
+                    "label": "手工啤酒"
+                },
+                "min_age": {
+                    "label": "最低年龄",
+                    "terms": "最低年龄,最小年龄,年龄下限"
+                },
                 "minspeed": {
                     "label": "最低限速",
                     "placeholder": "20, 30, 40..."
@@ -2960,6 +3746,9 @@
                     },
                     "placeholder": "0, 1, 2, 3..."
                 },
+                "museum": {
+                    "label": "类型"
+                },
                 "name": {
                     "label": "名称",
                     "placeholder": "常用名称（如果有）"
@@ -2970,8 +3759,12 @@
                 "network": {
                     "label": "网络"
                 },
-                "network_bicycle": {
+                "network/type": {
                     "label": "网络类型",
+                    "terms": "网络类型"
+                },
+                "network_bicycle": {
+                    "label": "网络类别",
                     "options": {
                         "icn": "国际的",
                         "lcn": "本地的",
@@ -2981,7 +3774,7 @@
                     "placeholder": "本地的，地区的，国家的，国际的"
                 },
                 "network_foot": {
-                    "label": "徒步网络类型",
+                    "label": "网络类别",
                     "options": {
                         "iwn": "国际的",
                         "lwn": "本地的",
@@ -2991,7 +3784,7 @@
                     "placeholder": "本地的，地区的，国家的，国际的"
                 },
                 "network_horse": {
-                    "label": "网络类型",
+                    "label": "网络类别",
                     "options": {
                         "ihn": "国际的",
                         "lhn": "本地的",
@@ -3003,6 +3796,9 @@
                 "network_road": {
                     "label": "网络"
                 },
+                "not/name": {
+                    "label": "错误名称"
+                },
                 "note": {
                     "label": "备注"
                 },
@@ -3030,12 +3826,19 @@
                         "yes": "是"
                     }
                 },
+                "opening_date": {
+                    "label": "预计开放日期"
+                },
                 "opening_hours": {
-                    "label": "开放时间"
+                    "label": "开放时间",
+                    "placeholder": "未知"
                 },
                 "operator": {
                     "label": "经营者"
                 },
+                "operator/type": {
+                    "label": "操作人员类型"
+                },
                 "outdoor_seating": {
                     "label": "室外座位"
                 },
@@ -3059,7 +3862,12 @@
                     }
                 },
                 "payment_multi": {
-                    "label": "支付类型"
+                    "label": "支付类型",
+                    "terms": "支付类型,付款类型,收款类型"
+                },
+                "payment_multi_fee": {
+                    "label": "支付类型",
+                    "terms": "支付类型,付款类型,收款类型"
                 },
                 "phases": {
                     "label": "相数",
@@ -3074,10 +3882,20 @@
                     "options": {
                         "advanced": "高级",
                         "easy": "简单",
-                        "expert": "专家"
+                        "expert": "专家",
+                        "extreme": "极难的",
+                        "freeride": "自由骑行",
+                        "intermediate": "中级",
+                        "novice": "新手"
                     },
                     "placeholder": "容易，中阶，进阶"
                 },
+                "piste/difficulty_nordic": {
+                    "label": "难度"
+                },
+                "piste/difficulty_skitour": {
+                    "label": "难度"
+                },
                 "piste/grooming": {
                     "label": "雪道类型",
                     "options": {
@@ -3113,18 +3931,18 @@
                     "label": "输出功率",
                     "placeholder": "500 MW, 1000 MW, 2000 MW..."
                 },
-                "playground/baby": {
-                    "label": "婴儿车"
-                },
-                "playground/max_age": {
-                    "label": "最高年龄"
+                "playground": {
+                    "label": "类型"
                 },
-                "playground/min_age": {
-                    "label": "最低年龄"
+                "playground/theme": {
+                    "label": "主题"
                 },
                 "population": {
                     "label": "人口"
                 },
+                "post": {
+                    "label": "邮寄地址"
+                },
                 "power": {
                     "label": "类型"
                 },
@@ -3137,6 +3955,18 @@
                 "product": {
                     "label": "产品"
                 },
+                "public_bookcase/type": {
+                    "label": "类型"
+                },
+                "pump": {
+                    "label": "æ³µ",
+                    "options": {
+                        "manual": "手动泵",
+                        "no": "无",
+                        "powered": "机械泵",
+                        "yes": "是"
+                    }
+                },
                 "railway": {
                     "label": "类型"
                 },
@@ -3145,7 +3975,7 @@
                     "placeholder": "距离，精确到一位小数 (123.4)"
                 },
                 "railway/signal/direction": {
-                    "label": "方向",
+                    "label": "影响方位",
                     "options": {
                         "backward": "向后",
                         "both": "双向 / 全部",
@@ -3156,7 +3986,9 @@
                     "label": "接受"
                 },
                 "recycling_type": {
+                    "label": "类型",
                     "options": {
+                        "centre": "中心",
                         "container": "回收容器"
                     }
                 },
@@ -3182,6 +4014,9 @@
                 "ref_road_number": {
                     "label": "道路编号"
                 },
+                "ref_room_number": {
+                    "label": "房间编号"
+                },
                 "ref_route": {
                     "label": "路线编号"
                 },
@@ -3202,6 +4037,24 @@
                 "religion": {
                     "label": "宗教"
                 },
+                "reservation": {
+                    "label": "预订",
+                    "options": {
+                        "no": "不接受",
+                        "recommended": "推荐",
+                        "required": "必需",
+                        "yes": "接受"
+                    }
+                },
+                "residential": {
+                    "label": "类型"
+                },
+                "resort": {
+                    "label": "类型"
+                },
+                "resource": {
+                    "label": "资源"
+                },
                 "restriction": {
                     "label": "类型"
                 },
@@ -3211,6 +4064,9 @@
                 "roof/colour": {
                     "label": "屋顶颜色"
                 },
+                "room": {
+                    "label": "类型"
+                },
                 "rooms": {
                     "label": "房间数"
                 },
@@ -3238,6 +4094,10 @@
                 "sanitary_dump_station": {
                     "label": "厕所废物"
                 },
+                "screen": {
+                    "label": "屏幕数",
+                    "placeholder": "1, 4, 8…"
+                },
                 "scuba_diving": {
                     "label": "服务"
                 },
@@ -3245,7 +4105,11 @@
                     "label": "形状"
                 },
                 "seamark/beacon_lateral/category": {
-                    "label": "分类"
+                    "label": "分类",
+                    "options": {
+                        "danger_left": "左侧危险",
+                        "danger_right": "右侧危险"
+                    }
                 },
                 "seamark/beacon_lateral/colour": {
                     "label": "颜色",
@@ -3267,8 +4131,28 @@
                 "seamark/buoy_lateral/category": {
                     "label": "分类"
                 },
+                "seamark/buoy_lateral/colour": {
+                    "label": "颜色",
+                    "options": {
+                        "green": "绿",
+                        "green;red;green": "绿-红-绿",
+                        "green;white;green;white": "绿-白-绿-白",
+                        "red": "红",
+                        "red;green;red": "红-绿-红",
+                        "red;white;red;white": "红-白-红-白",
+                        "white": "白",
+                        "yellow": "黄"
+                    }
+                },
+                "seamark/buoy_lateral/shape": {
+                    "label": "形状"
+                },
                 "seamark/buoy_lateral/system": {
+                    "label": "系统",
                     "options": {
+                        "cevni": "CEVNI",
+                        "iala-a": "IALA A",
+                        "iala-b": "IALA B",
                         "other": "其它"
                     }
                 },
@@ -3278,11 +4162,15 @@
                 "seamark/type": {
                     "label": "导航标志"
                 },
+                "seamark/wreck/category": {
+                    "label": "分类"
+                },
                 "seasonal": {
                     "label": "具备季节性"
                 },
                 "seats": {
-                    "label": "座位"
+                    "label": "座位",
+                    "placeholder": "2, 4, 6..."
                 },
                 "second_hand": {
                     "label": "出售二手商品",
@@ -3293,6 +4181,12 @@
                     },
                     "placeholder": "是，否，仅"
                 },
+                "segregated": {
+                    "label": "行人与自行车隔离"
+                },
+                "self_service": {
+                    "label": "自助服务"
+                },
                 "service": {
                     "label": "类型"
                 },
@@ -3309,7 +4203,8 @@
                         "siding": "侧线",
                         "spur": "短途支线",
                         "yard": "站场线路"
-                    }
+                    },
+                    "terms": "服务类型"
                 },
                 "service_times": {
                     "label": "服务时间"
@@ -3324,7 +4219,10 @@
                     "label": "类型"
                 },
                 "siren/type": {
-                    "label": "类型"
+                    "label": "类型",
+                    "options": {
+                        "other": "其它"
+                    }
                 },
                 "site": {
                     "label": "类型"
@@ -3358,6 +4256,9 @@
                     },
                     "placeholder": "轴承, 轮胎, 越野..."
                 },
+                "sms": {
+                    "label": "SMS"
+                },
                 "social_facility": {
                     "label": "类型"
                 },
@@ -3367,6 +4268,10 @@
                 "source": {
                     "label": "来源"
                 },
+                "species/wikidata": {
+                    "label": "物种维基数据",
+                    "terms": "物种维基数据,维基数据"
+                },
                 "sport": {
                     "label": "运动"
                 },
@@ -3377,7 +4282,7 @@
                     "label": "赛车项目"
                 },
                 "sport_racing_nonmotor": {
-                    "label": "非机动竞速项目"
+                    "label": "运动项目"
                 },
                 "stars": {
                     "label": "星级"
@@ -3388,6 +4293,9 @@
                 "step_count": {
                     "label": "台阶数"
                 },
+                "stile": {
+                    "label": "类型"
+                },
                 "stop": {
                     "label": "停车指示类型",
                     "options": {
@@ -3395,6 +4303,18 @@
                         "minor": "次要道路"
                     }
                 },
+                "street_cabinet": {
+                    "label": "类型"
+                },
+                "stroller": {
+                    "label": "婴儿车通行",
+                    "options": {
+                        "limited": "有限制",
+                        "no": "否",
+                        "yes": "是"
+                    },
+                    "terms": "婴儿车,婴儿推车,童车"
+                },
                 "structure": {
                     "label": "结构",
                     "options": {
@@ -3467,21 +4387,34 @@
                     },
                     "placeholder": "是，否，仅限外卖"
                 },
+                "target": {
+                    "label": "目标国"
+                },
                 "tidal": {
                     "label": "处于潮间带"
                 },
                 "to": {
                     "label": "终点"
                 },
+                "toilets": {
+                    "label": "厕所",
+                    "terms": "厕所,公厕,洗手间,卫生间"
+                },
                 "toilets/disposal": {
                     "label": "排污方式",
                     "options": {
                         "bucket": "粪桶",
                         "chemical": "化学厕所",
                         "flush": "冲水式",
-                        "pitlatrine": "旱厕/茅厕"
+                        "pitlatrine": "旱厕"
                     }
                 },
+                "toilets/handwashing": {
+                    "label": "洗手处"
+                },
+                "toilets/position": {
+                    "label": "位置"
+                },
                 "toll": {
                     "label": "收费"
                 },
@@ -3498,6 +4431,9 @@
                 "tower/type": {
                     "label": "类型"
                 },
+                "townhall/type": {
+                    "label": "类型"
+                },
                 "tracktype": {
                     "label": "道路铺设种类",
                     "options": {
@@ -3519,7 +4455,7 @@
                     "label": "交通标志"
                 },
                 "traffic_sign/direction": {
-                    "label": "方向",
+                    "label": "影响方位",
                     "options": {
                         "backward": "向后",
                         "both": "双向 / 全部",
@@ -3530,7 +4466,7 @@
                     "label": "类型"
                 },
                 "traffic_signals/direction": {
-                    "label": "方向",
+                    "label": "影响方位",
                     "options": {
                         "backward": "向后",
                         "both": "双向 / 全部",
@@ -3540,12 +4476,12 @@
                 "trail_visibility": {
                     "label": "路径可见度",
                     "options": {
-                        "bad": "差劲：没有标示，路径有时候消失",
-                        "excellent": "良好：路径明显或标示充分",
-                        "good": "尚可：有标示但可能不明显",
-                        "horrible": "可怕：路径常消失，需要部分定向能力",
-                        "intermediate": "略差：标示稀少，路径大致可见",
-                        "no": "无：没有路径，需具备完整的定向能力"
+                        "bad": "差劲：没有标示，路径有时候消失；需基本越野定向能力",
+                        "excellent": "极好：路径明显或有充分标示",
+                        "good": "良好：有标示但可能不明显",
+                        "horrible": "可怕：路径经常消失，需要较好的越野定向能力",
+                        "intermediate": "尚可：标示稀少，路径大致可见；需要较好方向感和地图",
+                        "no": "无：没有路径，需具备极高的越野定向能力"
                     },
                     "placeholder": "良好，尚可，稍差..."
                 },
@@ -3565,6 +4501,13 @@
                 "trees": {
                     "label": "树林"
                 },
+                "trench": {
+                    "label": "类型"
+                },
+                "trolley_wire": {
+                    "label": "架空电车线",
+                    "terms": "架空电车线,电车线,接触网,架空线,架空,高架电缆,无轨电车,电车"
+                },
                 "tunnel": {
                     "label": "类型",
                     "placeholder": "默认"
@@ -3578,7 +4521,11 @@
                         "military": "军用",
                         "test": "测试线",
                         "tourism": "观光线"
-                    }
+                    },
+                    "terms": "使用类型,利用类型"
+                },
+                "valve": {
+                    "label": "类型"
                 },
                 "vending": {
                     "label": "商品类型"
@@ -3631,6 +4578,12 @@
                 "water_point": {
                     "label": "饮水点"
                 },
+                "water_source": {
+                    "label": "水源"
+                },
+                "water_volume": {
+                    "label": "蓄水量 (m³)"
+                },
                 "waterway": {
                     "label": "类型"
                 },
@@ -3642,7 +4595,12 @@
                     "label": "类型"
                 },
                 "wheelchair": {
-                    "label": "轮椅通道"
+                    "label": "轮椅通道",
+                    "options": {
+                        "limited": "有限制",
+                        "no": "否",
+                        "yes": "是"
+                    }
                 },
                 "wholesale": {
                     "label": "批发"
@@ -3651,10 +4609,17 @@
                     "label": "宽度 (米)"
                 },
                 "wikidata": {
-                    "label": "维基数据"
+                    "label": "维基数据",
+                    "terms": "维基数据,维基"
+                },
+                "wikimedia_commons": {
+                    "label": "维基共享资源页",
+                    "placeholder": "File:Example.jpg",
+                    "terms": "维基共享资源,维基"
                 },
                 "wikipedia": {
-                    "label": "维基百科"
+                    "label": "维基百科",
+                    "terms": "维基百科,维基"
                 },
                 "windings": {
                     "label": "绕组数",
@@ -3729,12 +4694,13 @@
                     "name": "牵绳",
                     "terms": "牵绳"
                 },
-                "aerialway/station": {
-                    "name": "缆车站"
-                },
                 "aerialway/t-bar": {
                     "name": "滑雪缆车",
-                    "terms": "滑雪缆车,滑雪吊车"
+                    "terms": "滑雪缆车"
+                },
+                "aerialway/zip_line": {
+                    "name": "滑索",
+                    "terms": "滑索,飞索,绳索,滑缆,飞人,空中,高空,滑翔"
                 },
                 "aeroway": {
                     "name": "机场路径"
@@ -3759,6 +4725,18 @@
                     "name": "直升机场",
                     "terms": "直升机场,直升机坪"
                 },
+                "aeroway/holding_position": {
+                    "name": "跑道等待位置",
+                    "terms": "跑道,滑行道,飞机等待"
+                },
+                "aeroway/jet_bridge": {
+                    "name": "登机桥",
+                    "terms": "登机桥,廊桥,登机,登机廊桥,空桥,廊桥,航站楼"
+                },
+                "aeroway/parking_position": {
+                    "name": "停机位",
+                    "terms": "停机位,机位,飞机"
+                },
                 "aeroway/runway": {
                     "name": "机场跑道",
                     "terms": "机场,跑道,飞机,飞机场,滑行,起飞,飞行,降落"
@@ -3772,7 +4750,7 @@
                     "terms": "机场航站楼"
                 },
                 "amenity": {
-                    "name": "便利设施"
+                    "name": "设施"
                 },
                 "amenity/animal_boarding": {
                     "name": "动物寄养机构",
@@ -3840,17 +4818,13 @@
                     "name": "咖啡馆",
                     "terms": "咖啡,茶,咖啡厅,咖啡馆,茶座,摩卡,拿铁,馥芮白,玛奇朵,卡布奇诺,红茶,黄茶,清茶,青茶,绿茶,花茶,黑茶,白茶,乌龙,咖啡豆,餐馆,餐厅"
                 },
-                "amenity/car_pooling": {
-                    "name": "拼车",
-                    "terms": "拼车"
-                },
                 "amenity/car_rental": {
                     "name": "汽车租赁",
                     "terms": "汽车租赁处,租车店,汽车租赁,租赁,出租,租"
                 },
                 "amenity/car_sharing": {
-                    "name": "汽车共享",
-                    "terms": "汽车共享"
+                    "name": "共享汽车站点",
+                    "terms": "共享汽车站点"
                 },
                 "amenity/car_wash": {
                     "name": "洗车",
@@ -3939,15 +4913,46 @@
                     "terms": "驾校,汽车,车,教练,驾驶,驾照,学校,交通,运输,培训,学习"
                 },
                 "amenity/embassy": {
-                    "name": "使馆",
-                    "terms": "使馆,大使馆,领事馆"
+                    "name": "使馆"
                 },
                 "amenity/fast_food": {
                     "name": "快餐店",
                     "terms": "快餐店"
                 },
                 "amenity/fast_food/burger": {
-                    "name": "汉堡快餐"
+                    "name": "汉堡快餐",
+                    "terms": "汉堡,汉堡店,快餐,快餐店,餐厅,早餐,午餐,午饭,中饭,食物,晚餐,晚饭,食物,美食,得来速"
+                },
+                "amenity/fast_food/chicken": {
+                    "name": "鸡肉快餐",
+                    "terms": "鸡肉,鸡,炸鸡,炸鸡店,快餐,快餐店,餐厅,早餐,早饭,午餐,午饭,中饭,食物,晚餐,晚饭,食物,美食,得来速"
+                },
+                "amenity/fast_food/donut": {
+                    "name": "甜甜圈快餐",
+                    "terms": "甜甜圈,快餐,快餐店,餐厅,咖啡厅,咖啡馆,咖啡,早饭,早午饭,午饭,中饭,食物,美食"
+                },
+                "amenity/fast_food/fish_and_chips": {
+                    "name": "炸鱼薯条快餐",
+                    "terms": "鱼,炸鱼,薯条,马铃薯,土豆,快餐,快餐店,餐厅,早餐,早饭,午餐,午饭,中饭,食物,晚餐,晚饭,食物,美食"
+                },
+                "amenity/fast_food/hot_dog": {
+                    "name": "热狗快餐",
+                    "terms": "热狗,火腿肠,肉肠,烤肠,香肠,辣狗,玉米狗,三明治,快餐,快餐店,餐厅,早饭,早午饭,午饭,中饭,食物,美食"
+                },
+                "amenity/fast_food/ice_cream": {
+                    "name": "冰淇淋快餐"
+                },
+                "amenity/fast_food/mexican": {
+                    "name": "墨西哥快餐",
+                    "terms": "墨西哥,墨式,快餐,快餐店,塔克,塔可,玉米卷,玉米薄饼,餐厅,早餐,早饭,午餐,午饭,中饭,食物,晚餐,晚饭,食物,美食,得来速"
+                },
+                "amenity/fast_food/pizza": {
+                    "name": "披萨快餐",
+                    "terms": "披萨,批萨,匹萨,比萨,薄饼,快餐,快餐店,披萨店,餐厅,午餐,午饭,中饭,食物,晚餐,晚饭,食物,美食,得来速"
+                },
+                "amenity/fast_food/sandwich": {
+                    "name": "三明治快餐",
+                    "terms": "三明治,三文治,快餐,快餐店,餐厅,早餐,早饭,午餐,午饭,中饭,食物,晚餐,晚饭,美食,得来速"
                 },
                 "amenity/ferry_terminal": {
                     "name": "轮船渡口 / 码头"
@@ -3968,6 +4973,10 @@
                     "name": "加油站",
                     "terms": "加油站,加气站,油站"
                 },
+                "amenity/gambling": {
+                    "name": "赌场厅",
+                    "terms": "赌场,赌博,赌,赌注,下注,宾果,纸牌,扑克,中彩,老虎机"
+                },
                 "amenity/grave_yard": {
                     "name": "墓地",
                     "terms": "墓地,坟地"
@@ -3992,9 +5001,13 @@
                     "name": "网吧",
                     "terms": "网吧,上网咖啡馆,上网咖啡厅"
                 },
+                "amenity/karaoke_box": {
+                    "name": "KTV亭",
+                    "terms": "卡拉ok,卡拉,ktv,迷你ktv,迷你卡拉ok,k歌,点唱,唱歌,唱吧,点唱亭,唱"
+                },
                 "amenity/kindergarten": {
-                    "name": "幼儿园",
-                    "terms": "幼儿园,学前班,托儿所,幼稚园,学校,校园,学习"
+                    "name": "幼儿园场地",
+                    "terms": "幼儿园,幼稚园,学前班,学龄前,托儿所,学校,校园"
                 },
                 "amenity/language_school": {
                     "name": "语言学校"
@@ -4027,19 +5040,27 @@
                     "name": "疗养院"
                 },
                 "amenity/parking": {
-                    "name": "停车场"
+                    "name": "停车场",
+                    "terms": "停车场,停车,rv"
                 },
                 "amenity/parking/multi-storey": {
                     "name": "多层停车场"
                 },
+                "amenity/parking/underground": {
+                    "name": "地下停车处"
+                },
                 "amenity/parking_entrance": {
-                    "name": "车库出入口",
-                    "terms": "停车场出入口,地下车库出入口,多层车库出入口"
+                    "name": "车库入口 / 出口",
+                    "terms": "停车场,停车库,车库,停车,地下车库,出入口,出口,入口"
                 },
                 "amenity/parking_space": {
                     "name": "停车位",
                     "terms": "停车空间,停车场地,停车位"
                 },
+                "amenity/pharmacy": {
+                    "name": "药房",
+                    "terms": "药房,药店,药妆店,药剂师,药师,处方,处方药,药,中药,西药,药材"
+                },
                 "amenity/photo_booth": {
                     "name": "自助拍照机",
                     "terms": "拍照机,照相机,拍照,照相,自助,自动,照相馆,照相亭,证件,证件照,护照,快照,照片,照"
@@ -4052,10 +5073,30 @@
                     "name": "佛教寺庙",
                     "terms": "寺庙,佛堂,和尚寺,尼姑庵,佛教,宗教,庙宇,礼拜,寺观,寺院,佛寺,梵刹,禅林,净院"
                 },
+                "amenity/place_of_worship/christian": {
+                    "name": "基督教堂",
+                    "terms": "基督教堂,基督教,天主教,东正教,新教,基督,教堂,修道院,教会,祈祷,祷告,礼拜,拜堂,牧师,圣所,圣殿,神殿,神"
+                },
+                "amenity/place_of_worship/christian/jehovahs_witness": {
+                    "name": "耶和华见证人王国会馆",
+                    "terms": "耶和华见证人,耶证,王国会馆,御国会馆,基督教,教堂,神,祈祷,祷告,敬神,崇拜,礼拜"
+                },
+                "amenity/place_of_worship/christian/la_luz_del_mundo": {
+                    "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": "神道教,日本,神社,社屋,拜殿,宗教,寺庙,庙宇,神祇,祭祀,崇奉,礼拜,祈福,牌坊,鸟居"
@@ -4077,8 +5118,8 @@
                     "terms": "警察局,警局,警署,派出所"
                 },
                 "amenity/post_box": {
-                    "name": "ä¿¡ç®±",
-                    "terms": "邮箱,邮筒"
+                    "name": "邮件投递箱",
+                    "terms": "投递箱,邮箱,信箱,邮件,信件,邮政,投递,包裹,邮筒,支柱箱"
                 },
                 "amenity/post_office": {
                     "name": "邮局",
@@ -4092,6 +5133,10 @@
                     "name": "酒馆",
                     "terms": "酒馆"
                 },
+                "amenity/pub/lgbtq": {
+                    "name": "LGBTQ+ 酒吧",
+                    "terms": "lgb,lgbt,lgbtq,同性恋,双性恋,双性,跨性别,酷儿,同性恋酒吧"
+                },
                 "amenity/public_bath": {
                     "name": "公共浴室",
                     "terms": "公共,浴室,淋浴,浴池,澡堂,洗澡,冲澡,冲凉,洗浴,搓澡,清洁,搓背,修脚,温泉,足浴"
@@ -4146,11 +5191,11 @@
                     "terms": "餐馆,餐厅,希腊,饭店,烧烤,橄榄,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
                 },
                 "amenity/restaurant/indian": {
-                    "name": "意式餐馆",
+                    "name": "印度餐馆",
                     "terms": "餐馆,餐厅,印式,印度,咖喱,飞饼,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
                 },
                 "amenity/restaurant/italian": {
-                    "name": "印度餐馆",
+                    "name": "意式餐馆",
                     "terms": "餐馆,餐厅,意式,意大利,意大利面,披萨,批萨,匹萨,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
                 },
                 "amenity/restaurant/japanese": {
@@ -4208,6 +5253,10 @@
                     "name": "亭",
                     "terms": "棚,棚屋"
                 },
+                "amenity/shelter/public_transport": {
+                    "name": "候车亭",
+                    "terms": "候车亭,候车厅,候车,等车,等候,棚,公交站,地铁站,公共交通,庇护所,站台,月台,车站,站点"
+                },
                 "amenity/shower": {
                     "name": "淋浴间",
                     "terms": "公共,浴室,淋浴,浴池,澡堂,洗澡,冲澡,冲凉,洗浴,搓澡,清洁,搓背,修脚,温泉,足浴,雨"
@@ -4240,6 +5289,10 @@
                     "name": "工作室",
                     "terms": "工作室"
                 },
+                "amenity/studio/video": {
+                    "name": "电影制片厂",
+                    "terms": "电影,影片,影像,映画,制片,录制,录音,后期,工作室,制片厂"
+                },
                 "amenity/swimming_pool": {
                     "name": "游泳池"
                 },
@@ -4255,14 +5308,30 @@
                     "name": "剧院",
                     "terms": "剧院,剧场,戏院"
                 },
+                "amenity/theatre/type/amphi": {
+                    "name": "圆形剧场",
+                    "terms": "圆形剧场,露天,竞技场,圆形露天剧场,阶梯教室"
+                },
                 "amenity/toilets": {
                     "name": "厕所",
                     "terms": "厕所,公厕,洗手间"
                 },
+                "amenity/toilets/disposal/flush": {
+                    "name": "冲水式厕所",
+                    "terms": "厕所,公厕,洗手间,马桶,WC"
+                },
+                "amenity/toilets/disposal/pitlatrine": {
+                    "name": "旱厕",
+                    "terms": "旱厕,坑厕,蹲坑厕所,蹲坑,茅坑"
+                },
                 "amenity/townhall": {
                     "name": "市政府",
                     "terms": "市政府,市政厅,大会堂"
                 },
+                "amenity/townhall/city": {
+                    "name": "市政府",
+                    "terms": "市政府,市政厅,市政府大楼,市政,地方议会,县政府,政府,市长,市当局"
+                },
                 "amenity/university": {
                     "name": "大学",
                     "terms": "大学,学院,院校,大专,校园,学校,学习"
@@ -4295,6 +5364,10 @@
                     "name": "纪念币压制机",
                     "terms": "纪念币,硬币,压制,纪念品,零钱,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
                 },
+                "amenity/vending_machine/excrement_bags": {
+                    "name": "排便袋提供处",
+                    "terms": "排便袋提供处"
+                },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "女性卫生用品售货机",
                     "terms": "女,女性,避孕套,安全套,月经,棉条,卫生巾,卫生,私人,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
@@ -4310,9 +5383,6 @@
                     "name": "冰淇淋售货机",
                     "terms": "冰淇淋,冰激淋,冰激凌,冰淇凌,冷饮,雪糕,冰沙,冰砖,冰棒,棒冰,售货,售卖,贩卖,售货机,自助,自动,付货,零售"
                 },
-                "amenity/vending_machine/news_papers": {
-                    "name": "报纸售货机"
-                },
                 "amenity/vending_machine/newspapers": {
                     "name": "报纸售货机",
                     "terms": "报,报纸,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
@@ -4363,11 +5433,11 @@
                 },
                 "area": {
                     "name": "区域",
-                    "terms": "区域"
+                    "terms": "区域,面"
                 },
                 "area/highway": {
-                    "name": "道路表面",
-                    "terms": "道路表面"
+                    "name": "道路范围",
+                    "terms": "道路,道路区域,道路边缘,道路范围,街道范围,道路表面,路面,路表"
                 },
                 "attraction": {
                     "name": "景点"
@@ -4376,18 +5446,10 @@
                     "name": "游乐设施",
                     "terms": "游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点,大摆锤,狂欢节"
                 },
-                "attraction/animal": {
-                    "name": "动物",
-                    "terms": "动物,动物园,生物,老虎,狮子,熊,猴,猿,鹿,龟,蛙,鳄,蛇,鸟,兽,牛,羊,豹,鼬,鼠,狸,鹤,鹳,鹅,雁,鸠,鸡,两栖,乐园,景点,游乐设施"
-                },
                 "attraction/big_wheel": {
                     "name": "摩天轮",
                     "terms": "摩天轮,大转轮,观览车,观景台,法利士,费里斯,巨轮,俯瞰,远眺,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
                 },
-                "attraction/bumper_car": {
-                    "name": "碰碰车",
-                    "terms": "碰碰车,碰,撞,碰撞,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
-                },
                 "attraction/bungee_jumping": {
                     "name": "蹦极",
                     "terms": "蹦极,蹦极跳,机索跳,笨猪跳,俯冲跳,自由落体,高空弹跳,弹跳,跳,跳跃,前扑,坠落,跌落,下坠,飞天,户外,塔顶,高楼,跳楼,跳水,橡皮绳,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
@@ -4400,22 +5462,10 @@
                     "name": "黑暗骑乘",
                     "terms": "黑暗,室内,骑乘,鬼,轨道,电影,音效,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
                 },
-                "attraction/drop_tower": {
-                    "name": "跳楼机",
-                    "terms": "跳楼机,跳楼,自由落体,蹦极,太空梭,垂直极限,天地双雄,穿越云霄,大怒神,下落,下坠,坠落,跌落,高塔,飞天,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
-                },
                 "attraction/maze": {
                     "name": "迷宫",
                     "terms": "迷宫,景点,旅游,游乐设施,游乐"
                 },
-                "attraction/pirate_ship": {
-                    "name": "海盗船",
-                    "terms": "海盗船,海盗,鬼魂,摆动,谷底,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
-                },
-                "attraction/river_rafting": {
-                    "name": "漂流",
-                    "terms": "漂流,峡谷漂流,激流勇进,激流,急流勇进,涉水,水,户外,竹筏,木筏,橡皮艇,皮艇,船,小舟,扁舟,顺流,落差,长漂,探险,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
-                },
                 "attraction/roller_coaster": {
                     "name": "过山车",
                     "terms": "过山车,云霄飞车,云霄,飞车,矿车,轨道,铁轨,窄轨,火车,列车,弹射,木质,垂直,下坠,跌落,坠落,下落,飞行,翻转,游乐设施,游乐,游艺,娱乐,乐园,游乐园,主题乐园,儿童乐园,景点"
@@ -4479,10 +5529,17 @@
                     "name": "路缘",
                     "terms": "路缘,路缘石,立缘石,路缘带,路肩,边缘,行车带,人行道,无障碍,公路,马路"
                 },
+                "barrier/kerb/flush": {
+                    "name": "平整路缘",
+                    "terms": "整齐路缘,水平路缘,无触碰路缘"
+                },
                 "barrier/kerb/lowered": {
                     "name": "下降式路缘",
                     "terms": "路缘,路缘石,平缘石,路缘带,路肩,边缘,行车带,人行道,无障碍,公路,马路"
                 },
+                "barrier/kerb/raised": {
+                    "name": "上升式路缘"
+                },
                 "barrier/kissing_gate": {
                     "name": "单人转门",
                     "terms": "单人转门"
@@ -4507,6 +5564,12 @@
                     "name": "墙",
                     "terms": "墙,墙壁"
                 },
+                "barrier/wall/noise_barrier": {
+                    "name": "隔音屏障"
+                },
+                "boundary": {
+                    "name": "边界"
+                },
                 "boundary/administrative": {
                     "name": "行政区域界线",
                     "terms": "行政区域界线"
@@ -4554,8 +5617,8 @@
                     "terms": "学院,建筑,教学楼,实验室,校舍,宿舍,大学,院校,大专,校园,学校,学习"
                 },
                 "building/commercial": {
-                    "name": "商业建筑物",
-                    "terms": "商业建筑物"
+                    "name": "商务办公楼",
+                    "terms": "商业建筑物,写字楼,办公楼"
                 },
                 "building/construction": {
                     "name": "在建建筑",
@@ -4605,8 +5668,8 @@
                     "terms": "工业建筑物"
                 },
                 "building/kindergarten": {
-                    "name": "学前班/幼儿园建筑",
-                    "terms": "学前班建筑,幼儿园建筑"
+                    "name": "幼儿园建筑",
+                    "terms": "幼儿园,幼稚园,学前班,学龄前,托儿所,学校,校园,建筑"
                 },
                 "building/public": {
                     "name": "公共建筑",
@@ -4617,8 +5680,8 @@
                     "terms": "住宅建筑物,住宅建筑"
                 },
                 "building/retail": {
-                    "name": "零售业建筑",
-                    "terms": "零售业建筑,百货"
+                    "name": "商场建筑",
+                    "terms": "零售业建筑,百货,购物中心,商场"
                 },
                 "building/roof": {
                     "name": "开放式建筑",
@@ -4670,17 +5733,20 @@
                     "name": "仓库",
                     "terms": "仓库,货栈"
                 },
-                "camp_site/camp_pitch": {
-                    "name": "宿营位",
-                    "terms": "宿营位,露营位,野营位,露营地,野营地,露营场,野营场,露营,野营,野营场地,露营场地,宿营地,宿营,扎营,帐篷,野外,荒野,郊野,郊外,度假"
+                "building_part": {
+                    "name": "建筑部分",
+                    "terms": "屋顶,楼顶,三维建筑,3D建筑"
                 },
-                "circular": {
-                    "name": "信号控制环岛"
+                "building_point": {
+                    "name": "建筑物"
                 },
                 "club": {
                     "name": "俱乐部",
                     "terms": "俱乐部,社团,夜总会,会所,可乐部,社交,组织,娱乐,社区,会议,驿站,平台,会,汇,社会,文化,团体,会员"
                 },
+                "club/sport": {
+                    "name": "体育俱乐部"
+                },
                 "craft": {
                     "name": "工艺作坊",
                     "terms": "工艺作坊,工场"
@@ -4765,9 +5831,6 @@
                     "name": "楼层隔热间",
                     "terms": "楼层隔热间,绝缘,隔热"
                 },
-                "craft/jeweler": {
-                    "name": "珠宝店"
-                },
                 "craft/key_cutter": {
                     "name": "配匙工",
                     "terms": "配匙工,切割,钥匙,配匙,钥匙,锁,锁匠,门锁"
@@ -4779,9 +5842,6 @@
                     "name": "金属结构建筑",
                     "terms": "金属建筑,金属建筑物"
                 },
-                "craft/optician": {
-                    "name": "眼镜店"
-                },
                 "craft/painter": {
                     "name": "油漆匠",
                     "terms": "粉刷匠"
@@ -4803,8 +5863,8 @@
                     "terms": "管道工"
                 },
                 "craft/pottery": {
-                    "name": "陶器场",
-                    "terms": "陶器场"
+                    "name": "制陶机",
+                    "terms": "制陶机"
                 },
                 "craft/rigger": {
                     "name": "装配工",
@@ -4869,9 +5929,18 @@
                     "name": "酿酒厂",
                     "terms": "酒庄,酒厂"
                 },
+                "demolished/building": {
+                    "name": "近期拆除的建筑物"
+                },
+                "disused/railway": {
+                    "name": "废弃铁路要素"
+                },
                 "embankment": {
                     "name": "堤岸"
                 },
+                "emergency": {
+                    "name": "应急要素"
+                },
                 "emergency/ambulance_station": {
                     "name": "救护站",
                     "terms": "救护站"
@@ -4886,6 +5955,9 @@
                 "emergency/destination": {
                     "name": "紧急集合处"
                 },
+                "emergency/fire_extinguisher": {
+                    "name": "灭火器"
+                },
                 "emergency/fire_hydrant": {
                     "name": "消防栓",
                     "terms": "消防栓"
@@ -4913,17 +5985,27 @@
                 "emergency/private": {
                     "name": "紧急设施：仅私人"
                 },
+                "emergency/water_tank": {
+                    "name": "应急水箱"
+                },
                 "emergency/yes": {
                     "name": "紧急设施：开放"
                 },
                 "entrance": {
                     "name": "入口/出口",
-                    "terms": "入口/出口,出入口"
+                    "terms": "入口,出口,出入口,门"
+                },
+                "entrance/emergency": {
+                    "name": "紧急出口",
+                    "terms": "紧急出口,消防出口,应急出口,非常口,消防门,火灾,火情,紧急,应急,消防,疏散,撤离,逃离,避难,安全出口,门"
                 },
                 "ford": {
                     "name": "过水路面",
                     "terms": "过水路面,浅滩,漫水桥,垫脚石"
                 },
+                "ford_line": {
+                    "name": "过水路面"
+                },
                 "golf/bunker": {
                     "name": "高尔夫沙坑",
                     "terms": "高尔夫沙坑"
@@ -5013,7 +6095,7 @@
                     "terms": "语言,语音,口语,声音,说话,哑,喉咙,治疗,诊所,医院,医学,医疗,疗法,卫生"
                 },
                 "highway": {
-                    "name": "道路"
+                    "name": "公路要素"
                 },
                 "highway/bridleway": {
                     "name": "马道",
@@ -5024,7 +6106,7 @@
                     "terms": "导向,巴士,导轨,导轮,胶轮,公交,公交车,轨道"
                 },
                 "highway/bus_stop": {
-                    "name": "公交车站 / 站台"
+                    "name": "公交站"
                 },
                 "highway/construction": {
                     "name": "道路关闭",
@@ -5034,6 +6116,9 @@
                     "name": "室内走廊",
                     "terms": "室内走廊,室内步行街"
                 },
+                "highway/crossing": {
+                    "name": "路口"
+                },
                 "highway/crossing/marked": {
                     "name": "人行横道 (有标线)",
                     "terms": "人行横道,斑马线"
@@ -5060,6 +6145,21 @@
                     "name": "自行车道",
                     "terms": "自行车,单车"
                 },
+                "highway/cycleway/bicycle_foot": {
+                    "name": "步行和自行车道",
+                    "terms": "步行和自行车道,绿道,多用道"
+                },
+                "highway/cycleway/crossing": {
+                    "name": "自行车横道"
+                },
+                "highway/cycleway/crossing/marked": {
+                    "name": "自行车横道 (有标线)",
+                    "terms": "自行车横道,自行车横道线,自行车路口,单车横道线,单车路口"
+                },
+                "highway/cycleway/crossing/unmarked": {
+                    "name": "自行车横道 (无标线)",
+                    "terms": "自行车横道,自行车横道线,自行车路口,单车横道线,单车路口"
+                },
                 "highway/elevator": {
                     "name": "电梯",
                     "terms": "电梯,直梯"
@@ -5068,6 +6168,9 @@
                     "name": "步行道路",
                     "terms": "步行径"
                 },
+                "highway/footway/crossing": {
+                    "name": "人行横道"
+                },
                 "highway/footway/marked": {
                     "name": "人行横道 (有标线)",
                     "terms": "人行横道,斑马线"
@@ -5111,7 +6214,7 @@
                 },
                 "highway/motorway": {
                     "name": "高速公路",
-                    "terms": "高速公路"
+                    "terms": "高速公路,高速,道路,路,公路,快速路,干道,马路"
                 },
                 "highway/motorway_junction": {
                     "name": "高速公路交界处/出口",
@@ -5119,7 +6222,7 @@
                 },
                 "highway/motorway_link": {
                     "name": "高速公路连接路",
-                    "terms": "高速公路连接路"
+                    "terms": "高速公路连接路,连接路,匝道,高速,道路,路,公路,快速路,干道,马路"
                 },
                 "highway/path": {
                     "name": "小道",
@@ -5135,19 +6238,19 @@
                 },
                 "highway/primary": {
                     "name": "主要道路",
-                    "terms": "主要道路"
+                    "terms": "主要道路,道路,路,公路,大道,高架路,干道,快速路,马路"
                 },
                 "highway/primary_link": {
                     "name": "主要道路连接路",
-                    "terms": "主要道路连接路"
+                    "terms": "主要道路连接路,连接路,匝道,道路,路,公路,大道,高架路,干道,快速路,马路"
                 },
                 "highway/raceway": {
-                    "name": "跑道(赛车)",
-                    "terms": "跑道,赛车,赛道"
+                    "name": "赛车场",
+                    "terms": "赛车场"
                 },
                 "highway/residential": {
                     "name": "住宅区道路",
-                    "terms": "住宅区道路"
+                    "terms": "住宅区道路,道路,路,街道,街,公路,马路,小型道路,城区道路"
                 },
                 "highway/rest_area": {
                     "name": "休息区",
@@ -5155,23 +6258,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": "胡同,巷,弄堂,里弄,小巷,巷,弄,巷弄（可通行机动车）"
+                    "terms": "胡同,巷,弄堂,里弄,小巷,弄,窄路,巷弄（可通行机动车）"
                 },
                 "highway/service/drive-through": {
                     "name": "免下车",
@@ -5214,15 +6317,15 @@
                 },
                 "highway/tertiary": {
                     "name": "三级道路",
-                    "terms": "三级道路"
+                    "terms": "三级道路,道路,路,公路,马路"
                 },
                 "highway/tertiary_link": {
                     "name": "三级道路连接路",
-                    "terms": "三级道路连接路"
+                    "terms": "三级道路连接路,连接路,匝道,道路,路,公路,马路"
                 },
                 "highway/track": {
                     "name": "未铺设路面的车径",
-                    "terms": "未铺设路面的车径"
+                    "terms": "车径,小路,土路,泥路,山路,马道,马路,消防道路,农场道路,牧场道路,路,道路,4x4,4wd,四驱,吉普"
                 },
                 "highway/traffic_mirror": {
                     "name": "道路反光镜",
@@ -5232,13 +6335,17 @@
                     "name": "交通信号灯",
                     "terms": "红绿灯"
                 },
+                "highway/trailhead": {
+                    "name": "小径起点",
+                    "terms": "小径起点,起点,路径,登山,远足,小路,小径,踪迹,登山口,终点,山地车,山地自行车,跋涉,长途旅行"
+                },
                 "highway/trunk": {
                     "name": "干线道路",
-                    "terms": "干线道路,干道"
+                    "terms": "干线公路,道路,路,公路,干道,大道,快速路,国道,高架路,马路"
                 },
                 "highway/trunk_link": {
                     "name": "干线道路连接路",
-                    "terms": "干线道路连接路"
+                    "terms": "干线公路连接路,连接路,匝道,道路,路,公路,干道,大道,快速路,国道,高架路,马路"
                 },
                 "highway/turning_circle": {
                     "name": "环岛",
@@ -5250,7 +6357,7 @@
                 },
                 "highway/unclassified": {
                     "name": "小型/未分级道路",
-                    "terms": "小型/未分级道路"
+                    "terms": "道路,道路,路,公路,街道,马路,小型道路,未分级道路"
                 },
                 "historic": {
                     "name": "历史地点",
@@ -5269,8 +6376,12 @@
                     "terms": "城堡"
                 },
                 "historic/memorial": {
-                    "name": "纪念碑",
-                    "terms": "纪念"
+                    "name": "纪念物",
+                    "terms": "纪念,纪念碑,纪念物,碑,墓碑,墓志铭,墓石,绊脚石,绊脚坎,奠基石,奠基,牌匾,蓝色牌匾,雕像,石刻,纪念堂,战争纪念,回忆"
+                },
+                "historic/memorial/plaque": {
+                    "name": "纪念牌匾",
+                    "terms": "牌匾,金石,纪念牌匾,纪念物,纪念碑,纪念,铭文,箴铭,刻字,墓志铭,墓志,遗址"
                 },
                 "historic/monument": {
                     "name": "纪念堂",
@@ -5292,6 +6403,28 @@
                     "name": "路旁神龛",
                     "terms": "路边神社"
                 },
+                "indoor": {
+                    "name": "室内要素"
+                },
+                "indoor/area": {
+                    "name": "室内区域"
+                },
+                "indoor/corridor": {
+                    "name": "室内走廊"
+                },
+                "indoor/corridor_line": {
+                    "name": "室内走廊"
+                },
+                "indoor/door": {
+                    "name": "室内的门"
+                },
+                "indoor/room": {
+                    "name": "房间",
+                    "terms": "房间,室内,前厅,前庭,门厅,大厅,大堂,小间,门廊,私室,卧室,卧房,接待厅,候见室"
+                },
+                "indoor/wall": {
+                    "name": "室内的墙"
+                },
                 "internet_access/wlan": {
                     "name": "无线热点"
                 },
@@ -5300,7 +6433,7 @@
                     "terms": "交通枢纽,路口"
                 },
                 "landuse": {
-                    "name": "土地用途"
+                    "name": "土地利用要素"
                 },
                 "landuse/allotments": {
                     "name": "公共花园",
@@ -5322,16 +6455,15 @@
                     "terms": "墓地"
                 },
                 "landuse/churchyard": {
-                    "name": "教堂庭院",
-                    "terms": "教堂庭院"
+                    "name": "教堂庭院"
                 },
                 "landuse/commercial": {
-                    "name": "商业区",
-                    "terms": "商业区,商业用地"
+                    "name": "商务办公用地",
+                    "terms": "商业区,商业用地,办公用地,商务"
                 },
                 "landuse/construction": {
-                    "name": "建设用地",
-                    "terms": "建设,建造,施工,工地,在建,建筑,构筑,构建,承建,用地,建设用地"
+                    "name": "建设区域",
+                    "terms": "建设区域,建设,建造,在建,施工,工地,承建"
                 },
                 "landuse/farm": {
                     "name": "农田"
@@ -5348,6 +6480,10 @@
                     "name": "人工林",
                     "terms": "人工林,森林,树林,林业,木材,树木,施业林,经营林,砍伐"
                 },
+                "landuse/garages": {
+                    "name": "车库土地利用",
+                    "terms": "车库土地利用"
+                },
                 "landuse/grass": {
                     "name": "草坪",
                     "terms": "草地"
@@ -5356,6 +6492,10 @@
                     "name": "待开发荒地",
                     "terms": "未开发过的土地"
                 },
+                "landuse/greenhouse_horticulture": {
+                    "name": "温室园艺",
+                    "terms": "温室,花,园艺,植物,种植,生长,栽培"
+                },
                 "landuse/harbour": {
                     "name": "港口",
                     "terms": "港口,港,岸,海"
@@ -5392,14 +6532,6 @@
                     "name": "军营",
                     "terms": "军营,虎帐,兵营,军队,部队,步兵,驻扎,营房"
                 },
-                "landuse/military/bunker": {
-                    "name": "军事碉堡",
-                    "terms": "军事碉堡,碉堡"
-                },
-                "landuse/military/checkpoint": {
-                    "name": "检查点",
-                    "terms": "检查点,检查站,检查,边检"
-                },
                 "landuse/military/danger_area": {
                     "name": "军事危险区域",
                     "terms": "危险区"
@@ -5408,18 +6540,10 @@
                     "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": "军事,靶场,靶子"
@@ -5467,15 +6591,15 @@
                     "terms": "公寓区,楼区,公寓楼,公寓,住宅,住宅区,住所,套间"
                 },
                 "landuse/retail": {
-                    "name": "零售场所",
-                    "terms": "零售场所"
+                    "name": "购物区",
+                    "terms": "零售场所,购物区,商业区,商业用地"
                 },
                 "landuse/vineyard": {
                     "name": "葡萄园",
                     "terms": "葡萄园,酒庄"
                 },
                 "leisure": {
-                    "name": "休闲场所"
+                    "name": "休闲要素"
                 },
                 "leisure/adult_gaming_centre": {
                     "name": "成人街机厅",
@@ -5510,8 +6634,8 @@
                     "terms": "狗公园,狗狗公园"
                 },
                 "leisure/firepit": {
-                    "name": "火塘",
-                    "terms": "火塘,火炉,火坑,火堆"
+                    "name": "火坑",
+                    "terms": "火坑"
                 },
                 "leisure/fishing": {
                     "name": "钓鱼地点"
@@ -5661,6 +6785,10 @@
                     "name": "体育场",
                     "terms": "体育,体育场"
                 },
+                "leisure/swimming_area": {
+                    "name": "自然游泳区域",
+                    "terms": "潜水,水,游泳"
+                },
                 "leisure/swimming_pool": {
                     "name": "游泳池",
                     "terms": "游泳池"
@@ -5669,6 +6797,13 @@
                     "name": "赛道(非机动竞速项目)",
                     "terms": "赛道,跑道,竞速"
                 },
+                "leisure/track/running": {
+                    "name": "体育跑道",
+                    "terms": "跑道,田径,跑步,跑,马拉松,冲刺,竞走,健身,操场跑道"
+                },
+                "leisure/track/running_point": {
+                    "name": "体育跑道"
+                },
                 "leisure/water_park": {
                     "name": "水上乐园",
                     "terms": "水上乐园,水上公园"
@@ -5678,7 +6813,7 @@
                     "terms": "线"
                 },
                 "man_made": {
-                    "name": "人造物"
+                    "name": "人造要素"
                 },
                 "man_made/adit": {
                     "name": "坑道入口",
@@ -5688,13 +6823,17 @@
                     "name": "天线杆塔",
                     "terms": "天线,天线杆,天线塔,电话,通讯,手机,无线电,电视,广播,频道,电台,信号塔"
                 },
+                "man_made/beehive": {
+                    "name": "蜂窝",
+                    "terms": "蜂窝,蜂巢,蜜蜂,蜂蜜,养蜂,养蜂人,蜂,蜂穴,授粉,花粉,农场"
+                },
                 "man_made/breakwater": {
                     "name": "防波堤",
                     "terms": "避风塘,避风港"
                 },
                 "man_made/bridge": {
-                    "name": "桥面轮廓",
-                    "terms": "桥面轮廓,桥体"
+                    "name": "桥梁范围",
+                    "terms": "桥梁范围,桥面轮廓,桥梁区域,桥梁边缘,桥面,桥体,桥梁,大桥,桥"
                 },
                 "man_made/chimney": {
                     "name": "烟囱",
@@ -5743,6 +6882,10 @@
                     "name": "码头",
                     "terms": "码头"
                 },
+                "man_made/pier/floating": {
+                    "name": "浮动码头",
+                    "terms": "浮动码头,码头,船坞,泊区,泊位,停泊,靠岸,港区"
+                },
                 "man_made/pipeline": {
                     "name": "管道",
                     "terms": "管道"
@@ -5774,6 +6917,10 @@
                 "man_made/tower/communication": {
                     "name": "通信塔"
                 },
+                "man_made/tunnel": {
+                    "name": "隧道范围",
+                    "terms": "隧道范围,隧道区域,隧道,地道,下立交"
+                },
                 "man_made/wastewater_plant": {
                     "name": "污水处理厂",
                     "terms": "污水处理厂"
@@ -5802,20 +6949,8 @@
                     "name": "工厂",
                     "terms": "工厂,加工,制造"
                 },
-                "manhole": {
-                    "name": "人井",
-                    "terms": "人井,人孔,检修,探孔,入孔,盖,洞,孔,下水道,排水,污水,通信,电信,电缆,通讯,人孔井,手井,穿线,下水管"
-                },
-                "manhole/drain": {
-                    "name": "窨井口",
-                    "terms": "窨井盖,窨井口,窨井,下水道,盖,下水管,排水,排水道,污水,排水管,排水沟,洞,井,孔,雨,雷雨,台风,沙井,沙井盖"
-                },
-                "manhole/telecom": {
-                    "name": "电信检查井",
-                    "terms": "井盖,井,检查,人孔,手机,盖,通讯,通信,移动,联通,电信,电话,洞,孔,下水道,基站"
-                },
                 "natural": {
-                    "name": "自然"
+                    "name": "自然要素"
                 },
                 "natural/bare_rock": {
                     "name": "岩石",
@@ -5865,6 +7000,10 @@
                     "name": "山峰",
                     "terms": "山峰"
                 },
+                "natural/reef": {
+                    "name": "礁",
+                    "terms": "礁,珊瑚,岩礁,暗礁,沙洲,沙滩,海滩,沙,滩,海洋,浅水"
+                },
                 "natural/ridge": {
                     "name": "山脊",
                     "terms": "山脊,山高,凸,坡,斜坡,山峰,山冈,山"
@@ -5897,6 +7036,10 @@
                     "name": "树列",
                     "terms": "树列,一列树,一排树,树阵,树"
                 },
+                "natural/valley": {
+                    "name": "山谷",
+                    "terms": "山谷,峡谷,峡,谷,咽喉,沟,沟壑,山涧"
+                },
                 "natural/volcano": {
                     "name": "火山",
                     "terms": "火山"
@@ -5905,8 +7048,12 @@
                     "name": "水体",
                     "terms": "æ°´"
                 },
+                "natural/water/basin": {
+                    "name": "æ°´æ± ",
+                    "terms": "水池,水库,蓄水池,人工水池,下水道,排水沟,溢流,雨水池"
+                },
                 "natural/water/canal": {
-                    "name": "运河",
+                    "name": "运河区域",
                     "terms": "运河,支流,水路,水道,河,河流,水,航运"
                 },
                 "natural/water/lake": {
@@ -5922,20 +7069,16 @@
                     "terms": "水库"
                 },
                 "natural/water/river": {
-                    "name": "æ²³",
+                    "name": "河流区域",
                     "terms": "河流,河,江,浜,水道,水路,支流,溪流,水流,水,泉流"
                 },
-                "natural/water/stream": {
-                    "name": "溪流",
-                    "terms": "溪流,溪,小溪,支流,涧流,细流,流,涧,水渠,渠,泉流,泉,水流,水"
-                },
                 "natural/wetland": {
                     "name": "湿地",
                     "terms": "湿地"
                 },
                 "natural/wood": {
-                    "name": "树林",
-                    "terms": "树林"
+                    "name": "自然树林",
+                    "terms": "树林,森林,自然树林,山林,林区,树,森,林,木"
                 },
                 "noexit/yes": {
                     "name": "路终点",
@@ -5980,6 +7123,10 @@
                     "name": "共享办公空间",
                     "terms": "共享办公空间"
                 },
+                "office/diplomatic": {
+                    "name": "外交代表机构",
+                    "terms": "外交代表机构,外交,大使馆,领事馆,使馆,领事"
+                },
                 "office/educational_institution": {
                     "name": "教育机构",
                     "terms": "教育机构"
@@ -5993,8 +7140,8 @@
                     "terms": "电力,电源,电,能源,煤气,天然气,电网,公司"
                 },
                 "office/estate_agent": {
-                    "name": "地产代理",
-                    "terms": "地产代理"
+                    "name": "地产中介",
+                    "terms": "地产代理,地产中介,房产中介,中介,房屋中介"
                 },
                 "office/financial": {
                     "name": "金融机构",
@@ -6059,8 +7206,8 @@
                     "name": "医生"
                 },
                 "office/political_party": {
-                    "name": "政党",
-                    "terms": "政党"
+                    "name": "政党办公室",
+                    "terms": "政党办公室"
                 },
                 "office/private_investigator": {
                     "name": "私家侦探事务所",
@@ -6080,7 +7227,7 @@
                 },
                 "office/telecommunication": {
                     "name": "电信办公室",
-                    "terms": "电信公司"
+                    "terms": "电信公司,营业厅,电信营业厅"
                 },
                 "office/therapist": {
                     "name": "治疗师工作室",
@@ -6208,7 +7355,7 @@
                     "terms": "点"
                 },
                 "power": {
-                    "name": "电力"
+                    "name": "电力要素"
                 },
                 "power/cable/underground": {
                     "name": "地下电缆",
@@ -6218,6 +7365,17 @@
                     "name": "发电机",
                     "terms": "发电机"
                 },
+                "power/generator/source/hydro": {
+                    "name": "水轮机",
+                    "terms": "水轮机,水力机,水轮,水力,水力电,水电站,水电,水坝,大坝,坝,发电,涡轮机,珀尔顿,卡普兰,水能"
+                },
+                "power/generator/source/nuclear": {
+                    "name": "核反应堆"
+                },
+                "power/generator/source/wind": {
+                    "name": "风力发电机",
+                    "terms": "风力发电机,风力,发电,风力机,风车,涡轮机,风能,风轮,风"
+                },
                 "power/line": {
                     "name": "超高压输电线",
                     "terms": "输电线,输电,超高压,高电压,高压线,高压电线,高压,架空,电线,电力,电缆,缆线,线缆,发电,导线,电"
@@ -6234,9 +7392,6 @@
                     "name": "电线杆",
                     "terms": "电线杆"
                 },
-                "power/sub_station": {
-                    "name": "变电站"
-                },
                 "power/substation": {
                     "name": "变电站",
                     "terms": "变电站,配电所"
@@ -6250,44 +7405,77 @@
                     "terms": "变电所"
                 },
                 "public_transport/platform": {
-                    "name": "公共交通站 / 站台",
-                    "terms": "公共交通,车站,站台"
+                    "name": "公共交通站台",
+                    "terms": "站台,月台,车站,公共交通,交通"
                 },
-                "public_transport/platform_aerialway": {
-                    "name": "缆车站 / 站台",
-                    "terms": "缆车,空中列车,车站,站台"
+                "public_transport/platform/aerialway": {
+                    "name": "缆车站台",
+                    "terms": "缆车,空中列车,车站,站台,月台,公共交通,交通"
                 },
-                "public_transport/platform_bus": {
-                    "name": "公交车站 / 站台",
-                    "terms": "公交,公交站,公交车,巴士,大巴,客车,车站,站台"
+                "public_transport/platform/aerialway_point": {
+                    "name": "缆车站 / 站台"
+                },
+                "public_transport/platform/bus": {
+                    "name": "公交站台",
+                    "terms": "公交,公交站,公交车,巴士,大巴,客车,车站,站台,月台,公共交通,交通"
+                },
+                "public_transport/platform/bus_point": {
+                    "name": "公交站",
+                    "terms": "公交,公交站,车站,公交车,巴士,大巴,客车,巴士站,公交停靠站,公共交通,交通"
+                },
+                "public_transport/platform/ferry": {
+                    "name": "轮船站台",
+                    "terms": "轮船,渡轮,渡口,车站,站台,公共交通,交通"
+                },
+                "public_transport/platform/ferry_point": {
+                    "name": "轮船渡口 / 站台"
+                },
+                "public_transport/platform/light_rail": {
+                    "name": "轻轨站台",
+                    "terms": "轻轨,地铁,捷运,铁路,车站,站台,月台,公共交通,交通"
                 },
-                "public_transport/platform_ferry": {
-                    "name": "轮船渡口 / 站台",
-                    "terms": "轮船,渡轮,渡口,车站,站台"
+                "public_transport/platform/light_rail_point": {
+                    "name": "轻轨站 / 站台"
                 },
-                "public_transport/platform_light_rail": {
-                    "name": "轻轨站 / 站台",
-                    "terms": "轻轨,地铁,捷运,铁路,车站,站台,月台"
+                "public_transport/platform/monorail": {
+                    "name": "单轨列车站台",
+                    "terms": "单轨,轻轨,列车,车站,站台,月台,公共交通,交通"
                 },
-                "public_transport/platform_monorail": {
-                    "name": "单轨列车站 / 站台",
-                    "terms": "单轨,列车,车站,站台,月台"
+                "public_transport/platform/monorail_point": {
+                    "name": "单轨列车站 / 站台"
                 },
-                "public_transport/platform_subway": {
-                    "name": "地铁站 / 站台",
-                    "terms": "地铁,轻轨,捷运,铁路,车站,站台,月台"
+                "public_transport/platform/subway": {
+                    "name": "地铁站台",
+                    "terms": "地铁,轻轨,捷运,铁路,车站,站台,月台,公共交通,交通,地下铁"
                 },
-                "public_transport/platform_train": {
-                    "name": "列车站 / 站台",
-                    "terms": "列车,火车,动车,高铁,铁路,车站,站台,月台"
+                "public_transport/platform/subway_point": {
+                    "name": "地铁站 / 站台"
                 },
-                "public_transport/platform_tram": {
-                    "name": "有轨电车站 / 站台",
-                    "terms": "电车,有轨电车,车站,站台"
+                "public_transport/platform/train": {
+                    "name": "火车站台",
+                    "terms": "列车,火车,动车,高铁,铁路,车站,站台,月台,公共交通,交通"
                 },
-                "public_transport/platform_trolleybus": {
-                    "name": "无轨电车站 / 站台",
-                    "terms": "电车,无轨电车,车站,站台"
+                "public_transport/platform/train_point": {
+                    "name": "火车站 / 站台"
+                },
+                "public_transport/platform/tram": {
+                    "name": "有轨电车站台",
+                    "terms": "有轨电车,轻轨,轻轨站,电车,电车站,站台,月台,公共交通,交通,有轨,轻铁"
+                },
+                "public_transport/platform/tram_point": {
+                    "name": "有轨电车站 / 站台"
+                },
+                "public_transport/platform/trolleybus": {
+                    "name": "无轨电车站台",
+                    "terms": "电车,无轨电车,电车站,公交,公交站,公交车,巴士,站台,月台,公共交通,交通,无轨"
+                },
+                "public_transport/platform/trolleybus_point": {
+                    "name": "无轨电车站",
+                    "terms": "电车,无轨电车,电车站,公交,公交站,公交车,巴士,公共交通,交通,无轨"
+                },
+                "public_transport/platform_point": {
+                    "name": "公共交通站 / 站台",
+                    "terms": "站台,月台,公共交通,车站"
                 },
                 "public_transport/station": {
                     "name": "公共交通车站",
@@ -6378,7 +7566,7 @@
                     "terms": "电车,无轨电车,停车处,停车点"
                 },
                 "railway": {
-                    "name": "铁路"
+                    "name": "铁路要素"
                 },
                 "railway/abandoned": {
                     "name": "已拆除铁路遗迹",
@@ -6388,6 +7576,10 @@
                     "name": "铁路挡车器",
                     "terms": "止冲器,末端,缓冲器,缓冲,停车,减速,挡车,停止,轨道,股道,铁轨,铁路,路轨,火车,列车,站台"
                 },
+                "railway/construction": {
+                    "name": "在建铁路",
+                    "terms": "在建铁路,建设,建造,铁路,施工,工地,在建,承建,铁轨,轨道"
+                },
                 "railway/crossing": {
                     "name": "铁路道口 (人行道)",
                     "terms": "铁路道口,平交道口,铁路道口(人行道)"
@@ -6432,12 +7624,16 @@
                     "terms": "窄轨铁路,铁路"
                 },
                 "railway/platform": {
-                    "name": "火车站 / 站台"
+                    "name": "火车站台"
                 },
                 "railway/rail": {
                     "name": "标准铁路",
                     "terms": "铁轨"
                 },
+                "railway/rail/highspeed": {
+                    "name": "高速铁路",
+                    "terms": "高铁,高速铁路,子弹头列车,动车,列车,铁路"
+                },
                 "railway/signal": {
                     "name": "铁路信号机",
                     "terms": "色灯,信号机,信号,灯,信号灯,红绿灯,表示器,轨道,股道,铁轨,铁路,路轨,火车,列车,调车,进站,出站"
@@ -6472,13 +7668,13 @@
                     "name": "关系",
                     "terms": "关系"
                 },
-                "roundabout": {
-                    "name": "环岛"
-                },
                 "route/ferry": {
                     "name": "航线",
                     "terms": "航线,轮渡,渡轮,渡船,渡口,摆渡"
                 },
+                "seamark": {
+                    "name": "航标"
+                },
                 "shop": {
                     "name": "商店",
                     "terms": "商店,超市,便利店,汽车,汽修,百货,商场,服装,面包,报刊,报纸,美发,理发,家具,硬件,电脑,花,电器,肉,酒,鞋,轮胎,自行车,单车,4S"
@@ -6488,8 +7684,8 @@
                     "terms": "酒庄"
                 },
                 "shop/anime": {
-                    "name": "动漫店",
-                    "terms": "动漫店"
+                    "name": "动漫/漫画店",
+                    "terms": "漫画,动漫,日漫,日本,cosplay,cos"
                 },
                 "shop/antiques": {
                     "name": "古董店",
@@ -6537,7 +7733,7 @@
                 },
                 "shop/beverages": {
                     "name": "饮料店",
-                    "terms": "饮品店"
+                    "terms": "饮品店,饮料店,奶茶,奶茶店"
                 },
                 "shop/bicycle": {
                     "name": "自行车店",
@@ -6552,8 +7748,7 @@
                     "terms": "书店,书城"
                 },
                 "shop/boutique": {
-                    "name": "精品店",
-                    "terms": "精品店"
+                    "name": "精品店"
                 },
                 "shop/butcher": {
                     "name": "肉店",
@@ -6623,10 +7818,6 @@
                     "name": "化妆品店",
                     "terms": "日化店"
                 },
-                "shop/craft": {
-                    "name": "艺术/手工艺品店",
-                    "terms": "艺术/手工艺品店"
-                },
                 "shop/curtain": {
                     "name": "窗帘店",
                     "terms": "窗帘店"
@@ -6672,8 +7863,7 @@
                     "terms": "农产直销店"
                 },
                 "shop/fashion": {
-                    "name": "服装店",
-                    "terms": "服装店,潮流服饰店"
+                    "name": "服装店"
                 },
                 "shop/fishmonger": {
                     "name": "海产店"
@@ -6686,6 +7876,10 @@
                     "name": "相框店",
                     "terms": "相框店"
                 },
+                "shop/frozen_food": {
+                    "name": "冷冻食品",
+                    "terms": "冷冻食品,冷冻,速冻,冷藏,生鲜,海鲜,超市,市场,卖场"
+                },
                 "shop/funeral_directors": {
                     "name": "殡仪馆",
                     "terms": "殡仪馆,墓园,墓地,坟墓,丧葬承办人,殡葬业者,殡葬,死亡,逝世,丧礼,葬"
@@ -6705,6 +7899,9 @@
                     "name": "瓶装燃气站",
                     "terms": "燃气,站,瓶,气,燃料"
                 },
+                "shop/general": {
+                    "name": "杂货店"
+                },
                 "shop/gift": {
                     "name": "礼品店",
                     "terms": "礼品店"
@@ -6741,6 +7938,10 @@
                     "name": "室内装饰店",
                     "terms": "室内装饰店"
                 },
+                "shop/jewelry": {
+                    "name": "珠宝店",
+                    "terms": "珠宝店,珠宝,首饰,手镯,戒指,钻戒,钻石,宝石,耳环,项链,黄金,金条,金银,银器,饰针,胸针,贵金属"
+                },
                 "shop/kiosk": {
                     "name": "售货亭",
                     "terms": "售货亭,报刊亭,书报亭,售卖"
@@ -6753,6 +7954,10 @@
                     "name": "洗衣店",
                     "terms": "洗衣店"
                 },
+                "shop/laundry/self_service": {
+                    "name": "自助洗衣店",
+                    "terms": "洗衣,洗衣房,洗衣店,洗衣间,自助,洗衣服,洗衣机,投币洗衣"
+                },
                 "shop/leather": {
                     "name": "皮具店",
                     "terms": "皮具店"
@@ -6766,8 +7971,8 @@
                     "terms": "彩票店,彩票购买点"
                 },
                 "shop/mall": {
-                    "name": "商场",
-                    "terms": "商场"
+                    "name": "购物中心",
+                    "terms": "商场,购物中心"
                 },
                 "shop/massage": {
                     "name": "按摩店",
@@ -6873,6 +8078,10 @@
                     "name": "鞋店",
                     "terms": "鞋店"
                 },
+                "shop/spices": {
+                    "name": "香料店",
+                    "terms": "香料,桂皮,肉桂,咖喱,药草,香草,草本,胡椒,胡椒粉,盐,味精,藏红花,香精,芥末,姜,姜黄,商店"
+                },
                 "shop/sports": {
                     "name": "体育用品店",
                     "terms": "体育,体育用品店"
@@ -6972,8 +8181,12 @@
                     "name": "酒品商店",
                     "terms": "酒品商店,酒店,酒楼,酒坊"
                 },
+                "telecom/data_center": {
+                    "name": "数据中心",
+                    "terms": "数据,电脑系统存储,计算机,计算机科学,电脑,服务器,云端,电信,通信"
+                },
                 "tourism": {
-                    "name": "旅游设施"
+                    "name": "旅游要素"
                 },
                 "tourism/alpine_hut": {
                     "name": "高山小屋",
@@ -6991,9 +8204,17 @@
                     "name": "艺术品",
                     "terms": "艺术,壁画,雕塑,雕刻,雕像,人像,塑像,油画,绘画,石像,写真,浮雕,画像,街头艺术,颜料"
                 },
+                "tourism/artwork/sculpture": {
+                    "name": "雕塑",
+                    "terms": "雕塑,塑像"
+                },
+                "tourism/artwork/statue": {
+                    "name": "塑像",
+                    "terms": "塑像,像,雕像"
+                },
                 "tourism/attraction": {
                     "name": "旅游名胜",
-                    "terms": "旅游名胜"
+                    "terms": "旅游名胜,景点"
                 },
                 "tourism/camp_site": {
                     "name": "宿营场地",
@@ -7051,6 +8272,10 @@
                     "name": "博物馆",
                     "terms": "博物馆"
                 },
+                "tourism/museum/history": {
+                    "name": "历史博物馆",
+                    "terms": "历史,博物馆,展览,展品,化石,文物,藏品,古物,博览"
+                },
                 "tourism/picnic_site": {
                     "name": "野餐地",
                     "terms": "郊游地点"
@@ -7071,6 +8296,18 @@
                     "name": "动物园",
                     "terms": "动物园"
                 },
+                "tourism/zoo/petting": {
+                    "name": "儿童动物园",
+                    "terms": "儿童动物园,宠养,社区动物园,农场动物,动物园"
+                },
+                "tourism/zoo/safari": {
+                    "name": "野生动物园",
+                    "terms": "野生动物园,动物园"
+                },
+                "tourism/zoo/wildlife": {
+                    "name": "土著动物园",
+                    "terms": "土著动物,土著,本地,动物园"
+                },
                 "traffic_calming": {
                     "name": "交通减速设置",
                     "terms": "车辆减速措施"
@@ -7111,6 +8348,18 @@
                     "name": "减速台",
                     "terms": "减速,减速台,交通稳静化"
                 },
+                "traffic_sign": {
+                    "name": "交通标志"
+                },
+                "traffic_sign/maxspeed": {
+                    "name": "限速标志"
+                },
+                "traffic_sign/maxspeed_vertex": {
+                    "name": "限速标志"
+                },
+                "traffic_sign_vertex": {
+                    "name": "交通标志"
+                },
                 "type/boundary": {
                     "name": "边界",
                     "terms": "边界"
@@ -7126,6 +8375,10 @@
                 "type/multipolygon": {
                     "name": "复合多边形"
                 },
+                "type/public_transport/stop_area_group": {
+                    "name": "公共交通站点群",
+                    "terms": "公共交通站点群,站点,网络"
+                },
                 "type/restriction": {
                     "name": "限制",
                     "terms": "限制"
@@ -7198,6 +8451,10 @@
                     "name": "轻轨线路",
                     "terms": "轻轨,地铁,捷运,地下铁,火车,电车,列车,铁路,线路,路线"
                 },
+                "type/route/monorail": {
+                    "name": "单轨列车路线",
+                    "terms": "单轨列车路线,单轨列车"
+                },
                 "type/route/pipeline": {
                     "name": "管道线路",
                     "terms": "管道路线,管线,路线,线路"
@@ -7238,12 +8495,8 @@
                     "name": "æ°´è·¯",
                     "terms": "水路,水系,水道,航道,水沟,河道,河流,流域,水体,水域"
                 },
-                "vertex": {
-                    "name": "其它",
-                    "terms": "其它"
-                },
                 "waterway": {
-                    "name": "航道"
+                    "name": "航道要素"
                 },
                 "waterway/boatyard": {
                     "name": "船舶库",
@@ -7253,9 +8506,13 @@
                     "name": "运河",
                     "terms": "运河"
                 },
+                "waterway/canal/lock": {
+                    "name": "船闸",
+                    "terms": "船闸,水闸,运河,闸室,航道,闸门"
+                },
                 "waterway/dam": {
                     "name": "水坝",
-                    "terms": "水坝"
+                    "terms": "水坝,大坝"
                 },
                 "waterway/ditch": {
                     "name": "水沟",
@@ -7273,6 +8530,10 @@
                     "name": "船舶加油站",
                     "terms": "船舶加油站,加油,船,航海"
                 },
+                "waterway/lock_gate": {
+                    "name": "闸门",
+                    "terms": "闸门,闸首,水闸,船闸,运河,水阀,阀门"
+                },
                 "waterway/river": {
                     "name": "æ²³",
                     "terms": "江,河流,川"
@@ -7307,35 +8568,46 @@
             }
         },
         "imagery": {
-            "Bing": {
-                "description": "卫星和航空影像",
-                "name": "必应航空影像"
+            "AGIV": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Flanders 最近的航拍图"
             },
-            "DigitalGlobe-Premium": {
+            "AGIV10cm": {
                 "attribution": {
-                    "text": "条款与反馈"
+                    "text": "© agentschap Informatie Vlaanderen"
                 },
-                "name": "DigitalGlobe 优质影像"
+                "name": "AIV Flanders 2013-2015 的 10厘米 航拍图"
             },
-            "DigitalGlobe-Premium-vintage": {
+            "AGIVFlandersGRB": {
                 "attribution": {
-                    "text": "使用条款与意见反馈"
+                    "text": "© agentschap Informatie Vlaanderen"
                 },
-                "description": "影像边界和拍摄日期。标签会在缩放到13层级或更高时显示。",
-                "name": "DigitalGlobe 优质影像年份"
+                "name": "AIV Flanders GRB"
             },
-            "DigitalGlobe-Standard": {
+            "AIV_DHMV_II_HILL_25cm": {
                 "attribution": {
-                    "text": "条款与反馈"
+                    "text": "© agentschap Informatie Vlaanderen"
                 },
-                "name": "DigitalGlobe 标准影像"
+                "name": "AIV 佛兰德地区数字高程模型 II, 0.25 米多向山体阴影"
+            },
+            "AIV_DHMV_II_SVF_25cm": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Digitaal Hoogtemodel Vlaanderen II, 0.25 ç±³ Skyview"
+            },
+            "Bing": {
+                "description": "卫星和航空影像",
+                "name": "必应航空影像"
             },
-            "DigitalGlobe-Standard-vintage": {
+            "EOXAT2018CLOUDLESS": {
                 "attribution": {
-                    "text": "使用条款与意见反馈"
+                    "text": "Sentinel-2 无云 - https://s2maps.eu by EOX IT Services GmbH (包含已修改的 Copernicus Sentinel data 2017 & 2018)"
                 },
-                "description": "影像边界和拍摄日期。标签会在缩放到13层级或更高时显示。",
-                "name": "DigitalGlobe 标准影像年份"
+                "description": "经后期处理的 Sentinel 卫星影像。",
+                "name": "eox.at 2018 无云"
             },
             "EsriWorldImagery": {
                 "attribution": {
@@ -7407,6 +8679,12 @@
                 },
                 "name": "OSM查看器：标签"
             },
+            "SPW_ORTHO_LAST": {
+                "name": "SPW(allonie) 最新航空影像"
+            },
+            "SPW_PICC": {
+                "name": "SPW(allonie) PICC 数字图像"
+            },
             "US-TIGER-Roads-2014": {
                 "description": "在缩放等级16级以上是来自美国人口调查局的公共领域地图数据。低缩放等级下仅包含自2006年以来的变更，不含已纳入 OpenStreetMap 的变更。",
                 "name": "TIGER 道路 2014"
@@ -7415,10 +8693,58 @@
                 "description": "黄色 = 来自美国人口调查局的公共领域地图数据。红色 = 在 OpenStreetMap 中找不到数据。",
                 "name": "TIGER 道路 2017"
             },
+            "US-TIGER-Roads-2018": {
+                "description": "黄色 = 来自美国人口调查局的公共领域地图数据。红色 = 在 OpenStreetMap 中找不到数据。",
+                "name": "TIGER 道路 2018"
+            },
+            "US-TIGER-Roads-2019": {
+                "description": "黄色 = 来自美国人口调查局的公共领域地图数据。红色 = 在 OpenStreetMap 中找不到数据。",
+                "name": "TIGER 道路 2019"
+            },
+            "USDA-NAIP": {
+                "description": "近年来自美国各州的国家农业影像计划 (NAIP) 的 DOQQ。",
+                "name": "国家农业影像计划"
+            },
             "US_Forest_Service_roads_overlay": {
                 "description": "公路：绿色线框 = 未分级。棕色线框 = 未铺设路面。表面：沙砾 = 浅棕色填充，沥青 = 黑色，已铺设 = 灰色，土地 = 白色，混凝土 = 蓝色，草地 = 绿色。季节性 = 白色条状",
                 "name": "美国森林道路叠加层"
             },
+            "UrbISOrtho2016": {
+                "attribution": {
+                    "text": "由布鲁塞尔 UrbIS®© 驱动 - 发行与版权 CIRB"
+                },
+                "name": "UrbIS-Ortho 2016"
+            },
+            "UrbISOrtho2017": {
+                "attribution": {
+                    "text": "由布鲁塞尔 UrbIS®© 驱动 - 发行与版权 CIRB"
+                },
+                "name": "UrbIS-Ortho 2017"
+            },
+            "UrbISOrtho2018": {
+                "attribution": {
+                    "text": "由布鲁塞尔 UrbIS®© 驱动 - 发行与版权 CIRB"
+                },
+                "name": "UrbIS-Ortho 2018"
+            },
+            "UrbISOrtho2019": {
+                "attribution": {
+                    "text": "由布鲁塞尔 UrbIS®© 驱动 - 发行与版权 CIRB"
+                },
+                "name": "UrbIS-Ortho 2019"
+            },
+            "UrbisAdmFR": {
+                "attribution": {
+                    "text": "由布鲁塞尔 UrbIS®© 驱动 - 发行与版权 CIRB"
+                },
+                "name": "UrbisAdm FR"
+            },
+            "UrbisAdmNL": {
+                "attribution": {
+                    "text": "由布鲁塞尔 UrbIS®© 驱动 - 发行与版权 CIRB"
+                },
+                "name": "UrbisAdm NL"
+            },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
                     "text": "© waymarkedtrails.org, OpenStreetMap 贡献者, 署名-相同方式共享 3.0"
@@ -7463,6 +8789,139 @@
                 "description": "由 basemap.at 提供的正射影像图层，接替 geoimage.at 影像图层。",
                 "name": "basemap.at 正射影像"
             },
+            "basemap.at-overlay": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "由basemap.at 提供的注释叠加层",
+                "name": "basemap.at 叠加层"
+            },
+            "basemap.at-surface": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "由 basemap.at 提供的地表层",
+                "name": "basemap.at 地表"
+            },
+            "basemap.at-terrain": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "由basemap.at 提供的地形层",
+                "name": "basemap.at 地形"
+            },
+            "eufar-balaton": {
+                "attribution": {
+                    "text": "欧洲空载研究舰队(EUFAR) 巴拉顿正射影像（2010）"
+                },
+                "description": "来自巴拉顿湖沼学研究所的1940年地理标记照片",
+                "name": "欧洲空载研究舰队(EUFAR) 巴拉顿正射影像"
+            },
+            "finds.jp_KBN_2500": {
+                "attribution": {
+                    "text": "国土地理院基盘地图 2500"
+                },
+                "description": "由 finds.jp 提供的国土地理院基盘地图 2500。适合描绘，但较为陈旧。",
+                "name": "日本国土地理院基盘地图 2500"
+            },
+            "gothenburg-citymap": {
+                "attribution": {
+                    "text": "© 哥德堡市, CC0"
+                },
+                "description": "城市地图是描述哥德堡的概览地图。 它包含有关土地、通讯、水文、建筑物、地址号码和街道名称，行政区划和其他方向性文字的一般信息。",
+                "name": "哥德堡城市地图"
+            },
+            "gsi.go.jp": {
+                "attribution": {
+                    "text": "日本国土地理院"
+                },
+                "description": "日本国土地理院正射影像(电子国土基本图)。通常比 Bing 更好，但较为陈旧。",
+                "name": "日本国土地理院正射影像"
+            },
+            "gsi.go.jp_airphoto": {
+                "attribution": {
+                    "text": "日本国土地理院"
+                },
+                "description": "日本国土地理院航空影像(空中写真)。未经过正射校正，但与国土地理院正射影像相比，其内容较新和/或覆盖范围有所不同。",
+                "name": "日本国土地理院航空影像"
+            },
+            "gsi.go.jp_seamlessphoto": {
+                "attribution": {
+                    "text": "日本国土地理院无缝照片"
+                },
+                "description": "日本国土地理院无缝影像。国土地理院最新正射、航空、灾后等影像的集合。",
+                "name": "日本国土地理院无缝影像"
+            },
+            "gsi.go.jp_std_map": {
+                "attribution": {
+                    "text": "日本国土地理院"
+                },
+                "description": "日本国土地理院标准地图。广泛覆盖。",
+                "name": "日本国土地理院地图"
+            },
+            "helsingborg-orto": {
+                "attribution": {
+                    "text": "© 赫尔辛堡市"
+                },
+                "description": "来自2016年赫尔辛堡市的正射影像，公有领域",
+                "name": "赫尔辛堡市正射影像"
+            },
+            "kalmar-orto-2014": {
+                "attribution": {
+                    "text": "© 卡尔马市"
+                },
+                "description": "来自2014年卡尔马市北部海岸的正射影像",
+                "name": "卡尔马市北部正射影像（2014）"
+            },
+            "kalmar-orto-2016": {
+                "attribution": {
+                    "text": "© 卡尔马市"
+                },
+                "description": "来自2016年卡尔马市南部海岸的正射影像",
+                "name": "卡尔马市南部正射影像（2016）"
+            },
+            "kalmar-orto-2018": {
+                "attribution": {
+                    "text": "© 卡尔马市"
+                },
+                "description": "来自2018年卡尔马市城区的正射影像",
+                "name": "卡尔马市城区正射影像（2018）"
+            },
+            "kelkkareitit": {
+                "attribution": {
+                    "text": "© Kelkkareitit.fi"
+                },
+                "description": "来自 OSM 的 Kelkkareitit.fi 机动雪橇车径（覆盖斯堪的纳维亚国家）",
+                "name": "斯堪的纳维亚国家机动雪橇叠加层"
+            },
+            "lantmateriet-orto1960": {
+                "attribution": {
+                    "text": "© 瑞典国家测绘局(Lantmäteriet), CC0"
+                },
+                "description": "1955-1965年瑞典正射镶嵌影像。新旧照片都可能会出现。",
+                "name": "瑞典国家测绘局历史正射影像（1960）"
+            },
+            "lantmateriet-orto1975": {
+                "attribution": {
+                    "text": "© 瑞典国家测绘局(Lantmäteriet), CC0"
+                },
+                "description": "1970-1980年瑞典正射镶嵌影像。正在建设中。",
+                "name": "瑞典国家测绘局历史正射影像（1975）"
+            },
+            "lantmateriet-topowebb": {
+                "attribution": {
+                    "text": "© 瑞典国家测绘局(Lantmäteriet), CC0"
+                },
+                "description": "瑞典地形图，1:50 000",
+                "name": "瑞典国家测绘局地形图"
+            },
+            "linkoping-orto": {
+                "attribution": {
+                    "text": "© 林雪平市"
+                },
+                "description": "来自2010年林雪平市的正射影像，公开数据",
+                "name": "林雪平市正射影像"
+            },
             "mapbox_locator_overlay": {
                 "attribution": {
                     "text": "条款与反馈"
@@ -7495,6 +8954,13 @@
                 },
                 "name": "OpenStreetMap（德国样式）"
             },
+            "osmse-ekonomiska": {
+                "attribution": {
+                    "text": "© 瑞典国家测绘局(Lantmäteriet)"
+                },
+                "description": "“经济地理图”扫描版本，约1950-1980年",
+                "name": "瑞典国家测绘局经济地理图（1950-1980）"
+            },
             "qa_no_address": {
                 "attribution": {
                     "text": "© Simon Poole, 数据 © OpenStreetMap 贡献者"
@@ -7507,12 +8973,26 @@
                 },
                 "name": "skobbler"
             },
+            "skoterleder": {
+                "attribution": {
+                    "text": "© Skoterleder.org"
+                },
+                "description": "机动雪橇车径",
+                "name": "瑞典机动雪橇地图"
+            },
             "stamen-terrain-background": {
                 "attribution": {
                     "text": "地图瓦片由 Stamen 设计，并以 署名 3.0 协议授权。数据由 OpenStreetMap 提供并采用开放数据共享开放数据库许可协议 (ODbL) 授权。"
                 },
                 "name": "Stamen 地形"
             },
+            "stockholm-orto": {
+                "attribution": {
+                    "text": "© 斯德哥尔摩市, CC0"
+                },
+                "description": "来自2016年斯德哥尔摩市的正射影像，CC0 许可",
+                "name": "斯德哥尔摩市正射影像"
+            },
             "tf-cycle": {
                 "attribution": {
                     "text": "地图 © Thunderforest，数据 © OpenStreetMap 贡献者"
@@ -7524,124 +9004,376 @@
                     "text": "地图 © Thunderforest，数据 © OpenStreetMap 贡献者"
                 },
                 "name": "Thunderforest 地貌"
+            },
+            "trafikverket-baninfo": {
+                "attribution": {
+                    "text": "© 瑞典交通管理局(Trafikverket), CC0"
+                },
+                "description": "瑞典铁路网络，包括侧线",
+                "name": "瑞典交通管理局铁路网络"
+            },
+            "trafikverket-baninfo-option": {
+                "attribution": {
+                    "text": "© 瑞典交通管理局(Trafikverket), CC0"
+                },
+                "description": "瑞典铁路网络，并可选择多种地图图层",
+                "name": "瑞典交通管理局铁路网络选项"
+            },
+            "trafikverket-vagnat": {
+                "attribution": {
+                    "text": "© 瑞典交通管理局(Trafikverket), CC0"
+                },
+                "description": "瑞典国家道路数据库(NVDB)道路网络",
+                "name": "瑞典交通管理局道路网络"
+            },
+            "trafikverket-vagnat-extra": {
+                "attribution": {
+                    "text": "© 瑞典交通管理局(Trafikverket), CC0"
+                },
+                "description": "瑞典国家道路数据库(NVDB)新增细节：道路编号、交通稳静化、休息区、公交车站、桥梁、隧道和测速照相机",
+                "name": "瑞典交通管理局道路网络追加项"
+            },
+            "trafikverket-vagnat-navn": {
+                "attribution": {
+                    "text": "© 瑞典交通管理局(Trafikverket), CC0"
+                },
+                "description": "瑞典国家道路数据库(NVDB)道路名称",
+                "name": "瑞典交通管理局道路名称"
+            },
+            "trafikverket-vagnat-option": {
+                "attribution": {
+                    "text": "© 瑞典交通管理局(Trafikverket), CC0"
+                },
+                "description": "瑞典国家道路数据库(NVDB)道路网络，并可选择多种地图图层",
+                "name": "瑞典交通管理局道路网络选项"
             }
         },
         "community": {
-            "cape-coast-youthmappers": {
-                "name": "海岸角大学 YouthMappers",
-                "description": "在 Twitter 上关注我们：{url}",
-                "extendedDescription": "此为加纳海岸角大学在 Youth Mappers 上的官方章节。我们热爱地图、开放数据以及帮助弱势群体。"
+            "Bahia-telegram": {
+                "name": "OpenStreetMap 巴伊亚 Telegram 小组",
+                "description": "在 Telegram 上加入 OpenStreetMap 巴伊亚社区",
+                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
             },
-            "osm-gh-facebook": {
-                "name": "OpenStreetMap 加纳 Facebook 主页",
-                "description": "为对 OpenStreetMap 感兴趣的用户准备的 Facebook 小组。",
-                "extendedDescription": "位于加纳的绘图者社区，在加纳宣传 OpenStreetMap 以及人道主义 OpenStreetMap 团队 (HOT) 项目。加入我们。"
+            "Bay-Area-OpenStreetMappers": {
+                "name": "旧金山湾区 OpenStreetMap 贡献者",
+                "description": "改进位于旧金山湾区的 OpenStreetMap",
+                "extendedDescription": "该小组的目的是在旧金山湾区发展 OpenStreetMap 社区。 我们的活动向所有人开放，包括开源代码爱好者、自行车骑手、GIS 专业人员和其他所有人。 欢迎对地图、地图制作和免费地图数据感兴趣的任何人和其他所有人，加入我们的团队并参加我们的活动。"
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "宾夕法尼亚中部 OSM",
+                "description": "来自宾夕法尼亚州立大学的在线制图社区"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "San Jose Slack 的代码",
+                "description": "我们欢迎所有人加入！请在 {signupUrl}进行注册，然后加入 #osm 频道。"
+            },
+            "DF-telegram": {
+                "name": "OpenStreetMap 巴西利亚 Telegram 群组",
+                "description": "在 Telegram 上加入 OpenStreetMap 巴西利亚社区",
+                "extendedDescription": "加入社区以了解有关 OpenStreetMap 的更多信息，在会议中提问或者参与。欢迎每个人的到来！"
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "达拉斯沃思堡 OSM",
+                "description": "达拉斯沃思堡的 OpenStreetMap 用户群组",
+                "extendedDescription": "达拉斯、沃思堡以及介于两者之间的所有城市中，到处都是富有创造力和精通技术的人。 该用户组的愿景是找到使用 OSM 惊人资源的新方法。"
+            },
+            "Galicia-Telegram": {
+                "name": "OpenStreetMap 加利西亚 Telegram",
+                "description": "OpenStreetMap 加利西亚 Telegram"
+            },
+            "Galicia-Twitter": {
+                "name": "OpenStreetMap 加利西亚 Twitter",
+                "description": "关注我们的 Twitter：{url}"
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "extendedDescription": "GeoPhilly 将开发人员、地理学家、数据极客、开源代码爱好者、民间黑客和地图迷们团结在一起，共同分享我们对地图及其故事的热爱。 如果您在工作中使用地图，或者只是想了解更多信息，这就是为您提供的聚会！ 我们的活动旨在开放、友好、具有教育性和社交性。活动范围从欢乐时光到闪电演讲，甚至是研讨会。 与我们一起在费城创建一个多样化、启发性的地理空间社区！"
+            },
+            "MapMinnesota": {
+                "name": "明尼苏达州地图",
+                "description": "位于双子城区域的绘图者和 OpenStreetMap 用户",
+                "extendedDescription": "连接明尼苏达州和双子城的 OpenStreetMap 爱好者！"
+            },
+            "Mapping-DC-meetup": {
+                "name": "正在绘制华盛顿特区",
+                "description": "在华盛顿特区改进 OpenStreetMap",
+                "extendedDescription": "我们是一个志愿地图绘制者团体，我们的目标是改善华盛顿特区的 OpenStreetMap。 我们还旨在向其他人讲授 OSM 生态系统、数据分、，制图和 GIS。 我们每隔一个月聚会一次，以关注城市的某个区域。"
+            },
+            "MappingWR": {
+                "name": "正在绘制滑铁卢地区",
+                "description": "轻松找到滑铁卢地区附近的低碳路线。"
+            },
+            "Maptime-Bogota": {
+                "name": "波哥大 绘图时间",
+                "description": "我们是一群对在波哥大的 OpenStreetMap 中进行地图绘制感兴趣的地图绘制者。",
+                "extendedDescription": "了解如何在现场收集数据并将其数字化到 OpenStreetMap 上。 没不需要有基础知识！ 您只需乐于参与、渴望学习和并收获快乐。"
+            },
+            "Maptime-ME-meetup": {
+                "name": "Maptime 缅因州",
+                "description": "位于缅因州波特兰地区的绘图者和 OpenStreetMap 用户",
+                "extendedDescription": "实际上，Maptime 是指在地图制作花费的时间。 我们的使命是通过使用制图工具和技术创建协作学习，探索和地图创建的时间和空间，为感兴趣的任何人打开制图的可能性。"
+            },
+            "Maptime-Oceania-Slack": {
+                "name": "Maptime 大洋洲 Slack",
+                "description": "在 {signupUrl} 上注册"
             },
-            "osm-gh-twitter": {
-                "name": "OpenStreetMap 加纳 Twitter 主页",
-                "description": "在 Twitter 上关注我们：{url}"
+            "MaptimeHRVA-twitter": {
+                "name": "Maptime 克罗地亚 Twitter",
+                "description": "关注我们的 Twitter：{url}"
             },
-            "talk-gh": {
-                "name": "Talk-gh 邮件列表",
-                "description": "Talk-gh 是为加纳 OSM 社区准备的官方邮件列表"
+            "Nottingham-OSM-pub-meetup": {
+                "name": "东米德兰（诺丁汉）月度酒吧见面会",
+                "description": "东米德兰绘图者和用户的社交聚会",
+                "extendedDescription": "该小组自2011年3月开始举行会议，地点最初在诺丁汉，近几年在德比，或不时在东米德兰的其他地方举行。这些虽是社交聚会，但却是来询问涉及地区或只是普通的 OSM 特定问题的好地方。在夏季，我们通常会在会场附近进行一小时的小型测绘。整个团队都对关于公共优先权的测绘有着特殊的兴趣，并且不时为此而召开绘图会议。"
             },
-            "osm-mg-facebook": {
-                "name": "OpenStreetMap 马达加斯加 Facebook 小组",
-                "description": "为对 OpenStreetMap 感兴趣的用户准备的马达加斯加 Facebook 小组。"
+            "OSM-AR-facebook": {
+                "name": "OpenStreetMap 阿根廷 Facebook",
+                "description": "在 Facebook 上加入 OpenStreetMap 阿根廷社区",
+                "extendedDescription": "当地社区的新闻"
             },
-            "talk-mg": {
-                "name": "Talk-mg 邮件列表",
-                "description": "位于马达加斯加的 OpenStreetMap 贡献者、社区和用户分享和讨论的地方。"
+            "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-Asia-mailinglist": {
+                "name": "OpenStreetMap 亚洲邮件列表",
+                "description": "Talk-asia 是亚洲社区的官方邮件列表"
             },
             "OSM-BGD-facebook": {
                 "name": "OpenStreetMap 孟加拉国",
                 "description": "改进位于孟加拉国的 OpenStreetMap",
-                "extendedDescription": "在孟加拉国绘图？有任何疑问，想要与当地的社区交流？在 {url} 加入我们。欢迎所有人！"
-            },
-            "OSM-India-facebook": {
-                "name": "OpenStreetMap 印度 - 共同参与的街区绘图",
-                "description": "改进位于印度的 OpenStreetMap",
-                "extendedDescription": "在印度绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！",
+                "extendedDescription": "在孟加拉国绘图？有任何疑问，想要与当地的社区交流？在 {url} 加入我们。欢迎所有人！",
                 "events": {
-                    "sotmasia2018": {
-                        "name": "State of the Map 亚洲 2018",
-                        "description": "加入位于印度的 State of the Map 亚洲的2018年 OpenStreetMap 地区活动。",
-                        "where": "印度管理学院，印度班加罗尔"
+                    "sotmasia2019": {
+                        "name": "State of the Map 亚洲 2019",
+                        "description": "加入位于达卡的 State of the Map 亚洲的 2019 年 OpenStreetMap 地区活动。",
+                        "where": "孟加拉国达卡农业研究所（KIB）"
                     }
                 }
             },
-            "OSM-india-mailinglist": {
-                "name": "OpenStreetMap 印度邮件列表",
-                "description": "Talk-in 是为印度社区准备的官方邮件列表"
+            "OSM-BO-mailinglist": {
+                "name": "Talk-bo 邮件列表",
+                "description": "Talk-bo 是玻利维亚 OpenStreetMap 社区的官方邮件列表",
+                "extendedDescription": "在玻利维亚绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
             },
-            "OSM-india-twitter": {
-                "name": "OpenStreetMap 印度 Twitter",
-                "description": "我们之间仅差一条推文：{url}"
+            "OSM-BiH-telegram": {
+                "name": "OpenStreetMap 波黑 Telegram",
+                "description": "OSM 波斯尼亚与黑塞哥维亚社区的 Telegram 群组： {url}"
             },
-            "osm-india-website": {
-                "name": "OpenStreetMap 印度"
+            "OSM-Boston": {
+                "name": "OpenStreetMap 波士顿",
+                "description": "位于波士顿地区的绘图者和 OpenStreetMap 用户",
+                "extendedDescription": "OpenStreetMap 是一种免费的，开放的 Wiki 风格的世界地图，每天都有来自像您这样的人作出的数十万贡献。 编辑地图既简单又有趣！ 在室内和室外与我们一起，努力创建波士顿和世界其他地区的最佳地图！"
             },
-            "OSM-India-Puducherry-Facebook": {
-                "name": "自由软硬件运动 (FSHM) - Facebook",
-                "description": "在 FSHM Facebook 主页上了解更多社区事件和活动"
+            "OSM-CA-Slack": {
+                "name": "OSM-CA Slack",
+                "description": "欢迎所有人加入！在 {signupUrl} 上注册。"
             },
-            "OSM-India-Puducherry-Matrix": {
-                "name": "自由软硬件运动 (FSHM) - Matrix"
+            "OSM-CA-mailinglist": {
+                "name": "OSM 加拿大 邮件列表",
+                "description": "讨论在加拿大 OpenStreetMap 的邮件列表"
             },
-            "OSM-IDN-facebook": {
-                "name": "OpenStreetMap 印度尼西亚",
-                "description": "改进位于印度尼西亚的 OpenStreetMap",
-                "extendedDescription": "在印度尼西亚绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            "OSM-CL-facebook": {
+                "name": "OpenStreetMap 智利 Facebook",
+                "description": "在 Facebook 上加入 OpenStreetMap 智利社区",
+                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
             },
-            "OSM-japan-facebook": {
-                "name": "OpenStreetMap 日本社区",
-                "description": "在日本的绘图者和 OpenStreetMap 用户"
+            "OSM-CL-mailinglist": {
+                "name": "Talk-cl 邮件列表",
+                "description": "讨论在智利 OpenStreetMap 的邮件列表"
             },
-            "OSM-japan-mailinglist": {
-                "name": "OpenStreetMap 日本邮件列表",
-                "description": "Talk-ja 是为日本社区准备的官方邮件列表"
+            "OSM-CL-telegram": {
+                "name": "OpenStreetMap 智利 Telegram",
+                "description": "在 Telegram 上加入 OpenStreetMap 智利社区",
+                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
             },
-            "OSM-japan-twitter": {
-                "name": "OpenStreetMap 日本 Twitter",
-                "description": "Twitter 上的#标签：{url}"
+            "OSM-CL-twitter": {
+                "name": "OpenStreetMap 智利 Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
             },
-            "OSM-japan-website": {
-                "name": "OpenStreetMap 日本",
-                "description": "位于日本的绘图者和 OpenStreetMap 用户"
+            "OSM-CN-telegram": {
+                "name": "OpenStreetMap 中国 Telegram",
+                "description": "OSM 中国社区的 Telegram 群组：{url}"
             },
-            "OSM-MY-forum": {
-                "name": "OpenStreetMap 马来西亚论坛",
-                "description": "官方 OpenStreetMap 马来西亚论坛"
+            "OSM-CO": {
+                "name": "OpenStreetMap 哥伦比亚",
+                "description": "关于 OpenStreetMap 哥伦比亚社区和 OSMCo 基金会的新闻"
             },
-            "OSM-MY-matrix": {
-                "name": "OpenStreetMap 马来西亚 Riot 频道",
-                "description": "欢迎所有的绘图者！在 {signupUrl} 上注册。"
+            "OSM-CO-facebook": {
+                "name": "OpenStreetMap 哥伦比亚 Facebook",
+                "description": "在 Facebook 上加入 OpenStreetMap 哥伦比亚社区",
+                "extendedDescription": "加入社区来了解更多 OpenStreetMap。欢迎每个人的到来！"
             },
-            "OSM-MNG-facebook": {
-                "name": "OpenStreetMap 蒙古",
-                "description": "改进位于蒙古的 OpenStreetMap",
-                "extendedDescription": "在蒙古绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            "OSM-CO-mailinglist": {
+                "name": "Talk-co 邮件列表",
+                "description": "讨论在哥伦比亚 OpenStreetMap 的邮件列表"
             },
-            "OSM-MMR-facebook": {
-                "name": "OpenStreetMap 缅甸",
+            "OSM-CO-telegram": {
+                "name": "OSM 哥伦比亚在 Telegram",
+                "description": "OpenStreetMap 哥伦比亚 Telegram 交流"
+            },
+            "OSM-CO-twitter": {
+                "name": "OpenStreetMap 哥伦比亚 Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "OSM-CU-telegram": {
+                "name": "OSM 古巴在 Telegram",
+                "description": "OpenStreetMap 古巴 Telegram 交流"
+            },
+            "OSM-CZ-telegram": {
+                "name": "OpenStreetMap 捷克 Telegram",
+                "description": "OSM 捷克社区的 Telegram 群组：{url}"
+            },
+            "OSM-Central-Salish-Sea": {
+                "name": "OpenStreetMap 中央盐海",
+                "description": "位于华盛顿州弗农山地区的绘图者和 OpenStreetMap 用户",
+                "extendedDescription": "OpenStreetMap 是由您这样的人制作的世界地图。 这是您创建的地图，像维基百科一样免费赠送。 查看 osm.org 了解更多。 我们一直在开会，讨论地图，制作地图并尽享乐趣！"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM 查塔努加",
+                "description": "查塔努加的 OpenStreetMap 用户群组"
+            },
+            "OSM-Colorado": {
+                "name": "OpenStreetMap 科罗拉多州",
+                "description": "位于美国科罗拉多州的绘图者和 OpenStreetMap 用户",
+                "extendedDescription": "科罗拉多州 OpenStreetMap 是一个有志于为创建免费地图做出贡献的人们的本地协作。 我们鼓励所有制图员组织或提倡举行全州制图活动。 聚会活动可以是简单的社交混合器，从基础到高级的 OSM 技术培训、或社区绘图聚会。"
+            },
+            "OSM-Discord": {
+                "name": "OpenStreetMap Discord",
+                "description": "通过 Discord 与其他绘图者联系"
+            },
+            "OSM-EC-telegram": {
+                "name": "OSM 厄瓜多尔在 Telegram",
+                "description": "OpenStreetMap 厄瓜多尔 Telegram 交流"
+            },
+            "OSM-ES-mailinglist": {
+                "name": "Talk-es 邮件列表",
+                "description": "讨论在西班牙 OpenStreetMap 的邮件列表"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes Telegram 主页",
+                "description": "OpenStreetMap 西班牙 Telegram 交流"
+            },
+            "OSM-Facebook": {
+                "name": "OpenStreetMap Facebook 主页",
+                "description": "在 Facebook 上喜欢我们并接收关于 OpenStreetMap 新闻和更新。"
+            },
+            "OSM-IDN-facebook": {
+                "name": "OpenStreetMap 印度尼西亚",
+                "description": "改进位于印度尼西亚的 OpenStreetMap",
+                "extendedDescription": "在印度尼西亚绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            },
+            "OSM-IRC": {
+                "name": "OpenStreetMap IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm"
+            },
+            "OSM-India-Puducherry-Facebook": {
+                "name": "自由软硬件运动 (FSHM) - Facebook",
+                "description": "在 FSHM Facebook 主页上了解更多社区事件和活动",
+                "extendedDescription": "FSHM 组织与免费软硬件、技术、行动主义和 OpenStreetMap 有关的活动。 其 FaceBook 页面是与这个活动保持联系的最佳方式。"
+            },
+            "OSM-India-Puducherry-Matrix": {
+                "name": "自由软硬件运动 (FSHM) - Matrix"
+            },
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap 印度 - 共同参与的街区绘图",
+                "description": "改进位于印度的 OpenStreetMap",
+                "extendedDescription": "在印度绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            },
+            "OSM-Japan-telegram": {
+                "name": "OpenStreetMap 日本 Telegram",
+                "description": "OSM 日本社区的 Telegram 群组：{url}"
+            },
+            "OSM-Kerala-facebook": {
+                "name": "OpenStreetMap 喀拉拉邦 - 共同参与的街区绘图",
+                "description": "改进位于喀拉拉邦的 OpenStreetMap"
+            },
+            "OSM-Korea-mailinglist": {
+                "name": "OpenStreetMap 韩国邮件列表",
+                "description": "Talk-ko 是社区讨论关于韩国事务的官方邮件列表"
+            },
+            "OSM-Korea-telegram": {
+                "name": "OSM 韩国 Telegram",
+                "description": "非官方的频道，用于韩国的 OpenStreetMap 贡献者、社区和用户的分享与讨论。"
+            },
+            "OSM-MMR-facebook": {
+                "name": "OpenStreetMap 缅甸",
                 "description": "改进位于缅甸的 OpenStreetMap",
                 "extendedDescription": "在缅甸绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
             },
+            "OSM-MNG-facebook": {
+                "name": "OpenStreetMap 蒙古",
+                "description": "改进位于蒙古的 OpenStreetMap",
+                "extendedDescription": "在蒙古绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            },
+            "OSM-MY-facebook": {
+                "name": "OpenStreetMap 马来西亚 Facebook 主页",
+                "description": "讨论任何和 OpenStreetMap 有关的内容！"
+            },
+            "OSM-MY-forum": {
+                "name": "OpenStreetMap 马来西亚论坛",
+                "description": "官方 OpenStreetMap 马来西亚论坛"
+            },
+            "OSM-MY-matrix": {
+                "name": "OpenStreetMap 马来西亚 Riot 频道",
+                "description": "欢迎所有的绘图者！在 {signupUrl} 上注册。"
+            },
             "OSM-Nepal-facebook": {
                 "name": "OpenStreetMap 尼泊尔",
                 "description": "改进位于尼泊尔的 OpenStreetMap",
                 "extendedDescription": "在尼泊尔绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
             },
-            "OSM-Asia-mailinglist": {
-                "name": "OpenStreetMap 亚洲邮件列表",
-                "description": "Talk-asia 是亚洲社区的官方邮件列表"
+            "OSM-Ottawa-meetup": {
+                "name": "OpenStreetMap 渥太华",
+                "description": "位于渥太华地区的绘图者和 OpenStreetMap 用户"
             },
-            "osm-asia-telegram": {
-                "name": "OpenStreetMap 亚洲 Telegram",
-                "description": "加入我们的大家庭：{url}"
+            "OSM-PE": {
+                "name": "OpenStreetMap 秘鲁",
+                "description": "关于 OpenStreetMap 秘鲁社区的新闻和资源"
+            },
+            "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-PH-facebook": {
-                "name": "OpenStreetMap 菲律宾 Facebook"
+                "name": "OpenStreetMap 菲律宾 Facebook",
+                "description": "欢迎来到 OpenStreetMap 菲律宾，我们在这里鼓励所有菲律宾同胞为 OpenStreetMap 项目做出贡献。"
             },
             "OSM-PH-mailinglist": {
                 "name": "Talk-ph 邮件列表",
@@ -7655,6 +9387,29 @@
                 "name": "OpenStreetMap 菲律宾 Telegram",
                 "description": "为在菲律宾的 OpenStreetMap 贡献者和伙伴们准备的非官方 Telegram 本地社区"
             },
+            "OSM-PL-facebook-group": {
+                "name": "OpenStreetMap 波兰 Facebook 小组",
+                "description": "为位于波兰的绘图者和 OpenStreetMap 用户提供的群组"
+            },
+            "OSM-PL-forum": {
+                "name": "OpenStreetMap 波兰论坛",
+                "description": "波兰 OpenStreetMap 社区论坛"
+            },
+            "OSM-PY-telegram": {
+                "name": "OSM 巴拉圭在 Telegram",
+                "description": "OpenStreetMap 巴拉圭 Telegram 交流"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap 波特兰",
+                "description": "位于波特兰地区的绘图者和 OpenStreetMap 用户"
+            },
+            "OSM-Portland-forum": {
+                "name": "OpenStreetMap 波特兰 Google 小组",
+                "description": "波特兰地区 OpenStreetMap 用户的论坛和邮件列表"
+            },
+            "OSM-Puducherry-Mailing-List": {
+                "name": "自由软硬件运动 (FSHM) - 邮件列表"
+            },
             "OSM-RU-forum": {
                 "name": "OpenStreetMap 俄罗斯论坛",
                 "description": "OpenStreetMap 俄罗斯网络论坛"
@@ -7663,6 +9418,27 @@
                 "name": "OpenStreetMap 俄罗斯 Telegram",
                 "description": "OpenStreetMap 俄罗斯 Telegram 交流"
             },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap Reddit 社区",
+                "description": "/r/openstreetmap/ 是了解更多关于 OpenStreetMap 的好地方。来尽管问我们吧！"
+            },
+            "OSM-Rome-meetup": {
+                "description": "在罗马地区改进 OpenStreetMap"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM 南湾"
+            },
+            "OSM-TH-CNX-meetup": {
+                "name": "清迈的 OSM 聚会",
+                "extendedDescription": "OpenStreetMap 社区的成员每隔几个月在清迈举行一次会议。请访问 {url} 以和我们取得联系，并查看下一次会议的日程安排。"
+            },
+            "OSM-TH-facebook": {
+                "name": "OpenStreetMap 泰国 Facebook 小组",
+                "description": "为泰国 OpenStreetMap 绘图者准备的 Facebook 小组"
+            },
+            "OSM-TH-forum": {
+                "description": "OpenStreetMap 泰国在线论坛"
+            },
             "OSM-TW-facebook": {
                 "name": "OpenStreetMap 台湾社区",
                 "description": "绘图者和 OpenStreetMap 用户用以讨论中国台湾省事务的 Facebook 小组。"
@@ -7671,6 +9447,122 @@
                 "name": "OpenStreetMap 台湾邮件列表",
                 "description": "Talk-tw 是社区讨论关于中国台湾省事务的官方邮件列表"
             },
+            "OSM-TW-telegram": {
+                "name": "OpenStreetMap 台湾 Telegram",
+                "description": "OSM 台湾社区的 Telegram 群组: {url}"
+            },
+            "OSM-Tampa-Bay": {
+                "name": "OpenStreetMap 坦帕湾",
+                "description": "坦帕湾地区的 OpenStreetMap 贡献者和使用者"
+            },
+            "OSM-Telegram": {
+                "name": "OpenStreetMap Telegram 群组",
+                "description": "加入 OpenStreetMap Telegram 全球大群：{url}"
+            },
+            "OSM-Twitter": {
+                "name": "OpenStreetMap Twitter 主页",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "OSM-US": {
+                "name": "OpenStreetMap 美国",
+                "description": "我们助长并改善位于美国的 OpenStreetMap。",
+                "extendedDescription": "我们通过召开年度会议、提供社区资源、建立合伙关系以及推广来支持 OpenStreetMap。在此处加入 OpenStreetMap 美国：{signupUrl}"
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap 美国 Slack",
+                "description": "欢迎所有人加入！在 {signupUrl} 上注册。"
+            },
+            "OSM-Utah": {
+                "name": "OpenStreetMap 犹他州",
+                "description": "位于盐湖城区域的绘图者和 OpenStreetMap 用户"
+            },
+            "OSM-Vancouver-meetup": {
+                "name": "OpenStreetMap 温哥华",
+                "description": "位于不列颠哥伦比亚省温哥华的绘图者和 OpenStreetMap 用户"
+            },
+            "OSM-Wyoming": {
+                "name": "OpenStreetMap 怀俄明州",
+                "description": "位于怀俄明州的绘图者和 OpenStreetMap 用户"
+            },
+            "OSM-br-discord": {
+                "name": "OpenStreetMap 巴西 Discord",
+                "description": "在 Discord 上加入 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-help": {
+                "name": "OpenStreetMap 帮助",
+                "description": "在 OSM 社区驱动的问答网站上提问并得到解答。",
+                "extendedDescription": "{url} 为所有人提供关于 OpenStreetMap 的帮助。无论您是新手绘图者或者有任何技术问题，都来找我们帮助吧！"
+            },
+            "OSM-india-mailinglist": {
+                "name": "OpenStreetMap 印度邮件列表",
+                "description": "Talk-in 是为印度社区准备的官方邮件列表"
+            },
+            "OSM-india-twitter": {
+                "name": "OpenStreetMap 印度 Twitter",
+                "description": "我们之间仅差一条推文：{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-sri-lanka-facebook": {
+                "name": "OpenStreetMap 斯里兰卡",
+                "description": "改进位于斯里兰卡的 OpenStreetMap",
+                "extendedDescription": "在斯里兰卡绘制地图？有任何疑问、或想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            },
+            "OSMF": {
+                "name": "OpenStreetMap 基金会 (OSMF)",
+                "description": "OSMF 是总部位于英国的非营利组织，用于支持 OpenStreetMap 项目。",
+                "extendedDescription": "OSMF 通过筹款、维护为网站提供动力的服务器、组织年度 State of the Map 会议以及协调维护网站的志愿者来支持 OpenStreetMap。您可以通过点击该链接成为 OSMF 的一员以展示您的支持并为 OpenStreetMap 的未来发声：{signupUrl}"
+            },
+            "OpenCleveland-meetup": {
+                "name": "开放克利夫兰",
+                "description": "在克利夫兰地区改进 OpenStreetMap"
+            },
+            "PHXGeo-meetup": {
+                "description": "位于亚利桑那州凤凰城地区的绘图者和 OpenStreetMap 用户"
+            },
+            "PHXGeo-twitter": {
+                "name": "PHXGeo Twitter",
+                "description": "在 Twitter 上关注我们：{url}"
+            },
+            "South-Tyrol-Mailing-List": {
+                "name": "南蒂罗尔 OpenStreetMap 邮件列表"
+            },
+            "Trentino-Mailing-List": {
+                "name": "特伦蒂诺 OpenStreetMap 邮件列表"
+            },
+            "Western-Slope-facebook": {
+                "name": "西坡 OSM Facebook"
+            },
+            "al-twitter": {
+                "description": "关注我们的 Twitter：{url}"
+            },
             "at-forum": {
                 "name": "OpenStreetMap 奥地利论坛"
             },
@@ -7682,53 +9574,60 @@
                 "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-chapter": {
+                "description": "我们助长并改善位于比利时的 OpenStreetMap。"
             },
             "be-facebook": {
-                "name": "OpenStreetMap 比利时社区"
+                "name": "OpenStreetMap 比利时 Facebook 社区",
+                "description": "位于比利时的绘图者和 OpenStreetMap Facebook 主页"
             },
             "be-forum": {
                 "name": "OpenStreetMap 比利时论坛",
                 "description": "OpenStreetMap 比利时网络论坛"
             },
+            "be-irc": {
+                "name": "OpenStreetMap 比利时 IRC"
+            },
             "be-mailinglist": {
-                "name": "Talk-be 邮件列表"
+                "name": "Talk-be 邮件列表",
+                "description": "Talk-be 是比利时 OSM 社区的官方邮件列表"
+            },
+            "be-matrix": {
+                "description": "欢迎所有的绘图者！"
+            },
+            "be-meetup": {
+                "name": "OpenStreetMap 比利时聚会"
             },
             "be-twitter": {
-                "name": "OpenStreetMap 比利时 Twitter"
+                "name": "OpenStreetMap 比利时 Twitter",
+                "description": "OSM 比利时 Twitter: @osm_be"
             },
-            "talk-cz-mailinglist": {
-                "description": "Talk-cz 是捷克 OpenStreetMap 社区的官方邮件列表"
+            "bw-facebook": {
+                "name": "Mapping Botswana 的 Facebook 页面",
+                "description": "OpenStreetMap in Botswana 的页面"
             },
-            "fr-facebook": {
-                "name": "OpenStreetMap 法国 Facebook 主页",
-                "description": "OpenStreetMap 法国 Facebook 主页"
+            "bw-twitter": {
+                "name": "Mapping Botswana 的 Twitter 页面",
+                "description": "OpenStreetMap in Botswana 的 Twitter 页面"
             },
-            "fr-forum": {
-                "name": "OpenStreetMap 法国网络论坛",
-                "description": "OpenStreetMap 法国网络论坛"
+            "byosm": {
+                "name": "OpenStreetMap 白俄罗斯",
+                "description": "OpenStreetMap 白俄罗斯 Telegram 交流"
             },
-            "fr-irc": {
-                "name": "OpenStreetMap 法国 IRC",
-                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-fr"
+            "cape-coast-youthmappers": {
+                "name": "海岸角大学 YouthMappers",
+                "description": "在 Twitter 上关注我们：{url}",
+                "extendedDescription": "此为加纳海岸角大学的 Youth Mappers 官方分会。我们热爱地图、开放数据以及帮助弱势群体。"
             },
-            "fr-mailinglist": {
-                "name": "Talk-fr 邮件列表",
-                "description": "Talk-fr 邮件列表"
+            "ch-mailinglist": {
+                "description": "瑞士的邮件列表"
             },
-            "fr-twitter": {
-                "name": "OpenStreetMap 法国 Twitter 主页",
-                "description": "OpenStreetMap 法国 Twitter 主页：{url}"
+            "ch-twitter": {
+                "name": "OpenStreetMap 瑞士 Twitter",
+                "description": "关注我们的 Twitter：{url}"
+            },
+            "czech-community": {
+                "name": "捷克 OSM 社区"
             },
             "de-berlin-mailinglist": {
                 "name": "柏林邮件列表",
@@ -7750,6 +9649,10 @@
                 "name": "OpenStreetMap 德国论坛",
                 "description": "OpenStreetMap 德国网络论坛"
             },
+            "de-hamburg-telegram": {
+                "name": "OSM 汉堡在 Telegram",
+                "description": "OpenStreetMap 汉堡 Telegram 交流: {url}"
+            },
             "de-irc": {
                 "name": "OpenStreetMap 德国 IRC",
                 "description": "在 irc.oftc.net (端口 6667) 加入 #osm-de"
@@ -7758,17 +9661,131 @@
                 "name": "Talk-de 邮件列表",
                 "description": "Talk-de 是德国 OpenStreetMap 社区的官方邮件列表"
             },
-            "osm-de": {
-                "name": "OpenStreetMap 德国",
-                "description": "位于德国的 OpenStreetMap 信息平台"
+            "de-matrix": {
+                "name": "OpenStreetMap 德国 Matrix",
+                "description": "加入 #osm-de:matrix.org 于 https://riot.im/app/#/room/%23osm-de:matrix.org"
             },
-            "it-facebook": {
-                "name": "OpenStreetMap 意大利 Facebook",
-                "description": "在 Facebook 上加入 OpenStreetMap 意大利社区"
+            "de-ostwestfalen-lippe-mailinglist": {
+                "name": "东威斯特伐利亚州邮件列表",
+                "description": "此为东威斯特伐利亚州 OSM 社区的邮件列表"
             },
-            "it-irc": {
-                "name": "OpenStreetMap 意大利 IRC",
-                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-it"
+            "de-telegram": {
+                "name": "OpenStreetMap 德国 Telegram",
+                "description": "加入 OpenStreetMap Telegram 德国大群：{url}"
+            },
+            "dk-forum": {
+                "name": "OpenStreetMap 丹麦网络论坛",
+                "description": "OpenStreetMap 丹麦网络论坛"
+            },
+            "dk-irc": {
+                "name": "OpenStreetMap 丹麦 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-dk"
+            },
+            "dk-mailinglist": {
+                "name": "Talk-dk 邮件列表",
+                "description": "讨论在丹麦 OpenStreetMap 的邮件列表"
+            },
+            "es-twitter": {
+                "name": "OpenStreetMap 西班牙 Twitter",
+                "description": "关注我们的 Twitter：{url}"
+            },
+            "fi-forum": {
+                "name": "OpenStreetMap 芬兰论坛",
+                "description": "OpenStreetMap 芬兰在线论坛"
+            },
+            "fi-irc": {
+                "name": "OpenStreetMap 芬兰 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-fi"
+            },
+            "fi-mailinglist": {
+                "name": "Talk-fi 邮件列表",
+                "description": "Talk-fi 是芬兰 OSM 社区的官方邮件列表"
+            },
+            "fr-chapter": {
+                "description": "我们助长并改善位于法国的 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-telegram": {
+                "name": "OpenStreetMap 法国的 Telegram 群组",
+                "description": "OSM 法国社区的 Telegram 群组: {url}"
+            },
+            "fr-twitter": {
+                "name": "OpenStreetMap 法国 Twitter 主页",
+                "description": "OpenStreetMap 法国 Twitter 主页：{url}"
+            },
+            "galicia-wiki": {
+                "name": "OpenStreetMap 维基计划 加利西亚",
+                "description": "在加利西亚绘图所需要知道的所有事情: {url}"
+            },
+            "gb-irc": {
+                "name": "OpenStreetMap 英国 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-gb"
+            },
+            "gb-mailinglist": {
+                "name": "Talk-gb 邮件列表",
+                "description": "Talk-gb 是英国(包括北爱尔兰) OSM 社区的主要交流论坛"
+            },
+            "hr-facebook": {
+                "name": "OpenStreetMap 克罗地亚 Facebook 小组",
+                "description": "OpenStreetMap 克罗地亚 Facebook 小组"
+            },
+            "hr-mailinglist": {
+                "name": "Talk-hr 邮件列表",
+                "description": "Talk-hr 邮件列表"
+            },
+            "hu-facebook": {
+                "name": "OpenStreetMap 匈牙利 Facebook 主页",
+                "description": "位于匈牙利的绘图者和 OpenStreetMap Facebook 主页"
+            },
+            "hu-forum": {
+                "name": "OpenStreetMap 匈牙利论坛",
+                "description": "OpenStreetMap 匈牙利网络论坛"
+            },
+            "ireland-facebook": {
+                "name": "OpenStreetMap 爱尔兰 Facebook 小组",
+                "description": "OpenStreetMap 爱尔兰 Facebook 主页"
+            },
+            "ireland-mailinglist": {
+                "name": "Talk-ie 邮件列表",
+                "description": "Talk-ie 是爱尔兰 OSM 社区的邮件列表"
+            },
+            "ireland-twitter": {
+                "name": "OpenStreetMap 爱尔兰 Twitter",
+                "description": "OpenStreetMap 爱尔兰 Twitter: {url}"
+            },
+            "is-facebook": {
+                "name": "OSM 冰岛 Facebook 主页"
+            },
+            "is-mailinglist": {
+                "name": "Talk-is 邮件列表",
+                "description": "Talk-is 是冰岛 OSM 社区的官方邮件列表"
+            },
+            "is-twitter": {
+                "name": "OSM 冰岛 Twitter",
+                "description": "位于冰岛 OpenStreetMap 的 Twitter"
+            },
+            "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 邮件列表",
@@ -7778,19 +9795,20 @@
                 "name": "OpenStreetMap 意大利 Twitter",
                 "description": "在 Twitter 上关注我们：{url}"
             },
-            "OSM-Rome-meetup": {
-                "description": "在罗马地区改进 OpenStreetMap"
+            "lu-mailinglist": {
+                "name": "Talk-lu 邮件列表"
             },
-            "South-Tyrol-Mailing-List": {
-                "name": "南蒂罗尔 OpenStreetMap 邮件列表"
+            "map-kibera": {
+                "name": "Map Kibera Trust",
+                "description": "Map Kibera 是位于肯尼亚的注册组织",
+                "extendedDescription": "Map Kibera Trust的使命是通过创造性地使用数字化行动工具来增加边缘化社区的影响力和代表性。"
             },
-            "talk-it-lazio": {
-                "name": "OpenStreetMap 意大利拉齐奥",
-                "description": "欢迎所有人加入！在 {signupUrl} 上注册。",
-                "extendedDescription": "罗马和拉齐奥大区的邮件列表"
+            "ni-facebook": {
+                "description": "位于尼加拉瓜的绘图者和 OpenStreetMap Facebook 主页"
             },
-            "Trentino-Mailing-List": {
-                "name": "特伦蒂诺 OpenStreetMap 邮件列表"
+            "ni-mailinglist": {
+                "name": "Talk-ni 邮件列表",
+                "description": "Talk-ni 是尼加拉瓜 OSM 社区的官方邮件列表"
             },
             "no-forum": {
                 "name": "OpenStreetMap 挪威网络论坛",
@@ -7803,244 +9821,289 @@
                 "name": "OpenStreetMap 挪威邮件列表",
                 "description": "为位于挪威的绘图者和 OpenStreetMap 用户、开发者与爱好者准备的邮件列表"
             },
-            "OSM-PL-facebook-group": {
-                "name": "OpenStreetMap 波兰 Facebook 小组"
+            "no-telegram": {
+                "name": "@OSM_no 于 Telegram",
+                "description": "OpenStreetMap 挪威 Telegram 讨论"
             },
-            "OSM-ES-mailinglist": {
-                "name": "Talk-es 邮件列表",
-                "description": "讨论在西班牙 OpenStreetMap 的邮件列表"
-            },
-            "OSM-ES-telegram": {
-                "name": "@OSMes Telegram 主页",
-                "description": "OpenStreetMap 西班牙 Telegram 交流"
-            },
-            "osm-se": {
-                "name": "OpenStreetMap.se"
+            "osm-afghanistan-facebook": {
+                "name": "OpenStreetMap 阿富汗",
+                "description": "改进位于阿富汗的 OpenStreetMap"
             },
-            "se-facebook": {
-                "name": "OpenStreetMap 瑞典 Facebook",
-                "description": "OpenStreetMap 瑞典 Facebook 主页"
+            "osm-africa-telegram": {
+                "name": "OpenStreetMap 非洲 Telegram",
+                "description": "OpenStreetMap 非洲 Telegram"
             },
-            "se-forum": {
-                "name": "OpenStreetMap 瑞典网络论坛",
-                "description": "OpenStreetMap 瑞典网络论坛"
+            "osm-asia-telegram": {
+                "name": "OpenStreetMap 亚洲 Telegram",
+                "description": "加入我们的大家庭：{url}"
             },
-            "se-irc": {
-                "name": "OpenStreetMap 瑞典 IRC",
-                "description": "在 irc.oftc.net (端口 6667) 加入 #osm.se"
+            "osm-at": {
+                "name": "OpenStreetMap 奥地利",
+                "description": "位于奥地利的 OpenStreetMap 信息平台"
             },
-            "se-mailinglist": {
-                "name": "Talk-se 邮件列表",
-                "description": "讨论在瑞典 OpenStreetMap 的邮件列表"
+            "osm-ch": {
+                "name": "OpenStreetMap 瑞士",
+                "description": "位于瑞士的 OpenStreetMap 信息平台"
             },
-            "se-twitter": {
-                "name": "OpenStreetMap 瑞典 Twitter 页面",
-                "description": "在 Twitter 上关注我们：{url}"
+            "osm-de": {
+                "name": "OpenStreetMap 德国",
+                "description": "位于德国的 OpenStreetMap 信息平台"
             },
-            "Nottingham-OSM-pub-meetup": {
-                "name": "东米德兰（诺丁汉）月度酒吧见面会",
-                "description": "东米德兰绘图者和用户的社交聚会",
-                "extendedDescription": "该小组自2011年3月开始举行会议，地点最初在诺丁汉，近几年在德比，或不时在东米德兰的其他地方举行。这些虽是社交聚会，但却是来询问涉及地区或只是普通的 OSM 特定问题的好地方。在夏季，我们通常会在会场附近进行一小时的小型测绘。整个团队都对关于公共优先权的测绘有着特殊的兴趣，并且不时为此而召开绘图会议。"
+            "osm-gh-facebook": {
+                "name": "OpenStreetMap 加纳 Facebook 主页",
+                "description": "为对 OpenStreetMap 感兴趣的用户准备的 Facebook 小组。",
+                "extendedDescription": "位于加纳的绘图者社区，在加纳宣传 OpenStreetMap 以及人道主义 OpenStreetMap 团队 (HOT) 项目。加入我们。"
             },
-            "gb-mailinglist": {
-                "name": "Talk-gb 邮件列表",
-                "description": "Talk-gb 是英国(包括北爱尔兰) OSM 社区的主要交流论坛"
+            "osm-gh-telegram": {
+                "name": "OpenStreetMap 加纳 Telegram",
+                "description": "OpenStreetMap 加纳社区于 Telegram"
             },
-            "gb-irc": {
-                "name": "OpenStreetMap 英国 IRC",
-                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-gb"
+            "osm-gh-twitter": {
+                "name": "OpenStreetMap 加纳 Twitter 主页",
+                "description": "在 Twitter 上关注我们：{url}"
             },
-            "OSM-CA-Slack": {
-                "name": "OSM-CA Slack",
-                "description": "欢迎所有人加入！在 {signupUrl} 上注册。"
+            "osm-india-forum": {
+                "name": "OpenStreetMap 印度论坛"
             },
-            "OSM-Vancouver-meetup": {
-                "name": "OpenStreetMap 温哥华",
-                "description": "位于不列颠哥伦比亚省温哥华的绘图者和 OpenStreetMap 用户"
+            "osm-india-github": {
+                "name": "OpenStreetMap 印度 GitHub",
+                "description": "和我们一起编程: {url}"
             },
-            "OSM-US-Slack": {
-                "name": "OpenStreetMap 美国 Slack",
-                "description": "欢迎所有人加入！在 {signupUrl} 上注册。"
+            "osm-india-telegram": {
+                "name": "OpenStreetMap 印度 Telegram",
+                "description": "加入我们的大家庭：{url}"
             },
-            "OSM-US": {
-                "name": "OpenStreetMap 美国",
-                "description": "我们助长并改善位于美国的 OpenStreetMap。",
-                "extendedDescription": "我们通过召开年度会议、提供社区资源、建立合伙关系以及推广来支持 OpenStreetMap。在此处加入 OpenStreetMap 美国：{signupUrl}"
+            "osm-india-website": {
+                "name": "OpenStreetMap 印度",
+                "description": "位于印度的绘图者和 OpenStreetMap 用户"
             },
-            "OSM-Utah": {
-                "name": "OpenStreetMap 犹他州",
-                "description": "位于盐湖城区域的绘图者和 OpenStreetMap 用户"
+            "osm-india-wiki": {
+                "name": "OpenStreetMap 维基计划 印度",
+                "description": "在印度绘图所需要知道的所有事情: {url}"
             },
-            "OSM-Wyoming": {
-                "name": "OpenStreetMap 怀俄明州",
-                "description": "位于怀俄明州的绘图者和 OpenStreetMap 用户"
+            "osm-india-youtube": {
+                "name": "OpenStreetMap 印度 Youtube",
+                "description": "订阅我们的频道: {url}"
             },
-            "PHXGeo-twitter": {
-                "name": "PHXGeo Twitter",
-                "description": "在 Twitter 上关注我们：{url}"
+            "osm-iran-aparat": {
+                "name": "OpenStreetMap 伊朗阿帕拉特",
+                "description": "订阅我们的频道于: {url}"
             },
-            "Western-Slope-facebook": {
-                "name": "西坡 OSM Facebook"
+            "osm-iran-forum": {
+                "name": "OpenStreetMap 伊朗网络论坛",
+                "description": "OpenStreetMap 伊朗网络论坛",
+                "extendedDescription": "为伊朗的 OpenStreetMap 用户提供的网络论坛。请尽情的提问并与他人讨论！"
             },
-            "Maptime-Australia-Slack": {
-                "name": "Maptime 澳大利亚 Slack",
-                "description": "在 {signupUrl} 上注册"
+            "osm-iran-telegram": {
+                "name": "OpenStreetMap 伊朗 Telegram",
+                "description": "欢迎你加入我们的 Telegram 频道 {url}。 我们也有一个有着众多对伊朗感兴趣的 OSM 绘图者的超级群组，请在频道的介绍页面找寻链接。"
             },
-            "talk-au": {
-                "name": "Talk-au 邮件列表",
-                "description": "澳大利亚绘图者交流的地方"
+            "osm-kenya": {
+                "name": "OSM 肯尼亚",
+                "description": "OSM Kenya 是 OSM 贡献者及用户的社群"
             },
-            "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-mg-facebook": {
+                "name": "OpenStreetMap 马达加斯加 Facebook 小组",
+                "description": "为对 OpenStreetMap 感兴趣的用户准备的马达加斯加 Facebook 小组。"
             },
-            "OSM-AR-telegram": {
-                "name": "OpenStreetMap 阿根廷 Telegram",
-                "description": "在 Telegram 上加入 OpenStreetMap 阿根廷社区",
-                "extendedDescription": "全社区最活跃的频道，专为聊天和问题速答而准备。欢迎每个人加入！"
+            "osm-se": {
+                "name": "OpenStreetMap.se"
             },
-            "OSM-AR-twitter": {
-                "name": "OpenStreetMap 阿根廷 Twitter",
-                "description": "在 Twitter 上关注我们：{url}",
-                "extendedDescription": "当地社区和 OpenStreetMap 大体的新闻"
+            "osmcz-facebook": {
+                "name": "OpenStreetMap 捷克 Facebook 主页",
+                "description": "关注捷克社区 Facebook - 包括已翻译的 WeeklyOSM！"
             },
-            "OSM-BO-mailinglist": {
-                "name": "Talk-bo 邮件列表",
-                "description": "Talk-bo 是玻利维亚 OpenStreetMap 社区的官方邮件列表",
-                "extendedDescription": "在玻利维亚绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+            "osmcz-twitter": {
+                "name": "捷克 Twitter @osmcz",
+                "description": "关注捷克社区 Twitter - 包括已翻译的 WeeklyOSM！"
             },
-            "Bahia-telegram": {
-                "name": "OpenStreetMap 巴伊亚 Telegram 小组",
-                "description": "在 Telegram 上加入 OpenStreetMap 巴伊亚社区",
-                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
+            "osmgraz-meetup": {
+                "name": "OSM 社区聚会于格拉茨",
+                "description": "每月的 OpenStreetMap 社区聚会在格拉茨"
             },
-            "OSM-br-mailinglist": {
-                "name": "Talk-br 邮件列表",
-                "description": "讨论在巴西 OpenStreetMap 的邮件列表"
+            "osmgraz-twitter": {
+                "name": "OSM 格拉茨社区 Twitter 主页",
+                "description": "OpenStreetMap 格拉茨社区 Twitter 主页"
             },
-            "OSM-br-telegram": {
-                "name": "OpenStreetMap 巴西 Telegram",
-                "description": "在 Telegram 上加入 OpenStreetMap 巴西社区",
-                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
+            "pt-mailinglist": {
+                "name": "Talk-pt 邮件列表",
+                "description": "Talk-pt 是葡萄牙 OSM 社区的官方邮件列表"
             },
-            "OSM-br-twitter": {
-                "name": "OpenStreetMap 巴西 Twitter",
-                "description": "在 Twitter 上关注我们：{url}"
+            "pt-telegram": {
+                "name": "OpenStreetMap 葡萄牙在 Telegram",
+                "description": "OSM 葡萄牙社区的 Telegram 群组：{url}"
             },
-            "OSM-CL-facebook": {
-                "name": "OpenStreetMap 智利 Facebook",
-                "description": "在 Facebook 上加入 OpenStreetMap 智利社区",
-                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
+            "sa-telegram": {
+                "name": "OSM 沙特阿拉伯 Telegram",
+                "description": "OSM 沙特阿拉伯社区的 Telegram 群组：{url}"
             },
-            "OSM-CL-mailinglist": {
-                "name": "Talk-cl 邮件列表",
-                "description": "讨论在智利 OpenStreetMap 的邮件列表"
+            "scotland-twitter": {
+                "name": "OpenStreetMap 阿尔巴 Twitter",
+                "description": "OpenStreetMap 阿尔巴 Twitter: {url}"
             },
-            "OSM-CL-telegram": {
-                "name": "OpenStreetMap 智利 Telegram",
-                "description": "在 Telegram 上加入 OpenStreetMap 智利社区",
-                "extendedDescription": "加入社区来了解更多 OpenStreetMap，在会议中提问或者参与。欢迎每个人的到来！"
+            "se-facebook": {
+                "name": "OpenStreetMap 瑞典 Facebook",
+                "description": "OpenStreetMap 瑞典 Facebook 主页"
             },
-            "OSM-CL-twitter": {
-                "name": "OpenStreetMap 智利 Twitter",
-                "description": "在 Twitter 上关注我们：{url}"
+            "se-forum": {
+                "name": "OpenStreetMap 瑞典网络论坛",
+                "description": "OpenStreetMap 瑞典网络论坛"
             },
-            "OSM-CO-facebook": {
-                "name": "OpenStreetMap 哥伦比亚 Facebook",
-                "description": "在 Facebook 上加入 OpenStreetMap 哥伦比亚社区",
-                "extendedDescription": "加入社区来了解更多 OpenStreetMap。欢迎每个人的到来！"
+            "se-irc": {
+                "name": "OpenStreetMap 瑞典 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm.se"
             },
-            "OSM-CO-mailinglist": {
-                "name": "Talk-co 邮件列表",
-                "description": "讨论在哥伦比亚 OpenStreetMap 的邮件列表"
+            "se-mailinglist": {
+                "name": "Talk-se 邮件列表",
+                "description": "讨论在瑞典 OpenStreetMap 的邮件列表"
             },
-            "OSM-CO-twitter": {
-                "name": "OpenStreetMap 哥伦比亚 Twitter",
+            "se-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 秘鲁社区官方邮件列表"
+            "si-forum": {
+                "name": "OpenStreetMap 斯洛文尼亚论坛",
+                "description": "斯洛文尼亚 OpenStreetMap 社区论坛"
             },
-            "OSM-PE-matrix": {
-                "name": "OpenStreetMap 秘鲁 Matrix 交流",
-                "description": "在 Matrix 上与 OpenStreetMap 秘鲁社区的其他成员交流。"
+            "si-mailinglist": {
+                "name": "OpenStreetMap 斯洛文尼亚邮件列表",
+                "description": "斯洛文尼亚 OpenStreetMap 社区的邮件列表"
             },
-            "OSM-PE-telegram": {
-                "name": "OpenStreetMap 秘鲁 Telegram",
-                "description": "在 Telegram 上加入 OpenStreetMap 秘鲁社区"
+            "si-twitter": {
+                "name": "OpenStreetMap 斯洛文尼亚 Twitter",
+                "description": "关注 OpenStreetMap 斯洛文尼亚 Twitter: {url}"
             },
-            "OSM-PE-twitter": {
-                "name": "OpenStreetMap 秘鲁 Twitter",
-                "description": "在 Twitter 上关注我们：{url}"
+            "sk-facebook": {
+                "name": "Freemap.sk 斯洛伐克社区 Facebook 页面",
+                "description": "Freemap.sk 斯洛伐克社区 Facebook 页面"
             },
-            "OSM-PE": {
-                "name": "OpenStreetMap 秘鲁",
-                "description": "关于 OpenStreetMap 秘鲁社区的新闻和资源"
+            "sk-freemap": {
+                "name": "OpenStreetMap 网站 Freemap 斯洛伐克",
+                "description": "OpenStreetMap 地图网站及工具于斯洛伐克及周边区域"
             },
-            "OSM-Discord": {
-                "name": "OpenStreetMap Discord",
-                "description": "通过 Discord 与其他绘图者联系"
+            "sk-freemap-wiki": {
+                "name": "OpenStreetMap Freemap 斯洛伐克维基",
+                "description": "为斯洛伐克绘图者和社区提供的 OpenStreetMap 维基"
             },
-            "OSM-Facebook": {
-                "name": "OpenStreetMap Facebook 主页",
-                "description": "在 Facebook 上喜欢我们并接收关于 OpenStreetMap 新闻和更新。"
+            "sk-twitter": {
+                "name": "OpenStreetMap Freemap 斯洛伐克推特",
+                "description": "OpenStreetMap Freemap 斯洛伐克推特: {url}"
             },
-            "OSM-help": {
-                "name": "OpenStreetMap 帮助",
-                "description": "在 OSM 社区驱动的问答网站上提问并得到解答。",
-                "extendedDescription": "{url} 为所有人提供关于 OpenStreetMap 的帮助。无论您是新手绘图者或者有任何技术问题，都来找我们帮助吧！"
+            "talk-au": {
+                "name": "Talk-au 邮件列表",
+                "description": "澳大利亚绘图者交流的地方"
             },
-            "OSM-IRC": {
-                "name": "OpenStreetMap IRC",
-                "description": "在 irc.oftc.net (端口 6667) 加入 #osm"
+            "talk-cz-mailinglist": {
+                "name": "捷克邮件列表 (talk-cz)",
+                "description": "Talk-cz 是捷克 OpenStreetMap 社区的官方邮件列表"
             },
-            "OSM-Reddit": {
-                "name": "OpenStreetMap Reddit 社区",
-                "description": "/r/openstreetmap/ 是了解更多关于 OpenStreetMap 的好地方。来尽管问我们吧！"
+            "talk-gh": {
+                "name": "Talk-gh 邮件列表",
+                "description": "Talk-gh 是为加纳 OSM 社区准备的官方邮件列表"
             },
-            "OSM-Telegram": {
-                "name": "OpenStreetMap Telegram 群组",
-                "description": "加入 OpenStreetMap Telegram 全球大群：{url}"
+            "talk-it-lazio": {
+                "name": "OpenStreetMap 意大利拉齐奥",
+                "description": "欢迎所有人加入！在 {signupUrl} 上注册。",
+                "extendedDescription": "罗马和拉齐奥大区的邮件列表"
             },
-            "OSM-Twitter": {
-                "name": "OpenStreetMap Twitter 主页",
-                "description": "在 Twitter 上关注我们：{url}"
+            "talk-mg": {
+                "name": "Talk-mg 邮件列表",
+                "description": "位于马达加斯加的 OpenStreetMap 贡献者、社区和用户分享和讨论的地方。"
             },
-            "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": "意大利米兰"
-                    }
-                }
+            "talk-nz": {
+                "name": "Talk-nz 邮件列表",
+                "description": "新西兰 OSM 社区讨论"
+            },
+            "ua-facebook": {
+                "name": "OpenStreetMap 乌克兰 Facebook 小组",
+                "description": "加入 OpenStreetMap 乌克兰社区的 Facebook"
+            },
+            "ua-forum": {
+                "name": "OpenStreetMap 乌克兰论坛",
+                "description": "乌克兰 OpenStreetMap 社区论坛"
+            },
+            "ua-github": {
+                "name": "OpenStreetMap 乌克兰于 GitHub",
+                "description": "OpenStreetMap 乌克兰 GitHub"
+            },
+            "ua-osm": {
+                "name": "OpenStreetMap 网站乌克兰",
+                "description": "OpenStreetMap 网站于乌克兰"
+            },
+            "ua-slack": {
+                "name": "OpenStreetMap 乌克兰 Slack",
+                "description": "在 Slack 上加入 OpenStreetMap 乌克兰社区"
+            },
+            "ua-telegram": {
+                "name": "@osmUA on Telegram",
+                "description": "OpenStreetMap 乌克兰 Telegram 交流"
+            },
+            "ua-twitter": {
+                "name": "OpenStreetMap 乌克兰 Twitter",
+                "description": "OpenStreetMap 乌克兰 Twitter: {url}"
+            },
+            "uk-localchapter": {
+                "name": "OpenStreetMap 英国"
+            },
+            "us-ma-mailinglist": {
+                "name": "Talk-us-massachusetts 邮件列表"
+            },
+            "uy-mailinglist": {
+                "name": "Talk-uy 邮件列表",
+                "description": "Talk-uy 是乌拉圭 OSM 社区的官方邮件列表"
+            },
+            "ve-mailinglist": {
+                "name": "Talk-ve 邮件列表",
+                "description": "Talk-ve 是委内瑞拉 OSM 社区的官方邮件列表"
+            },
+            "ym-Centre-Universitaire-de-Recherche-et-dApplication-en-Tldtection-CURAT-de-lUniversit-Felix-Houphouet-Boigny": {
+                "name": "遥感研究与应用中心 YouthMappers",
+                "description": "菲利克斯·乌弗埃·博瓦尼大学遥感研究与应用中心的 YouthMappers 分会",
+                "extendedDescription": "我们分会目的是推广合作绘制自由地图的使用，以及在研究与决策应用时运用 OpenStreetMap 资料，帮助学生在他们研究时能生成自己的资料。"
+            },
+            "ym-General-Lansana-Conte-University": {
+                "name": "兰萨纳·孔戴将军大学 YouthMappers",
+                "description": "兰萨纳·孔戴将军大学 YouthMappers 分会",
+                "extendedDescription": "兰萨纳·孔戴大学将军的 YouthMappers 是一个非营利性社区，愿意为几内亚地图和世界其他地区做出贡献。 我们正在促进使用GIS和开放数据来构建决策支持工具。 我们还致力于在学生和当地社区中建立能力。"
+            },
+            "ym-Institute-of-Science-and-Veterinary-Medicine": {
+                "name": "YouthMappers ISSMV Dalaba",
+                "description": "科学和兽医学院 YouthMappers 分会",
+                "extendedDescription": "YouthMappers ISSMV Dabala是一个非营利组织，致力于促进人道主义地图绘制以及使用开源和开放数据在几内亚建立决策工具。"
+            },
+            "ym-Kwame-Nkrumah-University-of-Science-and-Technology": {
+                "name": "恩克鲁玛科技大学的 YouthMappers",
+                "description": "恩克鲁玛科技大学的 YouthMappers 分会"
+            },
+            "ym-The-Gambia-YMCA-University-of-the-Gambia": {
+                "name": "Connected YouthMappers",
+                "description": "冈比亚基督教青年会/冈比亚大学的 YouthMappers 分会",
+                "extendedDescription": "Connected YouthMappers 由年轻甘比亚人组成，希望能改变和协助国家发展"
+            },
+            "ym-Universit-de-NZrkor": {
+                "name": "恩泽雷科雷 YouthMappers",
+                "description": "恩泽雷科雷大学 YouthMappers 分会",
+                "extendedDescription": "YouthMappers是一个小组，可以绘制内陆社区的地图，并在发生灾难或流行病时做出决策。 它还允许免费访问数据的生产和使用。"
+            },
+            "ym-University-of-Cape-Coast": {
+                "name": "UCC地理学协会",
+                "description": "海岸角大学的 YouthMappers 分会",
+                "extendedDescription": "我们协会涵盖了开普敦大学地理与区域规划系所有正在阅读和阅读地理的学生。 我们的主要目的是提高对教室内外学科的兴趣。 我们的座右铭是“我们了解地球及其居民”。"
+            },
+            "ym-University-of-Energy-and-Natural-Resources": {
+                "name": "Eco-Club",
+                "description": "加纳能源与自然资源大学的 YouthMappers 分会",
+                "extendedDescription": "为所有公民提供有关不断恶化的环境的良好教育，并最大程度地利用环境的重建来维持人类的生存。"
+            },
+            "ym-University-of-Ghana": {
+                "name": "加纳大学 YouthMappers",
+                "description": "加纳大学 YouthMappers 分会",
+                "extendedDescription": "加大 YouthMappers由拥有GIS和遥感知识和技能的研究生和本科生组成。 该俱乐部由一支充满活力的团队组成，该团队随时准备通过绘图解决社会问题并缓解环境问题。 我们的基本原则是能力建设、增强和团队合作。"
+            },
+            "ym-University-of-Mines-and-Technology": {
+                "name": "加纳矿业大学 YouthMappers",
+                "description": "加纳矿业大学 YouthMappers 分会",
+                "extendedDescription": "UMaT YouthMappers是一群学生志愿者，他们旨在为学生提供机会，以提高他们在制图领域的技能，并创建开放的地理数据和分析，以应对全球范围内本地定义的发展挑战。"
             }
         }
     }