Merge branch 'master' into redesign

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

diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json
index bb1ed3e0a36c91bc06df44b57b071bfaee180d08..511fbf3f92d79aa162cefe2cd7255c3ff9968d77 100644 (file)
--- a/vendor/assets/iD/iD/locales/ja.json
+++ b/vendor/assets/iD/iD/locales/ja.json
@@ -387,6 +387,9 @@
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "建物"
+            },
             "category-landuse": {
                 "name": "土地利用"
             },
@@ -402,8 +405,11 @@
             "category-route": {
                 "name": "ルート"
             },
-            "category-water": {
-                "name": "水路"
+            "category-water-area": {
+                "name": "水面"
+            },
+            "category-water-line": {
+                "name": "水面"
             }
         },
         "fields": {
@@ -701,6 +707,9 @@
             "shelter": {
                 "label": "避難所"
             },
+            "shelter_type": {
+                "label": "タイプ"
+            },
             "shop": {
                 "label": "店舗種別"
             },
@@ -741,6 +750,9 @@
             "trail_visibility": {
                 "label": "道の可視度"
             },
+            "tree_type": {
+                "label": "タイプ"
+            },
             "vending": {
                 "label": "販売商品の種別"
             },
@@ -930,6 +942,9 @@
             "amenity/school": {
                 "name": "学校"
             },
+            "amenity/shelter": {
+                "name": "避難所"
+            },
             "amenity/swimming_pool": {
                 "name": "プール"
             },
@@ -1053,6 +1068,9 @@
             "entrance": {
                 "name": "エントランス"
             },
+            "footway/crossing": {
+                "name": "横断歩道"
+            },
             "highway": {
                 "name": "道路"
             },
@@ -1401,6 +1419,33 @@
             "office": {
                 "name": "オフィス"
             },
+            "office/administrative": {
+                "name": "市町村役所"
+            },
+            "office/architect": {
+                "name": "建築家"
+            },
+            "office/company": {
+                "name": "会社事務所"
+            },
+            "office/employment_agency": {
+                "name": "人材紹介"
+            },
+            "office/it": {
+                "name": "ITオフィス"
+            },
+            "office/lawyer": {
+                "name": "法律事務所"
+            },
+            "office/ngo": {
+                "name": "NGO事務所"
+            },
+            "office/therapist": {
+                "name": "心療内科"
+            },
+            "office/travel_agent": {
+                "name": "旅行代理店"
+            },
             "place": {
                 "name": "地名"
             },