X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2f6165e040dff4231922a4d631085b6591d3b746..a3eb48385bcf1465339d473c0c1657e075cd507d:/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 8cb1ec929..db5631334 100644
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -71,7 +71,8 @@
                 "line": "环形化线。",
                 "area": "环形化区域。"
             },
-            "not_closed": "它不是闭合的环形，无法圆形化。"
+            "not_closed": "它不是闭合的环形，无法圆形化。",
+            "too_large": "因为可见部分不足，不能变成圆形。"
         },
         "orthogonalize": {
             "title": "直角化",
@@ -84,7 +85,8 @@
                 "line": "拉直线上角的边。",
                 "area": "已将区域的弯角换成直角。"
             },
-            "not_squarish": "因为它不是近似方形的，这不能被直角化。"
+            "not_squarish": "因为它不是近似方形的，这不能被直角化。",
+            "too_large": "因为可见部分不足，不能变成方形。"
         },
         "straighten": {
             "title": "拉直",
@@ -95,7 +97,7 @@
         },
         "delete": {
             "title": "删除",
-            "description": "从地图上删除。",
+            "description": "彻底删除对象。",
             "annotation": {
                 "point": "删除点。",
                 "vertex": "删除路径上的节点。",
@@ -148,7 +150,8 @@
                 "area": "移动区域。",
                 "multiple": "移动多个对象。"
             },
-            "incomplete_relation": "该特征还没有下载完整，无法移动。"
+            "incomplete_relation": "该特征还没有下载完整，无法移动。",
+            "too_large": "因为可见部分不足，不能移动。"
         },
         "rotate": {
             "title": "旋转",
@@ -157,7 +160,8 @@
             "annotation": {
                 "line": "旋转线。",
                 "area": "旋转区域。"
-            }
+            },
+            "too_large": "因为可见部分不足，不能旋转。"
         },
         "reverse": {
             "title": "反转",
@@ -180,6 +184,18 @@
             },
             "not_eligible": "不能在线段的首尾进行分割。",
             "multiple_ways": "太多线段，未能进行分割。"
+        },
+        "restriction": {
+            "help": {
+                "select": "单击以选中一条路。",
+                "toggle": "点击切换转向限制。",
+                "toggle_on": "单击以添加一个\"{restriction}\"限制。",
+                "toggle_off": "单击以删除一个\"{restriction}\"限制。"
+            },
+            "annotation": {
+                "create": "增加一个转向限制",
+                "delete": "删除一个转向限制"
+            }
         }
     },
     "undo": {
@@ -266,6 +282,7 @@
         "none": "空",
         "custom": "自定义",
         "custom_button": "编辑自定义背景",
+        "custom_prompt": "输入瓦片模板。Z/X/Y方案的有效标记是{z}，{x}，{y}，quadtile方案的有效标记是{u}。",
         "fix_misalignment": "修复对齐",
         "reset": "重置"
     },
@@ -317,7 +334,9 @@
         "untagged_area": "未标记的区域",
         "many_deletions": "您正在删除 {n} 个对象，您确定要这么做吗？这将会把它们从大家所见的 openstreetmap.org 地图上删除。",
         "tag_suggests_area": "标签{tag}表明线应该为区域，但它不是区域",
-        "untagged_tooltip": "选择一个用来描述{geometry}的要输类型。",
+        "untagged_point_tooltip": "选择该点的特征类型。",
+        "untagged_line_tooltip": "选择描述这条线的特征类型。",
+        "untagged_area_tooltip": "选择描述这块区域的特征类型。",
         "deprecated_tags": "弃用标签：{tags}"
     },
     "zoom": {
@@ -366,7 +385,6 @@
         },
         "areas": {
             "title": "区域",
-            "add": "区域能较详细地代表物件，提供该物件的边界资料。大部份以点可以代表的物件类别，都可以用区域代表，而后者往往更为适合。 **点击「区域」按钮，以新增一个区域**",
             "corner": "通过将节点放到面的边界上，可绘制面。 **将起始节点置于游乐场的其中一角**",
             "place": "放置更多节点可绘制区域。点击开始节点即可完成绘制。**在沙盒绘制一个区域。**",
             "search": "**搜索'{name}'。**",
@@ -409,6 +427,9 @@
             "category-rail": {
                 "name": "铁轨"
             },
+            "category-restriction": {
+                "name": "限制"
+            },
             "category-road": {
                 "name": "道路"
             },
@@ -461,15 +482,28 @@
                 }
             },
             "access_simple": {
-                "label": "通行限制"
+                "label": "通行限制",
+                "placeholder": "是"
+            },
+            "access_toilets": {
+                "label": "连接"
             },
             "address": {
                 "label": "地址",
                 "placeholders": {
-                    "number": "123号",
+                    "housename": "房屋名称",
+                    "housenumber": "123号",
                     "street": "街道",
                     "city": "城市",
-                    "postcode": "邮政编码"
+                    "postcode": "邮政编码",
+                    "place": "地方",
+                    "hamlet": "村庄",
+                    "suburb": "地区",
+                    "subdistrict": "街道",
+                    "district": "行政区",
+                    "province": "行政省",
+                    "state": "行政州",
+                    "country": "国家"
                 }
             },
             "admin_level": {
@@ -478,6 +512,17 @@
             "aerialway": {
                 "label": "类型"
             },
+            "aerialway/access": {
+                "label": "通行限制",
+                "options": {
+                    "entry": "入口",
+                    "exit": "出口",
+                    "both": "双向"
+                }
+            },
+            "aerialway/bubble": {
+                "label": "圆形顶"
+            },
             "aerialway/capacity": {
                 "label": "容量(每小时)",
                 "placeholder": "500, 2500, 5000..."
@@ -486,9 +531,21 @@
                 "label": "持续时间(分钟)",
                 "placeholder": "1, 2, 3..."
             },
+            "aerialway/heating": {
+                "label": "暖气"
+            },
             "aerialway/occupancy": {
+                "label": "载客数",
                 "placeholder": "2, 4, 8..."
             },
+            "aerialway/summer/access": {
+                "label": "通行方向（夏季）",
+                "options": {
+                    "entry": "入口",
+                    "exit": "出口",
+                    "both": "双方"
+                }
+            },
             "aeroway": {
                 "label": "类型"
             },
@@ -527,7 +584,18 @@
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
-                "label": "方向"
+                "label": "方向",
+                "options": {
+                    "N": "北",
+                    "E": "东",
+                    "S": "南",
+                    "W": "西",
+                    "NE": "东北",
+                    "SE": "东南",
+                    "SW": "西南",
+                    "NW": "西北",
+                    "NNE": "东北偏北"
+                }
             },
             "clock_direction": {
                 "label": "方向",
@@ -548,6 +616,9 @@
             "covered": {
                 "label": "覆盖"
             },
+            "crop": {
+                "label": "庄稼"
+            },
             "crossing": {
                 "label": "类型"
             },
@@ -564,7 +635,14 @@
                 "label": "说明"
             },
             "electrified": {
-                "label": "电气化"
+                "label": "电气化",
+                "placeholder": "接触线、电气化铁路…",
+                "options": {
+                    "contact_line": "接触线",
+                    "rail": "电气化铁路",
+                    "yes": "是(未指明)",
+                    "no": "否"
+                }
             },
             "elevation": {
                 "label": "海拔"
@@ -575,6 +653,9 @@
             "entrance": {
                 "label": "类型"
             },
+            "except": {
+                "label": "异常"
+            },
             "fax": {
                 "label": "传真",
                 "placeholder": "+31 42 123 4567"
@@ -583,11 +664,47 @@
                 "label": "费用"
             },
             "fire_hydrant/type": {
-                "label": "类型"
+                "label": "类型",
+                "options": {
+                    "pillar": "支柱/地上",
+                    "underground": "地铁",
+                    "wall": "墙",
+                    "pond": "池塘"
+                }
             },
             "fixme": {
                 "label": "修复我"
             },
+            "fuel": {
+                "label": "油站"
+            },
+            "fuel/biodiesel": {
+                "label": "销售生物柴油"
+            },
+            "fuel/diesel": {
+                "label": "销售柴油"
+            },
+            "fuel/e10": {
+                "label": "销售E10"
+            },
+            "fuel/e85": {
+                "label": "销售E85"
+            },
+            "fuel/lpg": {
+                "label": "销售丙烷"
+            },
+            "fuel/octane_100": {
+                "label": "销售赛车汽油"
+            },
+            "fuel/octane_91": {
+                "label": "销售普通汽油"
+            },
+            "fuel/octane_95": {
+                "label": "销售中等汽油"
+            },
+            "fuel/octane_98": {
+                "label": "销售高级汽油"
+            },
             "gauge": {
                 "label": "轨距"
             },
@@ -605,6 +722,7 @@
                 "placeholder": "球洞编号（1-18）"
             },
             "handicap": {
+                "label": "手工店",
                 "placeholder": "1-18"
             },
             "highway": {
@@ -614,6 +732,7 @@
                 "label": "类型"
             },
             "hoops": {
+                "label": "篮球",
                 "placeholder": "1, 2, 4..."
             },
             "iata": {
@@ -631,11 +750,16 @@
             "internet_access": {
                 "label": "互联网接入",
                 "options": {
+                    "yes": "是",
+                    "no": "否",
                     "wlan": "Wi-Fi",
                     "wired": "有线网络",
                     "terminal": "终端"
                 }
             },
+            "lamp_type": {
+                "label": "类型"
+            },
             "landuse": {
                 "label": "类型"
             },
@@ -649,6 +773,9 @@
             "leisure": {
                 "label": "类型"
             },
+            "length": {
+                "label": "高度(米)"
+            },
             "levels": {
                 "label": "层次",
                 "placeholder": "2, 4, 6..."
@@ -666,6 +793,20 @@
                 "label": "速度限制",
                 "placeholder": "40, 50, 60..."
             },
+            "mtb/scale": {
+                "label": "登山車难度",
+                "placeholder": "0, 1, 2, 3..."
+            },
+            "mtb/scale/imba": {
+                "placeholder": "简单,中等,困难...",
+                "options": {
+                    "0": "最简单的(白色圆圈)"
+                }
+            },
+            "mtb/scale/uphill": {
+                "label": "山地自行车上坡难度",
+                "placeholder": "0, 1, 2, 3..."
+            },
             "name": {
                 "label": "名称",
                 "placeholder": "常用名称（如果有）"
@@ -683,10 +824,20 @@
                 "label": "类型"
             },
             "oneway": {
-                "label": "单行线"
+                "label": "单行线",
+                "options": {
+                    "undefined": "假定为否",
+                    "yes": "是",
+                    "no": "否"
+                }
             },
             "oneway_yes": {
-                "label": "单行线"
+                "label": "单行线",
+                "options": {
+                    "undefined": "假定为是",
+                    "yes": "是",
+                    "no": "否"
+                }
             },
             "opening_hours": {
                 "label": "开放时间"
@@ -695,33 +846,70 @@
                 "label": "经营者"
             },
             "par": {
+                "label": "标准杆",
                 "placeholder": "3, 4, 5..."
             },
             "park_ride": {
                 "label": "停车换乘"
             },
             "parking": {
-                "label": "类型"
+                "label": "类型",
+                "options": {
+                    "surface": "地面",
+                    "multi-storey": "多晨",
+                    "underground": "地下",
+                    "sheds": "单独车库",
+                    "carports": "车棚",
+                    "lane": "路边"
+                }
             },
             "phone": {
                 "label": "电话",
                 "placeholder": "+31 42 123 4567"
             },
             "piste/difficulty": {
-                "label": "困难"
+                "label": "困难",
+                "options": {
+                    "advanced": "高级(黑钻)"
+                }
+            },
+            "piste/grooming": {
+                "options": {
+                    "skating": "滑冰"
+                }
             },
             "piste/type": {
-                "label": "类型"
+                "label": "类型",
+                "options": {
+                    "downhill": "下坡",
+                    "ice_skate": "滑冰",
+                    "playground": "操场"
+                }
             },
             "place": {
                 "label": "类型"
             },
+            "population": {
+                "label": "人口"
+            },
             "power": {
                 "label": "类型"
             },
             "railway": {
                 "label": "类型"
             },
+            "recycling/cans": {
+                "label": "接受铝管回收"
+            },
+            "recycling/clothes": {
+                "label": "接受衣物回收"
+            },
+            "recycling/glass": {
+                "label": "接受玻璃回收"
+            },
+            "recycling/paper": {
+                "label": "接受纸张回收"
+            },
             "ref": {
                 "label": "参考"
             },
@@ -729,20 +917,14 @@
                 "label": "类型"
             },
             "religion": {
-                "label": "宗教",
-                "options": {
-                    "christian": "基督教",
-                    "muslim": "伊斯兰教",
-                    "buddhist": "佛教",
-                    "jewish": "犹太教",
-                    "hindu": "印度教",
-                    "shinto": "神道教",
-                    "taoist": "道教"
-                }
+                "label": "宗教"
             },
             "restriction": {
                 "label": "类型"
             },
+            "restrictions": {
+                "label": "转向限制"
+            },
             "route": {
                 "label": "类型"
             },
@@ -750,7 +932,11 @@
                 "label": "类型"
             },
             "sac_scale": {
-                "label": "行径难度"
+                "label": "远足难度",
+                "placeholder": "高山远足"
+            },
+            "seasonal": {
+                "label": "具备季节性"
             },
             "service": {
                 "label": "类型"
@@ -765,7 +951,19 @@
                 "label": "类型"
             },
             "smoking": {
-                "label": "吸烟"
+                "label": "吸烟",
+                "placeholder": "禁止、隔开、允许...",
+                "options": {
+                    "no": "禁止吸烟",
+                    "separated": "指定区域可使用（布隔开）",
+                    "isolated": "指定区域可使用（隔开）",
+                    "outside": "外面可使用",
+                    "yes": "随处可使用",
+                    "dedicated": "吸烟专用"
+                }
+            },
+            "social_facility_for": {
+                "placeholder": "无家可归者，残疾人，儿童等"
             },
             "source": {
                 "label": "来源"
@@ -804,9 +1002,6 @@
             "towertype": {
                 "label": "塔型"
             },
-            "tracktype": {
-                "label": "类型"
-            },
             "trail_visibility": {
                 "label": "路径可见度"
             },
@@ -838,6 +1033,9 @@
             "wheelchair": {
                 "label": "轮椅通道"
             },
+            "width": {
+                "label": "宽度(米)"
+            },
             "wikipedia": {
                 "label": "维基百科"
             },
@@ -857,6 +1055,9 @@
             "aerialway/cable_car": {
                 "name": "缆车"
             },
+            "aerialway/chair_lift": {
+                "name": "登山吊椅"
+            },
             "aerialway/pylon": {
                 "name": "缆车塔",
                 "terms": "缆车塔"
@@ -921,6 +1122,9 @@
                 "name": "酒吧",
                 "terms": "酒吧"
             },
+            "amenity/bbq": {
+                "name": "烧烤设施"
+            },
             "amenity/bench": {
                 "name": "长椅",
                 "terms": "长椅,长凳"
@@ -937,6 +1141,12 @@
                 "name": "船舶租赁处",
                 "terms": "船舶租赁处"
             },
+            "amenity/bureau_de_change": {
+                "name": "货币兑换"
+            },
+            "amenity/bus_station": {
+                "name": "公交车站"
+            },
             "amenity/cafe": {
                 "name": "咖啡馆",
                 "terms": "咖啡厅,茶座,小餐馆,咖啡,小餐厅"
@@ -953,9 +1163,9 @@
                 "name": "洗车",
                 "terms": "洗车店,洗车"
             },
-            "amenity/childcare": {
-                "name": "托儿所",
-                "terms": "托儿所"
+            "amenity/charging_station": {
+                "name": "充电站",
+                "terms": "充电站"
             },
             "amenity/cinema": {
                 "name": "电影院",
@@ -969,9 +1179,8 @@
                 "name": "时钟",
                 "terms": "时钟,钟表,钟"
             },
-            "amenity/college": {
-                "name": "学院",
-                "terms": "学院,书院,专科学院"
+            "amenity/compressed_air": {
+                "name": "压缩空气"
             },
             "amenity/courthouse": {
                 "name": "法院",
@@ -985,6 +1194,10 @@
                 "name": "医生办公室",
                 "terms": "医生"
             },
+            "amenity/dojo": {
+                "name": "Dojo /武术学院",
+                "terms": "Dojo /武术学院"
+            },
             "amenity/drinking_water": {
                 "name": "饮水处",
                 "terms": "饮水处,饮水处,饮水"
@@ -1016,9 +1229,6 @@
             "amenity/hospital": {
                 "name": "医院"
             },
-            "amenity/kindergarten": {
-                "name": "幼儿园"
-            },
             "amenity/library": {
                 "name": "图书馆",
                 "terms": "图书馆"
@@ -1035,6 +1245,9 @@
                 "name": "停车场",
                 "terms": "停车"
             },
+            "amenity/parking_entrance": {
+                "name": "停车场入口/出口"
+            },
             "amenity/pharmacy": {
                 "name": "药店",
                 "terms": "药房,药店"
@@ -1080,11 +1293,12 @@
                 "terms": "野郊访客处"
             },
             "amenity/recycling": {
+                "name": "资源回收设施",
                 "terms": "回收,循环利用,再造"
             },
             "amenity/restaurant": {
                 "name": "餐馆",
-                "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼"
+                "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼,美食"
             },
             "amenity/school": {
                 "name": "学校"
@@ -1093,6 +1307,15 @@
                 "name": "亭",
                 "terms": "棚,棚屋"
             },
+            "amenity/social_facility": {
+                "name": "社会服务设施"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "食品银行"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "流浪者庇护站"
+            },
             "amenity/studio": {
                 "name": "工作室",
                 "terms": "工作室"
@@ -1121,10 +1344,6 @@
                 "name": "市政府",
                 "terms": "市政府,市政厅,大会堂"
             },
-            "amenity/university": {
-                "name": "大学",
-                "terms": "大学"
-            },
             "amenity/vending_machine": {
                 "name": "售卖机",
                 "terms": "售卖机"
@@ -1236,6 +1455,16 @@
             "building/construction": {
                 "name": "在建建筑"
             },
+            "building/detached": {
+                "name": "连体屋"
+            },
+            "building/dormitory": {
+                "name": "宿舍"
+            },
+            "building/entrance": {
+                "name": "入口/出口",
+                "terms": "入口/出口,出入口"
+            },
             "building/garage": {
                 "name": "车库",
                 "terms": "车库"
@@ -1246,6 +1475,12 @@
             "building/greenhouse": {
                 "name": "温室"
             },
+            "building/hospital": {
+                "name": "医院大楼"
+            },
+            "building/hotel": {
+                "name": "宾馆楼"
+            },
             "building/house": {
                 "name": "房屋",
                 "terms": "房屋"
@@ -1258,10 +1493,16 @@
                 "name": "工业建筑物",
                 "terms": "工业建筑物"
             },
+            "building/public": {
+                "name": "公共建筑"
+            },
             "building/residential": {
                 "name": "住宅建筑物",
                 "terms": "住宅建筑物"
             },
+            "building/retail": {
+                "name": "商业建筑"
+            },
             "building/roof": {
                 "name": "楼顶",
                 "terms": "楼顶,房顶"
@@ -1288,6 +1529,9 @@
             "craft/blacksmith": {
                 "name": "铁匠"
             },
+            "craft/boatbuilder": {
+                "name": "制船"
+            },
             "craft/bookbinder": {
                 "name": "装订工人",
                 "terms": "书籍钉装员,装订商,装订工,钉书匠"
@@ -1296,18 +1540,114 @@
                 "name": "酿酒厂",
                 "terms": "酒厂,酿酒厂,酒坊"
             },
+            "craft/carpenter": {
+                "name": "木匠"
+            },
+            "craft/carpet_layer": {
+                "name": "铺地毯的人"
+            },
+            "craft/caterer": {
+                "name": "酒席承办人"
+            },
+            "craft/clockmaker": {
+                "name": "钟表匠"
+            },
+            "craft/confectionary": {
+                "name": "糖果店"
+            },
+            "craft/dressmaker": {
+                "name": "女装裁缝"
+            },
+            "craft/electrician": {
+                "name": "电工"
+            },
+            "craft/gardener": {
+                "name": "园艺工"
+            },
+            "craft/glaziery": {
+                "name": "装玻璃的人"
+            },
+            "craft/handicraft": {
+                "name": "手工匠"
+            },
+            "craft/hvac": {
+                "name": "高压交流电"
+            },
+            "craft/insulator": {
+                "name": "绝缘体"
+            },
+            "craft/jeweler": {
+                "name": "珠宝店"
+            },
+            "craft/key_cutter": {
+                "name": "切割钥匙（配匙）"
+            },
+            "craft/locksmith": {
+                "name": "锁匠"
+            },
+            "craft/optician": {
+                "name": "眼镜店"
+            },
+            "craft/painter": {
+                "name": "油漆匠"
+            },
+            "craft/photographer": {
+                "name": "照相店"
+            },
+            "craft/photographic_laboratory": {
+                "name": "照片冲洗店"
+            },
+            "craft/plasterer": {
+                "name": "泥水匠"
+            },
+            "craft/plumber": {
+                "name": "管道工"
+            },
             "craft/pottery": {
                 "name": "陶器场",
                 "terms": "陶器场"
             },
+            "craft/rigger": {
+                "name": "装配工"
+            },
+            "craft/roofer": {
+                "name": "盖屋顶的人"
+            },
+            "craft/saddler": {
+                "name": "造马鞍的人"
+            },
+            "craft/sailmaker": {
+                "name": "修帆的人"
+            },
             "craft/sawmill": {
                 "name": "锯木厂",
                 "terms": "锯木厂"
             },
+            "craft/scaffolder": {
+                "name": "搭脚手架的人"
+            },
+            "craft/sculpter": {
+                "name": "雕刻师"
+            },
+            "craft/shoemaker": {
+                "name": "制鞋店"
+            },
+            "craft/stonemason": {
+                "name": "石匠"
+            },
+            "craft/sweep": {
+                "name": "扫烟囱的人"
+            },
             "craft/tailor": {
                 "name": "裁缝",
                 "terms": "裁缝"
             },
+            "craft/tiler": {
+                "name": "砖瓦匠"
+            },
+            "craft/tinsmith": {
+                "name": "锡制品手工店"
+            },
             "craft/upholsterer": {
                 "name": "室内装潢",
                 "terms": "室内装潢,室内设计,室内装饰"
@@ -1316,6 +1656,9 @@
                 "name": "制表商",
                 "terms": "钟表制作,制表商,钟表匠"
             },
+            "craft/window_construction": {
+                "name": "窗户修理店"
+            },
             "embankment": {
                 "name": "堤坝",
                 "terms": "堤,堤坝,堤岸"
@@ -1332,14 +1675,28 @@
                 "name": "紧急电话",
                 "terms": "紧急电话"
             },
+            "entrance": {
+                "name": "入口/出口",
+                "terms": "入口/出口,出入口"
+            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "路口"
             },
+            "footway/crosswalk": {
+                "name": "人行横道",
+                "terms": "人行横道"
+            },
             "footway/sidewalk": {
                 "name": "人行道",
                 "terms": "人行道,便道,走道"
             },
+            "ford": {
+                "name": "浅滩"
+            },
+            "golf/bunker": {
+                "name": "沙坑"
+            },
             "golf/fairway": {
                 "name": "高尔夫球道",
                 "terms": "球道,高尔夫球道"
@@ -1351,6 +1708,9 @@
             "golf/hole": {
                 "name": "高尔夫球洞"
             },
+            "golf/rough": {
+                "name": "深草区"
+            },
             "golf/tee": {
                 "name": "开球区",
                 "terms": "开球区,发球台"
@@ -1374,6 +1734,10 @@
                 "name": "路口",
                 "terms": "路口"
             },
+            "highway/crosswalk": {
+                "name": "人行横道",
+                "terms": "人行横道"
+            },
             "highway/cycleway": {
                 "name": "自行车道",
                 "terms": "自行车,单车"
@@ -1395,8 +1759,8 @@
                 "terms": "高速公路"
             },
             "highway/motorway_junction": {
-                "name": "高速公路连接点",
-                "terms": "高速公路连接点"
+                "name": "高速公路交界处/出口",
+                "terms": "高速公路交界处/出口,入口/出口,出入口"
             },
             "highway/motorway_link": {
                 "name": "高速公路匝道",
@@ -1474,6 +1838,9 @@
                 "name": "停车标志",
                 "terms": "停车标志"
             },
+            "highway/street_lamp": {
+                "name": "街灯"
+            },
             "highway/tertiary": {
                 "name": "三级道路",
                 "terms": "三级道路"
@@ -1558,6 +1925,10 @@
                 "name": "墓地",
                 "terms": "墓地"
             },
+            "landuse/churchyard": {
+                "name": "墓地",
+                "terms": "墓地"
+            },
             "landuse/commercial": {
                 "name": "商业区",
                 "terms": "商业区"
@@ -1590,10 +1961,17 @@
                 "name": "工业区",
                 "terms": "工业区"
             },
+            "landuse/landfill": {
+                "name": "垃圾填埋区"
+            },
             "landuse/meadow": {
                 "name": "草地",
                 "terms": "牧场"
             },
+            "landuse/military": {
+                "name": "军事",
+                "terms": "军事,军队,军事区"
+            },
             "landuse/orchard": {
                 "name": "果园",
                 "terms": "果园"
@@ -1626,6 +2004,9 @@
                 "name": "狗公园",
                 "terms": "狗公园"
             },
+            "leisure/firepit": {
+                "name": "火炉"
+            },
             "leisure/garden": {
                 "name": "花园",
                 "terms": "花园"
@@ -1690,8 +2071,8 @@
                 "terms": "船台"
             },
             "leisure/sports_center": {
-                "name": "体育,体育中心",
-                "terms": "体育中心"
+                "name": "体育中心/健身中心",
+                "terms": "体育中心,健身中心"
             },
             "leisure/stadium": {
                 "name": "体育场",
@@ -1701,10 +2082,6 @@
                 "name": "游泳池",
                 "terms": "游泳池"
             },
-            "leisure/track": {
-                "name": "赛车跑道",
-                "terms": "赛车跑道"
-            },
             "line": {
                 "name": "线",
                 "terms": "线"
@@ -1761,10 +2138,6 @@
                 "name": "水塔",
                 "terms": "水塔"
             },
-            "man_made/water_well": {
-                "name": "水井",
-                "terms": "水井"
-            },
             "man_made/water_works": {
                 "name": "供水厂",
                 "terms": "供水厂"
@@ -1949,6 +2322,9 @@
                 "name": "旅行社",
                 "terms": "旅行社"
             },
+            "piste": {
+                "name": "滑雪道"
+            },
             "place": {
                 "name": "地点",
                 "terms": "地点"
@@ -1973,6 +2349,14 @@
                 "name": "地方",
                 "terms": "地方,地点"
             },
+            "place/neighbourhood": {
+                "name": "街坊",
+                "terms": "社区,街坊"
+            },
+            "place/suburb": {
+                "name": "区",
+                "terms": "区"
+            },
             "place/town": {
                 "name": "城镇",
                 "terms": "城镇"
@@ -2113,9 +2497,8 @@
                 "name": "自行车店",
                 "terms": "自行车,单车"
             },
-            "shop/books": {
-                "name": "书店",
-                "terms": "书店"
+            "shop/bookmaker": {
+                "name": "书商"
             },
             "shop/boutique": {
                 "name": "精品店",
@@ -2149,10 +2532,6 @@
                 "name": "电脑店",
                 "terms": "电脑店"
             },
-            "shop/confectionery": {
-                "name": "糖果店",
-                "terms": "甜点店"
-            },
             "shop/convenience": {
                 "name": "便利店",
                 "terms": "便利店"
@@ -2169,10 +2548,6 @@
                 "name": "DIY店",
                 "terms": "DIY商店"
             },
-            "shop/dry_cleaning": {
-                "name": "干洗店",
-                "terms": "干洗店"
-            },
             "shop/electronics": {
                 "name": "电器店",
                 "terms": "电器店"
@@ -2189,6 +2564,9 @@
                 "name": "花店",
                 "terms": "花店"
             },
+            "shop/funeral_directors": {
+                "name": "墓园"
+            },
             "shop/furniture": {
                 "name": "家具店",
                 "terms": "家具店"
@@ -2221,10 +2599,6 @@
                 "name": "珠宝店",
                 "terms": "珠宝店"
             },
-            "shop/kiosk": {
-                "name": "报刊亭",
-                "terms": "报刊亭"
-            },
             "shop/laundry": {
                 "name": "洗衣店",
                 "terms": "洗衣店"
@@ -2252,18 +2626,10 @@
                 "name": "音乐店",
                 "terms": "音乐店"
             },
-            "shop/newsagent": {
-                "name": "报摊",
-                "terms": "报摊"
-            },
             "shop/optician": {
                 "name": "眼镜店",
                 "terms": "眼镜店"
             },
-            "shop/outdoor": {
-                "name": "户外用品店",
-                "terms": "户外用品店"
-            },
             "shop/pet": {
                 "name": "宠物店",
                 "terms": "宠物店"
@@ -2291,6 +2657,9 @@
                 "name": "超市",
                 "terms": "超级市场"
             },
+            "shop/tailor": {
+                "name": "裁缝"
+            },
             "shop/toys": {
                 "name": "玩具店",
                 "terms": "玩具店"
@@ -2315,6 +2684,10 @@
                 "name": "影像店",
                 "terms": "影像店"
             },
+            "shop/wine": {
+                "name": "酒店",
+                "terms": "酒店,酒楼,酒坊"
+            },
             "tourism": {
                 "name": "旅行",
                 "terms": "旅行"
@@ -2352,8 +2725,8 @@
                 "terms": "招待所"
             },
             "tourism/hotel": {
-                "name": "酒店",
-                "terms": "酒店"
+                "name": "宾馆",
+                "terms": "宾馆,酒店,旅馆"
             },
             "tourism/information": {
                 "name": "信息",
@@ -2399,6 +2772,34 @@
                 "name": "限制",
                 "terms": "限制"
             },
+            "type/restriction/no_left_turn": {
+                "name": "禁止左转弯",
+                "terms": "禁止左转弯"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "禁止右转弯",
+                "terms": "禁止右转弯"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "禁止直行",
+                "terms": "禁止直行"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "禁止掉头",
+                "terms": "禁止掉头"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "只左转",
+                "terms": "只左转"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "只右转",
+                "terms": "只右转"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "禁止转向",
+                "terms": "禁止转向"
+            },
             "type/route": {
                 "name": "线路",
                 "terms": "路线,路径"