Merge branch 'master' into modern

1 files changed, 66 insertions, 58 deletions

diff --git a/web/l10n/sv.json b/web/l10n/sv.json
index 79a54a6c..944d9154 100644
--- a/web/l10n/sv.json
+++ b/web/l10n/sv.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Computed Attributes",
     "sharedCheckComputedAttribute": "Check Computed Attribute",
     "sharedExpression": "Uttryck",
-    "sharedDeviceDistance": "Enhet Avstånd",
     "sharedDevice": "Enhet",
     "sharedTestNotification": "Skicka testnortis",
     "sharedCalendar": "Kalender",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Hastighetsbegränsning",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Rapport: Ignorera Odometer",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Disable Drivers",
     "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
     "attributeUiDisableCalendars": "UI: Disable Calendars",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "errorTitle": "Fel",
     "errorGeneral": "Invalid parameters or constraints violation",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Tvinga inställning",
     "mapTitle": "Karta",
     "mapLayer": "Kartlager",
-    "mapCustom": "Egenanpassad karta",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto grundkarta",
     "mapOsm": "Open Street karta",
     "mapBingKey": "Bing Maps Nyckel",
@@ -252,8 +254,8 @@
     "stateValue": "Värde",
     "commandTitle": "Kommando",
     "commandSend": "Skicka",
-    "commandSent": "Kommandot har skickats",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Enhet",
     "commandCustom": "Anpassat kommandot",
     "commandDeviceIdentification": "Enhetsidentifikation",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Slå av larm",
     "commandSetTimezone": "Ställ in tidszon",
     "commandRequestPhoto": "Begär fotografi",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Starta om enhet",
     "commandSendSms": "Skicka SMS",
     "commandSendUssd": "Skicka USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Modify Power Saving",
     "commandModeDeepSleep": "Modify Deep Sleep",
     "commandMovementAlarm": "Movement Alarm",
-    "commandAlarmBattery": "Battery Alarm",
-    "commandAlarmSos": "SOS Alarm",
-    "commandAlarmRemove": "Remove Alarm",
-    "commandAlarmClock": "Clock Alarm",
-    "commandAlarmSpeed": "Larm hastighetsöverträdelse",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "Frekvens",
     "commandTimezone": "Tidszon Offset",
     "commandMessage": "Meddelande",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Alla event",
-    "eventDeviceOnline": "Enheten är online",
-    "eventDeviceUnknown": "Okänd status på enheten",
-    "eventDeviceOffline": "Enheten är offline",
-    "eventDeviceMoving": "Enheten rör sig",
-    "eventDeviceStopped": "Enheten har stannat",
-    "eventDeviceOverspeed": "Enheten har överskridit hastigheten",
-    "eventDeviceFuelDrop": "Fuel drop event",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Kommando resultat",
-    "eventGeofenceEnter": "Enheten har anlänt till geofence",
-    "eventGeofenceExit": "Enheten har lämnat genofence",
-    "eventAlarm": "Larm",
-    "eventIgnitionOn": "Tändningen är PÅ",
-    "eventIgnitionOff": "Tändningen är AV",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Underhåll krävs",
     "eventTextMessage": "Textmeddelande mottaget",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Scrolla till sista",
-    "alarmSos": "SOS Larm",
-    "alarmVibration": "Vibrations Larm",
-    "alarmMovement": "Rörelse Larm",
-    "alarmOverspeed": "Larm hastighetsöverträdelse",
-    "alarmFallDown": "Fall Larm",
-    "alarmLowBattery": "Lågt batteri Larm",
-    "alarmLowPower": "Varning låg spänning",
-    "alarmFault": "Felkod Larm",
-    "alarmPowerOff": "Power Off Larm",
-    "alarmPowerOn": "Power On Larm",
-    "alarmDoor": "Dörr Larm",
-    "alarmGeofence": "Geofence Larm",
-    "alarmGeofenceEnter": "Geofence Inrese Larm",
-    "alarmGeofenceExit": "Geofence Utrese Larm",
-    "alarmGpsAntennaCut": "GPS Antenn Bruten Lam",
-    "alarmAccident": "Olycksfalls Larm",
-    "alarmTow": "Bogserings Larm",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Hårt Acceleration Larm",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Trötthetslarm",
-    "alarmPowerCut": "Strömavbrott Larm",
-    "alarmPowerRestored": "Spänning återställd",
-    "alarmJamming": "Störningslarm",
-    "alarmTemperature": "Temperaturlarm",
-    "alarmParking": "Parkeringslarm",
-    "alarmShock": "Stötlarm",
-    "alarmBonnet": "Larm brytare",
-    "alarmFootBrake": "Fotbromslarm",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Manipuleringlarm",
-    "alarmRemoving": "Ta bort larm",
+    "alarmGeneral": "General",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibration",
+    "alarmMovement": "Movement",
+    "alarmLowspeed": "Low Speed",
+    "alarmOverspeed": "Overspeed",
+    "alarmFallDown": "Fall Down",
+    "alarmLowPower": "Low Power",
+    "alarmLowBattery": "Low Battery",
+    "alarmFault": "Fault",
+    "alarmPowerOff": "Power Off",
+    "alarmPowerOn": "Power On",
+    "alarmDoor": "Door",
+    "alarmLock": "Lock",
+    "alarmUnlock": "Unlock",
+    "alarmGeofence": "Geofence",
+    "alarmGeofenceEnter": "Geofence Enter",
+    "alarmGeofenceExit": "Geofence Exit",
+    "alarmGpsAntennaCut": "GPS Antenna Cut",
+    "alarmAccident": "Accident",
+    "alarmTow": "Tow",
+    "alarmIdle": "Idle",
+    "alarmHighRpm": "High RPM",
+    "alarmHardAcceleration": "Hard Acceleration",
+    "alarmHardBraking": "Hard Braking",
+    "alarmHardCornering": "Hard Cornering",
+    "alarmLaneChange": "Lane Change",
+    "alarmFatigueDriving": "Fatigue Driving",
+    "alarmPowerCut": "Power Cut",
+    "alarmPowerRestored": "Power Restored",
+    "alarmJamming": "Jamming",
+    "alarmTemperature": "Temperature",
+    "alarmParking": "Parking",
+    "alarmShock": "Shock",
+    "alarmBonnet": "Bonnet",
+    "alarmFootBrake": "Foot Brake",
+    "alarmFuelLeak": "Fuel Leak",
+    "alarmTampering": "Tampering",
+    "alarmRemoving": "Removing",
     "notificationType": "Typ av notis",
     "notificationAlways": "All Devices",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Rutt",
     "reportEvents": "Händelser",
     "reportTrips": "Resor",
@@ -371,6 +375,7 @@
     "reportChartType": "Diagramtyp",
     "reportShowMarkers": "Visa markörer",
     "reportExport": "Export",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "Sluttid",
     "reportEndAddress": "Slutadress",
     "reportSpentFuel": "Förbrukat bränsle",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistik",
     "statisticsCaptureTime": "Inspelningstid",
     "statisticsActiveUsers": "Aktiva användare",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Lastbil",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file