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

[rails.git] / vendor / assets / iD / iD / locales / yue.json

diff --git a/vendor/assets/iD/iD/locales/yue.json b/vendor/assets/iD/iD/locales/yue.json
index cc480a2d746b29db5de4df6f91a12878d7fce0de..13eb5fbced23adbe07764ef81027629c2b5da169 100644 (file)
--- a/vendor/assets/iD/iD/locales/yue.json
+++ b/vendor/assets/iD/iD/locales/yue.json
@@ -87,7 +87,6 @@
                     "line": "整方個綫角",
                     "area": "整方範圍角"
                 },
-                "key": "S",
                 "annotation": {
                     "line": "整方咗綫角。",
                     "area": "整方咗範圍角。"
@@ -98,11 +97,8 @@
             },
             "straighten": {
                 "title": "拉直",
-                "description": "拉直條綫",
                 "key": "S",
-                "annotation": "條綫拉直咗。",
-                "too_bendy": "條綫太彎，拉直唔到。",
-                "connected_to_hidden": "無得拉直，佢連咗去隱藏地貌。"
+                "too_bendy": "條綫太彎，拉直唔到。"
             },
             "delete": {
                 "title": "刪",
@@ -473,12 +469,7 @@
         "cannot_zoom": "今下模式，無得再縮。",
         "full_screen": "來回全螢幕",
         "mapillary_images": {
-            "tooltip": "拎輿兵嘅街相",
-            "title": "疊相（輿兵）"
-        },
-        "mapillary_signs": {
-            "tooltip": "拎輿兵嘅交通燈（必先開疊相）",
-            "title": "疊交通燈（輿兵）"
+            "tooltip": "拎輿兵嘅街相"
         },
         "mapillary": {
             "view_on_mapillary": "去輿兵度睇張相"
@@ -584,35 +575,11 @@
                 "category-landuse": {
                     "name": "用地地貌"
                 },
-                "category-natural-area": {
-                    "name": "天然地貌"
-                },
-                "category-natural-line": {
-                    "name": "天然地貌"
-                },
-                "category-natural-point": {
-                    "name": "天然地貌"
-                },
-                "category-path": {
-                    "name": "徑地貌"
-                },
-                "category-rail": {
-                    "name": "軌道地貌"
-                },
                 "category-restriction": {
                     "name": "限制地貌"
                 },
-                "category-road": {
-                    "name": "車道地貌"
-                },
                 "category-route": {
                     "name": "路綫地貌"
-                },
-                "category-water-area": {
-                    "name": "水地貌"
-                },
-                "category-water-line": {
-                    "name": "水地貌"
                 }
             },
             "fields": {
@@ -1534,8 +1501,7 @@
                     "options": {
                         "bucket": "尿兜",
                         "chemical": "化學",
-                        "flush": "沖水",
-                        "pitlatrine": "廁坑／旱廁"
+                        "flush": "沖水"
                     }
                 },
                 "tomb": {
@@ -1763,8 +1729,7 @@
                     "terms": "Drinking Water,水源,活水,飲水,飲水處,飲用水"
                 },
                 "amenity/embassy": {
-                    "name": "大使館",
-                    "terms": "Embassy,使館,大使館,領事館"
+                    "name": "大使館"
                 },
                 "amenity/fast_food": {
                     "name": "快餐店",
@@ -2672,8 +2637,7 @@
                     "terms": "Bicycle Shop,單車店,單車舖,自行車店"
                 },
                 "shop/boutique": {
-                    "name": "時裝店",
-                    "terms": "Boutique,時裝店,服飾店,精品店"
+                    "name": "時裝店"
                 },
                 "shop/butcher": {
                     "name": "肉舖",
@@ -3001,10 +2965,6 @@
                     "name": "路綫總管",
                     "terms": "Route Master,線路總管,路綫總管,路線總目"
                 },
-                "vertex": {
-                    "name": "其他",
-                    "terms": "Other,其他,其它"
-                },
                 "waterway": {
                     "name": "水路"
                 },