Update to iD v1.8.2

[rails.git] / 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 ef08cea5b44359a46848b45617b59952fbfaaac2..0b0dd3a95200d4f9e4e4f4230b7c640294214fbc 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh.json
+++ b/vendor/assets/iD/iD/locales/zh.json
@@ -108,11 +108,8 @@
         },
         "merge": {
             "title": "合并",
-            "description": "合并这些线。",
             "key": "C",
-            "annotation": "合并{n}条线。",
-            "not_eligible": "这些要素不能被合并。",
-            "not_adjacent": "这些线段并不连接，不能合并。"
+            "not_eligible": "这些要素不能被合并。"
         },
         "move": {
             "title": "移动",
@@ -165,7 +162,6 @@
         "nothing": "没有可重做的。"
     },
     "tooltip_keyhint": "快捷方式",
-    "browser_notice": "该编辑器支持Firefox、Chrome、Safari、Opera和Internet Explorer9及以上的浏览器。请升级您的浏览器或者使用Potlatch 2来编辑地图。",
     "translate": {
         "translate": "翻译",
         "localized_translation_label": "多种语言名称",
@@ -175,7 +171,6 @@
     "zoom_in_edit": "放大编辑",
     "logout": "退出",
     "loading_auth": "连接OpenStreetMap...",
-    "report_a_bug": "报告bug",
     "status": {
         "error": "无法连接到API。",
         "offline": "API是离线的。请稍后尝试编辑。",
@@ -350,7 +345,6 @@
         },
         "fields": {
             "access": {
-                "label": "通行限制",
                 "options": {
                     "designated": {
                         "description": "只限标志指定或特定本地法律容许人士进入",
@@ -377,9 +371,7 @@
                         "title": "允许的"
                     }
                 },
-                "placeholder": "未知种类",
                 "types": {
-                    "access": "普通",
                     "bicycle": "自行车",
                     "foot": "步行",
                     "horse": "马匹",
@@ -857,9 +849,6 @@
             "highway/bus_stop": {
                 "name": "公交车站"
             },
-            "highway/crossing": {
-                "name": "人行横道"
-            },
             "highway/cycleway": {
                 "name": "自行车道"
             },
@@ -881,9 +870,6 @@
             "highway/path": {
                 "name": "路径"
             },
-            "highway/pedestrian": {
-                "name": "行人专用路"
-            },
             "highway/primary": {
                 "name": "主要道路"
             },
@@ -974,12 +960,6 @@
             "historic/wayside_shrine": {
                 "name": "路边神社"
             },
-            "landuse": {
-                "name": "土地用途"
-            },
-            "landuse/allotments": {
-                "name": "社区花园"
-            },
             "landuse/basin": {
                 "name": "水池"
             },
@@ -1205,9 +1185,6 @@
             "railway/disused": {
                 "name": "废弃的铁路"
             },
-            "railway/level_crossing": {
-                "name": "平交路口"
-            },
             "railway/monorail": {
                 "name": "单轨铁路"
             },