X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f36fc22e1a5b8311ccba0f5530639b26c78c2973..16f5a5ac0c674b258996fcbde1c3fda2e651906a:/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 07a792e48..118556d48 100644
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -1,9 +1,9 @@
 {
     "modes": {
         "add_area": {
-            "title": "区域",
-            "description": "添加公园、建筑物、湖或其它区域到地图上。",
-            "tail": "在地图上单击开始绘制区域，如公园、湖泊或建筑物。"
+            "title": "面",
+            "description": "添加公园、建筑物、湖或其它面到地图上。",
+            "tail": "在地图上单击开始绘制面状要素，如公园、湖泊或建筑物。"
         },
         "add_line": {
             "title": "线",
@@ -37,7 +37,7 @@
         "start": {
             "annotation": {
                 "line": "开始绘制线。",
-                "area": "开始绘制区域。"
+                "area": "开始绘制面状要素。"
             }
         },
         "continue": {
@@ -45,17 +45,17 @@
             "title": "继续",
             "description": "继续绘制这条线。",
             "not_eligible": "这里没有线可以在继续。",
-            "multiple": "可以选择多条线。要增加选择一条直线，按住Shift键并单击以选中它。",
+            "multiple": "多条线可以在此延长。要选定其中一条，按住Shift键并单击以选中它。",
             "annotation": {
                 "line": "继续绘制线。",
-                "area": "继续绘制区域。"
+                "area": "继续绘制面状要素。"
             }
         },
         "cancel_draw": {
             "annotation": "取消绘制。"
         },
         "change_role": {
-            "annotation": "已更改关系成员的角色。"
+            "annotation": "更改关系成员的定位。"
         },
         "change_tags": {
             "annotation": "更改标签。"
@@ -64,12 +64,12 @@
             "title": "环形化",
             "description": {
                 "line": "环形化该线。",
-                "area": "环形化该区域。"
+                "area": "环形化该面状要素。"
             },
             "key": "O",
             "annotation": {
                 "line": "环形化线。",
-                "area": "环形化区域。"
+                "area": "环形化面要素。"
             },
             "not_closed": "它不是闭合的环形，无法圆形化。",
             "too_large": "因为可见部分不足，不能变成圆形。",
@@ -79,12 +79,12 @@
             "title": "直角化",
             "description": {
                 "line": "将这条线上的弯角转化成直角。",
-                "area": "将这个区域上的弯角转化成直角。"
+                "area": "将这个面状要素上的弯角转化成直角。"
             },
             "key": "S",
             "annotation": {
                 "line": "拉直线上角的边。",
-                "area": "已将区域的弯角换成直角。"
+                "area": "已将面要素的弯角换成直角。"
             },
             "not_squarish": "因为它不是近似方形的，这不能被直角化。",
             "too_large": "因为可见部分不足，不能变成方形。",
@@ -94,7 +94,7 @@
             "title": "拉直",
             "description": "把这一条线拉直。",
             "key": "S",
-            "annotation": "已拉直了一条线。",
+            "annotation": "拉直线。",
             "too_bendy": "因为它弯曲太多，不能拉直。",
             "connected_to_hidden": "该线不能取直，因为其与一隐藏要素相连。"
         },
@@ -105,7 +105,7 @@
                 "point": "删除点。",
                 "vertex": "删除路径上的节点。",
                 "line": "删除线。",
-                "area": "删除区域。",
+                "area": "删除面状要素。",
                 "relation": "删除关系。",
                 "multiple": "删除{n}个对象。"
             },
@@ -122,28 +122,29 @@
         "connect": {
             "annotation": {
                 "point": "连接路径到点。",
-                "vertex": "连接两条路径。",
+                "vertex": "连接路径到另一路径。",
                 "line": "连接路径到线。",
-                "area": "连接条路径到区域。"
+                "area": "连接条线要素到面要素。"
             }
         },
         "disconnect": {
             "title": "断开连接",
-            "description": "断开这些线/区域之间的连接。",
+            "description": "断开这些线/面之间的连接。",
             "key": "D",
-            "annotation": "断开线/区域连接。",
+            "annotation": "断开线/面连接。",
             "not_connected": "没有足够的线/面来断开。",
             "connected_to_hidden": "无法断开连接，因为其与一隐藏要素相连。"
         },
         "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": "移动",
@@ -153,7 +154,7 @@
                 "point": "移动点。",
                 "vertex": "移动路径中节点。",
                 "line": "移动线。",
-                "area": "移动区域。",
+                "area": "移动面状要素。",
                 "multiple": "移动多个对象。"
             },
             "incomplete_relation": "该特征还没有下载完整，无法移动。",
@@ -166,7 +167,7 @@
             "key": "R",
             "annotation": {
                 "line": "旋转线。",
-                "area": "旋转区域。"
+                "area": "旋转面状要素。"
             },
             "too_large": "因为可见部分不足，不能旋转。",
             "connected_to_hidden": "无法旋转，因为其与一隐藏要素相连。"
@@ -187,8 +188,8 @@
             "key": "X",
             "annotation": {
                 "line": "切割一条线。",
-                "area": "分割一区域的边界。",
-                "multiple": "分割{n}的项线段/区域的边界。"
+                "area": "分割面要素的边界。",
+                "multiple": "分割{n}项线段/面的边界。"
             },
             "not_eligible": "不能在线段的首尾进行分割。",
             "multiple_ways": "太多线段，未能进行分割。",
@@ -202,21 +203,21 @@
                 "toggle_off": "单击以删除一个\"{restriction}\"限制。"
             },
             "annotation": {
-                "create": "增加一个转向限制",
-                "delete": "删除一个转向限制"
+                "create": "添加转向限制",
+                "delete": "删除转向限制"
             }
         }
     },
     "undo": {
         "tooltip": "撤销：{action}",
-        "nothing": "没有东西可以撤销。"
+        "nothing": "没有可以撤销的操作。"
     },
     "redo": {
         "tooltip": "重做：{action}",
-        "nothing": "没有东西可以重做。"
+        "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": "多语言名称",
@@ -227,6 +228,7 @@
     "logout": "退出",
     "loading_auth": "正在连接OpenStreetMap...",
     "report_a_bug": "报告漏洞",
+    "help_translate": "帮助改进翻译",
     "feature_info": {
         "hidden_warning": "{count}个隐藏特征",
         "hidden_details": "以下要素目前被隐藏：{details}"
@@ -239,12 +241,12 @@
     "commit": {
         "title": "保存变更",
         "description_placeholder": "简单说明你的贡献。",
-        "message_label": "提交信息",
+        "message_label": "修改集合注释",
         "upload_explanation": "你的修改将会在所有使用OpenStreetMap的数据的地图上看得见。",
         "upload_explanation_with_user": "{user}，你的修改将会在所有使用OpenStreetMap数据的地图上展现。",
         "save": "保存",
         "cancel": "取消",
-        "changes": "{count} 个更改",
+        "changes": "{count}个变更",
         "warnings": "警告",
         "modified": "已更改",
         "deleted": "已删除",
@@ -254,6 +256,26 @@
         "list": "{users}编辑",
         "truncated_list": "{users}及另外{count}人编辑"
     },
+    "infobox": {
+        "selected": "已选择{n}个",
+        "geometry": "几何",
+        "closed": "已关闭",
+        "center": "中心",
+        "perimeter": "周长",
+        "length": "长度",
+        "area": "面",
+        "centroid": "重心",
+        "location": "位置",
+        "metric": "公制",
+        "imperial": "英制"
+    },
+    "geometry": {
+        "point": "点",
+        "vertex": "顶点",
+        "line": "线",
+        "area": "面状要素",
+        "relation": "关系"
+    },
     "geocoder": {
         "search": "在全球搜索...",
         "no_results_visible": "在可见地图区域没有结果",
@@ -266,13 +288,13 @@
         "no_documentation_combination": "这个标签组合没有可用的说明",
         "no_documentation_key": "这个键值没有可用的说明",
         "show_more": "显示更多",
-        "view_on_osm": "在openstreetmap.org中查看",
+        "view_on_osm": "在openstreetmap.org上查看",
         "all_tags": "所有标签",
         "all_members": "所有成员",
         "all_relations": "所有关系",
         "new_relation": "新关系...",
-        "role": "角色",
-        "choose": "选择标记内容种类。",
+        "role": "定位",
+        "choose": "选择特征类型",
         "results": "{search}有{n}个结果。",
         "reference": "在OpenStreetMap Wiki中查看",
         "back_tooltip": "变更特征",
@@ -287,7 +309,7 @@
             "yes": "是",
             "no": "否"
         },
-        "none": "空",
+        "none": "无",
         "node": "节点",
         "way": "路径",
         "relation": "关系",
@@ -297,19 +319,23 @@
     "background": {
         "title": "背景",
         "description": "背景设置",
-        "percent_brightness": "{opacity}%不透明度",
-        "none": "空",
+        "percent_brightness": "{opacity}%亮度",
+        "none": "无",
         "custom": "自定义",
         "custom_button": "编辑自定义背景",
         "custom_prompt": "输入瓦片模板。Z/X/Y方案的有效标记是{z}，{x}，{y}，quadtile方案的有效标记是{u}。",
         "fix_misalignment": "修复对齐",
-        "reset": "重置"
+        "reset": "重置",
+        "minimap": {
+            "description": "小地图",
+            "tooltip": "显示一个大范围的地图来帮助定位当前显示的区域"
+        }
     },
     "map_data": {
         "title": "地图数据",
         "description": "地图数据",
         "data_layers": "数据图层",
-        "fill_area": "填充区域",
+        "fill_area": "填充面状要素",
         "map_features": "地图特征",
         "autohidden": "这些要素已被自动隐藏，因为屏幕中的要素过多。请放大再编辑。"
     },
@@ -339,11 +365,11 @@
             "tooltip": "森林，农田，公园，居民地，商用地等。"
         },
         "boundaries": {
-            "description": "境界",
-            "tooltip": "行政境界"
+            "description": "分界线",
+            "tooltip": "行政分界线"
         },
         "water": {
-            "description": "水部要素",
+            "description": "水体特征",
             "tooltip": "河流，湖泊，池塘，盆地等。"
         },
         "rail": {
@@ -370,7 +396,7 @@
         },
         "partial": {
             "description": "部分填充",
-            "tooltip": "仅在内部边界附近填充区域。（推荐初学者使用）"
+            "tooltip": "仅在面的内部边界附近填充区域。（推荐初学者使用）"
         },
         "full": {
             "description": "全部填充",
@@ -421,8 +447,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": "确定",
@@ -447,12 +472,12 @@
     "validations": {
         "untagged_point": "未标记的点",
         "untagged_line": "未标记的线",
-        "untagged_area": "未标记的区域",
+        "untagged_area": "未标记的面",
         "many_deletions": "您正在删除 {n} 个对象，您确定要这么做吗？这将会把它们从大家所见的 openstreetmap.org 地图上删除。",
-        "tag_suggests_area": "标签{tag}表明线应该为区域，但它不是区域",
+        "tag_suggests_area": "标签{tag}表明线应该为面要素，但它不是面",
         "untagged_point_tooltip": "选择该点的要素类型。",
         "untagged_line_tooltip": "选择描述这条线的要素类型。",
-        "untagged_area_tooltip": "选择描述这块区域的要素类型。",
+        "untagged_area_tooltip": "选择描述这个面的要素类型。",
         "deprecated_tags": "弃用标签：{tags}"
     },
     "zoom": {
@@ -460,6 +485,7 @@
         "out": "缩小"
     },
     "cannot_zoom": "在此模式下不能再缩小",
+    "full_screen": "切换全屏",
     "gpx": {
         "local_layer": "本地GPX文件",
         "drag_drop": "拖放GPX文件到页面上，或按一下浏览按钮，",
@@ -467,140 +493,142 @@
         "browse": "浏览GPX文件"
     },
     "mapillary": {
-        "tooltip": "Mapillary的街道照片",
-        "title": "照片叠加层(Mapillary)",
         "view_on_mapillary": "在Mapillary上查看这张图片"
     },
     "help": {
         "title": "帮助",
         "help": "#帮助\n\n这是一个免费且可编辑的世界地图[OpenStreetMap](http://www.openstreetmap.org/)\n的编辑器，你可以用它来增加和更新你所在地区的数据，\n为全世界将这个开源、开放数据的世界地图变得更好。\n\n你在这张地图上的编辑将会被使用OpenStreetMap的所有人看到。\n你需要[登录](https://www.openstreetmap.org/login)才能编辑。\n\n本编辑器名为[iD](http://ideditor.com/)，是一个[源码在GitHub上共享](https://github.com/openstreetmap/iD)\n的协作项目。\n",
-        "editing_saving": "# 编辑和保存\n\n本编辑器为在线使用设计，您先在也是通过一个网站访问它的。\n\n### 选择特征\n\n在地图上点击可以选择一个地图特征，比如道路或景点，并使得所选的特征高亮显示、打开包含它详情的面板、以及显示一个包含您可以对这个特征所做操作的菜单。\n\n按住 Shift 键并点击您想选择的特征或在地图上拖拽方框可以选择多个特征。\n\n### 保存编辑\n\n当您做了比如编辑道路、建筑物或地点的更改后，这些更改在您将它们保存到服务器之前都只会保存在本地。不要担心犯错，您可以点击撤销或重做按钮撤销或重做更改。\n\n点击「保存」按钮结束一组编辑，比方说，当您完成了城镇一个区域并想要开始一个新区域。您会有一次检查您所做的更改的机会，此时编辑器会提供一些有帮助的建议并对看起来有问题的更改作出警告。\n\n如果一切正常，您可以输入一段简短的文字说明您所做的更改，并再次点击「保存」将更改提交到 [OpenStreetMap.org](http://www.openstreetmap.org/)，让所有用户都可以浏览或继续改进。\n\n如果您不能一次完成您的编辑，您可以离开编辑器窗口，并随时回来(同一台电脑，同一个浏览器)继续编辑。编辑器会为您保留上一次的状态。\n",
+        "editing_saving": "# 编辑和保存\n\n本编辑器为在线编辑设计，您正在经由本网站使用它。\n\n### 选择要素\n\n您可以在地图上单击以选中一个要素，如道路或一个兴趣点。\n被选中的要素将被高亮显示，同时弹出一个显示其详细信息的面板，\n以及一个列出了可对该特征进行之操作的菜单。\n\n如需同时选中多个要素，您需要先按住 Shift 键。然后请多次点击选择全部的特征，\n或者在地图上画出一个长方形以圈出并选中长方形中所有的点。\n\n### 保存编辑内容\n\n当您做了比如编辑道路、建筑物或地点的更改后，\n这些更改在您将它们保存到服务器之前都只会保存在本地。\n无需担心犯错：您随时可以点击撤销按钮或重做按钮以撤销或重做更改。\n\n请点击“保存”按钮以结束一组编辑内容。例如，如果您刚完成了城镇的一个区域，\n正打算开始下一个区域的工作，这时您有机会重新检查之前完成的工作，\n同时编辑器会自动给出有用的建议。如果您的更改有一些问题，编辑器也会给出警告。\n\n如果一切正常，您可以在保存时写入一小段注释以解释上一阶段的工作内容，\n然后再次点击“保存”按钮以向\n[OpenStreetMap.org](http://www.openstreetmap.org/) 提交更改。\n在此之后，您的更改将对所有其它用户可见，其它用户也将以此为基础继续改进地图。\n\n如果您一时无法完成编辑内容，您可以关闭编辑器窗口。\n待稍后您返回 (至同一台计算机的同一个浏览器) 时，\n重新打开编辑器将会恢复您的工作进度。\n\n## 使用编辑器\n\n编辑器可用的键盘快捷键列表可以 [在此](http://wiki.openstreetmap.org/wiki/ID/Shortcuts) 找到。\n",
         "roads": "# 道路\n\n您可以利用这个编辑器创建，修复，及删除道路。道路可以有很多种：路径，公路，郊游径，单车径，和更多－ 任何经常使用的路段都可制图。\n\n### 选择道路\n\n点击图上的道路以选择该道路。道路的轮廓会以高亮度显示，而同时地图上会出现小工具选单，旁边亦会弹出面板，显示有关该道路的信息。\n\n### 编辑道路\n\n您或会经常注意到，道路并非对齐在背景中显示的卫星图像或GPS轨迹。您可以调整这些道路，让他们位于正确的位置。\n\n首先，点击您想编辑的道路。这会将道路以高亮度显示，并显示沿着这道路的节点，你可以拖曳这些节点到更好的位置。如果您想增加细节，可以为道路添加新的节点，点击两下道路上没有节点的部分，便可在该处増加节点。\n\n如果道路连接到另一条道路，但在地图上并未妥善连接，你可以拖曳道路的其中一个节点到另一条道路上，以连接两条道路。连接好道路，对地图非常重要，特别是对提供驾驶指示的应用程序而言，是必要的。\n\n您也可以点击'移动'工具或按`M`快速键，来移动整条道路，然后点击一下以完成移动的动作。\n\n### 删除道路\n\n如果一条道路完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将道路删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该道路或许只是新建的。\n\n要删除道路，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n\n### 绘制新道路\n\n发现某处应有一条道路，但地图上没有？点击编辑器左上方的'线'图标，或按下`2`快速键，以开始绘制线段。\n\n在地图上点击道路的开端，以开始绘制道路。如果道路从一条现有的道路分支出来，应点击两者连接的地方，以开始绘制。\n\n然后点击沿着道路的点，以根据卫星影像或GPS轨迹，正确地绘制道路。如果您绘制的道路如果与另一条道路交汇，请点击相交点以将它们连接起来。当您完成绘制后，可点击两下或按键盘上的'Return' 或'Enter' 键。\n",
-        "gps": "# GPS\n\nGPS数据是OpenStreetMap最信任的数据源。本编辑器\n支持本地轨迹（即本地计算机中的GPX文件）。你可以\n用各种智能手机或者用个人手持GPS硬件收集此类数据。\n\n关于如何进行GPS测绘，请参见\n[用GPS测绘](http://learnosm.org/en/beginner/using-gps/).\n\n要利用GPX轨迹绘图，请将GPX文件拖曳至地图编辑器。\n如果能被识别，其将以亮紫色线条显示于图中。点击右侧\n地图数据菜单开启、关闭或缩放至该新增的GPX图层。\n\nGPX轨迹未被直接上传至OpenStreetMap，轨迹的最佳用\n法是在地图上显示，引导你绘制新的地图要素。也可以[上传\n至OpenStreetMap](http://www.openstreetmap.org/trace/create)\n供其他用户使用。\n",
+        "gps": "# GPS\n\n户外采集的GPS轨迹是OpenStreetMap的重要数据源之一。本编辑器\n支持本地轨迹——即你的电脑上的.gpx文件。你可以用众多智能手机\n应用或者个人GPS硬件采集这种GPS轨迹。\n\n有关如何使用GPS测量的信息，请参见\n[用智能手机、GPS或纸质图测图](http://learnosm.org/en/mobile-mapping/)。\n\n要使用GPX轨迹制图，将GPX文件拖曳到编辑器上即可。\n如果可以识别，将以亮紫色线条在地图上显示。\n点击右侧“地图数据”菜单可以打开、关闭或者\n缩放到新添加的GPX图层。\n\nGPX轨迹不会被直接上传到OpenStreetMap——最佳的使用方法是\n将其展绘到地图上作为辅助来绘制新增的地图要素，\n或者将其[上传到OpenStreetMap](http://www.openstreetmap.org/trace/create)\n供他人使用。\n",
         "imagery": "# 影像\n\n航拍影像是绘制地图的一个重要资源。编辑器右侧「背景设置」菜单里提供了一组飞机航拍、卫星影像及自由编译的来源。\n\n默认情况下编辑器显示的是[必应地图](http://www.bing.com/maps/)的卫星图层，但当您移动或缩放地图到一个新的地理区域会得到新的来源。一些国家，比如美国、法国和丹麦，会在一些区域提供非常高质量的影像。\n\n影像有时会因为影像提供商的错误和地图数据存在偏移。如果您看到许多道路偏离背景，请不要立刻移动它们来匹配背景，您可以点击背景设置界面底部的「修复对齐」来调整影像以使它和已有数据吻合。\n",
         "addresses": "# 地址\n\n地址是地图上的最有用的一些信息。\n\nOpenStreetMap通过沿街位置记录建筑和场所的地址，地址通常表示为街道的一部分。\n\n您可以添加地址信息映射为建筑轮廓的地方以及那些映射为单个点。地址的最佳来源数据是来自于实地调查或个人的知识与任何其他功能，从谷歌地图商业来源的复制是严格禁止的。\n",
-        "inspector": "# 使用检查器\n\n检查器位于页面左侧，可以用来编辑所选特征的详情。\n\n### 选择特征类型\n\n当您添加了一个点、线或区域后，您可以选择它特征类型，比如它是高速公路还是小区道路、超市还是咖啡厅。检查器会显示基本特征类型的按钮，您也可以在搜索框中输入其它您要寻找的类型。\n\n点击特征类型右下角的「i」可以了解这个类型的一些信息，点击按钮选中这个类型。\n\n### 使用表单和编辑标签\n\n当你选中一个特征类型，或当你选中了一个已经指定了类型的特征后，检查器会显示这个特征的名称、地址等字段和详情。\n\n在您看到的字段下面，您可以点击图标来添加其它详情，比如[维基百科](http://www.wikipedia.org/)信息、无障碍情况等。\n\n在检查器的底部，点击「附加标签」可以向元素添加其它任意标签。您可以从 [Taginfo](http://taginfo.openstreetmap.org/) 了解更多常用标签组合的信息。\n\n您在检查器中所做的更改将会自动应用到地图上。您可以随时点击「撤销」按钮撤掉更改。\n",
-        "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界，以选择该建筑物。该建筑物将以高亮度显示，并会开启小工具选单，和在右边显示有关建筑物更多资料的面板。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后点击'移动'工具。移动您的滑鼠以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n为地图添加建筑物的主要问题之一，是OpenStreetMap 可以用轮廓或点的形式，记录建筑物。一般来说，应_尽可能以区域记录建筑物的轮廓_，并以置于建筑轮廓内的点，记录建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后则按键盘上的'Return'键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一项建筑物完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将建筑物删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该建筑物或许只是新建的。\n\n要删除建筑物，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n",
-        "relations": "# 关系\n\n关系是 OpenStreetMap 中用于组合其它特征的特殊特征类型。比如，两个基本关系类型*路径关系*和*复合多边形*，它们分别用于组合同一条公路或高速公路的不同部分和一个复杂区域(分成多块或像油炸圈饼一样中间有个洞)的多条线条。\n\n关系中包含的特征称为*成员*。在侧边栏中，您可以看到成员所属的关系，并点击选中它。选中某个关系后，您就能看到它的所有成员在侧边栏被全部列出并在地图上被高亮显示。\n\n在大多数时候，iD 会在您编辑的时候自动处理关系。您主要注意的是当您删除道路的某个部分并重绘它时，请确保新的部分还是原来的关系中的一员。\n\n## 编辑关系\n\n如果您想要编辑关系，这里是一些基本技巧。\n\n要向关系中添加特征，选择该特征，点击侧边栏「所有关系」中的「+」按钮，并选择或输入关系的名称。\n\n要创建一个新的关系，选中要作为成员的第一个特征，点击「所有关系」中的「+」按钮，并选择「新建关系...」。\n\n要从一个关系中移除特征，选择特征并点击您要从中移除的关系旁边的垃圾箱按钮。\n\n您可以使用「合并」工具创建有洞的复合多边形。绘制两个区域(内部和外部)，按住 Shift 键并点击各个多边形来选中它们，然后电机「合并」(+)按钮。\n"
+        "inspector": "# 使用查看器\n\n查看器是页面左侧窗格中供你\n查看所选要素详细信息栏目。\n\n### 选择要素类型\n\n你添加完一个点、线或面之后，要选择它是什么类型，\n比如高速公路还是居民区街道、超市还是咖啡厅。\n查看器会显示一些常见要素类型的按钮，你也可以通过\n搜索框查找其他标签。\n\n点击要素类型按钮右下角的“i”可以深入了解该类型。\n点击类型按钮即可选择该类型。\n\n### 使用表格编辑标签\n\n选择要素类型后，或者某要素本来已有类型时，\n查看器会显示要素的字段详情，比如名称和地\n址。\n\n在已有的字段下方，你可以点击“添加字段”下拉菜单\n来添加其他详情，比如维基百科链接、轮椅通行情况\n等。\n\n在查看器底部，可以点击“附加标签”按钮来给要素添加\n任意其他标签。[Taginfo](http://taginfo.openstreetmap.org/)\n是了解更多常见标签组合的好资源。\n\n你在查看器里所做的变更会自动应用到地图。\n你可以随时点击“撤销”按钮撤销这些变更。\n",
+        "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界，以选择该建筑物。该建筑物将以高亮度显示，并会开启小工具选单，和在右边显示有关建筑物更多资料的面板。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后点击'移动'工具。移动您的鼠标以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n为地图添加建筑物的主要问题之一，是OpenStreetMap 可以用轮廓或点的形式，记录建筑物。一般来说，应_尽可能以区域记录建筑物的轮廓_，并以置于建筑轮廓内的点，记录建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后则按键盘上的回车键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一个建筑物完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将建筑物删除，这会从地图中将之移除。删除要素时务必要小心－ 像任何其他的编辑一样，结果会公之于众，而卫星图像往往会过时，因此该建筑物或许只是新建的。\n\n要删除建筑物，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n",
+        "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": "当选定一个特征时，会出现特征编辑器。抬头展示特征类型，主窗格展示特征的属性，如名称和地址。**单击特征编辑器右上角的关闭按钮，关闭特征编辑器。**"
+            "select": "地图要素有三种表示方法：点、线、面。所有要素都可以通过点击选择。**单击该点来选定它。**",
+            "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": "通过将节点放到面的边界上，可绘制面。 **将起始节点置于游乐场的其中一角**",
-            "place": "放置更多节点可绘制区域。点击开始节点即可完成绘制。**在沙盒绘制一个区域。**",
+            "title": "面状要素",
+            "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": "æ°´"
-            },
-            "category-water-line": {
-                "name": "æ°´"
-            }
-        },
         "fields": {
             "access": {
-                "label": "通行限制",
-                "placeholder": "未知",
-                "types": {
-                    "access": "普通",
-                    "foot": "步行",
-                    "motor_vehicle": "汽车",
-                    "bicycle": "自行车",
-                    "horse": "马匹"
-                },
+                "label": "通行规则",
                 "options": {
-                    "yes": {
-                        "title": "允许的",
-                        "description": "按法律及路权，有权使用"
+                    "designated": {
+                        "description": "只限标志指定或特定本地法律容许人士进入",
+                        "title": "特定的"
+                    },
+                    "destination": {
+                        "description": "只限前往目的地人士进入",
+                        "title": "目的地"
+                    },
+                    "dismount": {
+                        "description": "允许通行但必须下车",
+                        "title": "下车"
                     },
                     "no": {
-                        "title": "禁止的",
-                        "description": "禁止一般公众进入"
+                        "description": "禁止一般公众进入",
+                        "title": "禁止的"
                     },
                     "permissive": {
-                        "title": "获许可进入",
-                        "description": "容许进入，直至拥有者撇回许可"
+                        "description": "容许进入，直至拥有者撇回许可",
+                        "title": "获许可进入"
                     },
                     "private": {
-                        "title": "私人",
-                        "description": "须拥有者个别批准，方可进入"
-                    },
-                    "designated": {
-                        "title": "特定的",
-                        "description": "只限标志指定或特定本地法律容许人士进入"
+                        "description": "须拥有者个别批准，方可进入",
+                        "title": "私人"
                     },
-                    "destination": {
-                        "title": "目的地",
-                        "description": "只限前往目的地人士进入"
+                    "yes": {
+                        "description": "按法律及路权，有权使用",
+                        "title": "允许的"
                     }
+                },
+                "placeholder": "未指定",
+                "types": {
+                    "access": "全部",
+                    "bicycle": "自行车",
+                    "foot": "步行",
+                    "horse": "马匹",
+                    "motor_vehicle": "汽车"
                 }
             },
             "access_simple": {
@@ -613,19 +641,20 @@
             "address": {
                 "label": "地址",
                 "placeholders": {
+                    "city": "城市",
+                    "conscriptionnumber": "123",
+                    "country": "国家",
+                    "district": "行政区",
+                    "hamlet": "村庄",
                     "housename": "房屋名称",
                     "housenumber": "123号",
-                    "street": "街道",
-                    "city": "城市",
-                    "postcode": "邮政编码",
                     "place": "地方",
-                    "hamlet": "村庄",
-                    "suburb": "地区",
-                    "subdistrict": "街道",
-                    "district": "行政区",
+                    "postcode": "邮政编码",
                     "province": "行政省",
                     "state": "行政州",
-                    "country": "国家"
+                    "street": "街道",
+                    "subdistrict": "街道",
+                    "suburb": "地区"
                 }
             },
             "admin_level": {
@@ -637,9 +666,9 @@
             "aerialway/access": {
                 "label": "通行限制",
                 "options": {
+                    "both": "双向",
                     "entry": "入口",
-                    "exit": "出口",
-                    "both": "双向"
+                    "exit": "出口"
                 }
             },
             "aerialway/bubble": {
@@ -663,9 +692,9 @@
             "aerialway/summer/access": {
                 "label": "通行方向（夏季）",
                 "options": {
+                    "both": "双方",
                     "entry": "入口",
-                    "exit": "出口",
-                    "both": "双方"
+                    "exit": "出口"
                 }
             },
             "aeroway": {
@@ -674,6 +703,9 @@
             "amenity": {
                 "label": "类型"
             },
+            "area/highway": {
+                "label": "类型"
+            },
             "artist": {
                 "label": "艺人"
             },
@@ -714,29 +746,29 @@
             "cardinal_direction": {
                 "label": "方向",
                 "options": {
-                    "N": "北",
                     "E": "东",
-                    "S": "南",
-                    "W": "西",
-                    "NE": "东北",
-                    "SE": "东南",
-                    "SW": "西南",
-                    "NW": "西北",
-                    "NNE": "东北偏北",
                     "ENE": "东北偏东",
                     "ESE": "东南偏东",
+                    "N": "北",
+                    "NE": "东北",
+                    "NNE": "东北偏北",
+                    "NNW": "西北偏北",
+                    "NW": "西北",
+                    "S": "南",
+                    "SE": "东南",
                     "SSE": "东南偏南",
                     "SSW": "西南偏南",
-                    "WSW": "西南偏西",
+                    "SW": "西南",
+                    "W": "西",
                     "WNW": "西北偏西",
-                    "NNW": "西北偏北"
+                    "WSW": "西南偏西"
                 }
             },
             "clock_direction": {
                 "label": "方向",
                 "options": {
-                    "clockwise": "顺时针",
-                    "anticlockwise": "逆时针"
+                    "anticlockwise": "逆时针",
+                    "clockwise": "顺时针"
                 }
             },
             "collection_times": {
@@ -745,6 +777,9 @@
             "construction": {
                 "label": "类型"
             },
+            "content": {
+                "label": "内容"
+            },
             "country": {
                 "label": "国家"
             },
@@ -763,6 +798,44 @@
             "cuisine": {
                 "label": "菜肴"
             },
+            "cycleway": {
+                "label": "自行车道",
+                "options": {
+                    "lane": {
+                        "description": "交通标线与机动车隔开的自行车道",
+                        "title": "标准自行车道"
+                    },
+                    "none": {
+                        "description": "无自行车道",
+                        "title": "无"
+                    },
+                    "opposite": {
+                        "description": "单行街道上双向行驶的自行车道",
+                        "title": "逆向自行车道"
+                    },
+                    "opposite_lane": {
+                        "description": "和其他车辆反向行驶的自行车道",
+                        "title": "对向自行车道"
+                    },
+                    "share_busway": {
+                        "description": "与公交车道共用的自行车道",
+                        "title": "与公交车共用的自行车道"
+                    },
+                    "shared_lane": {
+                        "description": "与机动车无隔离的自行车道",
+                        "title": "共用自行车道"
+                    },
+                    "track": {
+                        "description": "有物理隔离的自行车道",
+                        "title": "专用自行车道"
+                    }
+                },
+                "placeholder": "无",
+                "types": {
+                    "cycleway:left": "左侧",
+                    "cycleway:right": "右侧"
+                }
+            },
             "delivery": {
                 "label": "邮寄"
             },
@@ -775,18 +848,24 @@
             "description": {
                 "label": "说明"
             },
+            "diaper": {
+                "label": "有尿布台"
+            },
+            "dock": {
+                "label": "类型"
+            },
             "drive_through": {
                 "label": "免下车"
             },
             "electrified": {
                 "label": "电气化",
-                "placeholder": "接触线、电气化铁路…",
                 "options": {
                     "contact_line": "接触线",
+                    "no": "否",
                     "rail": "电气化铁路",
-                    "yes": "是(未指明)",
-                    "no": "否"
-                }
+                    "yes": "是(未指明)"
+                },
+                "placeholder": "接触线、电气化铁路…"
             },
             "elevation": {
                 "label": "海拔"
@@ -811,9 +890,9 @@
                 "label": "类型",
                 "options": {
                     "pillar": "支柱/地上",
+                    "pond": "池塘",
                     "underground": "地铁",
-                    "wall": "墙",
-                    "pond": "池塘"
+                    "wall": "墙"
                 }
             },
             "fixme": {
@@ -854,12 +933,12 @@
             },
             "gender": {
                 "label": "性别",
-                "placeholder": "未知",
                 "options": {
-                    "male": "男",
                     "female": "女",
+                    "male": "男",
                     "unisex": "中性"
-                }
+                },
+                "placeholder": "未知"
             },
             "generator/method": {
                 "label": "模式"
@@ -878,6 +957,9 @@
                 "label": "手工店",
                 "placeholder": "1-18"
             },
+            "handrail": {
+                "label": "扶手"
+            },
             "highway": {
                 "label": "类型"
             },
@@ -900,8 +982,8 @@
             "incline_steps": {
                 "label": "坡度",
                 "options": {
-                    "up": "上",
-                    "down": "下"
+                    "down": "下",
+                    "up": "上"
                 }
             },
             "information": {
@@ -910,11 +992,11 @@
             "internet_access": {
                 "label": "互联网接入",
                 "options": {
-                    "yes": "是",
                     "no": "否",
-                    "wlan": "Wi-Fi",
+                    "terminal": "终端",
                     "wired": "有线网络",
-                    "terminal": "终端"
+                    "wlan": "Wi-Fi",
+                    "yes": "是"
                 }
             },
             "lamp_type": {
@@ -933,20 +1015,37 @@
             "leaf_cycle": {
                 "label": "叶寿命",
                 "options": {
-                    "evergreen": "常绿",
                     "deciduous": "落叶",
-                    "semi_evergreen": "半常绿",
+                    "evergreen": "常绿",
+                    "mixed": "混交林",
                     "semi_deciduous": "半落叶",
-                    "mixed": "混交林"
+                    "semi_evergreen": "半常绿"
+                }
+            },
+            "leaf_cycle_singular": {
+                "label": "叶寿命",
+                "options": {
+                    "deciduous": "落叶树",
+                    "evergreen": "常绿树",
+                    "semi_deciduous": "半落叶树",
+                    "semi_evergreen": "半常绿树"
                 }
             },
             "leaf_type": {
                 "label": "叶型",
                 "options": {
                     "broadleaved": "阔叶",
-                    "needleleaved": "针叶",
+                    "leafless": "无叶",
                     "mixed": "混交林",
-                    "leafless": "无叶"
+                    "needleleaved": "针叶"
+                }
+            },
+            "leaf_type_singular": {
+                "label": "叶型",
+                "options": {
+                    "broadleaved": "阔叶",
+                    "leafless": "无叶",
+                    "needleleaved": "针叶"
                 }
             },
             "leisure": {
@@ -955,6 +1054,9 @@
             "length": {
                 "label": "高度(米)"
             },
+            "level": {
+                "label": "楼层"
+            },
             "levels": {
                 "label": "层次",
                 "placeholder": "2, 4, 6..."
@@ -972,9 +1074,11 @@
                 "label": "速度限制",
                 "placeholder": "40, 50, 60..."
             },
+            "maxstay": {
+                "label": "可停留时间"
+            },
             "mtb/scale": {
                 "label": "登山車难度",
-                "placeholder": "0, 1, 2, 3...",
                 "options": {
                     "0": "0：坚实的硕石土路，没有障碍物，大湾曲",
                     "1": "1：铺面部分松散，有小的障碍物，大弯曲",
@@ -983,22 +1087,22 @@
                     "4": "4：路面松散或是充满石头，有危险的发夹弯",
                     "5": "5：骑乘等级最困难，路面充满石头，或者是路面坍方",
                     "6": "6：除非是技巧极好的越野车手，否则并不适合骑乘"
-                }
+                },
+                "placeholder": "0, 1, 2, 3..."
             },
             "mtb/scale/imba": {
                 "label": "国际登山车协会路径难度",
-                "placeholder": "简单,中等,困难...",
                 "options": {
                     "0": "最简单(白圈)",
                     "1": "容易(绿圈)",
                     "2": "中等(蓝方块)",
                     "3": "困难(黑色钻石型)",
                     "4": "极端困难(双重黑色钻石型)"
-                }
+                },
+                "placeholder": "简单,中等,困难..."
             },
             "mtb/scale/uphill": {
                 "label": "山地自行车上坡难度",
-                "placeholder": "0, 1, 2, 3...",
                 "options": {
                     "0": "0：平均坡度小于10％时，有碎石/夯实的地面，没有障碍物",
                     "1": "1：平均坡度小于15％，有碎石/夯实的地面，有些许障碍物",
@@ -1006,7 +1110,8 @@
                     "3": "3：平均坡度25％，多变的平面，拳头大的石头/树墙",
                     "4": "4：平均坡度小于30％时，很糟的路面状况，大石头/树墙",
                     "5": "5：很陡，单车得牵行或扛车"
-                }
+                },
+                "placeholder": "0, 1, 2, 3..."
             },
             "name": {
                 "label": "名称",
@@ -1027,17 +1132,17 @@
             "oneway": {
                 "label": "单行线",
                 "options": {
+                    "no": "否",
                     "undefined": "假定为否",
-                    "yes": "是",
-                    "no": "否"
+                    "yes": "是"
                 }
             },
             "oneway_yes": {
                 "label": "单行线",
                 "options": {
+                    "no": "否",
                     "undefined": "假定为是",
-                    "yes": "是",
-                    "no": "否"
+                    "yes": "是"
                 }
             },
             "opening_hours": {
@@ -1056,13 +1161,13 @@
             "parking": {
                 "label": "类型",
                 "options": {
-                    "surface": "地面",
-                    "multi-storey": "多晨",
-                    "underground": "地下",
-                    "sheds": "单独车库",
                     "carports": "车棚",
                     "garage_boxes": "车库盒",
-                    "lane": "路边"
+                    "lane": "路边",
+                    "multi-storey": "多晨",
+                    "sheds": "单独车库",
+                    "surface": "地面",
+                    "underground": "地下"
                 }
             },
             "phone": {
@@ -1071,24 +1176,24 @@
             },
             "piste/difficulty": {
                 "label": "困难",
-                "placeholder": "容易，中阶，进阶",
                 "options": {
-                    "novice": "新手(教学)",
-                    "easy": "容易(绿圈)",
-                    "intermediate": "中阶(蓝方块)",
                     "advanced": "进阶(黑色钻石型)",
+                    "easy": "容易(绿圈)",
                     "expert": "专家(双重黑色钻石型)",
+                    "extreme": "极端困难(需要攀登工具)",
                     "freeride": "自由滑行(场地外)",
-                    "extreme": "极端困难(需要攀登工具)"
-                }
+                    "intermediate": "中阶(蓝方块)",
+                    "novice": "新手(教学)"
+                },
+                "placeholder": "容易，中阶，进阶"
             },
             "piste/grooming": {
                 "label": "雪道类型",
                 "options": {
-                    "classic": "经典",
-                    "mogul": "蒙古人",
                     "backcountry": "偏远地区",
+                    "classic": "经典",
                     "classic+skating": "经典和滑行",
+                    "mogul": "蒙古人",
                     "scooter": "滑行艇/雪车",
                     "skating": "滑冰"
                 }
@@ -1097,14 +1202,14 @@
                 "label": "类型",
                 "options": {
                     "downhill": "下坡",
+                    "hike": "徒步旅行",
+                    "ice_skate": "冰刀",
                     "nordic": "北欧人",
+                    "playground": "练习场",
                     "skitour": "滑雪旅行",
                     "sled": "雪橇",
-                    "hike": "徒步旅行",
                     "sleigh": "简易雪橇",
-                    "ice_skate": "冰刀",
-                    "snow_park": "滑雪场",
-                    "playground": "练习场"
+                    "snow_park": "滑雪场"
                 }
             },
             "place": {
@@ -1116,6 +1221,9 @@
             "power": {
                 "label": "类型"
             },
+            "power_supply": {
+                "label": "供电"
+            },
             "railway": {
                 "label": "类型"
             },
@@ -1128,9 +1236,22 @@
             "recycling/glass": {
                 "label": "接受玻璃回收"
             },
+            "recycling/glass_bottles": {
+                "label": "接受玻璃瓶回收"
+            },
             "recycling/paper": {
                 "label": "接受纸张回收"
             },
+            "recycling/plastic": {
+                "label": "接受塑料回收"
+            },
+            "recycling/type": {
+                "label": "回收类型",
+                "options": {
+                    "centre": "回收中心",
+                    "container": "回收容器"
+                }
+            },
             "ref": {
                 "label": "参考"
             },
@@ -1154,15 +1275,18 @@
             },
             "sac_scale": {
                 "label": "远足难度",
-                "placeholder": "登山旅行，越岭行走...",
                 "options": {
-                    "hiking": "T1：徒步旅行",
-                    "mountain_hiking": "T2：登山旅行",
-                    "demanding_mountain_hiking": "T3：进阶登山旅行",
                     "alpine_hiking": "T4：高山旅行",
                     "demanding_alpine_hiking": "T5：进阶高山旅行",
-                    "difficult_alpine_hiking": "T6：艰困高山旅行"
-                }
+                    "demanding_mountain_hiking": "T3：进阶登山旅行",
+                    "difficult_alpine_hiking": "T6：艰困高山旅行",
+                    "hiking": "T1：徒步旅行",
+                    "mountain_hiking": "T2：登山旅行"
+                },
+                "placeholder": "登山旅行，越岭行走..."
+            },
+            "sanitary_dump_station": {
+                "label": "厕所废物"
             },
             "seasonal": {
                 "label": "具备季节性"
@@ -1171,27 +1295,28 @@
                 "label": "类型"
             },
             "service/bicycle/chain_tool": {
+                "label": "链条维修工具",
                 "options": {
+                    "no": "否",
                     "undefined": "假定为否",
-                    "yes": "是",
-                    "no": "否"
+                    "yes": "是"
                 }
             },
             "service/bicycle/pump": {
                 "label": "气泵",
                 "options": {
+                    "no": "否",
                     "undefined": "假定为否",
-                    "yes": " 是",
-                    "no": "否"
+                    "yes": " 是"
                 }
             },
             "service_rail": {
                 "label": "服务类型",
                 "options": {
-                    "spur": "短途支线",
-                    "yard": "站场线路",
+                    "crossover": "渡线",
                     "siding": "侧线",
-                    "crossover": "渡线"
+                    "spur": "短途支线",
+                    "yard": "站场线路"
                 }
             },
             "shelter": {
@@ -1208,29 +1333,29 @@
             },
             "smoking": {
                 "label": "吸烟",
-                "placeholder": "禁止、隔开、允许...",
                 "options": {
-                    "no": "禁止吸烟",
-                    "separated": "指定区域可使用（布隔开）",
+                    "dedicated": "吸烟专用",
                     "isolated": "指定区域可使用（隔开）",
+                    "no": "禁止吸烟",
                     "outside": "外面可使用",
-                    "yes": "随处可使用",
-                    "dedicated": "吸烟专用"
-                }
+                    "separated": "指定区域可使用（布隔开）",
+                    "yes": "随处可使用"
+                },
+                "placeholder": "禁止、隔开、允许..."
             },
             "smoothness": {
                 "label": "平顺度",
-                "placeholder": "轴承，轮胎，越野",
                 "options": {
+                    "bad": "强化轮胎：休旅自行车，汽车，人力车",
                     "excellent": "轴承：溜冰，滑板",
                     "good": "细轮：竞速自行车",
+                    "horrible": "越野：高负重越野车辆",
+                    "impassable": "禁止通行/禁止轮类交通工具",
                     "intermediate": "轮胎：通勤脚踏车，轮椅，滑板车",
-                    "bad": "强化轮胎：休旅自行车，汽车，人力车",
                     "very_bad": "轻量化：低负重越野车辆",
-                    "horrible": "越野：高负重越野车辆",
-                    "very_horrible": "越野专用：拖拉机，全地形越野车",
-                    "impassable": "禁止通行/禁止轮类交通工具"
-                }
+                    "very_horrible": "越野专用：拖拉机，全地形越野车"
+                },
+                "placeholder": "轴承，轮胎，越野"
             },
             "social_facility_for": {
                 "label": "服务对象",
@@ -1250,14 +1375,14 @@
             },
             "structure": {
                 "label": "结构",
-                "placeholder": "未知种类",
                 "options": {
                     "bridge": "æ¡¥",
-                    "tunnel": "隧道",
-                    "embankment": "堤岸",
                     "cutting": "开凿",
-                    "ford": "浅滩"
-                }
+                    "embankment": "堤岸",
+                    "ford": "浅滩",
+                    "tunnel": "隧道"
+                },
+                "placeholder": "未知种类"
             },
             "studio_type": {
                 "label": "类型"
@@ -1276,20 +1401,20 @@
             },
             "takeaway": {
                 "label": "外卖",
-                "placeholder": "是，否，仅限外卖",
                 "options": {
-                    "yes": "是",
                     "no": "否",
-                    "only": "仅限外卖"
-                }
+                    "only": "仅限外卖",
+                    "yes": "是"
+                },
+                "placeholder": "是，否，仅限外卖"
             },
             "toilets/disposal": {
                 "label": "废弃",
                 "options": {
-                    "flush": "冲水式",
-                    "pitlatrine": "旱厕/翼坑",
+                    "bucket": "尿筒",
                     "chemical": "化工",
-                    "bucket": "尿筒"
+                    "flush": "冲水式",
+                    "pitlatrine": "旱厕/翼坑"
                 }
             },
             "tourism": {
@@ -1300,26 +1425,29 @@
             },
             "tracktype": {
                 "label": "产业道路种类",
-                "placeholder": "坚硬地面，硬物铺面，软铺面",
                 "options": {
                     "grade1": "刚性铺面：铺面为柏油，水泥或由刚性材质密实组成",
                     "grade2": "近刚性铺面：砾石与石块混合柔性材质",
                     "grade3": "混合刚性与柔性材质",
                     "grade4": "近柔性铺面：土壤，砂土与草地混合其他刚性材质",
                     "grade5": "柔性铺面：只有土壤，砂土与草地"
-                }
+                },
+                "placeholder": "坚硬地面，硬物铺面，软铺面"
+            },
+            "traffic_signals": {
+                "label": "类型"
             },
             "trail_visibility": {
                 "label": "路径可见度",
-                "placeholder": "良好，尚可，稍差...",
                 "options": {
+                    "bad": "差劲：没有标示，路径有时候消失",
                     "excellent": "良好：路径明显或标示充分",
                     "good": "尚可：有标示但可能不明显",
-                    "intermediate": "略差：标示稀少，路径大致可见",
-                    "bad": "差劲：没有标示，路径有时候消失",
                     "horrible": "可怕：路径常消失，需要部分定向能力",
+                    "intermediate": "略差：标示稀少，路径大致可见",
                     "no": "无：没有路径，需具备完整的定向能力"
-                }
+                },
+                "placeholder": "良好，尚可，稍差..."
             },
             "trees": {
                 "label": "树林"
@@ -1333,6 +1461,9 @@
             "water": {
                 "label": "类型"
             },
+            "water_point": {
+                "label": "饮水点"
+            },
             "waterway": {
                 "label": "类型"
             },
@@ -1378,10 +1509,16 @@
                 "name": "魔毯电梯",
                 "terms": "魔毯,传送带式电梯"
             },
+            "aerialway/platter": {
+                "name": "吊盘"
+            },
             "aerialway/pylon": {
                 "name": "缆车塔",
                 "terms": "缆车塔"
             },
+            "aerialway/rope_tow": {
+                "name": "牵绳"
+            },
             "aerialway/station": {
                 "name": "缆车站",
                 "terms": "缆车站"
@@ -1432,11 +1569,11 @@
             },
             "amenity/atm": {
                 "name": "ATM",
-                "terms": "ATM,提款机,自动提款机"
+                "terms": "ATM,提款机,自动提款机,自动取款机"
             },
             "amenity/bank": {
                 "name": "银行",
-                "terms": "银行"
+                "terms": "银行,储蓄银行"
             },
             "amenity/bar": {
                 "name": "酒吧",
@@ -1457,19 +1594,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": "咖啡馆",
@@ -1487,6 +1622,10 @@
                 "name": "洗车",
                 "terms": "洗车店,洗车"
             },
+            "amenity/casino": {
+                "name": "赌场",
+                "terms": "赌场"
+            },
             "amenity/charging_station": {
                 "name": "充电站",
                 "terms": "充电站"
@@ -1508,7 +1647,8 @@
                 "terms": "时钟,钟表,钟"
             },
             "amenity/college": {
-                "name": "大专院校校园"
+                "name": "大专院校校园",
+                "terms": "大专校园"
             },
             "amenity/community_centre": {
                 "name": "社区活动中心",
@@ -1525,13 +1665,13 @@
                 "name": "牙科",
                 "terms": "牙医,牙"
             },
-            "amenity/doctor": {
-                "name": "医生办公室",
-                "terms": "医生"
+            "amenity/doctors": {
+                "name": "医生",
+                "terms": "医生,医护人员"
             },
             "amenity/dojo": {
-                "name": "Dojo /武术学院",
-                "terms": "Dojo /武术学院"
+                "name": "道场/武术学院",
+                "terms": "道场,武术学院"
             },
             "amenity/drinking_water": {
                 "name": "饮水处",
@@ -1562,7 +1702,8 @@
                 "terms": "墓地,坟地"
             },
             "amenity/hospital": {
-                "name": "医院"
+                "name": "医院",
+                "terms": "医院场地"
             },
             "amenity/kindergarten": {
                 "name": "学前班/幼儿园用地"
@@ -1575,6 +1716,10 @@
                 "name": "市场",
                 "terms": "市场,菜市场"
             },
+            "amenity/motorcycle_parking": {
+                "name": "摩托车停车场",
+                "terms": "摩托车场"
+            },
             "amenity/nightclub": {
                 "name": "夜总会",
                 "terms": "夜店,夜总会"
@@ -1584,7 +1729,12 @@
                 "terms": "停车"
             },
             "amenity/parking_entrance": {
-                "name": "停车场入口/出口"
+                "name": "停车场入口/出口",
+                "terms": "停车场出入口"
+            },
+            "amenity/parking_space": {
+                "name": "停车空间",
+                "terms": "停车空间,停车场地"
             },
             "amenity/pharmacy": {
                 "name": "药店",
@@ -1627,7 +1777,8 @@
                 "terms": "酒馆"
             },
             "amenity/public_bookcase": {
-                "name": "公共书架"
+                "name": "公共书架",
+                "terms": "公共书架,公共书籍"
             },
             "amenity/ranger_station": {
                 "name": "野郊访客处",
@@ -1638,14 +1789,16 @@
                 "terms": "回收,循环利用,再造"
             },
             "amenity/register_office": {
-                "name": "民政登记处"
+                "name": "民政登记处",
+                "terms": "登记处,民政处"
             },
             "amenity/restaurant": {
                 "name": "餐馆",
                 "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼,美食"
             },
             "amenity/school": {
-                "name": "学校"
+                "name": "学校",
+                "terms": "学校场地"
             },
             "amenity/shelter": {
                 "name": "亭",
@@ -1655,10 +1808,12 @@
                 "name": "社会服务设施"
             },
             "amenity/social_facility/food_bank": {
-                "name": "食品银行"
+                "name": "食品银行",
+                "terms": "食物银行"
             },
             "amenity/social_facility/group_home": {
-                "name": "敬老院"
+                "name": "敬老院",
+                "terms": "敬老院,养老院,老年之家"
             },
             "amenity/social_facility/homeless_shelter": {
                 "name": "流浪者庇护站"
@@ -1692,11 +1847,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": "兽医",
@@ -1710,6 +1886,9 @@
                 "name": "区域",
                 "terms": "区域"
             },
+            "area/highway": {
+                "name": "道路表面"
+            },
             "barrier": {
                 "name": "屏障",
                 "terms": "屏障,阻挡"
@@ -1735,8 +1914,8 @@
                 "terms": "自行车,单车,路障"
             },
             "barrier/ditch": {
-                "name": "水沟",
-                "terms": "沟,沟渠,涧"
+                "name": "壕沟",
+                "terms": "沟坎,壕"
             },
             "barrier/entrance": {
                 "name": "入口",
@@ -1776,7 +1955,7 @@
             },
             "barrier/wall": {
                 "name": "墙",
-                "terms": "收费站"
+                "terms": "墙,墙壁"
             },
             "boundary/administrative": {
                 "name": "行政区域界线",
@@ -1801,14 +1980,6 @@
             "building/cabin": {
                 "name": "小木屋"
             },
-            "building/cathedral": {
-                "name": "主教座堂",
-                "terms": "教堂,大教堂"
-            },
-            "building/church": {
-                "name": "宗教场所",
-                "terms": "礼拜堂"
-            },
             "building/college": {
                 "name": "大专院校建筑"
             },
@@ -1819,11 +1990,9 @@
             "building/construction": {
                 "name": "在建建筑"
             },
-            "building/detached": {
-                "name": "连体屋"
-            },
             "building/dormitory": {
-                "name": "宿舍"
+                "name": "宿舍",
+                "terms": "宿舍,寝室"
             },
             "building/entrance": {
                 "name": "入口/出口",
@@ -1834,7 +2003,8 @@
                 "terms": "车库"
             },
             "building/garages": {
-                "name": "车库(连排)"
+                "name": "车库(连排)",
+                "terms": "连排车库"
             },
             "building/greenhouse": {
                 "name": "温室",
@@ -1844,7 +2014,8 @@
                 "name": "医院大楼"
             },
             "building/hotel": {
-                "name": "宾馆楼"
+                "name": "宾馆楼",
+                "terms": "宾馆建筑"
             },
             "building/house": {
                 "name": "房屋",
@@ -1859,21 +2030,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": "学校建筑",
@@ -1951,19 +2123,23 @@
                 "name": "切割钥匙（配匙）"
             },
             "craft/locksmith": {
-                "name": "锁匠"
+                "name": "锁匠",
+                "terms": "锁匠,开锁师"
             },
             "craft/metal_construction": {
-                "name": "金属结构建筑"
+                "name": "金属结构建筑",
+                "terms": "金属建筑,金属建筑物"
             },
             "craft/optician": {
                 "name": "眼镜店"
             },
             "craft/painter": {
-                "name": "油漆匠"
+                "name": "油漆匠",
+                "terms": "粉刷匠"
             },
             "craft/photographer": {
-                "name": "照相店"
+                "name": "照相店",
+                "terms": "摄影师"
             },
             "craft/photographic_laboratory": {
                 "name": "照片冲洗店"
@@ -2054,13 +2230,8 @@
                 "name": "入口/出口",
                 "terms": "入口/出口,出入口"
             },
-            "footway/crossing": {
-                "name": "路口",
-                "terms": "路口"
-            },
             "footway/crosswalk": {
-                "name": "人行横道",
-                "terms": "人行横道"
+                "name": "人行横道"
             },
             "footway/sidewalk": {
                 "name": "人行道",
@@ -2105,14 +2276,6 @@
                 "name": "公交车站",
                 "terms": "公交车站,巴士站"
             },
-            "highway/crossing": {
-                "name": "路口",
-                "terms": "路口"
-            },
-            "highway/crosswalk": {
-                "name": "人行横道",
-                "terms": "人行横道"
-            },
             "highway/cycleway": {
                 "name": "自行车道",
                 "terms": "自行车,单车"
@@ -2146,8 +2309,7 @@
                 "terms": "路径"
             },
             "highway/pedestrian": {
-                "name": "步行街",
-                "terms": "行人专用路"
+                "name": "步行街"
             },
             "highway/primary": {
                 "name": "主要道路",
@@ -2227,10 +2389,6 @@
                 "name": "三级道路匝道",
                 "terms": "三级道路匝道"
             },
-            "highway/track": {
-                "name": "小路",
-                "terms": "未铺设路面的车径"
-            },
             "highway/traffic_signals": {
                 "name": "交通信号灯",
                 "terms": "红绿灯"
@@ -2247,10 +2405,6 @@
                 "name": "环岛",
                 "terms": "环岛"
             },
-            "highway/unclassified": {
-                "name": "未分级的道路",
-                "terms": "未分级的道路"
-            },
             "historic": {
                 "name": "历史遗迹",
                 "terms": "历史遗迹,史迹"
@@ -2293,11 +2447,7 @@
             },
             "landuse": {
                 "name": "土地用途",
-                "terms": "土地用途"
-            },
-            "landuse/allotments": {
-                "name": "菜地",
-                "terms": "菜地,社区花园"
+                "terms": "土地用途,土地使用"
             },
             "landuse/basin": {
                 "name": "æ°´æ± ",
@@ -2319,7 +2469,12 @@
                 "terms": "建筑物"
             },
             "landuse/farm": {
-                "name": "农田"
+                "name": "农田",
+                "terms": "农田,农场"
+            },
+            "landuse/farmland": {
+                "name": "农田",
+                "terms": "农田,农场"
             },
             "landuse/farmyard": {
                 "name": "农庄",
@@ -2330,7 +2485,8 @@
                 "terms": "森林"
             },
             "landuse/garages": {
-                "name": "车库"
+                "name": "车库",
+                "terms": "车库, 停车间"
             },
             "landuse/grass": {
                 "name": "草坪",
@@ -2347,7 +2503,8 @@
                 "terms": "牧场,草场"
             },
             "landuse/military": {
-                "name": "军事区"
+                "name": "军事区",
+                "terms": "军事用地, 军事区域"
             },
             "landuse/orchard": {
                 "name": "果园",
@@ -2400,7 +2557,8 @@
                 "terms": "码头"
             },
             "leisure/nature_reserve": {
-                "name": "自然保护区"
+                "name": "自然保护区",
+                "terms": "自然保护区"
             },
             "leisure/park": {
                 "name": "公园",
@@ -2453,10 +2611,6 @@
                 "name": "船台",
                 "terms": "船台"
             },
-            "leisure/sports_center": {
-                "name": "体育中心/健身中心",
-                "terms": "体育中心,健身中心"
-            },
             "leisure/stadium": {
                 "name": "体育场",
                 "terms": "体育,体育场"
@@ -2500,6 +2654,10 @@
                 "name": "瞭望塔",
                 "terms": "瞭望塔"
             },
+            "man_made/petroleum_well": {
+                "name": "油井",
+                "terms": "油井"
+            },
             "man_made/pier": {
                 "name": "码头",
                 "terms": "码头"
@@ -2525,7 +2683,8 @@
                 "terms": "水塔"
             },
             "man_made/water_well": {
-                "name": "水井"
+                "name": "水井",
+                "terms": "水井, 取水点"
             },
             "man_made/water_works": {
                 "name": "供水厂",
@@ -2543,6 +2702,10 @@
                 "name": "地堡",
                 "terms": "地堡,暗堡"
             },
+            "military/danger_area": {
+                "name": "危险区域",
+                "terms": "危险区域,危险地区"
+            },
             "military/range": {
                 "name": "军事靶场",
                 "terms": "靶场,射击场,军事射击场"
@@ -2606,6 +2769,9 @@
                 "name": "树",
                 "terms": "树"
             },
+            "natural/volcano": {
+                "name": "火山"
+            },
             "natural/water": {
                 "name": "æ°´",
                 "terms": "æ°´"
@@ -2725,6 +2891,9 @@
                 "name": "城市",
                 "terms": "城市"
             },
+            "place/farm": {
+                "name": "农场"
+            },
             "place/hamlet": {
                 "name": "小村庄",
                 "terms": "村庄,村落"
@@ -2825,10 +2994,6 @@
                 "name": "小火车站",
                 "terms": "小火车站"
             },
-            "railway/level_crossing": {
-                "name": "平交道口",
-                "terms": "平交道口"
-            },
             "railway/monorail": {
                 "name": "单轨铁路",
                 "terms": "单轨铁路"
@@ -2883,15 +3048,13 @@
             "shop/antiques": {
                 "name": "古董店"
             },
-            "shop/art": {
-                "name": "画廊",
-                "terms": "美术馆,艺术馆"
-            },
             "shop/baby_goods": {
-                "name": "婴儿用品店"
+                "name": "婴儿用品店",
+                "terms": "母婴用品店, 婴幼儿用品店"
             },
             "shop/bag": {
-                "name": "箱包店"
+                "name": "箱包店",
+                "terms": "箱包店"
             },
             "shop/bakery": {
                 "name": "面包店",
@@ -2920,7 +3083,8 @@
                 "name": "书商"
             },
             "shop/books": {
-                "name": "书店"
+                "name": "书店",
+                "terms": "书店, 书城"
             },
             "shop/boutique": {
                 "name": "精品店",
@@ -2931,7 +3095,8 @@
                 "terms": "肉铺"
             },
             "shop/candles": {
-                "name": "蜡烛店"
+                "name": "蜡烛店",
+                "terms": "蜡烛专卖店"
             },
             "shop/car": {
                 "name": "汽车店",
@@ -2946,17 +3111,20 @@
                 "terms": "汽车修理店"
             },
             "shop/carpet": {
-                "name": "地毯店"
+                "name": "地毯店",
+                "terms": "地毯店,毯店"
             },
             "shop/cheese": {
-                "name": "奶酪店"
+                "name": "奶酪店",
+                "terms": "奶酪店,奶酪专卖店"
             },
             "shop/chemist": {
                 "name": "日化用品店",
                 "terms": "药房"
             },
             "shop/chocolate": {
-                "name": "巧克力店"
+                "name": "巧克力店",
+                "terms": "巧克力店,巧克力专卖店"
             },
             "shop/clothes": {
                 "name": "服装店",
@@ -2967,7 +3135,8 @@
                 "terms": "电脑店"
             },
             "shop/confectionery": {
-                "name": "糖果店"
+                "name": "糖果店",
+                "terms": "糖果店,糖果屋"
             },
             "shop/convenience": {
                 "name": "便利店",
@@ -3003,7 +3172,8 @@
                 "terms": "DIY商店"
             },
             "shop/dry_cleaning": {
-                "name": "干洗店"
+                "name": "干洗店",
+                "terms": "干洗店"
             },
             "shop/electronics": {
                 "name": "电器店",
@@ -3017,7 +3187,8 @@
                 "terms": "农场"
             },
             "shop/fashion": {
-                "name": "服装店"
+                "name": "服装店",
+                "terms": "服装店,潮流服饰店"
             },
             "shop/fishmonger": {
                 "name": "海产店",
@@ -3054,6 +3225,10 @@
                 "name": "五金店",
                 "terms": "五金店"
             },
+            "shop/herbalist": {
+                "name": "中医",
+                "terms": "中医"
+            },
             "shop/hifi": {
                 "name": "音响店",
                 "terms": "音响店"
@@ -3071,26 +3246,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": "摩托车行,摩托车"
@@ -3100,12 +3286,24 @@
                 "terms": "音乐店"
             },
             "shop/musical_instrument": {
-                "name": "乐器店"
+                "name": "乐器店",
+                "terms": "乐器店,音乐用品店"
+            },
+            "shop/newsagent": {
+                "name": "报摊"
             },
             "shop/optician": {
                 "name": "眼镜店",
                 "terms": "眼镜店"
             },
+            "shop/organic": {
+                "name": "有机产品店",
+                "terms": "有机产品店"
+            },
+            "shop/outdoor": {
+                "name": "户外用品店",
+                "terms": "户外用品店,销售户外活动用品的商店"
+            },
             "shop/pet": {
                 "name": "宠物店",
                 "terms": "宠物店"
@@ -3139,6 +3337,10 @@
             "shop/tailor": {
                 "name": "裁缝"
             },
+            "shop/tea": {
+                "name": "茶叶商店",
+                "terms": "茶叶商店,茶店"
+            },
             "shop/tobacco": {
                 "name": "烟草店"
             },
@@ -3166,9 +3368,15 @@
                 "name": "影像店",
                 "terms": "影像店"
             },
+            "shop/video_games": {
+                "name": "视频游戏店"
+            },
+            "shop/weapons": {
+                "name": "武器店"
+            },
             "shop/wine": {
-                "name": "酒店",
-                "terms": "酒店,酒楼,酒坊"
+                "name": "酒品商店",
+                "terms": "酒品商店,酒店,酒楼,酒坊"
             },
             "tourism": {
                 "name": "旅行",
@@ -3255,11 +3463,11 @@
                 "terms": "限制"
             },
             "type/restriction/no_left_turn": {
-                "name": "禁止左转弯",
+                "name": "禁止左转",
                 "terms": "禁止左转弯"
             },
             "type/restriction/no_right_turn": {
-                "name": "禁止右转弯",
+                "name": "禁止右转",
                 "terms": "禁止右转弯"
             },
             "type/restriction/no_straight_on": {
@@ -3351,28 +3559,31 @@
                 "terms": "水坝"
             },
             "waterway/ditch": {
-                "name": "壕沟",
-                "terms": "沟坎,壕"
+                "name": "水沟",
+                "terms": "沟,沟渠,涧"
+            },
+            "waterway/dock": {
+                "name": "码头"
             },
             "waterway/drain": {
                 "name": "渠",
                 "terms": "下水道"
             },
             "waterway/river": {
-                "name": "河流",
-                "terms": "河流"
+                "name": "æ²³",
+                "terms": "江,河流,川"
             },
             "waterway/riverbank": {
-                "name": "河堤",
-                "terms": "河堤"
+                "name": "å ¤",
+                "terms": "岸,畔,河岸,河堤,河畔"
             },
             "waterway/stream": {
-                "name": "溪流",
-                "terms": "溪流"
+                "name": "溪",
+                "terms": "小河,小溪,涧,溪流"
             },
             "waterway/weir": {
                 "name": "å °",
-                "terms": "堤坝"
+                "terms": "坝,堰坝,拦河坝"
             }
         }
     }