X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4a9846b078c6a82d312cd6f3b9cac536dec1c00a..876d150e577d27921e83fd54991ce5602e3f1430:/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 8aa7ad646..a510feb8a 100644
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -1,9 +1,11 @@
 {
     "zh-CN": {
         "icons": {
+            "download": "下载",
             "information": "信息",
             "remove": "删除",
-            "undo": "复原"
+            "undo": "复原",
+            "zoom_to": "缩放至"
         },
         "modes": {
             "add_area": {
@@ -21,6 +23,11 @@
                 "description": "添加餐馆、纪念碑、邮筒或其他点到地图上。",
                 "tail": "在地图上单击，添加一个点。"
             },
+            "add_note": {
+                "title": "笔记",
+                "description": "发现有问题的地方？告知其他绘图者。",
+                "tail": "在地图上点击，添加一条笔记。"
+            },
             "browse": {
                 "title": "浏览",
                 "description": "移动和缩放地图。"
@@ -40,7 +47,8 @@
                 "annotation": {
                     "point": "添加点。",
                     "vertex": "添加节点到路径。",
-                    "relation": "添加关系。"
+                    "relation": "添加关系。",
+                    "note": "添加笔记。"
                 }
             },
             "start": {
@@ -146,10 +154,9 @@
             },
             "connect": {
                 "annotation": {
-                    "point": "已连接路径到一个点。",
-                    "vertex": "已连接路径到另一路径。",
-                    "line": "已连接路径到一线段。",
-                    "area": "已连接路径到一区域。"
+                    "from_point": {
+                        "to_line": "将点添加到线上"
+                    }
                 },
                 "relation": "这些要素不能被连接，因为其有冲突的关系成员。",
                 "restriction": "这些要素不能被连接，因为这样会破坏 “{relation}” 关系。"
@@ -170,7 +177,8 @@
                 "annotation": "已合并 {n} 个要素。",
                 "not_eligible": "这些要素不可以合并。",
                 "not_adjacent": "这些要素的结束节点并未相连，无法将其合并。",
-                "restriction": "这些要素不能被合并，因为其中至少有一个要素是某个“{relation}”关系的成员。",
+                "restriction": "这些要素不能被合并，因为这样会破坏 “{relation}” 关系。",
+                "relation": "这些要素不能被合并，因为其有冲突的关系成员。",
                 "incomplete_relation": "此要素暂未下载完成，无法合并。",
                 "conflicting_tags": "这些要素不能被合并，因为它们的某些标签具有冲突的值。"
             },
@@ -296,6 +304,14 @@
                     "create": "添加转向限制",
                     "delete": "删除转向限制"
                 }
+            },
+            "detach_node": {
+                "title": "隔离",
+                "key": "E",
+                "description": "将该节点从路径/区域中隔离。",
+                "annotation": "从父路径/区域中隔离了一个节点。",
+                "restriction": "该节点无法被隔离，因为这样会破坏“{relation}”关系。",
+                "connected_to_hidden": "该节点无法被隔离，因为其与一隐藏要素相连。"
             }
         },
         "restriction": {
@@ -356,6 +372,10 @@
         "loading_auth": "正在连接 OpenStreetMap...",
         "report_a_bug": "反馈 BUG",
         "help_translate": "帮助改进翻译",
+        "sidebar": {
+            "key": "`",
+            "tooltip": "切换侧边栏。"
+        },
         "feature_info": {
             "hidden_warning": "{count}个隐藏要素",
             "hidden_details": "以下要素目前被隐藏：{details}"
@@ -415,7 +435,12 @@
                 "edited_by": "编辑者",
                 "changeset": "变更集合",
                 "unknown": "未知",
-                "link_text": "在 openstreetmap.org 上的历史记录"
+                "link_text": "在 openstreetmap.org 上的历史记录",
+                "note_no_history": "无历史记录（新笔记）",
+                "note_comments": "评论数",
+                "note_created_date": "创建时间",
+                "note_created_user": "创建者",
+                "note_link_text": "在 openstreetmap.org 上的笔记"
             },
             "location": {
                 "key": "L",
@@ -445,7 +470,8 @@
             "vertex": "顶点",
             "line": "线",
             "area": "区域",
-            "relation": "关系"
+            "relation": "关系",
+            "note": "笔记"
         },
         "geocoder": {
             "search": "在全球搜索...",
@@ -497,7 +523,10 @@
             "way": "路径",
             "relation": "关系",
             "location": "位置",
-            "add_fields": "添加字段："
+            "add_fields": "添加字段：",
+            "lock": {
+                "suggestion": "{label}框已锁定，由于有Wikidata的标签。 你可以删除它或在“所有标签”框内编辑它。"
+            }
         },
         "background": {
             "title": "背景",
@@ -508,8 +537,6 @@
             "best_imagery": "此地最知名的影像数据源",
             "switch": "切换回该底图",
             "custom": "自定义",
-            "custom_button": "编辑自定义背景",
-            "custom_prompt": "输入地图瓦片URL地址。有效的参数有：\n   - {zoom} 或 {z}, {x}, {y} 作为 Z/X/Y 坐标系\n   - {-y} 或 {ty} 作为翻转的 TMS 算法 Y 坐标\n   - {u} 作为四叉树坐标编码\n   - {switch:a,b,c} 作为 DNS 服务器解析的并行连接子域\n\n示例：\n{example}",
             "overlays": "叠加图层",
             "imagery_source_faq": "影像信息 / 报告问题",
             "reset": "重置",
@@ -535,6 +562,14 @@
                 "osm": {
                     "tooltip": "来自 OpenStreetMap 的地图数据",
                     "title": "OpenStreetMap 数据"
+                },
+                "notes": {
+                    "tooltip": "来自 OpenStreetMap 的笔记",
+                    "title": "OpenStreetMap 笔记"
+                },
+                "custom": {
+                    "title": "自定义地图数据",
+                    "zoom": "缩放到数据"
                 }
             },
             "fill_area": "填充区域",
@@ -607,6 +642,28 @@
                 "tooltip": "在区域内全部填充。"
             }
         },
+        "settings": {
+            "custom_background": {
+                "tooltip": "编辑自定义背景",
+                "header": "自定义背景设置",
+                "instructions": "输入地图瓦片URL地址。有效的参数有：\n   {zoom} 或 {z}, {x}, {y} 作为 Z/X/Y 坐标系\n   {-y} 或 {ty} 作为翻转的 TMS 算法 Y 坐标\n   {u} 作为四叉树坐标编码\n   {switch:a,b,c} 作为 DNS 服务器解析的并行连接子域\n\n示例：\n{example}",
+                "template": {
+                    "placeholder": "输入URL地址"
+                }
+            },
+            "custom_data": {
+                "tooltip": "编辑自定义数据层",
+                "header": "自定义地图数据设置",
+                "file": {
+                    "instructions": "选择一个本地数据文件。支持的格式如下：\n   .gpx, .kml, .geojson, .json",
+                    "label": "浏览文件"
+                },
+                "or": "或者",
+                "url": {
+                    "placeholder": "输入一个URL"
+                }
+            }
+        },
         "restore": {
             "heading": "您有未保存的更改",
             "description": "您在上一次编辑时有未保存的修改，您想恢复这些修改吗？",
@@ -708,11 +765,12 @@
         },
         "cannot_zoom": "在此模式下不能再缩小",
         "full_screen": "切换全屏",
-        "gpx": {
-            "local_layer": "本地文件",
-            "drag_drop": "将.gpx、.geojson或.kml文件拖放到页面上，或单击右侧的按钮浏览",
-            "zoom": "缩放到图层",
-            "browse": "浏览文件"
+        "streetside": {
+            "tooltip": "来自微软公司的街景照片",
+            "title": "照片叠加层 (必应 Streetside)",
+            "report": "报告该图像的隐私问题",
+            "view_on_bing": "在必应地图上查看",
+            "hires": "高分辨率"
         },
         "mapillary_images": {
             "tooltip": "来自Mapillary的街景照片",
@@ -727,11 +785,38 @@
         },
         "openstreetcam_images": {
             "tooltip": "来自 OpenStreetCam 的街道等级照片",
-            "title": "照片覆盖（OpenStreetCam）"
+            "title": "照片叠加层 (OpenStreetCam)"
         },
         "openstreetcam": {
             "view_on_openstreetcam": "在 OpenStreetCam 上查看该图像"
         },
+        "note": {
+            "note": "笔记",
+            "title": "编辑笔记",
+            "anonymous": "匿名用户",
+            "closed": "(已关闭)",
+            "commentTitle": "评论",
+            "status": {
+                "opened": "创建于 {when}",
+                "reopened": "重启于 {when}",
+                "commented": "评论于 {when}",
+                "closed": "关闭于 {when}"
+            },
+            "newComment": "发表新评论",
+            "inputPlaceholder": "输入评论并分享给其他用户。",
+            "close": "解决笔记",
+            "open": "重启笔记",
+            "comment": "评论",
+            "close_comment": "解决并评论",
+            "open_comment": "重启并评论",
+            "report": "举报",
+            "new": "新笔记",
+            "newDescription": "描述该处的问题或错误。",
+            "save": "保存笔记",
+            "login": "你必须登录才能修改或评论该笔记。",
+            "upload_explanation": "你的评论将会对所有 OpenStreetMap 用户公开可见。",
+            "upload_explanation_with_user": "{user}，你的评论将会对所有 OpenStreetMap 用户公开可见。"
+        },
         "help": {
             "title": "帮助",
             "key": "H",
@@ -776,19 +861,32 @@
                 "keyboard": "您可以按下 `?` 键以查看键盘快捷键列表。"
             },
             "feature_editor": {
-                "title": "要素编辑器"
+                "title": "要素编辑器",
+                "fields_h": "字段",
+                "tags_h": "标签"
             },
             "points": {
-                "title": "点"
+                "title": "点",
+                "add_point_h": "添加点",
+                "move_point_h": "移动点",
+                "delete_point_h": "删除点",
+                "delete_point": "删除现实世界中不存在的要素是被允许的。在 OpenStreetMap 中删除要素意味着它将会从每个人使用的地图中移除，所以您应该在删除前确保它真的已不复存在。"
             },
             "lines": {
-                "title": "线"
+                "title": "线",
+                "add_line_h": "添加线"
             },
             "areas": {
                 "title": "区域"
             },
             "relations": {
-                "title": "关系"
+                "title": "关系",
+                "route_h": "路线"
+            },
+            "notes": {
+                "title": "笔记",
+                "add_note_h": "添加笔记",
+                "save_note_h": "保存笔记"
             },
             "imagery": {
                 "title": "背景影像",
@@ -985,7 +1083,7 @@
                 "add_name": "在 OpenStreetMap 中，所有的字段都是选填的，如果您不确定的话，让字段留空也是可以的。{br}让我们假设您对当地这间咖啡馆有所了解，并且知道它的名称。 **为这间咖啡馆添加名称。**",
                 "add_close": "要素编辑器会自动记住您所有的改动。 **当您添加了名称后，按下 Esc 键、回车键或点击 {button} 按钮来关闭要素编辑器。**",
                 "reselect": "很多时候，点会已经存在，但是信息有错误或不完整。我们可以编辑已经存在的点。 **点击选中您刚才创建的咖啡馆。**",
-                "update": "让我们给这间咖啡馆加入更多的细节。您可以更改它的名称、添加菜肴或填写地址。 **更改咖啡馆的细节。**",
+                "update": "让我们给这间咖啡馆加入更多的细节。您可以更改它的名称、添加菜系或填写地址。 **更改咖啡馆的细节。**",
                 "update_close": "**当您完成更新咖啡馆后，按下 Esc 键、回车键或点击 {button} 按钮来关闭要素编辑器。**",
                 "rightclick": "您可以右键点击任意要素来显示 *编辑菜单* ，它显示可以使用的编辑操作列表。 **右键点击您创建的点来显示编辑菜单。**",
                 "delete": "删除现实世界中不存在的要素是被允许的。{br}在 OpenStreetMap 中删除要素意味着它将会从每个人使用的地图中移除，所以您应该在删除前确保它真的已不复存在。 **点击 {button} 按钮来删除该点。**",
@@ -996,7 +1094,7 @@
                 "title": "区域",
                 "add_playground": "*区域* 用来显示诸如湖泊、建筑物或居民区等要素的边界。{br}他们亦可作为相较于用点来标记要素而言更为细致的绘制方式。 **点击 {button} 区域按钮来添加一个新的区域。**",
                 "start_playground": "让我们用描绘一个区域的方式来添加这个游乐场吧。区域是通过在要素的外部轮廓上放置若干 *节点* 来描绘。 **点击或按空格键，在游乐场的其中一角放置一个起始节点。**",
-                "continue_playground": "继续在游乐场的轮廓上放置更多的节点来绘制该区域。如果遇到既有的人行道，你也可以将区域连接到人行道上。{br}提示：您可以按下{alt}键以防止节点连接到其他要素上。 **继续绘制游乐场区域。**",
+                "continue_playground": "继续在游乐场的轮廓上放置更多的节点来绘制该区域。如果遇到既有的人行道，您也可以将区域连接到人行道上。{br}提示：您可以按下{alt}键以防止节点连接到其他要素上。 **继续绘制游乐场区域。**",
                 "finish_playground": "按回车键、或再次点击起始/结束节点来结束绘制该区域。 **完成勾画该游乐场的轮廓。**",
                 "search_playground": "**搜索 '{preset}' 。**",
                 "choose_playground": "**在列表中选择 {preset} 。**",
@@ -1116,6 +1214,7 @@
                     "background_switch": "切换回上一背景",
                     "map_data": "显示地图数据设置",
                     "fullscreen": "进入全屏模式",
+                    "sidebar": "切换侧边栏",
                     "wireframe": "切换线框模式",
                     "minimap": "切换小地图"
                 },
@@ -1146,7 +1245,8 @@
                     "add_point": "'增加 点' 模式",
                     "add_line": "'增加 线' 模式",
                     "add_area": "'增加区域' 模式",
-                    "place_point": "放置一个点",
+                    "add_note": "'增加笔记' 模式",
+                    "place_point": "放置一个节点或一条笔记",
                     "disable_snap": "按住以禁用节点吸附",
                     "stop_line": "完成绘制线段或区域"
                 },
@@ -1155,6 +1255,7 @@
                     "continue_line": "在选中节点上继续绘制线",
                     "merge": "合并选中的要素",
                     "disconnect": "在选中节点上分离要素",
+                    "detach_node": "将选中的节点从其父路径/区域中隔离",
                     "split": "在选中节点上分割线",
                     "reverse": "反转线的方向",
                     "move": "移动选中的要素",
@@ -1246,6 +1347,9 @@
                 "category-route": {
                     "name": "线路"
                 },
+                "category-utility": {
+                    "name": "公共设施"
+                },
                 "category-water-area": {
                     "name": "水体"
                 },
@@ -1258,31 +1362,25 @@
                     "label": "允许通行",
                     "options": {
                         "designated": {
-                            "description": "只限标志指定或特定本地法律容许的人士、车辆进入",
                             "title": "指定"
                         },
                         "destination": {
-                            "description": "只限前往目的地人士进入",
+                            "description": "仅限驻地车辆行驶",
                             "title": "目的地"
                         },
                         "dismount": {
-                            "description": "允许通行但必须下车",
                             "title": "下车"
                         },
                         "no": {
-                            "description": "禁止一般公众进入",
                             "title": "禁止"
                         },
                         "permissive": {
-                            "description": "容许进入，直至拥有者撤回许可",
                             "title": "默许"
                         },
                         "private": {
-                            "description": "须拥有者个别批准，方可进入",
                             "title": "私人"
                         },
                         "yes": {
-                            "description": "按法律及路权，有权使用",
                             "title": "允许"
                         }
                     },
@@ -1303,14 +1401,14 @@
                     "placeholders": {
                         "block_number": "街区编号",
                         "block_number!jp": "街区号",
-                        "city": "地级市/自治州",
+                        "city": "地级市/地区/自治州/盟",
                         "city!jp": "市/镇/村/东京都特别区",
                         "city!vn": "市/镇",
                         "conscriptionnumber": "123号",
                         "country": "国家",
                         "county": "郡",
                         "county!jp": "郡 (日本)",
-                        "district": "市辖区/县/县级市",
+                        "district": "市辖区/县级市/县/自治县/旗/旗/特区/林区",
                         "district!vn": "郡/镇/区",
                         "floor": "楼层",
                         "hamlet": "村庄",
@@ -1321,7 +1419,7 @@
                         "neighbourhood!jp": "丁目/字/小字",
                         "place": "地方",
                         "postcode": "邮政编码",
-                        "province": "省/自治区/特别行政区",
+                        "province": "省/自治区/特别行政区/直辖市",
                         "province!jp": "日本县",
                         "quarter": "地方",
                         "quarter!jp": "大字/町",
@@ -1671,7 +1769,7 @@
                     "label": "表盘显示类型"
                 },
                 "distance": {
-                    "label": "总距离"
+                    "label": "距离"
                 },
                 "dock": {
                     "label": "类型"
@@ -1681,7 +1779,7 @@
                 },
                 "duration": {
                     "label": "乘坐时长",
-                    "placeholder": "00:00"
+                    "placeholder": "hh:mm"
                 },
                 "electrified": {
                     "label": "电气化",
@@ -1757,6 +1855,9 @@
                 "frequency": {
                     "label": "工作频率"
                 },
+                "from": {
+                    "label": "起点"
+                },
                 "fuel": {
                     "label": "油站"
                 },
@@ -1923,6 +2024,9 @@
                     "label": "车道数目",
                     "placeholder": "1, 2, 3..."
                 },
+                "language_multi": {
+                    "label": "语言"
+                },
                 "layer": {
                     "label": "图层",
                     "placeholder": "0"
@@ -1982,6 +2086,13 @@
                 "location": {
                     "label": "位置"
                 },
+                "location_pool": {
+                    "label": "位置",
+                    "options": {
+                        "indoor": "室内",
+                        "outdoor": "户外"
+                    }
+                },
                 "man_made": {
                     "label": "类型"
                 },
@@ -2157,15 +2268,6 @@
                 },
                 "piste/difficulty": {
                     "label": "困难",
-                    "options": {
-                        "advanced": "进阶(黑色钻石型)",
-                        "easy": "容易(绿圈)",
-                        "expert": "专家(双重黑色钻石型)",
-                        "extreme": "极端困难(需要攀登工具)",
-                        "freeride": "自由滑行(场地外)",
-                        "intermediate": "中阶(蓝方块)",
-                        "novice": "新手(教学)"
-                    },
                     "placeholder": "容易，中阶，进阶"
                 },
                 "piste/grooming": {
@@ -2317,6 +2419,41 @@
                 "sanitary_dump_station": {
                     "label": "厕所废物"
                 },
+                "seamark/beacon_isolated_danger/shape": {
+                    "label": "形状"
+                },
+                "seamark/beacon_lateral/category": {
+                    "label": "分类"
+                },
+                "seamark/beacon_lateral/colour": {
+                    "options": {
+                        "green": "绿色",
+                        "red": "红色"
+                    }
+                },
+                "seamark/beacon_lateral/shape": {
+                    "label": "形状"
+                },
+                "seamark/beacon_lateral/system": {
+                    "label": "系统",
+                    "options": {
+                        "other": "其它"
+                    }
+                },
+                "seamark/buoy_lateral/category": {
+                    "label": "分类"
+                },
+                "seamark/buoy_lateral/system": {
+                    "options": {
+                        "other": "其它"
+                    }
+                },
+                "seamark/mooring/category": {
+                    "label": "分类"
+                },
+                "seamark/type": {
+                    "label": "导航标志"
+                },
                 "seasonal": {
                     "label": "具备季节性"
                 },
@@ -2359,9 +2496,15 @@
                 "shop": {
                     "label": "类型"
                 },
+                "siren/type": {
+                    "label": "类型"
+                },
                 "site": {
                     "label": "类型"
                 },
+                "site_type": {
+                    "label": "站点类型"
+                },
                 "smoking": {
                     "label": "吸烟",
                     "options": {
@@ -2475,6 +2618,9 @@
                 "surveillance/zone": {
                     "label": "监控区"
                 },
+                "swimming_pool": {
+                    "label": "类型"
+                },
                 "switch": {
                     "label": "开关类型"
                 },
@@ -2490,6 +2636,9 @@
                     },
                     "placeholder": "是，否，仅限外卖"
                 },
+                "to": {
+                    "label": "终点"
+                },
                 "toilets/disposal": {
                     "label": "排污方式",
                     "options": {
@@ -2710,7 +2859,7 @@
                     "terms": "物资缆车"
                 },
                 "aerialway/magic_carpet": {
-                    "name": "魔毯电梯",
+                    "name": "滑雪场魔毯传送带",
                     "terms": "魔毯,传送带式电梯"
                 },
                 "aerialway/mixed_lift": {
@@ -2823,8 +2972,7 @@
                     "terms": "自行车维修工具站"
                 },
                 "amenity/biergarten": {
-                    "name": "啤酒花园",
-                    "terms": "啤酒花园"
+                    "name": "幼儿园"
                 },
                 "amenity/boat_rental": {
                     "name": "船舶租赁处",
@@ -2841,6 +2989,10 @@
                     "name": "咖啡馆",
                     "terms": "咖啡,茶,咖啡厅,咖啡馆,茶座,摩卡,拿铁,馥芮白,玛奇朵,卡布奇诺,红茶,黄茶,清茶,青茶,绿茶,花茶,黑茶,白茶,乌龙,咖啡豆,餐馆,餐厅"
                 },
+                "amenity/car_pooling": {
+                    "name": "拼车",
+                    "terms": "拼车"
+                },
                 "amenity/car_rental": {
                     "name": "汽车租赁",
                     "terms": "汽车租赁处,租车店,汽车租赁,租赁,出租,租"
@@ -2983,6 +3135,9 @@
                     "name": "幼儿园",
                     "terms": "幼儿园,学前班,托儿所,幼稚园,学校,校园,学习"
                 },
+                "amenity/language_school": {
+                    "name": "语言学校"
+                },
                 "amenity/library": {
                     "name": "图书馆",
                     "terms": "图书馆"
@@ -3010,10 +3165,6 @@
                 "amenity/nursing_home": {
                     "name": "疗养院"
                 },
-                "amenity/parking": {
-                    "name": "停车场",
-                    "terms": "停车"
-                },
                 "amenity/parking_entrance": {
                     "name": "车库出入口",
                     "terms": "停车场出入口,地下车库出入口,多层车库出入口"
@@ -3022,10 +3173,6 @@
                     "name": "停车位",
                     "terms": "停车空间,停车场地,停车位"
                 },
-                "amenity/pavilion": {
-                    "name": "休息亭",
-                    "terms": "休息,亭,阁楼"
-                },
                 "amenity/pharmacy": {
                     "name": "药店",
                     "terms": "药房,药店"
@@ -3113,6 +3260,78 @@
                     "name": "餐馆",
                     "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼,美食,饭馆,食堂,食物,吃,美食,食肆,菜馆"
                 },
+                "amenity/restaurant/american": {
+                    "name": "美式餐馆",
+                    "terms": "餐馆,餐厅,美式,美国,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,饭店,食物,食堂"
+                },
+                "amenity/restaurant/asian": {
+                    "name": "亚洲餐馆",
+                    "terms": "餐馆,餐厅,亚洲,东亚,东南亚,中亚,西亚,中国,中式,日式,韩式,日本,韩国,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/chinese": {
+                    "name": "中式餐馆",
+                    "terms": "餐馆,餐厅,饭店,中餐馆,中式,中国,中料,中国料理,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/french": {
+                    "name": "法式餐馆",
+                    "terms": "餐馆,餐厅,法式,法国,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/german": {
+                    "name": "德式餐馆",
+                    "terms": "餐馆,餐厅,徳式,德国,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/greek": {
+                    "name": "希腊餐馆",
+                    "terms": "餐馆,餐厅,希腊,饭店,烧烤,橄榄,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/indian": {
+                    "name": "意式餐馆",
+                    "terms": "餐馆,餐厅,印式,印度,咖喱,飞饼,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/italian": {
+                    "name": "印度餐馆",
+                    "terms": "餐馆,餐厅,意式,意大利,意大利面,披萨,批萨,匹萨,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/japanese": {
+                    "name": "日式餐馆",
+                    "terms": "餐馆,餐厅,日本,日式,日料,日本料理,和食,定食,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/mexican": {
+                    "name": "墨西哥餐馆",
+                    "terms": "餐馆,餐厅,墨西哥,饭店,烧烤,玉米卷,玉米片,塔克,塔可,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/noodle": {
+                    "name": "面馆",
+                    "terms": "面馆,面,面条,拉面,餐馆,餐厅,牛肉面,汤面,粉丝,饭店,早餐,早点,早饭,午餐,午饭,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/pizza": {
+                    "name": "披萨餐馆",
+                    "terms": "披萨,批萨,匹萨,餐馆,餐厅,西餐,酒吧,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/seafood": {
+                    "name": "海鲜餐馆",
+                    "terms": "海鲜,餐馆,餐厅,鱼,章鱼,鱿鱼,虾,龙虾,贝,蛤蜊,螺,蚌,蟹,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/steakhouse": {
+                    "name": "牛排餐馆",
+                    "terms": "牛排,牛肉,餐馆,餐厅,牛,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/sushi": {
+                    "name": "寿司餐馆",
+                    "terms": "寿司,刺身,手卷,海鲜,日料,餐馆,餐厅,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/thai": {
+                    "name": "泰式餐馆",
+                    "terms": "餐馆,餐厅,泰式,泰国,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/turkish": {
+                    "name": "土耳其餐馆",
+                    "terms": "餐馆,餐厅,土耳其,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
+                "amenity/restaurant/vietnamese": {
+                    "name": "越南餐馆",
+                    "terms": "餐馆,餐厅,越南,饭店,烧烤,酒吧,早餐,早点,早饭,午餐,午饭,下午茶,晚餐,晚饭,食物,食堂"
+                },
                 "amenity/sanitary_dump_station": {
                     "name": "厕所卸污处",
                     "terms": "厕所卸污处"
@@ -3164,8 +3383,8 @@
                     "name": "游泳池"
                 },
                 "amenity/taxi": {
-                    "name": "出租车站",
-                    "terms": "出租车站,的士站,计程车站"
+                    "name": "出租车停车处",
+                    "terms": "出租车停车处,的士停车处,计程车停车处"
                 },
                 "amenity/telephone": {
                     "name": "电话",
@@ -3201,11 +3420,11 @@
                 },
                 "amenity/vending_machine/condoms": {
                     "name": "避孕套售货机",
-                    "terms": "避孕套,安全套,避孕,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
+                    "terms": "计生用品,避孕套,安全套,避孕,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
                 },
                 "amenity/vending_machine/drinks": {
                     "name": "饮料售货机",
-                    "terms": "饮料,饮品,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机,水,果汁,汽水,咖啡,奶茶,茶"
+                    "terms": "饮料,饮品,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机,水,矿泉水,果汁,汽水,咖啡,奶茶,茶"
                 },
                 "amenity/vending_machine/electronics": {
                     "name": "电器售货机",
@@ -3238,10 +3457,6 @@
                     "name": "报纸售货机",
                     "terms": "报,报纸,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
                 },
-                "amenity/vending_machine/parcel_pickup_dropoff": {
-                    "name": "行李提取/装卸机",
-                    "terms": "行李,包裹,背包,提取,装卸,提取机,装卸机"
-                },
                 "amenity/vending_machine/parking_tickets": {
                     "name": "停车缴费机",
                     "terms": "停车,停车场,缴费,售票,缴费机,售票机"
@@ -3399,7 +3614,11 @@
                 },
                 "barrier/kerb": {
                     "name": "路缘",
-                    "terms": "路缘,路缘带,路肩,边缘,行车带,人行道,无障碍,公路,马路"
+                    "terms": "路缘,路缘石,立缘石,路缘带,路肩,边缘,行车带,人行道,无障碍,公路,马路"
+                },
+                "barrier/kerb/lowered": {
+                    "name": "下降式路缘",
+                    "terms": "路缘,路缘石,平缘石,路缘带,路肩,边缘,行车带,人行道,无障碍,公路,马路"
                 },
                 "barrier/kissing_gate": {
                     "name": "单人转门",
@@ -3433,10 +3652,6 @@
                     "name": "建筑物",
                     "terms": "建筑物，屋宇"
                 },
-                "building/apartments": {
-                    "name": "住宅楼",
-                    "terms": "公寓,住宅楼"
-                },
                 "building/barn": {
                     "name": "谷仓",
                     "terms": "粮仓,畜棚,库房"
@@ -3553,7 +3768,7 @@
                 },
                 "building/shed": {
                     "name": "储物木屋",
-                    "terms": "储物间, 小木屋"
+                    "terms": "储物间,小木屋,木屋"
                 },
                 "building/stable": {
                     "name": "马厩",
@@ -3655,7 +3870,7 @@
                 },
                 "craft/electronics_repair": {
                     "name": "电子用品修理商店",
-                    "terms": "电子修理商店,电子用品修理点"
+                    "terms": "电子修理商店,电子用品修理点,家电维修"
                 },
                 "craft/gardener": {
                     "name": "园艺工",
@@ -3782,8 +3997,7 @@
                     "terms": "酒庄,酒厂"
                 },
                 "embankment": {
-                    "name": "堤岸",
-                    "terms": "堤,堤坝,堤岸,路堤"
+                    "name": "堤岸"
                 },
                 "emergency/ambulance_station": {
                     "name": "救护站",
@@ -3803,6 +4017,9 @@
                     "name": "消防栓",
                     "terms": "消防栓"
                 },
+                "emergency/first_aid_kit": {
+                    "name": "急救包"
+                },
                 "emergency/life_ring": {
                     "name": "救生圈",
                     "terms": "救生圈,橡皮圈,应急,救生,游泳"
@@ -3827,26 +4044,6 @@
                     "name": "入口/出口",
                     "terms": "入口/出口,出入口"
                 },
-                "footway/crossing": {
-                    "name": "人行横道",
-                    "terms": "路口"
-                },
-                "footway/crossing-raised": {
-                    "name": "抬高的人行横道",
-                    "terms": "人行横道,速度,减速,交通稳静化"
-                },
-                "footway/crosswalk": {
-                    "name": "人行横道",
-                    "terms": "人行横道,斑马线"
-                },
-                "footway/crosswalk-raised": {
-                    "name": "抬高的人行横道",
-                    "terms": "人行横道,斑马线,速度,减速,交通稳静化"
-                },
-                "footway/sidewalk": {
-                    "name": "路边人行道",
-                    "terms": "路边人行道,人行道,便道,走道"
-                },
                 "ford": {
                     "name": "过水路面",
                     "terms": "过水路面,浅滩,漫水桥,垫脚石"
@@ -3973,21 +4170,27 @@
                     "name": "室内走廊",
                     "terms": "室内走廊,室内步行街"
                 },
-                "highway/crossing": {
-                    "name": "路口",
-                    "terms": "路口"
+                "highway/crossing/marked": {
+                    "name": "人行横道 (有标线)",
+                    "terms": "人行横道,斑马线"
                 },
-                "highway/crossing-raised": {
-                    "name": "抬高的街道十字路口",
-                    "terms": "人行横道,速度,减速,交通稳静化"
+                "highway/crossing/marked-raised": {
+                    "name": "人行横道 (有标线/抬升)",
+                    "terms": "人行横道,斑马线,抬升,减速台,减速带,减速"
                 },
-                "highway/crosswalk": {
-                    "name": "人行横道",
+                "highway/crossing/unmarked": {
+                    "name": "人行横道 (无标线)",
                     "terms": "人行横道"
                 },
-                "highway/crosswalk-raised": {
-                    "name": "抬高的人行横道",
-                    "terms": "人行横道,斑马线,速度,减速,交通稳静化"
+                "highway/crossing/unmarked-raised": {
+                    "name": "人行横道 (无标线/抬升)",
+                    "terms": "人行横道,抬升,减速台,减速带,减速"
+                },
+                "highway/crossing/zebra": {
+                    "name": "人行横道 (有标线)"
+                },
+                "highway/crossing/zebra-raised": {
+                    "name": "人行横道 (有标线/抬升)"
                 },
                 "highway/cycleway": {
                     "name": "自行车道",
@@ -4001,6 +4204,32 @@
                     "name": "步行道路",
                     "terms": "步行径"
                 },
+                "highway/footway/marked": {
+                    "name": "人行横道 (有标线)",
+                    "terms": "人行横道,斑马线"
+                },
+                "highway/footway/marked-raised": {
+                    "name": "人行横道 (有标线/抬升)",
+                    "terms": "人行横道,斑马线,抬升,减速台,减速带,减速"
+                },
+                "highway/footway/sidewalk": {
+                    "name": "人行道",
+                    "terms": "人行道,人行通道,路缘,路边,路牙,盲道"
+                },
+                "highway/footway/unmarked": {
+                    "name": "人行横道 (无标线)",
+                    "terms": "人行横道"
+                },
+                "highway/footway/unmarked-raised": {
+                    "name": "人行横道 (无标线/抬升)",
+                    "terms": "人行横道,抬升,减速台,减速带,减速"
+                },
+                "highway/footway/zebra": {
+                    "name": "人行横道 (有标线)"
+                },
+                "highway/footway/zebra-raised": {
+                    "name": "人行横道 (有标线/抬升)"
+                },
                 "highway/give_way": {
                     "name": "让行标志",
                     "terms": "让行标志,减速让行标志"
@@ -4074,7 +4303,7 @@
                     "terms": "辅助道路"
                 },
                 "highway/service/alley": {
-                    "name": "窄路 (机动车通行)",
+                    "name": "窄路/巷",
                     "terms": "胡同,巷,弄堂,里弄,小巷,巷,弄,巷弄（可通行机动车）"
                 },
                 "highway/service/drive-through": {
@@ -4231,7 +4460,7 @@
                 },
                 "landuse/construction": {
                     "name": "建设用地",
-                    "terms": "建筑物"
+                    "terms": "建设,建造,施工,工地,在建,建筑,构筑,构建,承建,用地,建设用地"
                 },
                 "landuse/farm": {
                     "name": "农田"
@@ -4282,7 +4511,7 @@
                 },
                 "landuse/military": {
                     "name": "军事区",
-                    "terms": "军事用地, 军事区域"
+                    "terms": "军事用地,军事区域"
                 },
                 "landuse/military/airfield": {
                     "name": "军用机场",
@@ -4464,10 +4693,6 @@
                     "name": "美式足球场",
                     "terms": "美式足球场"
                 },
-                "leisure/pitch/baseball": {
-                    "name": "棒球场",
-                    "terms": "棒球场"
-                },
                 "leisure/pitch/basketball": {
                     "name": "篮球场",
                     "terms": "篮球场"
@@ -4619,10 +4844,6 @@
                     "name": "通讯天线杆",
                     "terms": "通讯天线杆,无线电杆,电线杆,杆"
                 },
-                "man_made/observation": {
-                    "name": "瞭望塔",
-                    "terms": "瞭望塔"
-                },
                 "man_made/observatory": {
                     "name": "天文台",
                     "terms": "天文台,天文,天象,天体,观测,气象台,瞭望台,望远镜,观星,星星,光学,射电"
@@ -4655,10 +4876,6 @@
                     "name": "监视器",
                     "terms": "监视器,监控,探头,监视探头"
                 },
-                "man_made/surveillance_camera": {
-                    "name": "监视摄像机",
-                    "terms": "监视摄像机,监控摄像机,监控,监视,摄像机,摄像头,探头,照相机,相机"
-                },
                 "man_made/survey_point": {
                     "name": "测量点",
                     "terms": "测量点"
@@ -4677,7 +4894,7 @@
                 },
                 "man_made/water_well": {
                     "name": "水井",
-                    "terms": "水井, 取水点"
+                    "terms": "水井,取水点"
                 },
                 "man_made/water_works": {
                     "name": "供水厂",
@@ -4789,7 +5006,7 @@
                 },
                 "natural/tree_row": {
                     "name": "树列",
-                    "terms": "树列,树阵,一排树"
+                    "terms": "树列,一列树,一排树,树阵,树"
                 },
                 "natural/volcano": {
                     "name": "火山",
@@ -4847,7 +5064,7 @@
                     "terms": "建筑事务所"
                 },
                 "office/association": {
-                    "name": "非盈利机构办公室",
+                    "name": "非营利机构办公室",
                     "terms": "非盈利机构办公室"
                 },
                 "office/charity": {
@@ -4975,10 +5192,6 @@
                     "name": "水务设施机构",
                     "terms": "水务,水源,设施,机构,水,自来水,废水,污水"
                 },
-                "piste": {
-                    "name": "滑雪道",
-                    "terms": "滑雪道"
-                },
                 "place": {
                     "name": "地点"
                 },
@@ -5096,25 +5309,21 @@
                 "power": {
                     "name": "电力"
                 },
+                "power/cable/underground": {
+                    "name": "地下电缆",
+                    "terms": "电缆,缆线,线缆,地下电缆,地下线缆,输电,电线,电力,发电,导线,电,输电线"
+                },
                 "power/generator": {
                     "name": "发电机",
                     "terms": "发电机"
                 },
-                "power/generator/source_nuclear": {
-                    "name": "核反应堆",
-                    "terms": "原子能,核,原子核,核电站,反应堆,链式,核裂变,发电,发电机,反应器,反应机,铀,核化学,中子"
-                },
-                "power/generator/source_wind": {
-                    "name": "风力涡轮机",
-                    "terms": "风能,风轮机,涡轮,发电机,发电器,风力,风车,风,发电"
-                },
                 "power/line": {
-                    "name": "输电线",
-                    "terms": "输电线"
+                    "name": "超高压输电线",
+                    "terms": "输电线,输电,超高压,高电压,高压线,高压电线,高压,架空,电线,电力,电缆,缆线,线缆,发电,导线,电"
                 },
                 "power/minor_line": {
-                    "name": "次要输电线",
-                    "terms": "次要输电线"
+                    "name": "高压输电线",
+                    "terms": "输电线,输电,配电,低电压,中电压,低压,低压线,低压,高压线,高压电线,架空,电线,电力,电缆,缆线,线缆,发电,导线,电"
                 },
                 "power/plant": {
                     "name": "发电厂",
@@ -5723,6 +5932,10 @@
                     "name": "摩托车店",
                     "terms": "摩托车行,摩托车"
                 },
+                "shop/motorcycle_repair": {
+                    "name": "摩托车修理店",
+                    "terms": "摩托车修理店"
+                },
                 "shop/music": {
                     "name": "音乐店",
                     "terms": "音乐店"
@@ -5943,7 +6156,7 @@
                     "terms": "美术馆,画廊,艺术中心"
                 },
                 "tourism/guest_house": {
-                    "name": "招待所",
+                    "name": "客栈",
                     "terms": "招待所,旅馆,宾馆"
                 },
                 "tourism/hostel": {
@@ -6243,7 +6456,6 @@
                 "attribution": {
                     "text": "条款与反馈"
                 },
-                "description": "DigitalGlobe 优质卫星影像",
                 "name": "DigitalGlobe 优质影像"
             },
             "DigitalGlobe-Premium-vintage": {
@@ -6257,7 +6469,6 @@
                 "attribution": {
                     "text": "条款与反馈"
                 },
-                "description": "DigitalGlobe 标准卫星影像",
                 "name": "DigitalGlobe 标准影像"
             },
             "DigitalGlobe-Standard-vintage": {
@@ -6337,9 +6548,6 @@
                 },
                 "name": "OSM查看器：标签"
             },
-            "US-TIGER-Roads-2012": {
-                "name": "TIGER 道路 2012"
-            },
             "US-TIGER-Roads-2014": {
                 "description": "在缩放等级16级以上是来自美国人口调查局的公共领域地图数据。低缩放等级下仅包含自2006年以来的变更，不含已纳入 OpenStreetMap 的变更。",
                 "name": "TIGER 道路 2014"
@@ -6396,12 +6604,6 @@
                 "description": "由 basemap.at 提供的正射影像图层，接替 geoimage.at 影像图层。",
                 "name": "basemap.at 正射影像"
             },
-            "hike_n_bike": {
-                "attribution": {
-                    "text": "© OpenStreetMap 贡献者"
-                },
-                "name": "徒步与自行车"
-            },
             "mapbox_locator_overlay": {
                 "attribution": {
                     "text": "条款与反馈"
@@ -6495,7 +6697,7 @@
             "OSM-BGD-facebook": {
                 "name": "OpenStreetMap 孟加拉国",
                 "description": "改进位于孟加拉国的 OpenStreetMap",
-                "extendedDescription": "在孟加拉国绘图？有任何疑问，想要与当地的社区交流？在 {Url} 加入我们。欢迎所有人！"
+                "extendedDescription": "在孟加拉国绘图？有任何疑问，想要与当地的社区交流？在 {url} 加入我们。欢迎所有人！"
             },
             "OSM-India-facebook": {
                 "name": "OpenStreetMap 印度 - 共同参与的街区绘图",
@@ -6541,6 +6743,14 @@
                 "name": "OpenStreetMap 日本 Twitter",
                 "description": "Twitter 上的#标签：{url}"
             },
+            "OSM-japan-website": {
+                "name": "OpenStreetMap 日本",
+                "description": "位于日本的绘图者和 OpenStreetMap 用户"
+            },
+            "OSM-korea-telegram": {
+                "name": "OSM 韩国电报频道",
+                "description": "非官方的频道，用于韩国的 OpenStreetMap 贡献者、社区和用户的分享与讨论。"
+            },
             "OSM-MY-forum": {
                 "name": "OpenStreetMap 马来西亚论坛",
                 "description": "官方 OpenStreetMap 马来西亚论坛"
@@ -6619,34 +6829,46 @@
                 "name": "OpenStreetMap 奥地利",
                 "description": "位于奥地利的 OpenStreetMap 信息平台"
             },
+            "byosm": {
+                "name": "OpenStreetMap 白俄罗斯",
+                "description": "OpenStreetMap 白俄罗斯 Telegram 交流"
+            },
             "be-facebook": {
-                "name": "OpenStreetMap 比利时社区",
-                "description": "在比利时的绘图者和 OpenStreetMap Facebook"
+                "name": "OpenStreetMap 比利时社区"
             },
             "be-forum": {
                 "name": "OpenStreetMap 比利时论坛",
                 "description": "OpenStreetMap 比利时网络论坛"
             },
             "be-mailinglist": {
-                "name": "Talk-be 邮件列表",
-                "description": "Talk-be 是比利时 OpenStreetMap 社区的官方邮件列表"
-            },
-            "be-matrix": {
-                "name": "OpenStreetMap 比利时 Riot 频道",
-                "description": "欢迎所有的绘图者！在 {signupUrl} 上注册。"
+                "name": "Talk-be 邮件列表"
             },
             "be-twitter": {
-                "name": "OpenStreetMap 比利时 Twitter",
-                "description": "OSM 比利时 Twitter 主页：{url}"
-            },
-            "byosm": {
-                "name": "OpenStreetMap 白俄罗斯",
-                "description": "OpenStreetMap 白俄罗斯 Telegram 交流"
+                "name": "OpenStreetMap 比利时 Twitter"
             },
             "talk-cz-mailinglist": {
-                "name": "Talk-cz 邮件列表",
                 "description": "Talk-cz 是捷克 OpenStreetMap 社区的官方邮件列表"
             },
+            "fr-facebook": {
+                "name": "OpenStreetMap 法国 Facebook 主页",
+                "description": "OpenStreetMap 法国 Facebook 主页"
+            },
+            "fr-forum": {
+                "name": "OpenStreetMap 法国网络论坛",
+                "description": "OpenStreetMap 法国网络论坛"
+            },
+            "fr-irc": {
+                "name": "OpenStreetMap 法国 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-fr"
+            },
+            "fr-mailinglist": {
+                "name": "Talk-fr 邮件列表",
+                "description": "Talk-fr 邮件列表"
+            },
+            "fr-twitter": {
+                "name": "OpenStreetMap 法国 Twitter 主页",
+                "description": "OpenStreetMap 法国 Twitter 主页：{url}"
+            },
             "de-berlin-mailinglist": {
                 "name": "柏林邮件列表",
                 "description": "此为柏林 OSM 社区的邮件列表"
@@ -6679,47 +6901,6 @@
                 "name": "OpenStreetMap 德国",
                 "description": "位于德国的 OpenStreetMap 信息平台"
             },
-            "OSM-ES-mailinglist": {
-                "name": "Talk-es 邮件列表",
-                "description": "讨论在西班牙 OpenStreetMap 的邮件列表"
-            },
-            "OSM-ES-telegram": {
-                "name": "@OSMes Telegram 主页",
-                "description": "OpenStreetMap 西班牙 Telegram 交流"
-            },
-            "fr-facebook": {
-                "name": "OpenStreetMap 法国 Facebook 主页",
-                "description": "OpenStreetMap 法国 Facebook 主页"
-            },
-            "fr-forum": {
-                "name": "OpenStreetMap 法国网络论坛",
-                "description": "OpenStreetMap 法国网络论坛"
-            },
-            "fr-irc": {
-                "name": "OpenStreetMap 法国 IRC",
-                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-fr"
-            },
-            "fr-mailinglist": {
-                "name": "Talk-fr 邮件列表",
-                "description": "Talk-fr 邮件列表"
-            },
-            "fr-twitter": {
-                "name": "OpenStreetMap 法国 Twitter 主页",
-                "description": "OpenStreetMap 法国 Twitter 主页：{url}"
-            },
-            "Nottingham-OSM-pub-meetup": {
-                "name": "东米德兰（诺丁汉）月度酒吧见面会",
-                "description": "东米德兰绘图者和用户的社交聚会",
-                "extendedDescription": "该小组自2011年3月开始举行会议，地点最初在诺丁汉，近几年在德比，或不时在东米德兰的其他地方举行。这些虽是社交聚会，但却是来询问涉及地区或只是普通的 OSM 特定问题的好地方。在夏季，我们通常会在会场附近进行一小时的小型测绘。整个团队都对关于公共优先权的测绘有着特殊的兴趣，并且不时为此而召开绘图会议。"
-            },
-            "gb-mailinglist": {
-                "name": "Talk-gb 邮件列表",
-                "description": "Talk-gb 是英国(包括北爱尔兰) OSM 社区的主要交流论坛"
-            },
-            "gb-irc": {
-                "name": "OpenStreetMap 英国 IRC",
-                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-gb"
-            },
             "it-facebook": {
                 "name": "OpenStreetMap 意大利 Facebook",
                 "description": "在 Facebook 上加入 OpenStreetMap 意大利社区"
@@ -6764,6 +6945,14 @@
             "OSM-PL-facebook-group": {
                 "name": "OpenStreetMap 波兰 Facebook 小组"
             },
+            "OSM-ES-mailinglist": {
+                "name": "Talk-es 邮件列表",
+                "description": "讨论在西班牙 OpenStreetMap 的邮件列表"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes Telegram 主页",
+                "description": "OpenStreetMap 西班牙 Telegram 交流"
+            },
             "osm-se": {
                 "name": "OpenStreetMap.se"
             },
@@ -6787,6 +6976,19 @@
                 "name": "OpenStreetMap 瑞典 Twitter 页面",
                 "description": "在 Twitter 上关注我们：{url}"
             },
+            "Nottingham-OSM-pub-meetup": {
+                "name": "东米德兰（诺丁汉）月度酒吧见面会",
+                "description": "东米德兰绘图者和用户的社交聚会",
+                "extendedDescription": "该小组自2011年3月开始举行会议，地点最初在诺丁汉，近几年在德比，或不时在东米德兰的其他地方举行。这些虽是社交聚会，但却是来询问涉及地区或只是普通的 OSM 特定问题的好地方。在夏季，我们通常会在会场附近进行一小时的小型测绘。整个团队都对关于公共优先权的测绘有着特殊的兴趣，并且不时为此而召开绘图会议。"
+            },
+            "gb-mailinglist": {
+                "name": "Talk-gb 邮件列表",
+                "description": "Talk-gb 是英国(包括北爱尔兰) OSM 社区的主要交流论坛"
+            },
+            "gb-irc": {
+                "name": "OpenStreetMap 英国 IRC",
+                "description": "在 irc.oftc.net (端口 6667) 加入 #osm-gb"
+            },
             "OSM-CA-Slack": {
                 "name": "OSM-CA Slack",
                 "description": "欢迎所有人加入！在 {signupUrl} 上注册。"
@@ -6951,16 +7153,21 @@
                 "name": "OpenStreetMap Reddit 社区",
                 "description": "/r/openstreetmap/ 是了解更多关于 OpenStreetMap 的好地方。来尽管问我们吧！"
             },
+            "OSM-Telegram": {
+                "name": "OpenStreetMap Telegram 群组",
+                "description": "加入 OpenStreetMap Telegram 全球大群：{url}"
+            },
             "OSM-Twitter": {
                 "name": "OpenStreetMap Twitter 主页",
                 "description": "在 Twitter 上关注我们：{url}"
             },
             "OSMF": {
                 "name": "OpenStreetMap 基金会 (OSMF)",
-                "description": "OSMF 是总部位于英国的非盈利组织，用于支持 OpenStreetMap 项目。",
+                "description": "OSMF 是总部位于英国的非营利组织，用于支持 OpenStreetMap 项目。",
                 "events": {
                     "sotm2018": {
                         "name": "State of the Map 2018",
+                        "description": "加入我们为期3天在意大利米兰举办的年度全球 OpenStreetMap 会议，与社区中的每个人相聚并进行交流、分享和学习。",
                         "where": "意大利米兰"
                     }
                 }