X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bb9f20710e851eb4943bfb8e63386680e359834a..cdc4e3f8d1fd6071151327389c08db911de3bcf4:/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 c2523d60a..81917acd2 100644
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -2,7 +2,7 @@
     "modes": {
         "add_area": {
             "title": "面",
-            "description": "添加公园、建筑物、湖或其它面状要素到地图上。",
+            "description": "添加公园、建筑物、湖或其它面到地图上。",
             "tail": "在地图上单击开始绘制面状要素，如公园、湖泊或建筑物。"
         },
         "add_line": {
@@ -137,13 +137,14 @@
         },
         "merge": {
             "title": "合并",
-            "description": "合并这些线。",
+            "description": "合并这些特征。",
             "key": "C",
-            "annotation": "合并{n}条线。",
+            "annotation": "已合并 {n} 个特征。",
             "not_eligible": "这些特征不可以合并。",
-            "not_adjacent": "这些线段并不连接，不能合并。",
-            "restriction": "这些线段不能合并，因为其中最少有一条线段是\"{relation}\"关系的成员。",
-            "incomplete_relation": "此要素暂未下载完成，无法合并。"
+            "not_adjacent": "这些特征不能被合并，因为它们不相连。",
+            "restriction": "这些特征不能被合并，因为其中至少有一个特征是某个“{relation}”关系的成员。",
+            "incomplete_relation": "此要素暂未下载完成，无法合并。",
+            "conflicting_tags": "这些特征不能被合并，因为它们的某些标签具有冲突的值。"
         },
         "move": {
             "title": "移动",
@@ -216,7 +217,7 @@
         "nothing": "没有可以重做的操作。"
     },
     "tooltip_keyhint": "快捷键：",
-    "browser_notice": "该编辑器仅支持Firefox、Chrome、Safari、Opera和Internet Explorer 9及更高版本。请升级你的浏览器或使用Potlatch 2编辑地图。",
+    "browser_notice": "本编辑器需要在 Firefox、Chrome、Safari、Opera 以及 Internet Explorer 11 或更新版本的浏览器中工作。请升级您的浏览器，或使用 Potlatch 2 来编辑地图。",
     "translate": {
         "translate": "翻译",
         "localized_translation_label": "多语言名称",
@@ -226,6 +227,8 @@
     "zoom_in_edit": "放大地图以编辑",
     "logout": "退出",
     "loading_auth": "正在连接OpenStreetMap...",
+    "report_a_bug": "报告漏洞",
+    "help_translate": "帮助改进翻译",
     "feature_info": {
         "hidden_warning": "{count}个隐藏特征",
         "hidden_details": "以下要素目前被隐藏：{details}"
@@ -237,7 +240,6 @@
     },
     "commit": {
         "title": "保存变更",
-        "description_placeholder": "简单说明你的贡献。",
         "message_label": "修改集合注释",
         "upload_explanation": "你的修改将会在所有使用OpenStreetMap的数据的地图上看得见。",
         "upload_explanation_with_user": "{user}，你的修改将会在所有使用OpenStreetMap数据的地图上展现。",
@@ -321,7 +323,6 @@
         "custom": "自定义",
         "custom_button": "编辑自定义背景",
         "custom_prompt": "输入瓦片模板。Z/X/Y方案的有效标记是{z}，{x}，{y}，quadtile方案的有效标记是{u}。",
-        "fix_misalignment": "修复对齐",
         "reset": "重置",
         "minimap": {
             "description": "小地图",
@@ -341,14 +342,6 @@
             "description": "点",
             "tooltip": "兴趣点(POI)"
         },
-        "major_roads": {
-            "description": "主要道路",
-            "tooltip": "公路，街道等。"
-        },
-        "minor_roads": {
-            "description": "次要道路",
-            "tooltip": "辅助道路，停车场通道，土路等。"
-        },
         "paths": {
             "description": "小路",
             "tooltip": "人行道，步行道路，自行车道等。"
@@ -444,8 +437,7 @@
         "view_on_osm": "在 OSM 上查看",
         "facebook": "分享到Facebook",
         "twitter": "分享到 Twitter",
-        "google": "分享到 Google+",
-        "help_html": "你的更新应该在几分钟后出现在“标准”图层上。其他图层和某些功能，可能需要更长的时间\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>详情</a>).\n"
+        "google": "分享到 Google+"
     },
     "confirm": {
         "okay": "确定",
@@ -491,8 +483,6 @@
         "browse": "浏览GPX文件"
     },
     "mapillary": {
-        "tooltip": "Mapillary的街道照片",
-        "title": "照片叠加层(Mapillary)",
         "view_on_mapillary": "在Mapillary上查看这张图片"
     },
     "help": {
@@ -508,85 +498,93 @@
         "relations": "# 关系\n\n关系是 OpenStreetMap 中用于组合其它特征的特殊要素类型。比如，两个基本关系类型*路径关系*和*复合多边形*，它们分别用于组合同一条公路或高速公路的不同部分和一个复杂区域(分成多块或像油炸圈饼一样中间有个洞)的多条线条。\n\n关系中包含的要素称为*成员*。在侧边栏中，您可以看到成员所属的关系，并点击选中它。选中某个关系后，您就能看到它的所有成员在侧边栏被全部列出并在地图上被高亮显示。\n\n在大多数时候，iD 会在您编辑的时候自动处理关系。您主要注意的是当您删除道路的某个部分并重绘它时，请确保新的部分还是原来的关系中的一员。\n\n## 编辑关系\n\n如果您想要编辑关系，这里是一些基本技巧。\n\n要向关系中添加要素，选择该要素，点击侧边栏「所有关系」中的「+」按钮，并选择或输入关系的名称。\n\n要创建一个新的关系，选中要作为成员的第一个特征，点击「所有关系」中的「+」按钮，并选择「新建关系...」。\n\n要从一个关系中移除要素，选择要素并点击您要从中移除的关系旁边的垃圾箱按钮。\n\n您可以使用「合并」工具创建有洞的复合多边形。绘制两个区域(内部和外部)，按住 Shift 键并点击各个多边形来选中它们，然后点击「合并」(+)按钮。\n"
     },
     "intro": {
+        "graph": {
+            "city_hall": "三里屯市政厅",
+            "fire_department": "三里屯消防站",
+            "memory_isle_park": "北海公园",
+            "riverwalk_trail": "河滨小道",
+            "w_michigan_ave": "南京西路",
+            "e_michigan_ave": "南京东路",
+            "spring_st": "解放路",
+            "scidmore_park": "中山公园",
+            "petting_zoo": "野生动物园",
+            "n_andrews_st": "北五环",
+            "s_andrews_st": "南五环",
+            "n_constantine_st": "北光明路",
+            "s_constantine_st": "南光明路",
+            "rocky_river": "李家沟",
+            "railroad_dr": "铁道线",
+            "conrail_rr": "大秦铁路",
+            "st_joseph_river": "吴淞江",
+            "n_main_st": "北二环",
+            "s_main_st": "南二环",
+            "water_st": "水岸路",
+            "foster_st": "跃进街",
+            "portage_river": "货运河",
+            "flower_st": "幸福街",
+            "elm_st": "江榆路",
+            "walnut_st": "江松路",
+            "morris_ave": "世纪大道",
+            "east_st": "东街",
+            "portage_ave": "货运大道"
+        },
         "navigation": {
             "title": "导航",
             "drag": "主地图区域在背景上展示了 OpenStreetMap 数据。您可以像在其它网络地图一样通过拖动和滚动来移动。**拖动地图！**",
             "select": "地图要素有三种表示方法：点、线、面。所有要素都可以通过点击选择。**单击该点来选定它。**",
-            "header": "上方显示特征类型",
-            "pane": "当选定一个特征时，会出现特征编辑器。抬头展示特征类型，主窗格展示特征的属性，如名称和地址。**单击特征编辑器右上角的关闭按钮，关闭特征编辑器。**"
+            "pane": "当选定一个地理特征时，特征编辑器将出现。其抬头展示特征类型，主窗格展示特征的属性，如名称和地址。**单击特征编辑器右上角的 {button} 按钮来关闭特征编辑器。**",
+            "search": "你也可以搜索目前视野上或世界的地理特征。**搜索'{name}'**",
+            "choose": "**在列表中选择{name}。**",
+            "chosen": "好！{name}已经被选中了。**按下{button}来关闭地理特征编辑器。**"
         },
         "points": {
             "title": "点",
-            "add": "点可以用于代表诸如商店、餐馆和历史遗迹的特征。它们标记一个特定的地点，并说明该地点是什么。**单击“点”按钮添加新点。**",
-            "place": "在地图上点击，可以地图上新增的一点。 **将该点放到建筑物上方**",
+            "add": "点可以用来表示某些地理特征，比如商店、餐厅和纪念碑。它们标定了一个特定的位置，并且描述了那里有什么。**按下{button}按钮来增加一个新点。**",
+            "place": "可以用点击地图的方式来放置点。**点击地图，把新点放置在这座建筑的上面。**",
             "search": "很多不同的物体可以用点来代表。您刚刚新增加的点是一间咖啡厅。**搜索'{name}'**",
             "choose": "**在列表中选择咖啡馆。**",
             "describe": "这个点已经标记为咖啡馆了。使用特征编辑器，我们可以添加更多关于特征的信息。**添加名称**",
-            "close": "特征编辑器可以通过单击关闭按钮来关闭。**关闭特征编辑器**",
-            "reselect": "很多时候，所需的点已经存在，但有错误或不完整。我们可以编辑现有的点。 **选择您刚创建的点**",
-            "fixname": "**更改名称，关闭特征编辑器。**",
-            "reselect_delete": "地图上的所有特征都可以删除。**单击你创建的点。**",
-            "delete": "在点周围的菜单包含在该点可执行的操作，包括删除。**删除点。**"
+            "close": "地理特征编辑器会自动记下你所有的改动。当你改动一个地理特征时，关闭按钮会变成对勾。**按下{button}按钮来关闭编辑器**",
+            "reselect": "有些点已经存在，但是信息有错误或不完整。我们可以编辑已经存在的点。**点击那个你刚刚创建的点。**",
+            "fixname": "**改变它的名字，然后点击{button}按钮来关闭编辑器。**",
+            "reselect_delete": "所有在地图上的特征都能被删除。**点击那个你刚刚创建的点。**",
+            "delete": "在点周围的菜单包含在该点可执行的操作，包括删除。**点击{button}按钮来删除点。**"
         },
         "areas": {
             "title": "面状要素",
-            "add": "面用来表示要素的界限，像是湖、建筑物或住宅区。也就是说可以让原本只是个兴趣点的要素呈现更多细节。 **按下面的按钮新建面要素**",
-            "corner": "通过将节点放到面的边界上，可绘制面。 **将起始节点置于游乐场的其中一角**",
+            "add": "面可以用来表示特征的界限，像是湖、建筑物或住宅区。也就是说可以让原本只是个兴趣点的特征呈现更多细节。 **按{button}按钮新建面。**",
+            "corner": "通过将节点放到面的边界上，可绘制面。 **将起始节点置于游乐场的其中一角。**",
             "place": "放置更多节点可绘制面要素。点击开始节点即可完成绘制。**在沙盒绘制一个面。**",
             "search": "**搜索'{name}'。**",
             "choose": "**在列表中选择儿童游乐场。**",
-            "describe": "**添加名称，关闭特征编辑器**"
+            "describe": "**添加名称，然后按{button}按钮来关闭特征编辑器**"
         },
         "lines": {
             "title": "线",
-            "add": "线用于代表诸如道路、铁路和河流的特征。**单击“线”按钮添加新线。**",
+            "add": "线用于代表诸如道路、铁路和河流的特征。**单击{button}按钮添加新线。**",
             "start": "**点击道路末端，以开始绘制线段。 **",
-            "intersect": "点击向线添加更多节点。必要时您可以在绘制时拖动地图。道路和许多其它类型的线都是一个更大的网络的组成部分，因此正确连接这些线以便导航应用使用是十分重要的。**点击 Flower Street 创建连接两条线的交叉点。**",
+            "intersect": "点击向线添加更多节点。必要时您可以在绘制时拖动地图。道路和许多其它类型的线都是一个更大的网络的组成部分，因此正确连接这些线以便导航应用使用是十分重要的。**点击{name}创建连接两条线的交叉点。**",
             "finish": "再次点击最后一个节点可结束绘制线。**完成道路的绘制。**",
             "road": "**在列表中选择道路**",
             "residential": "道路有不同种类，最常见的为住宅区道路。 **选择住宅区道路**",
-            "describe": "**给道路命名，关闭特征编辑器。**",
-            "restart": "道路需要花街相交。",
+            "describe": "**给道路命名，然后按{button}按钮关闭特征编辑器。**",
+            "restart": "这个道路需要和{name}相交。",
             "wrong_preset": "你没有选择住宅道路类型。 **点击这里重新选择**"
         },
         "startediting": {
             "title": "开始编辑",
-            "help": "在这里有更多使用说明，还可以重温简介",
+            "help": "如需重新查看本导览，或者查看更多文档，您可以点击 {button} 帮助 按钮。",
             "save": "不要忘了定期保存你的修改！",
             "start": "开始绘制地图！"
         }
     },
     "presets": {
         "categories": {
-            "category-building": {
-                "name": "建筑物"
-            },
-            "category-golf": {
-                "name": "高尔夫球"
-            },
-            "category-landuse": {
-                "name": "土地使用"
-            },
-            "category-path": {
-                "name": "小径"
-            },
-            "category-rail": {
-                "name": "铁轨"
-            },
-            "category-restriction": {
-                "name": "限制"
-            },
-            "category-road": {
-                "name": "道路"
-            },
-            "category-route": {
-                "name": "线路"
-            },
             "category-water-area": {
-                "name": "æ°´"
+                "name": "水体特征"
             },
             "category-water-line": {
-                "name": "æ°´"
+                "name": "水体特征"
             }
         },
         "fields": {
@@ -632,6 +630,7 @@
                 }
             },
             "access_simple": {
+                "label": "通行限制",
                 "placeholder": "是"
             },
             "access_toilets": {
@@ -776,6 +775,9 @@
             "construction": {
                 "label": "类型"
             },
+            "content": {
+                "label": "内容"
+            },
             "country": {
                 "label": "国家"
             },
@@ -844,6 +846,12 @@
             "description": {
                 "label": "说明"
             },
+            "diaper": {
+                "label": "有尿布台"
+            },
+            "dock": {
+                "label": "类型"
+            },
             "drive_through": {
                 "label": "免下车"
             },
@@ -891,33 +899,6 @@
             "fuel": {
                 "label": "油站"
             },
-            "fuel/biodiesel": {
-                "label": "销售生物柴油"
-            },
-            "fuel/diesel": {
-                "label": "销售柴油"
-            },
-            "fuel/e10": {
-                "label": "销售E10"
-            },
-            "fuel/e85": {
-                "label": "销售E85"
-            },
-            "fuel/lpg": {
-                "label": "销售丙烷"
-            },
-            "fuel/octane_100": {
-                "label": "销售赛车汽油"
-            },
-            "fuel/octane_91": {
-                "label": "销售普通汽油"
-            },
-            "fuel/octane_95": {
-                "label": "销售中等汽油"
-            },
-            "fuel/octane_98": {
-                "label": "销售高级汽油"
-            },
             "gauge": {
                 "label": "轨距"
             },
@@ -947,6 +928,9 @@
                 "label": "手工店",
                 "placeholder": "1-18"
             },
+            "handrail": {
+                "label": "扶手"
+            },
             "highway": {
                 "label": "类型"
             },
@@ -1061,6 +1045,9 @@
                 "label": "速度限制",
                 "placeholder": "40, 50, 60..."
             },
+            "maxstay": {
+                "label": "可停留时间"
+            },
             "mtb/scale": {
                 "label": "登山車难度",
                 "options": {
@@ -1211,31 +1198,6 @@
             "railway": {
                 "label": "类型"
             },
-            "recycling/cans": {
-                "label": "接受铝管回收"
-            },
-            "recycling/clothes": {
-                "label": "接受衣物回收"
-            },
-            "recycling/glass": {
-                "label": "接受玻璃回收"
-            },
-            "recycling/glass_bottles": {
-                "label": "接受玻璃瓶回收"
-            },
-            "recycling/paper": {
-                "label": "接受纸张回收"
-            },
-            "recycling/plastic": {
-                "label": "接受塑料回收"
-            },
-            "recycling/type": {
-                "label": "回收类型",
-                "options": {
-                    "centre": "回收中心",
-                    "container": "回收容器"
-                }
-            },
             "ref": {
                 "label": "参考"
             },
@@ -1312,9 +1274,6 @@
             "shop": {
                 "label": "类型"
             },
-            "sloped_curb": {
-                "label": "斜路缘"
-            },
             "smoking": {
                 "label": "吸烟",
                 "options": {
@@ -1368,9 +1327,6 @@
                 },
                 "placeholder": "未知种类"
             },
-            "studio_type": {
-                "label": "类型"
-            },
             "substation": {
                 "label": "类型"
             },
@@ -1418,6 +1374,9 @@
                 },
                 "placeholder": "坚硬地面，硬物铺面，软铺面"
             },
+            "traffic_signals": {
+                "label": "类型"
+            },
             "trail_visibility": {
                 "label": "路径可见度",
                 "options": {
@@ -1490,10 +1449,16 @@
                 "name": "魔毯电梯",
                 "terms": "魔毯,传送带式电梯"
             },
+            "aerialway/platter": {
+                "name": "吊盘"
+            },
             "aerialway/pylon": {
                 "name": "缆车塔",
                 "terms": "缆车塔"
             },
+            "aerialway/rope_tow": {
+                "name": "牵绳"
+            },
             "aerialway/station": {
                 "name": "缆车站",
                 "terms": "缆车站"
@@ -1544,11 +1509,11 @@
             },
             "amenity/atm": {
                 "name": "ATM",
-                "terms": "ATM,提款机,自动提款机"
+                "terms": "ATM,提款机,自动提款机,自动取款机"
             },
             "amenity/bank": {
                 "name": "银行",
-                "terms": "银行"
+                "terms": "银行,储蓄银行"
             },
             "amenity/bar": {
                 "name": "酒吧",
@@ -1569,19 +1534,17 @@
                 "name": "自行车出租点",
                 "terms": "自行车租赁处,单车,出租,租赁,自行车"
             },
-            "amenity/bicycle_repair_station": {
-                "name": "自行车修理站"
-            },
             "amenity/boat_rental": {
                 "name": "船舶租赁处",
                 "terms": "船舶租赁处"
             },
             "amenity/bureau_de_change": {
-                "name": "货币兑换"
+                "name": "货币兑换",
+                "terms": "货币兑换"
             },
             "amenity/bus_station": {
-                "name": "汽车站",
-                "terms": "公交车起讫站,公交枢纽,公交场站"
+                "name": "公交站",
+                "terms": "公交车起讫站,公交枢纽,公交场站,公交车站"
             },
             "amenity/cafe": {
                 "name": "咖啡馆",
@@ -1600,7 +1563,8 @@
                 "terms": "洗车店,洗车"
             },
             "amenity/casino": {
-                "name": "赌场"
+                "name": "赌场",
+                "terms": "赌场"
             },
             "amenity/charging_station": {
                 "name": "充电站",
@@ -1623,7 +1587,8 @@
                 "terms": "时钟,钟表,钟"
             },
             "amenity/college": {
-                "name": "大专院校校园"
+                "name": "大专院校校园",
+                "terms": "大专校园"
             },
             "amenity/community_centre": {
                 "name": "社区活动中心",
@@ -1640,13 +1605,13 @@
                 "name": "牙科",
                 "terms": "牙医,牙"
             },
-            "amenity/doctor": {
-                "name": "医生办公室",
-                "terms": "医生"
+            "amenity/doctors": {
+                "name": "医生",
+                "terms": "医生,医护人员"
             },
             "amenity/dojo": {
-                "name": "Dojo /武术学院",
-                "terms": "Dojo /武术学院"
+                "name": "道场/武术学院",
+                "terms": "道场,武术学院"
             },
             "amenity/drinking_water": {
                 "name": "饮水处",
@@ -1677,7 +1642,8 @@
                 "terms": "墓地,坟地"
             },
             "amenity/hospital": {
-                "name": "医院"
+                "name": "医院",
+                "terms": "医院场地"
             },
             "amenity/kindergarten": {
                 "name": "学前班/幼儿园用地"
@@ -1691,7 +1657,8 @@
                 "terms": "市场,菜市场"
             },
             "amenity/motorcycle_parking": {
-                "name": "摩托车停车场"
+                "name": "摩托车停车场",
+                "terms": "摩托车场"
             },
             "amenity/nightclub": {
                 "name": "夜总会",
@@ -1702,7 +1669,12 @@
                 "terms": "停车"
             },
             "amenity/parking_entrance": {
-                "name": "停车场入口/出口"
+                "name": "停车场入口/出口",
+                "terms": "停车场出入口"
+            },
+            "amenity/parking_space": {
+                "name": "停车空间",
+                "terms": "停车空间,停车场地"
             },
             "amenity/pharmacy": {
                 "name": "药店",
@@ -1745,7 +1717,8 @@
                 "terms": "酒馆"
             },
             "amenity/public_bookcase": {
-                "name": "公共书架"
+                "name": "公共书架",
+                "terms": "公共书架,公共书籍"
             },
             "amenity/ranger_station": {
                 "name": "野郊访客处",
@@ -1756,14 +1729,16 @@
                 "terms": "回收,循环利用,再造"
             },
             "amenity/register_office": {
-                "name": "民政登记处"
+                "name": "民政登记处",
+                "terms": "登记处,民政处"
             },
             "amenity/restaurant": {
                 "name": "餐馆",
                 "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼,美食"
             },
             "amenity/school": {
-                "name": "学校"
+                "name": "学校",
+                "terms": "学校场地"
             },
             "amenity/shelter": {
                 "name": "亭",
@@ -1773,7 +1748,8 @@
                 "name": "社会服务设施"
             },
             "amenity/social_facility/food_bank": {
-                "name": "食品银行"
+                "name": "食品银行",
+                "terms": "食物银行"
             },
             "amenity/social_facility/group_home": {
                 "name": "敬老院",
@@ -1811,11 +1787,32 @@
                 "terms": "市政府,市政厅,大会堂"
             },
             "amenity/university": {
-                "name": "大学校园"
+                "name": "大学校园",
+                "terms": "大学校园,大学场地"
             },
-            "amenity/vending_machine": {
-                "name": "售卖机",
-                "terms": "售卖机"
+            "amenity/vending_machine/cigarettes": {
+                "name": "香烟售货机",
+                "terms": "香烟售货机,香烟贩卖机"
+            },
+            "amenity/vending_machine/condoms": {
+                "name": "避孕套售货机",
+                "terms": "避孕套售货机,避孕套贩卖机"
+            },
+            "amenity/vending_machine/drinks": {
+                "name": "饮料售货机",
+                "terms": "饮料售货机,饮品售货机,饮品贩卖机"
+            },
+            "amenity/vending_machine/news_papers": {
+                "name": "报纸售货机",
+                "terms": "报纸售货机,报纸贩卖机"
+            },
+            "amenity/vending_machine/sweets": {
+                "name": "零食售货机",
+                "terms": "零食贩卖机"
+            },
+            "amenity/vending_machine/vending_machine": {
+                "name": "售货机",
+                "terms": "贩卖机"
             },
             "amenity/veterinary": {
                 "name": "兽医",
@@ -1856,10 +1853,6 @@
                 "name": "自行车路障",
                 "terms": "自行车,单车,路障"
             },
-            "barrier/ditch": {
-                "name": "壕沟",
-                "terms": "沟坎,壕"
-            },
             "barrier/entrance": {
                 "name": "入口",
                 "terms": "入口"
@@ -1898,7 +1891,7 @@
             },
             "barrier/wall": {
                 "name": "墙",
-                "terms": "收费站"
+                "terms": "墙,墙壁"
             },
             "boundary/administrative": {
                 "name": "行政区域界线",
@@ -1923,14 +1916,6 @@
             "building/cabin": {
                 "name": "小木屋"
             },
-            "building/cathedral": {
-                "name": "主教座堂",
-                "terms": "教堂,大教堂"
-            },
-            "building/church": {
-                "name": "宗教场所",
-                "terms": "礼拜堂"
-            },
             "building/college": {
                 "name": "大专院校建筑"
             },
@@ -1942,7 +1927,8 @@
                 "name": "在建建筑"
             },
             "building/dormitory": {
-                "name": "宿舍"
+                "name": "宿舍",
+                "terms": "宿舍,寝室"
             },
             "building/entrance": {
                 "name": "入口/出口",
@@ -1953,7 +1939,8 @@
                 "terms": "车库"
             },
             "building/garages": {
-                "name": "车库(连排)"
+                "name": "车库(连排)",
+                "terms": "连排车库"
             },
             "building/greenhouse": {
                 "name": "温室",
@@ -1963,7 +1950,8 @@
                 "name": "医院大楼"
             },
             "building/hotel": {
-                "name": "宾馆楼"
+                "name": "宾馆楼",
+                "terms": "宾馆建筑"
             },
             "building/house": {
                 "name": "房屋",
@@ -1978,21 +1966,22 @@
                 "terms": "工业建筑物"
             },
             "building/kindergarten": {
-                "name": "学前班/幼儿园建筑"
+                "name": "学前班/幼儿园建筑",
+                "terms": "学前班建筑,幼儿园建筑"
             },
             "building/public": {
                 "name": "公共建筑"
             },
             "building/residential": {
                 "name": "住宅建筑物",
-                "terms": "住宅建筑物"
+                "terms": "住宅建筑物,住宅建筑"
             },
             "building/retail": {
                 "name": "商业建筑"
             },
             "building/roof": {
                 "name": "楼顶",
-                "terms": "楼顶,房顶"
+                "terms": "楼顶,房顶,屋顶"
             },
             "building/school": {
                 "name": "学校建筑",
@@ -2070,16 +2059,19 @@
                 "name": "切割钥匙（配匙）"
             },
             "craft/locksmith": {
-                "name": "锁匠"
+                "name": "锁匠",
+                "terms": "锁匠,开锁师"
             },
             "craft/metal_construction": {
-                "name": "金属结构建筑"
+                "name": "金属结构建筑",
+                "terms": "金属建筑,金属建筑物"
             },
             "craft/optician": {
                 "name": "眼镜店"
             },
             "craft/painter": {
-                "name": "油漆匠"
+                "name": "油漆匠",
+                "terms": "粉刷匠"
             },
             "craft/photographer": {
                 "name": "照相店",
@@ -2333,10 +2325,6 @@
                 "name": "三级道路匝道",
                 "terms": "三级道路匝道"
             },
-            "highway/track": {
-                "name": "小路",
-                "terms": "未铺设路面的车径"
-            },
             "highway/traffic_signals": {
                 "name": "交通信号灯",
                 "terms": "红绿灯"
@@ -2353,10 +2341,6 @@
                 "name": "环岛",
                 "terms": "环岛"
             },
-            "highway/unclassified": {
-                "name": "未分级的道路",
-                "terms": "未分级的道路"
-            },
             "historic": {
                 "name": "历史遗迹",
                 "terms": "历史遗迹,史迹"
@@ -2397,6 +2381,10 @@
                 "name": "交叉口",
                 "terms": "交通枢纽,路口"
             },
+            "landuse": {
+                "name": "土地用途",
+                "terms": "土地用途,土地使用"
+            },
             "landuse/basin": {
                 "name": "æ°´æ± ",
                 "terms": "æ°´æ± "
@@ -2410,14 +2398,20 @@
                 "terms": "墓地"
             },
             "landuse/commercial": {
-                "name": "商业区"
+                "name": "商业区",
+                "terms": "商业区,商业用地"
             },
             "landuse/construction": {
                 "name": "建设用地",
                 "terms": "建筑物"
             },
             "landuse/farm": {
-                "name": "农田"
+                "name": "农田",
+                "terms": "农田,农场"
+            },
+            "landuse/farmland": {
+                "name": "农田",
+                "terms": "农田,农场"
             },
             "landuse/farmyard": {
                 "name": "农庄",
@@ -2500,7 +2494,8 @@
                 "terms": "码头"
             },
             "leisure/nature_reserve": {
-                "name": "自然保护区"
+                "name": "自然保护区",
+                "terms": "自然保护区"
             },
             "leisure/park": {
                 "name": "公园",
@@ -2553,10 +2548,6 @@
                 "name": "船台",
                 "terms": "船台"
             },
-            "leisure/sports_center": {
-                "name": "体育中心/健身中心",
-                "terms": "体育中心,健身中心"
-            },
             "leisure/stadium": {
                 "name": "体育场",
                 "terms": "体育,体育场"
@@ -2600,6 +2591,10 @@
                 "name": "瞭望塔",
                 "terms": "瞭望塔"
             },
+            "man_made/petroleum_well": {
+                "name": "油井",
+                "terms": "油井"
+            },
             "man_made/pier": {
                 "name": "码头",
                 "terms": "码头"
@@ -2644,6 +2639,10 @@
                 "name": "地堡",
                 "terms": "地堡,暗堡"
             },
+            "military/danger_area": {
+                "name": "危险区域",
+                "terms": "危险区域,危险地区"
+            },
             "military/range": {
                 "name": "军事靶场",
                 "terms": "靶场,射击场,军事射击场"
@@ -2986,10 +2985,6 @@
             "shop/antiques": {
                 "name": "古董店"
             },
-            "shop/art": {
-                "name": "画廊",
-                "terms": "美术馆,艺术馆"
-            },
             "shop/baby_goods": {
                 "name": "婴儿用品店",
                 "terms": "母婴用品店, 婴幼儿用品店"
@@ -3037,7 +3032,8 @@
                 "terms": "肉铺"
             },
             "shop/candles": {
-                "name": "蜡烛店"
+                "name": "蜡烛店",
+                "terms": "蜡烛专卖店"
             },
             "shop/car": {
                 "name": "汽车店",
@@ -3052,17 +3048,16 @@
                 "terms": "汽车修理店"
             },
             "shop/carpet": {
-                "name": "地毯店"
+                "name": "地毯店",
+                "terms": "地毯店,毯店"
             },
             "shop/cheese": {
-                "name": "奶酪店"
-            },
-            "shop/chemist": {
-                "name": "日化用品店",
-                "terms": "药房"
+                "name": "奶酪店",
+                "terms": "奶酪店,奶酪专卖店"
             },
             "shop/chocolate": {
-                "name": "巧克力店"
+                "name": "巧克力店",
+                "terms": "巧克力店,巧克力专卖店"
             },
             "shop/clothes": {
                 "name": "服装店",
@@ -3073,7 +3068,8 @@
                 "terms": "电脑店"
             },
             "shop/confectionery": {
-                "name": "糖果店"
+                "name": "糖果店",
+                "terms": "糖果店,糖果屋"
             },
             "shop/convenience": {
                 "name": "便利店",
@@ -3109,7 +3105,8 @@
                 "terms": "DIY商店"
             },
             "shop/dry_cleaning": {
-                "name": "干洗店"
+                "name": "干洗店",
+                "terms": "干洗店"
             },
             "shop/electronics": {
                 "name": "电器店",
@@ -3123,7 +3120,8 @@
                 "terms": "农场"
             },
             "shop/fashion": {
-                "name": "服装店"
+                "name": "服装店",
+                "terms": "服装店,潮流服饰店"
             },
             "shop/fishmonger": {
                 "name": "海产店",
@@ -3160,6 +3158,10 @@
                 "name": "五金店",
                 "terms": "五金店"
             },
+            "shop/herbalist": {
+                "name": "中医",
+                "terms": "中医"
+            },
             "shop/hifi": {
                 "name": "音响店",
                 "terms": "音响店"
@@ -3177,26 +3179,37 @@
                 "terms": "洗衣店"
             },
             "shop/leather": {
-                "name": "皮具店"
+                "name": "皮具店",
+                "terms": "皮具店"
             },
             "shop/locksmith": {
                 "name": "锁匠铺",
                 "terms": "锁匠铺"
             },
             "shop/lottery": {
-                "name": "彩票店"
+                "name": "彩票店",
+                "terms": "彩票店,彩票购买点"
             },
             "shop/mall": {
                 "name": "商场",
                 "terms": "商场"
             },
             "shop/massage": {
-                "name": "按摩店"
+                "name": "按摩店",
+                "terms": "按摩店"
+            },
+            "shop/medical_supply": {
+                "name": "医疗用品店",
+                "terms": "医疗用品店,医护用品店"
             },
             "shop/mobile_phone": {
                 "name": "手机店",
                 "terms": "手机店"
             },
+            "shop/money_lender": {
+                "name": "放贷人",
+                "terms": "放贷人,放贷者"
+            },
             "shop/motorcycle": {
                 "name": "摩托车店",
                 "terms": "摩托车行,摩托车"
@@ -3206,7 +3219,8 @@
                 "terms": "音乐店"
             },
             "shop/musical_instrument": {
-                "name": "乐器店"
+                "name": "乐器店",
+                "terms": "乐器店,音乐用品店"
             },
             "shop/newsagent": {
                 "name": "报摊"
@@ -3215,6 +3229,14 @@
                 "name": "眼镜店",
                 "terms": "眼镜店"
             },
+            "shop/organic": {
+                "name": "有机产品店",
+                "terms": "有机产品店"
+            },
+            "shop/outdoor": {
+                "name": "户外用品店",
+                "terms": "户外用品店,销售户外活动用品的商店"
+            },
             "shop/pet": {
                 "name": "宠物店",
                 "terms": "宠物店"
@@ -3248,6 +3270,10 @@
             "shop/tailor": {
                 "name": "裁缝"
             },
+            "shop/tea": {
+                "name": "茶叶商店",
+                "terms": "茶叶商店,茶店"
+            },
             "shop/tobacco": {
                 "name": "烟草店"
             },
@@ -3282,8 +3308,8 @@
                 "name": "武器店"
             },
             "shop/wine": {
-                "name": "酒店",
-                "terms": "酒店,酒楼,酒坊"
+                "name": "酒品商店",
+                "terms": "酒品商店,酒店,酒楼,酒坊"
             },
             "tourism": {
                 "name": "旅行",
@@ -3353,6 +3379,10 @@
                 "name": "动物园",
                 "terms": "动物园"
             },
+            "traffic_calming/table": {
+                "name": "人行横道",
+                "terms": "行人专用路"
+            },
             "type/boundary": {
                 "name": "边界",
                 "terms": "边界"