X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cb43e6af9eb0b6356542607b8d71d0a98db0fb4c..90175c3bdbc1b25eab177dc2d019b86d2854f9a7:/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 e070f815c..81917acd2 100644
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -240,7 +240,6 @@
     },
     "commit": {
         "title": "保存变更",
-        "description_placeholder": "简单说明你的贡献。",
         "message_label": "修改集合注释",
         "upload_explanation": "你的修改将会在所有使用OpenStreetMap的数据的地图上看得见。",
         "upload_explanation_with_user": "{user}，你的修改将会在所有使用OpenStreetMap数据的地图上展现。",
@@ -324,7 +323,6 @@
         "custom": "自定义",
         "custom_button": "编辑自定义背景",
         "custom_prompt": "输入瓦片模板。Z/X/Y方案的有效标记是{z}，{x}，{y}，quadtile方案的有效标记是{u}。",
-        "fix_misalignment": "修复对齐",
         "reset": "重置",
         "minimap": {
             "description": "小地图",
@@ -344,14 +342,6 @@
             "description": "点",
             "tooltip": "兴趣点(POI)"
         },
-        "major_roads": {
-            "description": "主要道路",
-            "tooltip": "公路，街道等。"
-        },
-        "minor_roads": {
-            "description": "次要道路",
-            "tooltip": "辅助道路，停车场通道，土路等。"
-        },
         "paths": {
             "description": "小路",
             "tooltip": "人行道，步行道路，自行车道等。"
@@ -447,8 +437,7 @@
         "view_on_osm": "在 OSM 上查看",
         "facebook": "分享到Facebook",
         "twitter": "分享到 Twitter",
-        "google": "分享到 Google+",
-        "help_html": "你的更新应该在几分钟后出现在“标准”图层上。其他图层和某些功能，可能需要更长的时间\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>详情</a>).\n"
+        "google": "分享到 Google+"
     },
     "confirm": {
         "okay": "确定",
@@ -494,8 +483,6 @@
         "browse": "浏览GPX文件"
     },
     "mapillary": {
-        "tooltip": "Mapillary的街道照片",
-        "title": "照片叠加层(Mapillary)",
         "view_on_mapillary": "在Mapillary上查看这张图片"
     },
     "help": {
@@ -593,35 +580,11 @@
     },
     "presets": {
         "categories": {
-            "category-building": {
-                "name": "建筑物"
-            },
-            "category-golf": {
-                "name": "高尔夫球"
-            },
-            "category-landuse": {
-                "name": "土地使用"
-            },
-            "category-path": {
-                "name": "小径"
-            },
-            "category-rail": {
-                "name": "铁轨"
-            },
-            "category-restriction": {
-                "name": "限制"
-            },
-            "category-road": {
-                "name": "道路"
-            },
-            "category-route": {
-                "name": "线路"
-            },
             "category-water-area": {
-                "name": "æ°´"
+                "name": "水体特征"
             },
             "category-water-line": {
-                "name": "æ°´"
+                "name": "水体特征"
             }
         },
         "fields": {
@@ -936,33 +899,6 @@
             "fuel": {
                 "label": "油站"
             },
-            "fuel/biodiesel": {
-                "label": "销售生物柴油"
-            },
-            "fuel/diesel": {
-                "label": "销售柴油"
-            },
-            "fuel/e10": {
-                "label": "销售E10"
-            },
-            "fuel/e85": {
-                "label": "销售E85"
-            },
-            "fuel/lpg": {
-                "label": "销售丙烷"
-            },
-            "fuel/octane_100": {
-                "label": "销售赛车汽油"
-            },
-            "fuel/octane_91": {
-                "label": "销售普通汽油"
-            },
-            "fuel/octane_95": {
-                "label": "销售中等汽油"
-            },
-            "fuel/octane_98": {
-                "label": "销售高级汽油"
-            },
             "gauge": {
                 "label": "轨距"
             },
@@ -1262,31 +1198,6 @@
             "railway": {
                 "label": "类型"
             },
-            "recycling/cans": {
-                "label": "接受铝管回收"
-            },
-            "recycling/clothes": {
-                "label": "接受衣物回收"
-            },
-            "recycling/glass": {
-                "label": "接受玻璃回收"
-            },
-            "recycling/glass_bottles": {
-                "label": "接受玻璃瓶回收"
-            },
-            "recycling/paper": {
-                "label": "接受纸张回收"
-            },
-            "recycling/plastic": {
-                "label": "接受塑料回收"
-            },
-            "recycling/type": {
-                "label": "回收类型",
-                "options": {
-                    "centre": "回收中心",
-                    "container": "回收容器"
-                }
-            },
             "ref": {
                 "label": "参考"
             },
@@ -1363,9 +1274,6 @@
             "shop": {
                 "label": "类型"
             },
-            "sloped_curb": {
-                "label": "斜路缘"
-            },
             "smoking": {
                 "label": "吸烟",
                 "options": {
@@ -1419,9 +1327,6 @@
                 },
                 "placeholder": "未知种类"
             },
-            "studio_type": {
-                "label": "类型"
-            },
             "substation": {
                 "label": "类型"
             },
@@ -1608,7 +1513,7 @@
             },
             "amenity/bank": {
                 "name": "银行",
-                "terms": "银行"
+                "terms": "银行,储蓄银行"
             },
             "amenity/bar": {
                 "name": "酒吧",
@@ -1634,11 +1539,12 @@
                 "terms": "船舶租赁处"
             },
             "amenity/bureau_de_change": {
-                "name": "货币兑换"
+                "name": "货币兑换",
+                "terms": "货币兑换"
             },
             "amenity/bus_station": {
-                "name": "汽车站",
-                "terms": "公交车起讫站,公交枢纽,公交场站"
+                "name": "公交站",
+                "terms": "公交车起讫站,公交枢纽,公交场站,公交车站"
             },
             "amenity/cafe": {
                 "name": "咖啡馆",
@@ -1681,7 +1587,8 @@
                 "terms": "时钟,钟表,钟"
             },
             "amenity/college": {
-                "name": "大专院校校园"
+                "name": "大专院校校园",
+                "terms": "大专校园"
             },
             "amenity/community_centre": {
                 "name": "社区活动中心",
@@ -1698,6 +1605,10 @@
                 "name": "牙科",
                 "terms": "牙医,牙"
             },
+            "amenity/doctors": {
+                "name": "医生",
+                "terms": "医生,医护人员"
+            },
             "amenity/dojo": {
                 "name": "道场/武术学院",
                 "terms": "道场,武术学院"
@@ -1731,7 +1642,8 @@
                 "terms": "墓地,坟地"
             },
             "amenity/hospital": {
-                "name": "医院"
+                "name": "医院",
+                "terms": "医院场地"
             },
             "amenity/kindergarten": {
                 "name": "学前班/幼儿园用地"
@@ -1745,7 +1657,8 @@
                 "terms": "市场,菜市场"
             },
             "amenity/motorcycle_parking": {
-                "name": "摩托车停车场"
+                "name": "摩托车停车场",
+                "terms": "摩托车场"
             },
             "amenity/nightclub": {
                 "name": "夜总会",
@@ -1804,7 +1717,8 @@
                 "terms": "酒馆"
             },
             "amenity/public_bookcase": {
-                "name": "公共书架"
+                "name": "公共书架",
+                "terms": "公共书架,公共书籍"
             },
             "amenity/ranger_station": {
                 "name": "野郊访客处",
@@ -1815,14 +1729,16 @@
                 "terms": "回收,循环利用,再造"
             },
             "amenity/register_office": {
-                "name": "民政登记处"
+                "name": "民政登记处",
+                "terms": "登记处,民政处"
             },
             "amenity/restaurant": {
                 "name": "餐馆",
                 "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼,美食"
             },
             "amenity/school": {
-                "name": "学校"
+                "name": "学校",
+                "terms": "学校场地"
             },
             "amenity/shelter": {
                 "name": "亭",
@@ -1832,7 +1748,8 @@
                 "name": "社会服务设施"
             },
             "amenity/social_facility/food_bank": {
-                "name": "食品银行"
+                "name": "食品银行",
+                "terms": "食物银行"
             },
             "amenity/social_facility/group_home": {
                 "name": "敬老院",
@@ -1870,7 +1787,8 @@
                 "terms": "市政府,市政厅,大会堂"
             },
             "amenity/university": {
-                "name": "大学校园"
+                "name": "大学校园",
+                "terms": "大学校园,大学场地"
             },
             "amenity/vending_machine/cigarettes": {
                 "name": "香烟售货机",
@@ -1888,6 +1806,14 @@
                 "name": "报纸售货机",
                 "terms": "报纸售货机,报纸贩卖机"
             },
+            "amenity/vending_machine/sweets": {
+                "name": "零食售货机",
+                "terms": "零食贩卖机"
+            },
+            "amenity/vending_machine/vending_machine": {
+                "name": "售货机",
+                "terms": "贩卖机"
+            },
             "amenity/veterinary": {
                 "name": "兽医",
                 "terms": "兽医"
@@ -1927,10 +1853,6 @@
                 "name": "自行车路障",
                 "terms": "自行车,单车,路障"
             },
-            "barrier/ditch": {
-                "name": "壕沟",
-                "terms": "沟坎,壕"
-            },
             "barrier/entrance": {
                 "name": "入口",
                 "terms": "入口"
@@ -1969,7 +1891,7 @@
             },
             "barrier/wall": {
                 "name": "墙",
-                "terms": "收费站"
+                "terms": "墙,墙壁"
             },
             "boundary/administrative": {
                 "name": "行政区域界线",
@@ -2005,7 +1927,8 @@
                 "name": "在建建筑"
             },
             "building/dormitory": {
-                "name": "宿舍"
+                "name": "宿舍",
+                "terms": "宿舍,寝室"
             },
             "building/entrance": {
                 "name": "入口/出口",
@@ -2016,7 +1939,8 @@
                 "terms": "车库"
             },
             "building/garages": {
-                "name": "车库(连排)"
+                "name": "车库(连排)",
+                "terms": "连排车库"
             },
             "building/greenhouse": {
                 "name": "温室",
@@ -2026,7 +1950,8 @@
                 "name": "医院大楼"
             },
             "building/hotel": {
-                "name": "宾馆楼"
+                "name": "宾馆楼",
+                "terms": "宾馆建筑"
             },
             "building/house": {
                 "name": "房屋",
@@ -2041,21 +1966,22 @@
                 "terms": "工业建筑物"
             },
             "building/kindergarten": {
-                "name": "学前班/幼儿园建筑"
+                "name": "学前班/幼儿园建筑",
+                "terms": "学前班建筑,幼儿园建筑"
             },
             "building/public": {
                 "name": "公共建筑"
             },
             "building/residential": {
                 "name": "住宅建筑物",
-                "terms": "住宅建筑物"
+                "terms": "住宅建筑物,住宅建筑"
             },
             "building/retail": {
                 "name": "商业建筑"
             },
             "building/roof": {
                 "name": "楼顶",
-                "terms": "楼顶,房顶"
+                "terms": "楼顶,房顶,屋顶"
             },
             "building/school": {
                 "name": "学校建筑",
@@ -2133,16 +2059,19 @@
                 "name": "切割钥匙（配匙）"
             },
             "craft/locksmith": {
-                "name": "锁匠"
+                "name": "锁匠",
+                "terms": "锁匠,开锁师"
             },
             "craft/metal_construction": {
-                "name": "金属结构建筑"
+                "name": "金属结构建筑",
+                "terms": "金属建筑,金属建筑物"
             },
             "craft/optician": {
                 "name": "眼镜店"
             },
             "craft/painter": {
-                "name": "油漆匠"
+                "name": "油漆匠",
+                "terms": "粉刷匠"
             },
             "craft/photographer": {
                 "name": "照相店",
@@ -2396,10 +2325,6 @@
                 "name": "三级道路匝道",
                 "terms": "三级道路匝道"
             },
-            "highway/track": {
-                "name": "小路",
-                "terms": "未铺设路面的车径"
-            },
             "highway/traffic_signals": {
                 "name": "交通信号灯",
                 "terms": "红绿灯"
@@ -2416,10 +2341,6 @@
                 "name": "环岛",
                 "terms": "环岛"
             },
-            "highway/unclassified": {
-                "name": "未分级的道路",
-                "terms": "未分级的道路"
-            },
             "historic": {
                 "name": "历史遗迹",
                 "terms": "历史遗迹,史迹"
@@ -2477,7 +2398,8 @@
                 "terms": "墓地"
             },
             "landuse/commercial": {
-                "name": "商业区"
+                "name": "商业区",
+                "terms": "商业区,商业用地"
             },
             "landuse/construction": {
                 "name": "建设用地",
@@ -2626,10 +2548,6 @@
                 "name": "船台",
                 "terms": "船台"
             },
-            "leisure/sports_center": {
-                "name": "体育中心/健身中心",
-                "terms": "体育中心,健身中心"
-            },
             "leisure/stadium": {
                 "name": "体育场",
                 "terms": "体育,体育场"
@@ -3067,10 +2985,6 @@
             "shop/antiques": {
                 "name": "古董店"
             },
-            "shop/art": {
-                "name": "画廊",
-                "terms": "美术馆,艺术馆"
-            },
             "shop/baby_goods": {
                 "name": "婴儿用品店",
                 "terms": "母婴用品店, 婴幼儿用品店"
@@ -3141,10 +3055,6 @@
                 "name": "奶酪店",
                 "terms": "奶酪店,奶酪专卖店"
             },
-            "shop/chemist": {
-                "name": "日化用品店",
-                "terms": "药房"
-            },
             "shop/chocolate": {
                 "name": "巧克力店",
                 "terms": "巧克力店,巧克力专卖店"
@@ -3469,6 +3379,10 @@
                 "name": "动物园",
                 "terms": "动物园"
             },
+            "traffic_calming/table": {
+                "name": "人行横道",
+                "terms": "行人专用路"
+            },
             "type/boundary": {
                 "name": "边界",
                 "terms": "边界"
@@ -3585,9 +3499,6 @@
                 "name": "水沟",
                 "terms": "沟,沟渠,涧"
             },
-            "waterway/dock": {
-                "name": "码头"
-            },
             "waterway/drain": {
                 "name": "渠",
                 "terms": "下水道"