Merge branch 'master' into modern

1 files changed, 66 insertions, 58 deletions

diff --git a/web/l10n/lo.json b/web/l10n/lo.json
index 6ac7685a..8d01305a 100644
--- a/web/l10n/lo.json
+++ b/web/l10n/lo.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Computed Attributes",
     "sharedCheckComputedAttribute": "Check Computed Attribute",
     "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
     "sharedCalendar": "Calendar",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Speed Limit",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Report: Ignore 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": "ຜິດພາດ",
     "errorGeneral": "Invalid parameters or constraints violation",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Force Settings",
     "mapTitle": "ແຜ່ນທີ",
     "mapLayer": "ຊັ້ນແຜ່ນທີ",
-    "mapCustom": "ແຜ່ນທີ່ທີ່ກຳຫນົດເອງ",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps ສຳຄັນ",
@@ -252,8 +254,8 @@
     "stateValue": "ມູນຄ່າ",
     "commandTitle": "ຄຳສັ່ງ",
     "commandSend": "ສົ່ງ",
-    "commandSent": "ຄຳສັ່ງໄດ້ຖືກສົ່ງແລ້ວ",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "ຫນ່ວຍ",
     "commandCustom": "ຄຳສັ່ງກຳຫນົດເອງ",
     "commandDeviceIdentification": "ໝາຍເລກອຸປະກອນ",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "ແຈ້ງເຕືອນຍົກເລີກຕິດຕໍ່ສາຂາ",
     "commandSetTimezone": "ຕັ້ງຄ່າເຂດເວລາ",
     "commandRequestPhoto": "ສັ່ງຖ່າຍຮູບ",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "ຣີບູດ",
     "commandSendSms": "ສົ່ງ SMS",
     "commandSendUssd": "Send 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": "ແຈ້ງເຕືອນຄວາມໄວເກີນກຳນົດ",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "ຄວາມຖີ່",
     "commandTimezone": "Timezone Offset",
     "commandMessage": "Message",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "All Events",
-    "eventDeviceOnline": "ອຸປະກອນເຊື່ອມຕໍ່ແລ້ວ",
-    "eventDeviceUnknown": "Device status is unknown",
-    "eventDeviceOffline": "ອຸປະກອນບໍ່ໄດ້ເຊື່ອມຕໍ່",
-    "eventDeviceMoving": "ອຸປະກອນກຳລັງເຄື່ອນທີ່",
-    "eventDeviceStopped": "Device has stopped",
-    "eventDeviceOverspeed": "ອຸປະກອນເກີນກຳນົດຄວາມໄວ",
-    "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": "ຜົນຮັບຈາກຄຳສັ່ງ",
-    "eventGeofenceEnter": "ອຸປະກອນເຂົ້າໃນເຂດພື້ນທີ່",
-    "eventGeofenceExit": "ອຸປະກອນອອກນອກເຂດພື້ນທີ່",
-    "eventAlarm": "ລາຍການແຈ້ງເຕືອນ",
-    "eventIgnitionOn": "Ignition is ON",
-    "eventIgnitionOff": "Ignition is OFF",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "ແຈ້ງເຕືອນ SOS",
-    "alarmVibration": "ແຈ້ງເຕືອນແບບສັ່ນ",
-    "alarmMovement": "ແຈ້ງເຕືອນມີການເຄື່ອນທີ່",
-    "alarmOverspeed": "ແຈ້ງເຕືອນຄວາມໄວສູງເກີນກຳນົດ",
-    "alarmFallDown": "ແຈ້ງເຕືອນການຕົກ",
-    "alarmLowBattery": "ແຈ້ງເຕືອນແບັດເຕີລີ້ອ່ອນ",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "ແຈ້ງເຕື່ອນຜິດພາດ",
-    "alarmPowerOff": "Power Off Alarm",
-    "alarmPowerOn": "Power On Alarm",
-    "alarmDoor": "Door Alarm",
-    "alarmGeofence": "Geofence Alarm",
-    "alarmGeofenceEnter": "Geofence Enter Alarm",
-    "alarmGeofenceExit": "Geofence Exit Alarm",
-    "alarmGpsAntennaCut": "GPS Antenna Cut Alarm",
-    "alarmAccident": "Accident Alarm",
-    "alarmTow": "Tow Alarm",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Hard Acceleration Alarm",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Fatigue Driving Alarm",
-    "alarmPowerCut": "Power Cut Alarm",
-    "alarmPowerRestored": "Power Restored Alarm",
-    "alarmJamming": "Jamming Alarm",
-    "alarmTemperature": "Temperature Alarm",
-    "alarmParking": "Parking Alarm",
-    "alarmShock": "Shock Alarm",
-    "alarmBonnet": "Bonnet Alarm",
-    "alarmFootBrake": "Foot Brake Alarm",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Tampering Alarm",
-    "alarmRemoving": "Removing Alarm",
+    "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": "ຊະນິດການແຈ້ງເຕືອນ",
     "notificationAlways": "All Devices",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
@@ -371,6 +375,7 @@
     "reportChartType": "Chart Type",
     "reportShowMarkers": "Show Markers",
     "reportExport": "Export",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "End Time",
     "reportEndAddress": "End Address",
     "reportSpentFuel": "Spent Fuel",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistics",
     "statisticsCaptureTime": "Capture Time",
     "statisticsActiveUsers": "Active Users",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Truck",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file