Merge remote-tracking branch 'upstream/pull/2161'

[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 ee96d5cb31f8acb49b41d8dfeadf0eab072850fe..90ba2284a5a746e2c160d1a20ca51e91f1adf6eb 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -1560,6 +1560,12 @@
                     "title": "移动标签",
                     "annotation": "移动标签。"
                 },
+                "remove_deprecated_tag": {
+                    "annotation": "删除一个旧标签。"
+                },
+                "remove_deprecated_tag_combo": {
+                    "annotation": "删除一个旧标签组合。"
+                },
                 "remove_generic_name": {
                     "title": "删除名称",
                     "annotation": "删除笼统名称。"
@@ -1568,6 +1574,9 @@
                     "title": "删除标签",
                     "annotation": "删除标签。"
                 },
+                "remove_tags": {
+                    "title": "删除标签"
+                },
                 "reposition_features": {
                     "title": "更改要素位置"
                 },
@@ -1579,9 +1588,11 @@
                     "annotation": "标记极相近要素为断开连接。"
                 },
                 "upgrade_tag": {
+                    "title": "改进此标签",
                     "annotation": "改进一个旧标签。"
                 },
                 "upgrade_tag_combo": {
+                    "title": "改进这些标签",
                     "annotation": "改进一个旧标签组合。"
                 },
                 "use_bridge_or_tunnel": {
@@ -4284,10 +4295,6 @@
                     "name": "纪念币压制机",
                     "terms": "纪念币,硬币,压制,纪念品,零钱,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
                 },
-                "amenity/vending_machine/excrement_bags": {
-                    "name": "粪便袋售货机",
-                    "terms": "粪便袋,粪便,屎,狗屎,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
-                },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "女性卫生用品售货机",
                     "terms": "女,女性,避孕套,安全套,月经,棉条,卫生巾,卫生,私人,售货,售卖,自助,自动,付货,零售,贩卖,售货机,贩卖机"
@@ -6734,10 +6741,6 @@
                     "name": "室内装饰店",
                     "terms": "室内装饰店"
                 },
-                "shop/jewelry": {
-                    "name": "珠宝店",
-                    "terms": "珠宝店"
-                },
                 "shop/kiosk": {
                     "name": "售货亭",
                     "terms": "售货亭,报刊亭,书报亭,售卖"