X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/16f5a5ac0c674b258996fcbde1c3fda2e651906a..cdc4e3f8d1fd6071151327389c08db911de3bcf4:/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 118556d48..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": "人行道，步行道路，自行车道等。"
@@ -589,6 +579,14 @@
         }
     },
     "presets": {
+        "categories": {
+            "category-water-area": {
+                "name": "水体特征"
+            },
+            "category-water-line": {
+                "name": "水体特征"
+            }
+        },
         "fields": {
             "access": {
                 "label": "通行规则",
@@ -901,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": "轨距"
             },
@@ -1227,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": "参考"
             },
@@ -1328,9 +1274,6 @@
             "shop": {
                 "label": "类型"
             },
-            "sloped_curb": {
-                "label": "斜路缘"
-            },
             "smoking": {
                 "label": "吸烟",
                 "options": {
@@ -1384,9 +1327,6 @@
                 },
                 "placeholder": "未知种类"
             },
-            "studio_type": {
-                "label": "类型"
-            },
             "substation": {
                 "label": "类型"
             },
@@ -1913,10 +1853,6 @@
                 "name": "自行车路障",
                 "terms": "自行车,单车,路障"
             },
-            "barrier/ditch": {
-                "name": "壕沟",
-                "terms": "沟坎,壕"
-            },
             "barrier/entrance": {
                 "name": "入口",
                 "terms": "入口"
@@ -2462,7 +2398,8 @@
                 "terms": "墓地"
             },
             "landuse/commercial": {
-                "name": "商业区"
+                "name": "商业区",
+                "terms": "商业区,商业用地"
             },
             "landuse/construction": {
                 "name": "建设用地",
@@ -3118,10 +3055,6 @@
                 "name": "奶酪店",
                 "terms": "奶酪店,奶酪专卖店"
             },
-            "shop/chemist": {
-                "name": "日化用品店",
-                "terms": "药房"
-            },
             "shop/chocolate": {
                 "name": "巧克力店",
                 "terms": "巧克力店,巧克力专卖店"
@@ -3446,6 +3379,10 @@
                 "name": "动物园",
                 "terms": "动物园"
             },
+            "traffic_calming/table": {
+                "name": "人行横道",
+                "terms": "行人专用路"
+            },
             "type/boundary": {
                 "name": "边界",
                 "terms": "边界"
@@ -3562,9 +3499,6 @@
                 "name": "水沟",
                 "terms": "沟,沟渠,涧"
             },
-            "waterway/dock": {
-                "name": "码头"
-            },
             "waterway/drain": {
                 "name": "渠",
                 "terms": "下水道"