Merge branch 'master' into redesign

[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 fa6d4801357a830d00ea10a34dcef2402da600d1..0e44b1e9b1f0795da0f3f0f7755a16dd17447e4a 100644 (file)
--- a/vendor/assets/iD/iD/locales/no.json
+++ b/vendor/assets/iD/iD/locales/no.json
@@ -156,7 +156,6 @@
         "title": "Bakgrunn",
         "description": "Bakgrunnsinnstillinger",
         "percent_brightness": "{opacity}% lysstyrke",
-        "fix_misalignment": "Rett opp skjevstilling",
         "reset": "tilbakestill"
     },
     "restore": {
@@ -198,8 +197,7 @@
         "out": "Forminsk"
     },
     "gpx": {
-        "local_layer": "Lokal GPX-fil",
-        "drag_drop": "Dra og slipp en .gpx-fil på denne siden"
+        "local_layer": "Lokal GPX-fil"
     },
     "help": {
         "title": "Hjelp"
@@ -225,9 +223,6 @@
             },
             "category-route": {
                 "name": "Rute"
-            },
-            "category-water": {
-                "name": "Vann"
             }
         },
         "fields": {
@@ -636,9 +631,6 @@
             "amenity/marketplace": {
                 "name": "Markedsplass"
             },
-            "amenity/parking": {
-                "name": "Parkering"
-            },
             "amenity/pharmacy": {
                 "name": "Apotek"
             },