X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/356fa7f2dec9284ad473ea0b062e7b3b00a60988..92384ed9565d6f6558417ea43958612cbf9a87d7:/vendor/assets/iD/iD/locales/zh.json

diff --git a/vendor/assets/iD/iD/locales/zh.json b/vendor/assets/iD/iD/locales/zh.json
index 8925c35a6..ef08cea5b 100644
--- a/vendor/assets/iD/iD/locales/zh.json
+++ b/vendor/assets/iD/iD/locales/zh.json
@@ -18,6 +18,12 @@
         "browse": {
             "title": "浏览",
             "description": "平移和缩放地图。"
+        },
+        "draw_area": {
+            "tail": "点击以为这个面添加节点。点击第一点来完成绘制面。"
+        },
+        "draw_line": {
+            "tail": "点击以为这线段添加更多节点。点击其他线段以连接它们，点击两下以完成绘制线段。"
         }
     },
     "operations": {
@@ -42,21 +48,26 @@
         "cancel_draw": {
             "annotation": "取消绘图。"
         },
+        "change_role": {
+            "annotation": "已更改关系成员的角色。"
+        },
         "change_tags": {
             "annotation": "改变标签。"
         },
         "circularize": {
             "title": "圆",
+            "description": {
+                "line": "把直线制作成圆形。",
+                "area": "把面制作成圆形。"
+            },
             "key": "O",
             "annotation": {
                 "line": "把线制作成圆形。",
                 "area": "把面制作成圆形。"
-            }
+            },
+            "not_closed": "该要素不可编辑为圆，因为它不是一个循环。"
         },
         "orthogonalize": {
-            "title": "直角化",
-            "description": "边角直角化。",
-            "key": "Q",
             "annotation": {
                 "line": "线直角化。",
                 "area": "面直角化。"
@@ -64,7 +75,6 @@
         },
         "delete": {
             "title": "删除",
-            "description": "从地图中删除此。",
             "annotation": {
                 "point": "删除一个点。",
                 "vertex": "删除线上一个结点。",
@@ -72,7 +82,14 @@
                 "area": "删除一个面。",
                 "relation": "删除一个关系。",
                 "multiple": "删除{n}个对象。"
-            }
+            },
+            "incomplete_relation": "此内容暂未下载完成无法删除。"
+        },
+        "add_member": {
+            "annotation": "增加关系中的成员。"
+        },
+        "delete_member": {
+            "annotation": "删除关系中的成员。"
         },
         "connect": {
             "annotation": {
@@ -86,14 +103,16 @@
             "title": "断开",
             "description": "断开这些线。",
             "key": "D",
-            "annotation": "断开线。"
+            "annotation": "断开线。",
+            "not_connected": "没有足够的线/面来断开。"
         },
         "merge": {
             "title": "合并",
             "description": "合并这些线。",
             "key": "C",
             "annotation": "合并{n}条线。",
-            "not_eligible": "这些要素不能被合并。"
+            "not_eligible": "这些要素不能被合并。",
+            "not_adjacent": "这些线段并不连接，不能合并。"
         },
         "move": {
             "title": "移动",
@@ -105,11 +124,11 @@
                 "line": "移动一条线。",
                 "area": "移动一个面。",
                 "multiple": "移动多个对象。"
-            }
+            },
+            "incomplete_relation": "要素没有完全下载，不能移动。"
         },
         "rotate": {
             "title": "旋转",
-            "description": "绕其中心点旋转该对象。",
             "key": "R",
             "annotation": {
                 "line": "旋转一条线。",
@@ -125,22 +144,35 @@
         "split": {
             "title": "分割",
             "description": {
-                "line": "在此节点上将这条线分割成两条线。"
+                "line": "在此节点上将这条线分割成两条线。",
+                "area": "将这个面的边界一分为二。",
+                "multiple": "在这一节点将线/面的边界一分为二。"
             },
             "key": "X",
             "annotation": {
                 "line": "分割一条线。",
-                "area": "分割一个面区域。"
+                "area": "分割一个面区域。",
+                "multiple": "分割{n}个线/面的边界"
             },
+            "not_eligible": "不能在线段的首尾进行分割。",
             "multiple_ways": "这里有太多的线条待分割。"
         }
     },
-    "nothing_to_undo": "没有可撤消的。",
-    "nothing_to_redo": "没有可重做的。",
-    "just_edited": "你正在编辑的OpenStreetMap！",
+    "undo": {
+        "nothing": "没有可撤消的。"
+    },
+    "redo": {
+        "nothing": "没有可重做的。"
+    },
+    "tooltip_keyhint": "快捷方式",
     "browser_notice": "该编辑器支持Firefox、Chrome、Safari、Opera和Internet Explorer9及以上的浏览器。请升级您的浏览器或者使用Potlatch 2来编辑地图。",
-    "view_on_osm": "在OSM上查看",
-    "zoom_in_edit": "放大编辑地图",
+    "translate": {
+        "translate": "翻译",
+        "localized_translation_label": "多种语言名称",
+        "localized_translation_language": "选择语言",
+        "localized_translation_name": "名称"
+    },
+    "zoom_in_edit": "放大编辑",
     "logout": "退出",
     "loading_auth": "连接OpenStreetMap...",
     "report_a_bug": "报告bug",
@@ -152,8 +184,8 @@
     "commit": {
         "title": "保存更改",
         "description_placeholder": "简要说明你的贡献",
-        "message_label": "提交说明",
-        "upload_explanation": "{user}你上传的更新将会显示在所有使用OpenStreetMap数据的地图上。",
+        "upload_explanation": "你上传的更新将会显示在所有使用 OpenStreetMap 数据的地图上。",
+        "upload_explanation_with_user": "你 {user} 上传的更新将会显示在所有使用 OpenStreetMap 数据的地图上。",
         "save": "保存",
         "cancel": "取消",
         "warnings": "警告",
@@ -162,13 +194,8 @@
         "created": "创建的"
     },
     "contributors": {
-        "list": "查看{users}的贡献",
-        "truncated_list": "查看{users}和其他{count}个成员的贡献"
-    },
-    "geocoder": {
-        "title": "查找位置",
-        "placeholder": "查找位置",
-        "no_results": "无法找到叫'{name}'的地方"
+        "list": "{user}编辑的",
+        "truncated_list": " {users}和其他{count}位用戶编辑的"
     },
     "geolocate": {
         "title": "显示我的位置"
@@ -177,21 +204,25 @@
         "no_documentation_combination": "没有关于此标签组合的文档",
         "no_documentation_key": "没有关于此键的文档",
         "show_more": "显示更多",
-        "new_tag": "新建标签",
-        "view_on_osm": "在on openstreetmap.org上查看",
-        "editing_feature": "编辑{feature}",
-        "additional": "附加标签",
+        "view_on_osm": "在openstreetmap.org上查看",
+        "all_tags": "所有标签",
+        "all_members": "所有成员",
+        "all_relations": "所有关系",
+        "role": "角色",
         "choose": "选择对象的类型",
         "results": "{search}共有{n}个结果",
         "reference": "在OpenStreetMap Wiki上查看",
-        "back_tooltip": "修改对象的类型",
-        "remove": "删除"
+        "back_tooltip": "修改要素",
+        "remove": "删除",
+        "search": "搜索",
+        "unknown": "未知",
+        "incomplete": "<没有下载>",
+        "edit": "编辑要素"
     },
     "background": {
         "title": "背景",
         "description": "设置背景",
         "percent_brightness": "{opacity}% 亮度",
-        "fix_misalignment": "修复错位",
         "reset": "重置"
     },
     "restore": {
@@ -204,20 +235,28 @@
         "title": "保存",
         "help": "保存更改到OpenStreetMap上，使其他用户可以看见。",
         "no_changes": "没有可以保存的更改。",
-        "error": "保存发生错误",
         "uploading": "正在向OpenStreetMap上传更改。",
         "unsaved_changes": "您有未保存的更改"
     },
+    "success": {
+        "edited_osm": "编辑OSM！",
+        "just_edited": "你正在编辑的OpenStreetMap！",
+        "view_on_osm": "在OSM上查看",
+        "facebook": "在Facebook上分享"
+    },
+    "confirm": {
+        "okay": "确定"
+    },
     "splash": {
         "welcome": "欢迎使用OpenStreetMap编辑器iD",
-        "text": "这是开发版本{version}。欲了解更多信息，请参阅{website}，在{github}报告bug。",
+        "text": "iD编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是版本{version}。欲知详情，请浏览{website} 及在{github}上报告程序错误。",
         "walkthrough": "开始练习",
         "start": "现在编辑"
     },
     "source_switch": {
-        "live": "live",
+        "live": "运行模式",
         "lose_changes": "您有未保存的更改。切换地图服务器会丢弃他们。你确定要切换服务器吗？",
-        "dev": "dev"
+        "dev": "开发模式"
     },
     "tag_reference": {
         "description": "描述",
@@ -238,14 +277,55 @@
     },
     "cannot_zoom": "在当前模式下无法进一步缩小。",
     "gpx": {
-        "local_layer": "本地GPX文件",
-        "drag_drop": "把GPX文件拖到页面上。"
+        "local_layer": "本地GPX文件"
     },
     "help": {
-        "title": "帮助"
+        "title": "帮助",
+        "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",
+        "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立\n和改善这个数据库。\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"
     },
     "intro": {
+        "navigation": {
+            "title": "导航",
+            "drag": "主要地图区域会在背景图像上方显示OpenStreetMap 资料，您可以透过拖曳与滚动来浏览，就像其他互联网地图一样。 **拖曳地图！ **",
+            "select": "地图物件有三种表示方式：点、线以及面，所有要素都可以点选。 **点击该点来选择它**",
+            "header": "上方显示要素种类",
+            "pane": "选择一个要素后，会显示要素编辑器。上方显示物件类型，主面板则显示物件的属性，如物件的名称与地址等。 **点击物件编辑器右上角的关闭按钮，关闭要素编辑器**"
+        },
+        "points": {
+            "title": "点。",
+            "add": "点可以用来表示像是商店、餐厅与古迹之类的要素，它们标示一个特定位置，并且描述那里有什么。 **点击「点」按钮以新增一点**",
+            "place": "在地图上点击，可以地图上放上新增的一点。 **将该点放到建筑物上方**",
+            "search": "很多不同的物体可以用点来代表。您刚刚新增加的点是一间咖啡厅。**搜寻'{咖啡厅}'**",
+            "choose": "**从列表中选择咖啡厅。**",
+            "describe": "这个点现在标示为咖啡厅，透过物件编辑器，我们可以加入更多相关资讯。 **新增一个名称**",
+            "close": "点选关闭按钮就可以关闭物件编辑器。 **关闭要素编辑器**",
+            "reselect": "很多时候，所需的点已经存在，但有错误或不完整。我们可以编辑现有的点。 **选择您刚创建的点**",
+            "fixname": "**改名，并关闭该要素的编辑器。**",
+            "reselect_delete": "地图上的所有要素均可删除。**点击你创建的点。**",
+            "delete": "在点周围的菜单包含在该点可执行的操作，包括删除。**删除点。**"
+        },
+        "areas": {
+            "title": "面。",
+            "corner": "透过将节点放到面的边界上，可绘制面。 **将起始节点置于游乐场的其中一角**",
+            "place": "放置更多节点，以勾画该面。点击起始节点以完成绘制面。 **绘制一区域以代表游乐场**",
+            "search": "**搜寻'{名称}'。**",
+            "choose": "**从列表中选择游乐场。**",
+            "describe": "**添加一个名字，并关闭该要素编辑器**"
+        },
+        "lines": {
+            "title": "直线。",
+            "start": "**点击道路末端，以开始绘制线段。 **",
+            "intersect": "点击以为线段添加更多的节点。在绘图是，如有需要，您可以拖曳地图。道路和许多其他类型的线段，是整个体系的一部分。这些线段正确地连接起来，对导航的应用程序的运作相当重要。 **点击Flower Street，建立连接这两条线段的相交点。 **",
+            "finish": "再次点击最后的节点，可完成绘制线段。 **完成绘制此道路**",
+            "road": "**从列表中选择道路**",
+            "residential": "道路有不同种类，最常见的为住宅区道路。 **选择住宅区道路**",
+            "describe": "**给道路命名，并关闭该要素编辑器。**",
+            "restart": "这道路须与Flower Street相交。"
+        },
         "startediting": {
+            "title": "开始编辑。",
+            "help": "在这里有更多使用说明，还可以重温简介",
             "save": "不要忘了定期保存你的修改！",
             "start": "开始制图！"
         }
@@ -264,48 +344,53 @@
             "category-road": {
                 "name": "道路"
             },
-            "category-water": {
-                "name": "æ°´"
+            "category-route": {
+                "name": "路线"
             }
         },
         "fields": {
             "access": {
-                "label": "通道",
-                "types": {
-                    "access": "普通",
-                    "foot": "步行",
-                    "motor_vehicle": "汽车",
-                    "bicycle": "自行车",
-                    "horse": "马匹"
-                },
+                "label": "通行限制",
                 "options": {
-                    "yes": {
-                        "title": "允许的"
+                    "designated": {
+                        "description": "只限标志指定或特定本地法律容许人士进入",
+                        "title": "特定的"
+                    },
+                    "destination": {
+                        "description": "只限前往目的地人士进入",
+                        "title": "目的地"
                     },
                     "no": {
+                        "description": "禁止一般公众进入",
                         "title": "禁止的"
                     },
                     "permissive": {
-                        "title": "容许的"
+                        "description": "容许进入，直至拥有者撇回许可",
+                        "title": "获许可进入"
                     },
                     "private": {
+                        "description": "须拥有者个别批准，方可进入",
                         "title": "私人"
                     },
-                    "designated": {
-                        "title": "特定的"
-                    },
-                    "destination": {
-                        "title": "目的地"
+                    "yes": {
+                        "description": "按法律及路权，有权使用",
+                        "title": "允许的"
                     }
+                },
+                "placeholder": "未知种类",
+                "types": {
+                    "access": "普通",
+                    "bicycle": "自行车",
+                    "foot": "步行",
+                    "horse": "马匹",
+                    "motor_vehicle": "汽车"
                 }
             },
             "address": {
                 "label": "地址",
                 "placeholders": {
-                    "housename": "房屋名称",
-                    "number": "123",
-                    "street": "街道",
-                    "city": "城市"
+                    "city": "城市",
+                    "street": "街道"
                 }
             },
             "admin_level": {
@@ -332,11 +417,9 @@
             "building_area": {
                 "label": "建筑物"
             },
-            "building_yes": {
-                "label": "建筑物"
-            },
             "capacity": {
-                "label": "容量"
+                "label": "容量",
+                "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
                 "label": "方向"
@@ -344,8 +427,8 @@
             "clock_direction": {
                 "label": "方向",
                 "options": {
-                    "clockwise": "顺时针",
-                    "anticlockwise": "逆时针"
+                    "anticlockwise": "逆时针",
+                    "clockwise": "顺时针"
                 }
             },
             "collection_times": {
@@ -369,6 +452,9 @@
             "denotation": {
                 "label": "意思"
             },
+            "description": {
+                "label": "描述"
+            },
             "elevation": {
                 "label": "海拔"
             },
@@ -379,30 +465,44 @@
                 "label": "类型"
             },
             "fax": {
-                "label": "传真"
+                "label": "传真",
+                "placeholder": "+31 42 123 4567"
             },
             "fee": {
                 "label": "费用"
             },
+            "fixme": {
+                "label": "修复我"
+            },
             "highway": {
                 "label": "类型"
             },
             "historic": {
                 "label": "类型"
             },
+            "iata": {
+                "label": "国际航空运输协会IATA"
+            },
+            "icao": {
+                "label": "国际民航组织ICAO"
+            },
+            "incline": {
+                "label": "斜度"
+            },
             "internet_access": {
                 "label": "互联网接入",
                 "options": {
-                    "wlan": "无线网络",
+                    "terminal": "终端",
                     "wired": "有线网络",
-                    "terminal": "终端"
+                    "wlan": "无线网络"
                 }
             },
             "landuse": {
                 "label": "类型"
             },
             "lanes": {
-                "label": "车道"
+                "label": "车道",
+                "placeholder": "1, 2, 3..."
             },
             "layer": {
                 "label": "层"
@@ -411,16 +511,22 @@
                 "label": "类型"
             },
             "levels": {
-                "label": "级别"
+                "label": "级别",
+                "placeholder": "2, 4, 6..."
+            },
+            "location": {
+                "label": "位置"
             },
             "man_made": {
                 "label": "类型"
             },
             "maxspeed": {
-                "label": "限速"
+                "label": "限速",
+                "placeholder": "40, 50, 60..."
             },
             "name": {
-                "label": "名称"
+                "label": "名称",
+                "placeholder": "常用名称（如有）"
             },
             "natural": {
                 "label": "自然"
@@ -453,7 +559,8 @@
                 "label": "类型"
             },
             "phone": {
-                "label": "手机"
+                "label": "手机",
+                "placeholder": "+31 42 123 4567"
             },
             "place": {
                 "label": "类型"
@@ -467,17 +574,14 @@
             "ref": {
                 "label": "参考"
             },
+            "relation": {
+                "label": "类型"
+            },
             "religion": {
-                "label": "宗教",
-                "options": {
-                    "christian": "基督教",
-                    "muslim": "穆斯林",
-                    "buddhist": "佛教",
-                    "jewish": "犹太教",
-                    "hindu": "印度教",
-                    "shinto": "神道教",
-                    "taoist": "道教"
-                }
+                "label": "宗教"
+            },
+            "route": {
+                "label": "类型"
             },
             "service": {
                 "label": "类型"
@@ -498,10 +602,11 @@
                 "label": "结构",
                 "options": {
                     "bridge": "æ¡¥",
-                    "tunnel": "隧道",
+                    "cutting": "开凿",
                     "embankment": "堤岸",
-                    "cutting": "开凿"
-                }
+                    "tunnel": "隧道"
+                },
+                "placeholder": "未知种类"
             },
             "supervised": {
                 "label": "监督"
@@ -512,8 +617,11 @@
             "tourism": {
                 "label": "类型"
             },
-            "tracktype": {
-                "label": "类型"
+            "towertype": {
+                "label": "塔型"
+            },
+            "trail_visibility": {
+                "label": "路径可见度"
             },
             "water": {
                 "label": "类型"
@@ -522,7 +630,8 @@
                 "label": "类型"
             },
             "website": {
-                "label": "网站"
+                "label": "网站",
+                "placeholder": "http://example.com/"
             },
             "wetland": {
                 "label": "类型"
@@ -532,29 +641,47 @@
             },
             "wikipedia": {
                 "label": "维基百科"
-            },
-            "wood": {
-                "label": "类型"
             }
         },
         "presets": {
+            "address": {
+                "name": "地址"
+            },
             "aeroway": {
                 "name": "机场相关道路"
             },
             "aeroway/aerodrome": {
-                "name": "机场",
-                "terms": "飞机,机场,机场"
+                "name": "机场"
+            },
+            "aeroway/apron": {
+                "name": "停机坪"
+            },
+            "aeroway/gate": {
+                "name": "机场门"
+            },
+            "aeroway/hangar": {
+                "name": "机库"
             },
             "aeroway/helipad": {
-                "name": "直升机场",
-                "terms": "直升机,直升机停机坪,直升机场"
+                "name": "直升机场"
+            },
+            "aeroway/runway": {
+                "name": "跑道"
+            },
+            "aeroway/taxiway": {
+                "name": "滑行道"
+            },
+            "aeroway/terminal": {
+                "name": "机场航站楼"
             },
             "amenity": {
                 "name": "便利设施"
             },
+            "amenity/atm": {
+                "name": "自动柜员机（ATM）。"
+            },
             "amenity/bank": {
-                "name": "银行",
-                "terms": "保险箱,信用社,存款,基金,囤积,投资公司,金库"
+                "name": "银行"
             },
             "amenity/bar": {
                 "name": "酒吧"
@@ -569,12 +696,13 @@
                 "name": "自行车租赁处"
             },
             "amenity/cafe": {
-                "name": "咖啡",
-                "terms": "咖啡,茶,咖啡馆"
+                "name": "咖啡"
+            },
+            "amenity/car_wash": {
+                "name": "洗车"
             },
             "amenity/cinema": {
-                "name": "电影院",
-                "terms": "大屏幕,电影,电影院,图片展示,图片,剧场,表演,银幕"
+                "name": "电影院"
             },
             "amenity/courthouse": {
                 "name": "法院"
@@ -588,24 +716,21 @@
             "amenity/fire_station": {
                 "name": "消防站"
             },
+            "amenity/fountain": {
+                "name": "喷泉"
+            },
             "amenity/fuel": {
                 "name": "加油站"
             },
             "amenity/grave_yard": {
                 "name": "墓地"
             },
-            "amenity/hospital": {
-                "name": "医院"
-            },
             "amenity/library": {
                 "name": "图书馆"
             },
             "amenity/marketplace": {
                 "name": "市场"
             },
-            "amenity/parking": {
-                "name": "停车场"
-            },
             "amenity/pharmacy": {
                 "name": "药房"
             },
@@ -616,19 +741,16 @@
                 "name": "教堂"
             },
             "amenity/place_of_worship/jewish": {
-                "name": "犹太教堂",
-                "terms": "犹太人,犹太教堂"
+                "name": "犹太教堂"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "清真寺",
-                "terms": "穆斯林,清真寺"
+                "name": "清真寺"
             },
             "amenity/police": {
                 "name": "警察局"
             },
             "amenity/post_box": {
-                "name": "邮箱",
-                "terms": "邮件投递,信箱,邮筒,邮箱"
+                "name": "邮箱"
             },
             "amenity/post_office": {
                 "name": "邮局"
@@ -639,9 +761,6 @@
             "amenity/restaurant": {
                 "name": "餐馆"
             },
-            "amenity/school": {
-                "name": "学校"
-            },
             "amenity/swimming_pool": {
                 "name": "游泳池"
             },
@@ -649,24 +768,25 @@
                 "name": "电话"
             },
             "amenity/theatre": {
-                "name": "剧院",
-                "terms": "戏剧,表演,播放,音乐"
+                "name": "剧院"
             },
             "amenity/toilets": {
                 "name": "厕所"
             },
             "amenity/townhall": {
-                "name": "市政府",
-                "terms": "村政厅,市政府,法院,市政建设,市政中心"
+                "name": "市政府"
+            },
+            "amenity/waste_basket": {
+                "name": "垃圾箱"
             },
-            "amenity/university": {
-                "name": "大学"
+            "area": {
+                "name": "面"
             },
             "barrier": {
                 "name": "屏障"
             },
             "barrier/block": {
-                "name": "街区"
+                "name": "障碍物"
             },
             "barrier/bollard": {
                 "name": "短柱"
@@ -677,6 +797,9 @@
             "barrier/city_wall": {
                 "name": "城墙"
             },
+            "barrier/cycle_barrier": {
+                "name": "单车矮栏"
+            },
             "barrier/ditch": {
                 "name": "沟"
             },
@@ -689,12 +812,21 @@
             "barrier/gate": {
                 "name": "门"
             },
+            "barrier/hedge": {
+                "name": "树篱"
+            },
+            "barrier/kissing_gate": {
+                "name": "单人转门"
+            },
             "barrier/lift_gate": {
                 "name": "电梯门"
             },
             "barrier/retaining_wall": {
                 "name": "挡土墙"
             },
+            "barrier/stile": {
+                "name": "梯磴"
+            },
             "barrier/toll_booth": {
                 "name": "收费站"
             },
@@ -710,34 +842,29 @@
             "building/apartments": {
                 "name": "酒店公寓"
             },
-            "building/entrance": {
-                "name": "入口"
-            },
             "building/house": {
                 "name": "房屋"
             },
-            "entrance": {
-                "name": "入口"
+            "emergency/phone": {
+                "name": "紧急电话"
             },
             "highway": {
                 "name": "公路"
             },
             "highway/bridleway": {
-                "name": "马道",
-                "terms": "楼梯"
+                "name": "马道"
             },
             "highway/bus_stop": {
                 "name": "公交车站"
             },
             "highway/crossing": {
-                "name": "路口",
-                "terms": "人行横道,斑马线"
+                "name": "人行横道"
             },
             "highway/cycleway": {
                 "name": "自行车道"
             },
             "highway/footway": {
-                "name": "人行道"
+                "name": "步行径"
             },
             "highway/living_street": {
                 "name": "生活街道"
@@ -748,66 +875,71 @@
             "highway/motorway": {
                 "name": "高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路连接点"
-            },
             "highway/motorway_link": {
-                "name": "高速公路匝道",
-                "terms": "坡道,匝道,出口匝道"
+                "name": "高速公路匝道"
             },
             "highway/path": {
-                "name": "è·¯"
+                "name": "路径"
             },
             "highway/pedestrian": {
-                "name": "行人"
+                "name": "行人专用路"
             },
             "highway/primary": {
                 "name": "主要道路"
             },
             "highway/primary_link": {
-                "name": "主要道路匝道",
-                "terms": "坡道,匝道,出口匝道"
+                "name": "主要道路匝道"
             },
             "highway/residential": {
                 "name": "住宅区道路"
             },
             "highway/road": {
-                "name": "未知道路"
+                "name": "未知种类道路"
             },
             "highway/secondary": {
                 "name": "次要道路"
             },
             "highway/secondary_link": {
-                "name": "次要道路匝道",
-                "terms": "坡道,匝道,出口匝道"
+                "name": "次要道路匝道"
             },
             "highway/service": {
                 "name": "辅助道路"
             },
+            "highway/service/alley": {
+                "name": "胡同"
+            },
+            "highway/service/drive-through": {
+                "name": "驾驶通过以获取服务"
+            },
+            "highway/service/driveway": {
+                "name": "车道"
+            },
+            "highway/service/emergency_access": {
+                "name": "紧急通道"
+            },
+            "highway/service/parking_aisle": {
+                "name": "停车场通道"
+            },
             "highway/steps": {
-                "name": "台阶",
-                "terms": "楼梯"
+                "name": "楼梯"
             },
             "highway/tertiary": {
                 "name": "三级道路"
             },
             "highway/tertiary_link": {
-                "name": "三级道路匝道",
-                "terms": "坡道,匝道,出口匝道"
+                "name": "三级道路匝道"
             },
             "highway/track": {
-                "name": "小路"
+                "name": "未铺设路面的车径"
             },
             "highway/traffic_signals": {
-                "name": "红绿灯",
-                "terms": "灯,刹车灯,交通灯"
+                "name": "红绿灯"
             },
             "highway/trunk": {
                 "name": "干线道路"
             },
             "highway/trunk_link": {
-                "name": "干线道路匝道",
-                "terms": "坡道,匝道,出口匝道"
+                "name": "干线道路匝道"
             },
             "highway/turning_circle": {
                 "name": "环岛"
@@ -831,16 +963,16 @@
                 "name": "纪念馆"
             },
             "historic/monument": {
-                "name": "纪念碑"
+                "name": "古迹"
             },
             "historic/ruins": {
                 "name": "废墟"
             },
             "historic/wayside_cross": {
-                "name": "路边的十字架"
+                "name": "路边十字架"
             },
             "historic/wayside_shrine": {
-                "name": "路边的神社"
+                "name": "路边神社"
             },
             "landuse": {
                 "name": "土地用途"
@@ -854,26 +986,17 @@
             "landuse/cemetery": {
                 "name": "墓地"
             },
-            "landuse/commercial": {
-                "name": "商业区"
-            },
             "landuse/construction": {
                 "name": "建筑物"
             },
-            "landuse/farm": {
-                "name": "农场"
-            },
             "landuse/farmyard": {
-                "name": "农场"
+                "name": "农庄"
             },
             "landuse/forest": {
                 "name": "森林"
             },
             "landuse/grass": {
-                "name": "草坪"
-            },
-            "landuse/industrial": {
-                "name": "工业区"
+                "name": "草地"
             },
             "landuse/meadow": {
                 "name": "牧场"
@@ -882,16 +1005,10 @@
                 "name": "果园"
             },
             "landuse/quarry": {
-                "name": "采石场"
-            },
-            "landuse/residential": {
-                "name": "住宅区"
-            },
-            "landuse/retail": {
-                "name": "零售"
+                "name": "矿场"
             },
             "landuse/vineyard": {
-                "name": "葡萄园"
+                "name": "酒庄"
             },
             "leisure": {
                 "name": "休闲场所"
@@ -926,11 +1043,14 @@
             "leisure/pitch/tennis": {
                 "name": "网球场"
             },
+            "leisure/pitch/volleyball": {
+                "name": "排球场"
+            },
             "leisure/playground": {
-                "name": "运动场"
+                "name": "游乐场"
             },
             "leisure/slipway": {
-                "name": "下水滑道"
+                "name": "船架滑道"
             },
             "leisure/stadium": {
                 "name": "体育场"
@@ -938,8 +1058,17 @@
             "leisure/swimming_pool": {
                 "name": "游泳池"
             },
+            "line": {
+                "name": "线"
+            },
             "man_made": {
-                "name": "人造的"
+                "name": "人造物"
+            },
+            "man_made/breakwater": {
+                "name": "防波堤"
+            },
+            "man_made/cutline": {
+                "name": "山林分界线"
             },
             "man_made/lighthouse": {
                 "name": "灯塔"
@@ -947,21 +1076,26 @@
             "man_made/pier": {
                 "name": "码头"
             },
+            "man_made/pipeline": {
+                "name": "管道"
+            },
             "man_made/survey_point": {
                 "name": "测量点"
             },
+            "man_made/tower": {
+                "name": "塔"
+            },
             "man_made/wastewater_plant": {
-                "name": "废水处理厂",
-                "terms": "污水处理厂,回收厂"
+                "name": "废水处理厂"
             },
             "man_made/water_tower": {
                 "name": "水塔"
             },
             "man_made/water_works": {
-                "name": "自来水公司"
+                "name": "水务设施"
             },
             "natural": {
-                "name": "自然"
+                "name": "自然物件"
             },
             "natural/bay": {
                 "name": "æµ·æ¹¾"
@@ -973,8 +1107,7 @@
                 "name": "悬崖"
             },
             "natural/coastline": {
-                "name": "海岸线",
-                "terms": "岸"
+                "name": "海岸线"
             },
             "natural/glacier": {
                 "name": "冰川"
@@ -1001,12 +1134,10 @@
                 "name": "æ°´"
             },
             "natural/water/lake": {
-                "name": "湖泊",
-                "terms": "小湖,湖"
+                "name": "湖泊"
             },
             "natural/water/pond": {
-                "name": "池塘",
-                "terms": "小湖,贮水池,游泳池"
+                "name": "池塘"
             },
             "natural/water/reservoir": {
                 "name": "水库"
@@ -1020,12 +1151,6 @@
             "office": {
                 "name": "办公室"
             },
-            "other": {
-                "name": "其他"
-            },
-            "other_area": {
-                "name": "其他"
-            },
             "place": {
                 "name": "地点"
             },
@@ -1033,7 +1158,7 @@
                 "name": "城市"
             },
             "place/hamlet": {
-                "name": "小村庄"
+                "name": "村庄"
             },
             "place/island": {
                 "name": "岛屿"
@@ -1042,7 +1167,7 @@
                 "name": "孤立的民房"
             },
             "place/locality": {
-                "name": "位置"
+                "name": "地点（无人定居）"
             },
             "place/town": {
                 "name": "城镇"
@@ -1050,12 +1175,12 @@
             "place/village": {
                 "name": "村庄"
             },
+            "point": {
+                "name": "点"
+            },
             "power": {
                 "name": "电力设施"
             },
-            "power/generator": {
-                "name": "发电厂"
-            },
             "power/line": {
                 "name": "电路线"
             },
@@ -1069,7 +1194,7 @@
                 "name": "高压电塔"
             },
             "power/transformer": {
-                "name": "变压器"
+                "name": "变电所"
             },
             "railway": {
                 "name": "铁路"
@@ -1102,8 +1227,13 @@
                 "name": "地铁口"
             },
             "railway/tram": {
-                "name": "电车",
-                "terms": "电车"
+                "name": "电车"
+            },
+            "relation": {
+                "name": "关系"
+            },
+            "route/ferry": {
+                "name": "渡轮航线"
             },
             "shop": {
                 "name": "商店"
@@ -1118,14 +1248,11 @@
                 "name": "美容店"
             },
             "shop/beverages": {
-                "name": "饮料店"
+                "name": "饮品店"
             },
             "shop/bicycle": {
                 "name": "自行车店"
             },
-            "shop/books": {
-                "name": "书店"
-            },
             "shop/boutique": {
                 "name": "精品店"
             },
@@ -1133,7 +1260,7 @@
                 "name": "肉贩"
             },
             "shop/car": {
-                "name": "汽车经销商"
+                "name": "车行"
             },
             "shop/car_parts": {
                 "name": "汽车配件店"
@@ -1150,9 +1277,6 @@
             "shop/computer": {
                 "name": "电脑店"
             },
-            "shop/confectionery": {
-                "name": "糕饼"
-            },
             "shop/convenience": {
                 "name": "便利店"
             },
@@ -1165,14 +1289,11 @@
             "shop/doityourself": {
                 "name": "DIY商店"
             },
-            "shop/dry_cleaning": {
-                "name": "干洗店"
-            },
             "shop/electronics": {
-                "name": "家电店"
+                "name": "电器店"
             },
             "shop/fishmonger": {
-                "name": "鱼贩"
+                "name": "海产店"
             },
             "shop/florist": {
                 "name": "花店"
@@ -1187,13 +1308,13 @@
                 "name": "礼品店"
             },
             "shop/greengrocer": {
-                "name": "蔬菜水果店"
+                "name": "果蔬店"
             },
             "shop/hairdresser": {
-                "name": "理发师"
+                "name": "理发点"
             },
             "shop/hardware": {
-                "name": "五金商店"
+                "name": "五金店"
             },
             "shop/hifi": {
                 "name": "音响店"
@@ -1201,33 +1322,24 @@
             "shop/jewelry": {
                 "name": "珠宝店"
             },
-            "shop/kiosk": {
-                "name": "报刊亭"
-            },
             "shop/laundry": {
                 "name": "洗衣店"
             },
             "shop/mall": {
-                "name": "购物中心"
+                "name": "商场"
             },
             "shop/mobile_phone": {
                 "name": "手机店"
             },
             "shop/motorcycle": {
-                "name": "摩托车经销商"
+                "name": "摩托车行"
             },
             "shop/music": {
                 "name": "音乐店"
             },
-            "shop/newsagent": {
-                "name": "书报"
-            },
             "shop/optician": {
                 "name": "眼镜店"
             },
-            "shop/outdoor": {
-                "name": "户外店"
-            },
             "shop/pet": {
                 "name": "宠物店"
             },
@@ -1262,7 +1374,7 @@
                 "name": "影像店"
             },
             "tourism": {
-                "name": "旅游业"
+                "name": "旅游设施"
             },
             "tourism/alpine_hut": {
                 "name": "高山小屋"
@@ -1283,8 +1395,7 @@
                 "name": "木屋"
             },
             "tourism/guest_house": {
-                "name": "宾馆",
-                "terms": "床和早餐,民宿"
+                "name": "宾馆"
             },
             "tourism/hostel": {
                 "name": "招待所"
@@ -1293,7 +1404,7 @@
                 "name": "旅馆"
             },
             "tourism/information": {
-                "name": "信息板"
+                "name": "资讯"
             },
             "tourism/motel": {
                 "name": "汽车旅馆"
@@ -1313,6 +1424,51 @@
             "tourism/zoo": {
                 "name": "动物园"
             },
+            "type/boundary": {
+                "name": "边界"
+            },
+            "type/multipolygon": {
+                "name": "复线段多边形"
+            },
+            "type/restriction": {
+                "name": "限制"
+            },
+            "type/route": {
+                "name": "路线"
+            },
+            "type/route/bicycle": {
+                "name": "单车路线"
+            },
+            "type/route/bus": {
+                "name": "公共汽车路线"
+            },
+            "type/route/detour": {
+                "name": "绕道路线"
+            },
+            "type/route/ferry": {
+                "name": "渡轮航线"
+            },
+            "type/route/foot": {
+                "name": "步行路线"
+            },
+            "type/route/pipeline": {
+                "name": "管道路线"
+            },
+            "type/route/power": {
+                "name": "供电路线"
+            },
+            "type/route/road": {
+                "name": "道路路线"
+            },
+            "type/route/train": {
+                "name": "铁路路线"
+            },
+            "type/route/tram": {
+                "name": "电车路线"
+            },
+            "vertex": {
+                "name": "其他"
+            },
             "waterway": {
                 "name": "航道"
             },