Merge remote-tracking branch 'systemed/routing'

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

diff --git a/vendor/assets/iD/iD/locales/no.json b/vendor/assets/iD/iD/locales/no.json
index 27a2ba458ed2c8a075ae82936e3b738e5d4178ea..c2b6d0e778960ddc7b95b764c9ddb4854ecf3adf 100644 (file)
--- a/vendor/assets/iD/iD/locales/no.json
+++ b/vendor/assets/iD/iD/locales/no.json
@@ -68,7 +68,6 @@
         },
         "delete": {
             "title": "Fjern",
-            "description": "Fjern dette fra kartet.",
             "annotation": {
                 "point": "Fjern et punkt.",
                 "vertex": "Fjernet en node fra veien.",
@@ -539,16 +538,7 @@
                 "label": "Type"
             },
             "religion": {
-                "label": "Religion",
-                "options": {
-                    "christian": "Kristen",
-                    "muslim": "Muslim",
-                    "buddhist": "Buddhist",
-                    "jewish": "Jøde",
-                    "hindu": "Hindu",
-                    "shinto": "Shinto",
-                    "taoist": "Taoist"
-                }
+                "label": "Religion"
             },
             "restriction": {
                 "label": "Type"
@@ -559,9 +549,6 @@
             "route_master": {
                 "label": "Type"
             },
-            "sac_scale": {
-                "label": "Stiens vanskelighetsgrad"
-            },
             "service": {
                 "label": "Type"
             },
@@ -600,12 +587,6 @@
             "towertype": {
                 "label": "Tårntype"
             },
-            "tracktype": {
-                "label": "Type"
-            },
-            "tree_type": {
-                "label": "Type"
-            },
             "tunnel": {
                 "label": "Tunnel"
             },
@@ -627,9 +608,6 @@
             },
             "wikipedia": {
                 "label": "Wikipedia"
-            },
-            "wood": {
-                "label": "Type"
             }
         },
         "presets": {
@@ -699,9 +677,6 @@
             "amenity/clock": {
                 "name": "Klokke"
             },
-            "amenity/college": {
-                "name": "Videregående skole"
-            },
             "amenity/doctor": {
                 "name": "Doktor"
             },
@@ -780,9 +755,6 @@
             "amenity/townhall": {
                 "name": "Rådhus"
             },
-            "amenity/university": {
-                "name": "Universitet"
-            },
             "amenity/waste_basket": {
                 "name": "Søppel"
             },
@@ -930,15 +902,9 @@
             "landuse/cemetery": {
                 "name": "Kirkegård"
             },
-            "landuse/commercial": {
-                "name": "Kommersielt"
-            },
             "landuse/construction": {
                 "name": "Konstruksjon"
             },
-            "landuse/farm": {
-                "name": "Gård"
-            },
             "landuse/farmyard": {
                 "name": "Gårdsplass"
             },
@@ -948,9 +914,6 @@
             "landuse/grass": {
                 "name": "Gress"
             },
-            "landuse/industrial": {
-                "name": "Industrielt"
-            },
             "landuse/meadow": {
                 "name": "Blomstereng"
             },
@@ -960,12 +923,6 @@
             "landuse/quarry": {
                 "name": "Steinbrudd"
             },
-            "landuse/residential": {
-                "name": "Boligområde"
-            },
-            "landuse/retail": {
-                "name": "Handel"
-            },
             "landuse/vineyard": {
                 "name": "Vingård"
             },
@@ -1041,9 +998,6 @@
             "man_made/water_tower": {
                 "name": "Vanntårn"
             },
-            "man_made/water_well": {
-                "name": "brønn"
-            },
             "man_made/water_works": {
                 "name": "Vannfiltreringsanlegg"
             },
@@ -1179,9 +1133,6 @@
             "shop/bicycle": {
                 "name": "Sykkelbutikk"
             },
-            "shop/books": {
-                "name": "Bokhandler"
-            },
             "shop/butcher": {
                 "name": "Slakter"
             },
@@ -1227,9 +1178,6 @@
             "shop/jewelry": {
                 "name": "Smykkeforhandler"
             },
-            "shop/kiosk": {
-                "name": "Kiosk"
-            },
             "shop/laundry": {
                 "name": "Vaskeri"
             },
@@ -1245,9 +1193,6 @@
             "shop/music": {
                 "name": "Musikkforretning"
             },
-            "shop/newsagent": {
-                "name": "Avisutsalg"
-            },
             "shop/optician": {
                 "name": "Optiker"
             },