Update to iD v1.8.2

[rails.git] / 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 c2523d60aa73134eb728e2d1e8db5151ca11a6b2..bcd08cf957b9ce67a724bcdd7a31b5fd095e29af 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -137,12 +137,8 @@
         },
         "merge": {
             "title": "合并",
-            "description": "合并这些线。",
             "key": "C",
-            "annotation": "合并{n}条线。",
             "not_eligible": "这些特征不可以合并。",
-            "not_adjacent": "这些线段并不连接，不能合并。",
-            "restriction": "这些线段不能合并，因为其中最少有一条线段是\"{relation}\"关系的成员。",
             "incomplete_relation": "此要素暂未下载完成，无法合并。"
         },
         "move": {
@@ -216,7 +212,6 @@
         "nothing": "没有可以重做的操作。"
     },
     "tooltip_keyhint": "快捷键：",
-    "browser_notice": "该编辑器仅支持Firefox、Chrome、Safari、Opera和Internet Explorer 9及更高版本。请升级你的浏览器或使用Potlatch 2编辑地图。",
     "translate": {
         "translate": "翻译",
         "localized_translation_label": "多语言名称",
@@ -1813,10 +1808,6 @@
             "amenity/university": {
                 "name": "大学校园"
             },
-            "amenity/vending_machine": {
-                "name": "售卖机",
-                "terms": "售卖机"
-            },
             "amenity/veterinary": {
                 "name": "兽医",
                 "terms": "兽医"
@@ -1923,14 +1914,6 @@
             "building/cabin": {
                 "name": "小木屋"
             },
-            "building/cathedral": {
-                "name": "主教座堂",
-                "terms": "教堂,大教堂"
-            },
-            "building/church": {
-                "name": "宗教场所",
-                "terms": "礼拜堂"
-            },
             "building/college": {
                 "name": "大专院校建筑"
             },