Merge branch 'master' into modern

1 files changed, 77 insertions, 69 deletions

diff --git a/web/l10n/nn.json b/web/l10n/nn.json
index fae23223..2b7c9ec7 100644
--- a/web/l10n/nn.json
+++ b/web/l10n/nn.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Berekna eigenskapar",
     "sharedCheckComputedAttribute": "Sjekk berekna eigenskaper",
     "sharedExpression": "Uttrykk",
-    "sharedDeviceDistance": "Einingsavstand",
     "sharedDevice": "Eining",
     "sharedTestNotification": "Send testvarsel",
     "sharedCalendar": "Kalender",
@@ -76,10 +75,11 @@
     "sharedShowAddress": "Vis adresse",
     "sharedDisabled": "Deaktiver",
     "sharedMaintenance": "Vedlikehald",
-    "sharedMaintenances": "Vedlikehald",
+    "sharedDeviceAccumulators": "Akkumulatorar",
+    "sharedAlarms": "Alarmar",
     "attributeSpeedLimit": "Fartsgrense",
     "attributePolylineDistance": "Polylinjedistanse",
-    "attributeReportIgnoreOdometer": "Rapporter: Ignorer kilometerteller",
+    "attributeReportIgnoreOdometer": "Rapporter: Ignorer kilometerteljar",
     "attributeWebReportColor": "Web: Rapportfarge",
     "attributeDevicePassword": "Einingspassord",
     "attributeProcessingCopyAttributes": "Prosesser: Kopier eigenskapar",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Deaktiver Sjåførar",
     "attributeUiDisableComputedAttributes": "UI: Deaktiver Berekna eigenskaper",
     "attributeUiDisableCalendars": "UI: Deaktiver kalendrar",
-    "attributeUiDisableMaintenances": "UI: Deaktiver vedlikehald",
+    "attributeUiDisableMaintenance": " UI: Deaktiver vedlikehald",
     "attributeUiHidePositionAttributes": "UI: Gøym posisojonseigenskapar",
     "errorTitle": "Feil",
     "errorGeneral": "ugyldige parameterar eller avgrensingsbrot",
@@ -191,8 +191,8 @@
     "positionEvent": "Hending",
     "positionAlarm": "Alarm",
     "positionStatus": "Status",
-    "positionOdometer": "Kilometerteller",
-    "positionServiceOdometer": "Service kilometertellar",
+    "positionOdometer": "Kilometerteljar",
+    "positionServiceOdometer": "Service kilometerteljar",
     "positionTripOdometer": "Turmålar",
     "positionHours": "Timar",
     "positionSteps": "Steg",
@@ -220,7 +220,7 @@
     "positionBlocked": "Blokert",
     "positionDtcs": "Diagnosefeilkoder",
     "positionObdSpeed": "OBD-hastigheit",
-    "positionObdOdometer": "OBD kilometerteller",
+    "positionObdOdometer": "OBD kilometerteljar",
     "positionDriverUniqueId": "Sjåførunik ID",
     "positionImage": "Bilete",
     "positionAudio": "Lyd",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Tving innstillingar",
     "mapTitle": "Kart",
     "mapLayer": "Kartlag",
-    "mapCustom": "Eigedefinert kart",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto basiskart",
     "mapOsm": "Open Street-kart",
     "mapBingKey": "Bing Maps-nøkkel",
@@ -252,8 +254,8 @@
     "stateValue": "Verdi",
     "commandTitle": "Kommando",
     "commandSend": "Send",
-    "commandSent": "Kommando har blitt send",
-    "commandQueued": "Kommando har blitt lagt i kø",
+    "commandSent": "Kommando sendt",
+    "commandQueued": " Kommando lagt i kø",
     "commandUnit": "Eining",
     "commandCustom": "Eigendefinert kommando",
     "commandDeviceIdentification": "Einingsidentifikasjon",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Slå alarm av",
     "commandSetTimezone": "Sett opp tidssone",
     "commandRequestPhoto": "Be om foto",
+    "commandPowerOff": "Skru av eining",
     "commandRebootDevice": "Omstart eining",
     "commandSendSms": "Send SMS",
     "commandSendUssd": "Send USSD",
@@ -281,19 +284,12 @@
     "commandGetVersion": "Syn versjon",
     "commandFirmwareUpdate": "Oppdater fastvare",
     "commandSetConnection": "Sett tilkopling",
-    "commandSetOdometer": "Sete odometer",
+    "commandSetOdometer": "Set kilometerteljar",
     "commandGetModemStatus": "Syn Modemstatus",
     "commandGetDeviceStatus": "Synd einingstatus",
     "commandModePowerSaving": "Endre straumsparing",
     "commandModeDeepSleep": "Endre djup svevn",
     "commandMovementAlarm": "Rørslealarm",
-    "commandAlarmBattery": "Batterialarm",
-    "commandAlarmSos": "SOS-alarm",
-    "commandAlarmRemove": "Fjern alarm",
-    "commandAlarmClock": "Klokke alarm",
-    "commandAlarmSpeed": "Fartsgrensealarm",
-    "commandAlarmFall": "Feilalarm",
-    "commandAlarmVibration": "Vibrasjonsalarm",
     "commandFrequency": "Frekvens",
     "commandTimezone": "Tidszoneforskyving",
     "commandMessage": "Melding",
@@ -305,61 +301,69 @@
     "commandServer": "Tenar",
     "commandPort": "Port",
     "eventAll": "Alle hendingar",
-    "eventDeviceOnline": "Eining er tilkopla",
-    "eventDeviceUnknown": "Status til eininga er ukjend",
-    "eventDeviceOffline": "Eininga er fråkopla",
-    "eventDeviceMoving": "Eininga rører seg",
-    "eventDeviceStopped": "Eininga har stoppa",
-    "eventDeviceOverspeed": "Eininga bryt fartsgrensa",
-    "eventDeviceFuelDrop": "Fall i drivstoff hending",
+    "eventDeviceOnline": "Status tilkopla",
+    "eventDeviceUnknown": "Status ukjend",
+    "eventDeviceOffline": "Status fråkopla",
+    "eventDeviceMoving": "Eining rører seg",
+    "eventDeviceStopped": "Eining stoppa",
+    "eventDeviceOverspeed": "Fartsgrense overstige",
+    "eventDeviceFuelDrop": "Fall i drivstoff",
     "eventCommandResult": "Kommandoresultat",
-    "eventGeofenceEnter": "Eininga har komme inn i geo-gjerde",
-    "eventGeofenceExit": "Eininga har forlatt geo-gjerde",
-    "eventAlarm": "Alarmar",
-    "eventIgnitionOn": "Tenninga er PÅ",
-    "eventIgnitionOff": "Tenninga er AV",
+    "eventGeofenceEnter": "Innkommen Geo-gjerde",
+    "eventGeofenceExit": "Forlate Geo-gjerde",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Tenning på",
+    "eventIgnitionOff": "Tenning av",
     "eventMaintenance": "Vedlikehald nøydsynt",
     "eventTextMessage": "Tekstmelding motteken",
-    "eventDriverChanged": "Sjåfør er endra",
+    "eventDriverChanged": "Sjåfør endra",
     "eventsScrollToLast": "Syn siste",
-    "alarmSos": "SOS-alarm",
-    "alarmVibration": "Vibrasjonsalarm",
-    "alarmMovement": "Rørslealarm",
-    "alarmOverspeed": "Fartsgrensealarm",
-    "alarmFallDown": "Fallalarm",
-    "alarmLowBattery": "Lavt-batteri-alarm",
-    "alarmLowPower": "Lav straum-alarm",
-    "alarmFault": "Feilalarm",
-    "alarmPowerOff": "Straum fråkopla-alarm",
-    "alarmPowerOn": "Straum tilkopla-alarm",
-    "alarmDoor": "Dør-alarm",
-    "alarmGeofence": "Geo-gjerde-alarm",
-    "alarmGeofenceEnter": "Geo-gjerde Innanfor-alarm",
-    "alarmGeofenceExit": "Geo-gjerde utanfor-alarm",
-    "alarmGpsAntennaCut": "GPS-antenne fjerna-alarm",
-    "alarmAccident": "Ulykke-alarm",
-    "alarmTow": "Slepe-alarm",
-    "alarmIdle": "Tomgang-alarm",
-    "alarmHardAcceleration": "Hard akselerasjon-alarm",
-    "alarmHardBraking": "Hard oppbremsing-alarm",
-    "alarmFatigueDriving": "Trøyttleik-alarm",
-    "alarmPowerCut": "Straum fråkopla-alarm",
-    "alarmPowerRestored": "Straum attilkopla-alarm",
-    "alarmJamming": "Jamming-alarm",
-    "alarmTemperature": "Temperatur-alarm",
-    "alarmParking": "Parkering-alarm",
-    "alarmShock": "Vibrasjon-alarm",
-    "alarmBonnet": "Motorpanser-alarm",
-    "alarmFootBrake": "Bemsepedal-alarm",
-    "alarmFuelLeak": "Drivstofflekkasje-alarm",
-    "alarmTampering": "Eining tukla med-alarm",
-    "alarmRemoving": "Fjern alarm",
+    "alarmGeneral": "Generell",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibrasjon",
+    "alarmMovement": "Rørsle",
+    "alarmLowspeed": "Låg hastigheit",
+    "alarmOverspeed": "Høgt turtal",
+    "alarmFallDown": "Fall",
+    "alarmLowPower": "Lite straum",
+    "alarmLowBattery": "Lågt batterinivå",
+    "alarmFault": "Feil",
+    "alarmPowerOff": "Straum fråkopla",
+    "alarmPowerOn": "Straum tilkopla",
+    "alarmDoor": "Dør",
+    "alarmLock": "Lås",
+    "alarmUnlock": "Lås opp",
+    "alarmGeofence": "Geo-gjerde",
+    "alarmGeofenceEnter": "Innanfor Geo-gjerde",
+    "alarmGeofenceExit": "Utanfor Geo-gjerde",
+    "alarmGpsAntennaCut": "GPS-antenne fjerna",
+    "alarmAccident": "Ulykke",
+    "alarmTow": "Tauing",
+    "alarmIdle": "Tomgang",
+    "alarmHighRpm": "Høgt turtal",
+    "alarmHardAcceleration": "Hard akselerasjon",
+    "alarmHardBraking": "Hard oppbremsing",
+    "alarmHardCornering": "Hard vending",
+    "alarmLaneChange": "Filskifte",
+    "alarmFatigueDriving": "Trøyttleikskøyring",
+    "alarmPowerCut": "Straum fråkopla",
+    "alarmPowerRestored": " Straumtilførsel atterreist",
+    "alarmJamming": "Jamming",
+    "alarmTemperature": "Temperatur",
+    "alarmParking": "Parkering",
+    "alarmShock": "Sjokk",
+    "alarmBonnet": "Motorpanser",
+    "alarmFootBrake": "Bremsepedal",
+    "alarmFuelLeak": "Drivstofflekkasje",
+    "alarmTampering": "Tukling",
+    "alarmRemoving": "Fjerning",
     "notificationType": "Varseltype",
     "notificationAlways": "Alle einingar",
-    "notificationNotificators": "Channels",
-    "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
+    "notificationNotificators": "Kanalar",
+    "notificatorWeb": "Vev",
+    "notificatorMail": "E-post",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobil",
     "reportRoute": "Rute",
     "reportEvents": "Hendingar",
     "reportTrips": "Turar",
@@ -371,6 +375,7 @@
     "reportChartType": "Graf type",
     "reportShowMarkers": "Syn markørar",
     "reportExport": "Eksporter",
+    "reportEmail": "E-post-rapport",
     "reportPeriod": "Periode",
     "reportCustom": "Tilpassa",
     "reportToday": "Idag",
@@ -389,6 +394,8 @@
     "reportEndTime": "Sluttidspunkt",
     "reportEndAddress": "Sluttadresse",
     "reportSpentFuel": "Brukt drivstoff",
+    "reportStartOdometer": "Kilometerteljar start",
+    "reportEndOdometer": "Kilometerteljar stop",
     "statisticsTitle": "Statistikk",
     "statisticsCaptureTime": "Opptakstid",
     "statisticsActiveUsers": "Aktive brukarar",
@@ -414,11 +421,12 @@
     "categoryPlane": "Fly",
     "categoryShip": "Skip",
     "categoryTractor": "Traktor",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Tog",
+    "categoryTram": "Trikk",
+    "categoryTrolleybus": "Trolleybuss",
     "categoryTruck": "Lastebil",
     "categoryVan": "Varebil",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Periode"
 }
\ No newline at end of file