Merge branch 'master' into modern

127 files changed, 5045 insertions, 5090 deletions

diff --git a/web/app/Application.js b/web/app/Application.js
index d0b6713c..91bdc584 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -21,7 +21,8 @@ Ext.define('Traccar.Application', {
 
     requires: [
         'Traccar.Style',
-        'Traccar.AttributeFormatter'
+        'Traccar.AttributeFormatter',
+        'Traccar.view.TouchFix62'
     ],
 
     models: [
@@ -51,6 +52,7 @@ Ext.define('Traccar.Application', {
         'Devices',
         'AllGroups',
         'AllDevices',
+        'AlarmTypes',
         'Positions',
         'LatestPositions',
         'EventPositions',
@@ -148,6 +150,19 @@ Ext.define('Traccar.Application', {
         }
     },
 
+    updateNotificationToken: function (token) {
+        var attributes = Ext.clone(this.user.get('attributes'));
+        if (!attributes.notificationTokens || attributes.notificationTokens.indexOf(token) < 0) {
+            if (!attributes.notificationTokens) {
+                attributes.notificationTokens = token;
+            } else {
+                attributes.notificationTokens += ',' + token;
+            }
+            this.user.set('attributes', attributes);
+            this.user.save();
+        }
+    },
+
     setUser: function (data) {
         var reader = Ext.create('Ext.data.reader.Json', {
             model: 'Traccar.model.User'
diff --git a/web/app/GeofenceConverter.js b/web/app/GeofenceConverter.js
index 4891e7b1..688f2233 100644
--- a/web/app/GeofenceConverter.js
+++ b/web/app/GeofenceConverter.js
@@ -45,7 +45,7 @@ Ext.define('Traccar.GeofenceConverter', {
                     resolutionAtEquator = mapView.getResolution();
                     pointResolution = ol.proj.getPointResolution(projection, resolutionAtEquator, center);
                     resolutionFactor = resolutionAtEquator / pointResolution;
-                    radius = Number(coordinates[2]) / ol.proj.METERS_PER_UNIT.m * resolutionFactor;
+                    radius = Number(coordinates[2]) / ol.proj.Units.METERS_PER_UNIT.m * resolutionFactor;
                     geometry = new ol.geom.Circle(center, radius);
                 }
             }
@@ -68,15 +68,14 @@ Ext.define('Traccar.GeofenceConverter', {
     },
 
     geometryToWkt: function (projection, geometry) {
-        var result, i, center, radius, edgeCoordinate, earthSphere, groundRadius, points;
+        var result, i, center, radius, edgeCoordinate, groundRadius, points;
         if (geometry instanceof ol.geom.Circle) {
             center = geometry.getCenter();
             radius = geometry.getRadius();
             edgeCoordinate = [center[0] + radius, center[1]];
             center = ol.proj.transform(center, projection, 'EPSG:4326');
-            earthSphere = new ol.Sphere(6378137);
-            groundRadius = earthSphere.haversineDistance(center,
-                ol.proj.transform(edgeCoordinate, projection, 'EPSG:4326'));
+            groundRadius = ol.sphere.getDistance(
+                center, ol.proj.transform(edgeCoordinate, projection, 'EPSG:4326'), 6378137);
             result = 'CIRCLE (';
             result += center[1] + ' ' + center[0] + ', ';
             result += groundRadius.toFixed(1) + ')';
diff --git a/web/app/Style.js b/web/app/Style.js
index 47c49a96..371e05a1 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -81,6 +81,9 @@ Ext.define('Traccar.Style', {
     mapGeofenceWidth: 5,
     mapGeofenceRadius: 9,
 
+    mapAnimateMarkerDuration: 2000,
+    mapAnimateMarkerTimeout: 40,
+
     coordinatePrecision: 6,
     numberPrecision: 2,
 
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 0edc049a..7c0345ad 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -109,6 +109,14 @@ Ext.define('Traccar.controller.Root', {
 
     loadApp: function () {
         var attribution, eventId;
+
+        if (window.webkit && window.webkit.messageHandlers.appInterface) {
+            window.webkit.messageHandlers.appInterface.postMessage('login');
+        }
+        if (window.appInterface) {
+            window.appInterface.postMessage('login');
+        }
+
         Ext.getStore('Groups').load();
         Ext.getStore('Drivers').load();
         Ext.getStore('Geofences').load();
diff --git a/web/app/model/ReportStop.js b/web/app/model/ReportStop.js
index 1867f73b..9aaa58b0 100644
--- a/web/app/model/ReportStop.js
+++ b/web/app/model/ReportStop.js
@@ -34,6 +34,10 @@ Ext.define('Traccar.model.ReportStop', {
         type: 'date',
         dateFormat: 'c'
     }, {
+        name: 'startOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
         name: 'address',
         type: 'string'
     }, {
diff --git a/web/app/model/ReportSummary.js b/web/app/model/ReportSummary.js
index 4bc78731..dcc0365c 100644
--- a/web/app/model/ReportSummary.js
+++ b/web/app/model/ReportSummary.js
@@ -39,6 +39,14 @@ Ext.define('Traccar.model.ReportSummary', {
         type: 'float',
         convert: Traccar.AttributeFormatter.getConverter('distance')
     }, {
+        name: 'startOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
+        name: 'endOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
         name: 'engineHours',
         type: 'int'
     }, {
diff --git a/web/app/model/ReportTrip.js b/web/app/model/ReportTrip.js
index 9004b86d..9d45fc87 100644
--- a/web/app/model/ReportTrip.js
+++ b/web/app/model/ReportTrip.js
@@ -39,6 +39,14 @@ Ext.define('Traccar.model.ReportTrip', {
         type: 'float',
         convert: Traccar.AttributeFormatter.getConverter('distance')
     }, {
+        name: 'startOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
+        name: 'endOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
         name: 'duration',
         type: 'int'
     }, {
diff --git a/web/app/store/AlarmTypes.js b/web/app/store/AlarmTypes.js
new file mode 100644
index 00000000..1ee7ffe8
--- /dev/null
+++ b/web/app/store/AlarmTypes.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+Ext.define('Traccar.store.AlarmTypes', {
+    extend: 'Ext.data.Store',
+    fields: ['key', 'name'],
+
+    data: (function () {
+        var key, items = [];
+        for (key in Strings) {
+            if (Strings.hasOwnProperty(key) && key.lastIndexOf('alarm', 0) === 0) {
+                items.push({
+                    key: key.charAt(5).toLowerCase() + key.slice(6),
+                    name: Strings[key]
+                });
+            }
+        }
+        return items;
+    })()
+});
diff --git a/web/app/store/AllMaintenances.js b/web/app/store/AllMaintenances.js
index 745b5d64..8435ad40 100644
--- a/web/app/store/AllMaintenances.js
+++ b/web/app/store/AllMaintenances.js
@@ -22,7 +22,7 @@ Ext.define('Traccar.store.AllMaintenances', {
 
     proxy: {
         type: 'rest',
-        url: 'api/maintenances',
+        url: 'api/maintenance',
         extraParams: {
             all: true
         }
diff --git a/web/app/store/CommonUserAttributes.js b/web/app/store/CommonUserAttributes.js
index 0ee9e163..a8e92825 100644
--- a/web/app/store/CommonUserAttributes.js
+++ b/web/app/store/CommonUserAttributes.js
@@ -63,8 +63,8 @@ Ext.define('Traccar.store.CommonUserAttributes', {
         name: Strings.attributeUiDisableCalendars,
         valueType: 'boolean'
     }, {
-        key: 'ui.disableMaintenances',
-        name: Strings.attributeUiDisableMaintenances,
+        key: 'ui.disableMaintenance',
+        name: Strings.attributeUiDisableMaintenance,
         valueType: 'boolean'
     }, {
         key: 'ui.hidePositionAttributes',
diff --git a/web/app/store/KnownCommands.js b/web/app/store/KnownCommands.js
index 8bf2e24e..1e82f2b8 100644
--- a/web/app/store/KnownCommands.js
+++ b/web/app/store/KnownCommands.js
@@ -39,7 +39,7 @@ Ext.define('Traccar.store.KnownCommands', {
     }, {
         type: 'setTimezone',
         parameters: [{
-            key: 'timezoneName',
+            key: 'timezone',
             name: Strings.commandTimezone,
             valueType: 'string',
             dataType: 'timezone'
@@ -56,6 +56,13 @@ Ext.define('Traccar.store.KnownCommands', {
             valueType: 'string'
         }]
     }, {
+        type: 'message',
+        parameters: [{
+            key: 'message',
+            name: Strings.commandMessage,
+            valueType: 'string'
+        }]
+    }, {
         type: 'sendUssd',
         parameters: [{
             key: 'phone',
diff --git a/web/app/store/Maintenances.js b/web/app/store/Maintenances.js
index 43d6ba5b..a7aa4a07 100644
--- a/web/app/store/Maintenances.js
+++ b/web/app/store/Maintenances.js
@@ -22,7 +22,7 @@ Ext.define('Traccar.store.Maintenances', {
 
     proxy: {
         type: 'rest',
-        url: 'api/maintenances',
+        url: 'api/maintenance',
         writer: {
             writeAllFields: true
         }
diff --git a/web/app/store/MapTypes.js b/web/app/store/MapTypes.js
index 3d322438..88d54bfa 100644
--- a/web/app/store/MapTypes.js
+++ b/web/app/store/MapTypes.js
@@ -49,5 +49,8 @@ Ext.define('Traccar.store.MapTypes', {
     }, {
         key: 'custom',
         name: Strings.mapCustom
+    }, {
+        key: 'customArcgis',
+        name: Strings.mapCustomArcgis
     }]
 });
diff --git a/web/app/view/DeviceMenu.js b/web/app/view/DeviceMenu.js
index e4623b94..06b272ad 100644
--- a/web/app/view/DeviceMenu.js
+++ b/web/app/view/DeviceMenu.js
@@ -57,7 +57,7 @@ Ext.define('Traccar.view.DeviceMenu', {
             handler: 'onCommandsClick',
             reference: 'menuCommandsButton'
         }, {
-            text: Strings.sharedMaintenances,
+            text: Strings.sharedMaintenance,
             glyph: 'xf0ad@FontAwesome',
             handler: 'onMaintenancesClick',
             reference: 'menuMaintenancesButton'
diff --git a/web/app/view/DeviceMenuController.js b/web/app/view/DeviceMenuController.js
index 9355571c..830ea7ec 100644
--- a/web/app/view/DeviceMenuController.js
+++ b/web/app/view/DeviceMenuController.js
@@ -40,7 +40,7 @@ Ext.define('Traccar.view.DeviceMenuController', {
         this.lookupReference('menuDeviceAccumulatorsButton').setHidden(
             !Traccar.app.getUser().get('administrator') && Traccar.app.getUser().get('userLimit') === 0 || Traccar.app.getVehicleFeaturesDisabled());
         this.lookupReference('menuMaintenancesButton').setHidden(
-            Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenances'));
+            Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenance'));
     },
 
     onGeofencesClick: function () {
@@ -110,7 +110,7 @@ Ext.define('Traccar.view.DeviceMenuController', {
 
     onMaintenancesClick: function () {
         Ext.create('Traccar.view.BaseWindow', {
-            title: Strings.sharedMaintenances,
+            title: Strings.sharedMaintenance,
             items: {
                 xtype: 'linkMaintenancesView',
                 baseObjectName: 'deviceId',
diff --git a/web/app/view/EventsController.js b/web/app/view/EventsController.js
index 8eb4363f..e11b4ff6 100644
--- a/web/app/view/EventsController.js
+++ b/web/app/view/EventsController.js
@@ -24,7 +24,11 @@ Ext.define('Traccar.view.EventsController', {
         listen: {
             controller: {
                 '*': {
-                    deselectevent: 'deselectEvent'
+                    selectdevice: 'deselectEvent',
+                    selectreport: 'deselectEvent'
+                },
+                'map': {
+                    deselectfeature: 'deselectFeature'
                 }
             },
             store: {
@@ -79,7 +83,14 @@ Ext.define('Traccar.view.EventsController', {
         Traccar.app.showEvents(false);
     },
 
-    deselectEvent: function () {
+
+    deselectEvent: function (object) {
+        if (object) {
+            this.deselectFeature();
+        }
+    },
+
+    deselectFeature: function () {
         this.getView().getSelectionModel().deselectAll();
     },
 
diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index f77cfca6..deedb747 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -63,6 +63,11 @@ Ext.define('Traccar.view.Report', {
             disabled: true,
             handler: 'onReportClick'
         }, {
+            text: Strings.reportEmail,
+            reference: 'emailButton',
+            disabled: true,
+            handler: 'onReportClick'
+        }, {
             text: Strings.reportClear,
             handler: 'onClearClick'
         }]
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 72e7e37e..2f10cde1 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -32,12 +32,13 @@ Ext.define('Traccar.view.ReportController', {
         listen: {
             controller: {
                 '*': {
-                    selectdevice: 'selectDevice',
-                    showsingleevent: 'showSingleEvent',
-                    deselectfeature: 'deselectFeature'
+                    selectdevice: 'deselectReport',
+                    selectevent: 'deselectReport',
+                    showsingleevent: 'showSingleEvent'
                 },
                 'map': {
-                    selectreport: 'selectReport'
+                    selectreport: 'selectReport',
+                    deselectfeature: 'deselectFeature'
                 }
             },
             global: {
@@ -145,6 +146,7 @@ Ext.define('Traccar.view.ReportController', {
         disabled = !reportType || !devices || !time || this.reportProgress;
         this.lookupReference('showButton').setDisabled(disabled);
         this.lookupReference('exportButton').setDisabled(reportType === 'chart' || disabled);
+        this.lookupReference('emailButton').setDisabled(reportType === 'chart' || disabled);
     },
 
     onReportClick: function (button) {
@@ -187,14 +189,15 @@ Ext.define('Traccar.view.ReportController', {
                         to: to.toISOString()
                     }
                 });
-            } else if (button.reference === 'exportButton') {
+            } else {
                 url = this.getGrid().getStore().getProxy().url;
-                this.downloadFile(url, {
+                this.excelReport(url, {
                     deviceId: this.deviceId,
                     groupId: this.groupId,
                     type: this.eventType,
                     from: Ext.Date.format(from, 'c'),
-                    to: Ext.Date.format(to, 'c')
+                    to: Ext.Date.format(to, 'c'),
+                    mail: button.reference === 'emailButton'
                 });
             }
         }
@@ -229,12 +232,6 @@ Ext.define('Traccar.view.ReportController', {
         }
     },
 
-    selectDevice: function (device) {
-        if (device) {
-            this.getGrid().getSelectionModel().deselectAll();
-        }
-    },
-
     selectReport: function (object) {
         var positionRelated, reportType = this.lookupReference('reportTypeField').getValue();
         if (object instanceof Traccar.model.Position) {
@@ -249,6 +246,12 @@ Ext.define('Traccar.view.ReportController', {
         }
     },
 
+    deselectReport: function (object) {
+        if (object) {
+            this.deselectFeature();
+        }
+    },
+
     deselectFeature: function () {
         if (this.lookupReference('reportTypeField').getValue() !== 'trips') {
             this.getGrid().getSelectionModel().deselectAll();
@@ -371,7 +374,7 @@ Ext.define('Traccar.view.ReportController', {
         });
     },
 
-    downloadFile: function (requestUrl, requestParams) {
+    excelReport: function (requestUrl, requestParams) {
         Ext.Ajax.request({
             url: requestUrl,
             method: 'GET',
@@ -384,7 +387,7 @@ Ext.define('Traccar.view.ReportController', {
             scope: this,
             callback: function (options, success, response) {
                 var disposition, filename, type, blob, url, downloadUrl;
-                if (success) {
+                if (success && !requestParams.mail) {
                     disposition = response.getResponseHeader('Content-Disposition');
                     filename = disposition.slice(disposition.indexOf('=') + 1, disposition.length);
                     type = response.getResponseHeader('Content-Type');
@@ -539,6 +542,14 @@ Ext.define('Traccar.view.ReportController', {
         dataIndex: 'distance',
         renderer: Traccar.AttributeFormatter.getFormatter('distance')
     }, {
+        text: Strings.reportStartOdometer,
+        dataIndex: 'startOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
+    }, {
+        text: Strings.reportEndOdometer,
+        dataIndex: 'endOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
+    }, {
         text: Strings.reportAverageSpeed,
         dataIndex: 'averageSpeed',
         renderer: Traccar.AttributeFormatter.getFormatter('speed')
@@ -566,6 +577,10 @@ Ext.define('Traccar.view.ReportController', {
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('startTime')
     }, {
+        text: Strings.reportStartOdometer,
+        dataIndex: 'startOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
+    }, {
         text: Strings.reportStartAddress,
         dataIndex: 'startAddress',
         renderer: Traccar.AttributeFormatter.getFormatter('address')
@@ -575,6 +590,10 @@ Ext.define('Traccar.view.ReportController', {
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('endTime')
     }, {
+        text: Strings.reportEndOdometer,
+        dataIndex: 'endOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
+    }, {
         text: Strings.reportEndAddress,
         dataIndex: 'endAddress',
         renderer: Traccar.AttributeFormatter.getFormatter('address')
@@ -614,6 +633,10 @@ Ext.define('Traccar.view.ReportController', {
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('startTime')
     }, {
+        text: Strings.positionOdometer,
+        dataIndex: 'startOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
+    }, {
         text: Strings.positionAddress,
         dataIndex: 'address',
         renderer: Traccar.AttributeFormatter.getFormatter('address')
diff --git a/web/app/view/SettingsMenu.js b/web/app/view/SettingsMenu.js
index 309133c1..0a81d520 100644
--- a/web/app/view/SettingsMenu.js
+++ b/web/app/view/SettingsMenu.js
@@ -98,7 +98,7 @@ Ext.define('Traccar.view.SettingsMenu', {
             reference: 'settingsCommandsButton'
         }, {
             hidden: true,
-            text: Strings.sharedMaintenances,
+            text: Strings.sharedMaintenance,
             glyph: 'xf0ad@FontAwesome',
             handler: 'onMaintenancesClick',
             reference: 'settingsMaintenancesButton'
diff --git a/web/app/view/SettingsMenuController.js b/web/app/view/SettingsMenuController.js
index 37e0634c..c8018f66 100644
--- a/web/app/view/SettingsMenuController.js
+++ b/web/app/view/SettingsMenuController.js
@@ -37,14 +37,15 @@ Ext.define('Traccar.view.SettingsMenuController', {
     ],
 
     init: function () {
-        var admin, manager, readonly, deviceReadonly;
+        var admin, manager, readonly;
         admin = Traccar.app.getUser().get('administrator');
         manager = Traccar.app.getUser().get('userLimit') !== 0;
         readonly = Traccar.app.getPreference('readonly', false);
-        deviceReadonly = Traccar.app.getUser().get('deviceReadonly');
         if (admin) {
             this.lookupReference('settingsServerButton').setHidden(false);
             this.lookupReference('settingsStatisticsButton').setHidden(false);
+            this.lookupReference('settingsComputedAttributesButton').setHidden(
+                Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
         }
         if (admin || manager) {
             this.lookupReference('settingsUsersButton').setHidden(false);
@@ -60,11 +61,7 @@ Ext.define('Traccar.view.SettingsMenuController', {
                 Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableDrivers'));
             this.lookupReference('settingsCommandsButton').setHidden(Traccar.app.getPreference('limitCommands', false));
             this.lookupReference('settingsMaintenancesButton').setHidden(
-                Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenances'));
-        }
-        if (admin || !deviceReadonly && !readonly) {
-            this.lookupReference('settingsComputedAttributesButton').setHidden(
-                Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
+                Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenance'));
         }
     },
 
@@ -166,7 +163,7 @@ Ext.define('Traccar.view.SettingsMenuController', {
 
     onMaintenancesClick: function () {
         Ext.create('Traccar.view.BaseWindow', {
-            title: Strings.sharedMaintenances,
+            title: Strings.sharedMaintenance,
             items: {
                 xtype: 'maintenancesView'
             }
diff --git a/web/app/view/StateController.js b/web/app/view/StateController.js
index 6363fc9c..1ab1aa2f 100644
--- a/web/app/view/StateController.js
+++ b/web/app/view/StateController.js
@@ -32,7 +32,8 @@ Ext.define('Traccar.view.StateController', {
             controller: {
                 '*': {
                     selectdevice: 'selectDevice',
-                    selectreport: 'selectReport',
+                    selectreport: 'selectPosition',
+                    selectevent: 'selectPosition',
                     deselectfeature: 'deselectFeature'
                 }
             },
@@ -167,7 +168,7 @@ Ext.define('Traccar.view.StateController', {
         }
     },
 
-    selectReport: function (position) {
+    selectPosition: function (position) {
         if (position instanceof Traccar.model.Position) {
             this.deviceId = null;
             this.position = position;
diff --git a/web/app/view/Statistics.js b/web/app/view/Statistics.js
index f033e03a..af199a02 100644
--- a/web/app/view/Statistics.js
+++ b/web/app/view/Statistics.js
@@ -77,10 +77,10 @@ Ext.define('Traccar.view.Statistics', {
             text: Strings.statisticsMessagesStored,
             dataIndex: 'messagesStored'
         }, {
-            text: Strings.notificationMail,
+            text: Strings.notificatorMail,
             dataIndex: 'mailSent'
         }, {
-            text: Strings.notificationSms,
+            text: Strings.notificatorSms,
             dataIndex: 'smsSent'
         }, {
             text: Strings.statisticsGeocoder,
diff --git a/web/app/view/TouchFix62.js b/web/app/view/TouchFix62.js
new file mode 100644
index 00000000..300d4f70
--- /dev/null
+++ b/web/app/view/TouchFix62.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Workaround for bug in ExtJs 6.2.0.
+ * Resolved in current yet unreleased version
+ */
+
+Ext.define('Traccar.view.TouchFix62', {
+    override: 'Ext.dom.Element'
+},
+function () {
+    var additiveEvents = this.prototype.additiveEvents,
+        eventMap = this.prototype.eventMap;
+    if (Ext.supports.TouchEvents && Ext.firefoxVersion >= 52 && Ext.os.is.Desktop) {
+        eventMap['touchstart'] = 'mousedown';
+        eventMap['touchmove'] = 'mousemove';
+        eventMap['touchend'] = 'mouseup';
+        eventMap['touchcancel'] = 'mouseup';
+        eventMap['click'] = 'click';
+        eventMap['dblclick'] = 'dblclick';
+        additiveEvents['mousedown'] = 'mousedown';
+        additiveEvents['mousemove'] = 'mousemove';
+        additiveEvents['mouseup'] = 'mouseup';
+        additiveEvents['touchstart'] = 'touchstart';
+        additiveEvents['touchmove'] = 'touchmove';
+        additiveEvents['touchend'] = 'touchend';
+        additiveEvents['touchcancel'] = 'touchcancel';
+        additiveEvents['pointerdown'] = 'mousedown';
+        additiveEvents['pointermove'] = 'mousemove';
+        additiveEvents['pointerup'] = 'mouseup';
+        additiveEvents['pointercancel'] = 'mouseup';
+    }
+});
diff --git a/web/app/view/UnescapedTextAreaField.js b/web/app/view/UnescapedTextAreaField.js
new file mode 100644
index 00000000..5de267ce
--- /dev/null
+++ b/web/app/view/UnescapedTextAreaField.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+Ext.define('Traccar.view.UnescapedTextAreaField', {
+    extend: 'Ext.form.field.TextArea',
+    xtype: 'unescapedTextAreaField',
+
+    initComponent: function () {
+        this.callParent();
+        this.on('change', this.onValueChange);
+    },
+
+    onValueChange: function (field, newValue) {
+        field.setValue(Ext.String.htmlDecode(newValue));
+    }
+});
diff --git a/web/app/view/UnescapedTextField.js b/web/app/view/UnescapedTextField.js
new file mode 100644
index 00000000..3b1b2798
--- /dev/null
+++ b/web/app/view/UnescapedTextField.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+Ext.define('Traccar.view.UnescapedTextField', {
+    extend: 'Ext.form.field.Text',
+    xtype: 'unescapedTextField',
+
+    initComponent: function () {
+        this.callParent();
+        this.on('change', this.onValueChange);
+    },
+
+    onValueChange: function (field, newValue) {
+        field.setValue(Ext.String.htmlDecode(newValue));
+    }
+});
diff --git a/web/app/view/dialog/Attribute.js b/web/app/view/dialog/Attribute.js
index 2a458977..a85cad05 100644
--- a/web/app/view/dialog/Attribute.js
+++ b/web/app/view/dialog/Attribute.js
@@ -21,7 +21,8 @@ Ext.define('Traccar.view.dialog.Attribute', {
     requires: [
         'Traccar.view.dialog.AttributeController',
         'Traccar.view.ColorPicker',
-        'Traccar.view.CustomNumberField'
+        'Traccar.view.CustomNumberField',
+        'Traccar.view.UnescapedTextField'
     ],
 
     controller: 'attribute',
@@ -33,7 +34,7 @@ Ext.define('Traccar.view.dialog.Attribute', {
             validitychange: 'onValidityChange'
         },
         items: [{
-            xtype: 'textfield',
+            xtype: 'unescapedTextField',
             reference: 'nameTextField',
             name: 'name',
             allowBlank: false,
diff --git a/web/app/view/dialog/Calendar.js b/web/app/view/dialog/Calendar.js
index 9880d4e6..5f00a8be 100644
--- a/web/app/view/dialog/Calendar.js
+++ b/web/app/view/dialog/Calendar.js
@@ -20,7 +20,8 @@ Ext.define('Traccar.view.dialog.Calendar', {
     extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.dialog.CalendarController'
+        'Traccar.view.dialog.CalendarController',
+        'Traccar.view.UnescapedTextField'
     ],
 
     controller: 'calendar',
@@ -32,7 +33,7 @@ Ext.define('Traccar.view.dialog.Calendar', {
             xtype: 'fieldset',
             title: Strings.sharedRequired,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'name',
                 fieldLabel: Strings.sharedName,
                 allowBlank: false
diff --git a/web/app/view/dialog/ComputedAttribute.js b/web/app/view/dialog/ComputedAttribute.js
index ef6269be..adae7f7b 100644
--- a/web/app/view/dialog/ComputedAttribute.js
+++ b/web/app/view/dialog/ComputedAttribute.js
@@ -20,7 +20,9 @@ Ext.define('Traccar.view.dialog.ComputedAttribute', {
     extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.dialog.ComputedAttributeController'
+        'Traccar.view.dialog.ComputedAttributeController',
+        'Traccar.view.UnescapedTextField',
+        'Traccar.view.UnescapedTextAreaField'
     ],
 
     controller: 'computedAttribute',
@@ -29,7 +31,7 @@ Ext.define('Traccar.view.dialog.ComputedAttribute', {
     items: {
         xtype: 'form',
         items: [{
-            xtype: 'textfield',
+            xtype: 'unescapedTextField',
             name: 'description',
             fieldLabel: Strings.sharedDescription
         }, {
@@ -43,7 +45,8 @@ Ext.define('Traccar.view.dialog.ComputedAttribute', {
                 change: 'onAttributeChange'
             }
         }, {
-            xtype: 'textareafield',
+            xtype: 'unescapedTextAreaField',
+            reference: 'expressionField',
             name: 'expression',
             fieldLabel: Strings.sharedExpression,
             allowBlank: false
diff --git a/web/app/view/dialog/Device.js b/web/app/view/dialog/Device.js
index 50a5e79c..60a8f716 100644
--- a/web/app/view/dialog/Device.js
+++ b/web/app/view/dialog/Device.js
@@ -20,7 +20,8 @@ Ext.define('Traccar.view.dialog.Device', {
 
     requires: [
         'Traccar.view.ClearableComboBox',
-        'Traccar.view.dialog.DeviceController'
+        'Traccar.view.dialog.DeviceController',
+        'Traccar.view.UnescapedTextField'
     ],
 
     controller: 'device',
@@ -32,12 +33,12 @@ Ext.define('Traccar.view.dialog.Device', {
             xtype: 'fieldset',
             title: Strings.sharedRequired,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'name',
                 fieldLabel: Strings.sharedName,
                 allowBlank: false
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'uniqueId',
                 fieldLabel: Strings.deviceIdentifier,
                 allowBlank: false
@@ -56,15 +57,15 @@ Ext.define('Traccar.view.dialog.Device', {
                 displayField: 'name',
                 valueField: 'id'
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'phone',
                 fieldLabel: Strings.sharedPhone
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'model',
                 fieldLabel: Strings.deviceModel
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'contact',
                 fieldLabel: Strings.deviceContact
             }, {
diff --git a/web/app/view/dialog/Driver.js b/web/app/view/dialog/Driver.js
index b67e182d..9b1c17b5 100644
--- a/web/app/view/dialog/Driver.js
+++ b/web/app/view/dialog/Driver.js
@@ -19,6 +19,10 @@
 Ext.define('Traccar.view.dialog.Driver', {
     extend: 'Traccar.view.dialog.BaseEdit',
 
+    requires: [
+        'Traccar.view.UnescapedTextField'
+    ],
+
     title: Strings.sharedDriver,
 
     items: {
@@ -27,12 +31,12 @@ Ext.define('Traccar.view.dialog.Driver', {
             xtype: 'fieldset',
             title: Strings.sharedRequired,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'name',
                 fieldLabel: Strings.sharedName,
                 allowBlank: false
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'uniqueId',
                 fieldLabel: Strings.deviceIdentifier,
                 allowBlank: false
diff --git a/web/app/view/dialog/Geofence.js b/web/app/view/dialog/Geofence.js
index 65c32c04..1e22cd7b 100644
--- a/web/app/view/dialog/Geofence.js
+++ b/web/app/view/dialog/Geofence.js
@@ -20,7 +20,8 @@ Ext.define('Traccar.view.dialog.Geofence', {
 
     requires: [
         'Traccar.view.ClearableComboBox',
-        'Traccar.view.dialog.GeofenceController'
+        'Traccar.view.dialog.GeofenceController',
+        'Traccar.view.UnescapedTextField'
     ],
 
     controller: 'geofence',
@@ -32,7 +33,7 @@ Ext.define('Traccar.view.dialog.Geofence', {
             xtype: 'fieldset',
             title: Strings.sharedRequired,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'name',
                 fieldLabel: Strings.sharedName
             }]
@@ -42,7 +43,7 @@ Ext.define('Traccar.view.dialog.Geofence', {
             collapsible: true,
             collapsed: true,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'description',
                 fieldLabel: Strings.sharedDescription
             }, {
diff --git a/web/app/view/dialog/Group.js b/web/app/view/dialog/Group.js
index 805b422c..61ca193d 100644
--- a/web/app/view/dialog/Group.js
+++ b/web/app/view/dialog/Group.js
@@ -19,7 +19,8 @@ Ext.define('Traccar.view.dialog.Group', {
     extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.ClearableComboBox'
+        'Traccar.view.ClearableComboBox',
+        'Traccar.view.UnescapedTextField'
     ],
 
     title: Strings.groupDialog,
@@ -30,7 +31,7 @@ Ext.define('Traccar.view.dialog.Group', {
             xtype: 'fieldset',
             title: Strings.sharedRequired,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'name',
                 fieldLabel: Strings.sharedName,
                 allowBlank: false
diff --git a/web/app/view/dialog/Maintenance.js b/web/app/view/dialog/Maintenance.js
index 5705278f..d844d259 100644
--- a/web/app/view/dialog/Maintenance.js
+++ b/web/app/view/dialog/Maintenance.js
@@ -21,7 +21,8 @@ Ext.define('Traccar.view.dialog.Maintenance', {
 
     requires: [
         'Traccar.view.dialog.MaintenanceController',
-        'Traccar.view.CustomNumberField'
+        'Traccar.view.CustomNumberField',
+        'Traccar.view.UnescapedTextField'
     ],
 
     controller: 'maintenance',
@@ -37,7 +38,7 @@ Ext.define('Traccar.view.dialog.Maintenance', {
             xtype: 'fieldset',
             title: Strings.sharedRequired,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'name',
                 fieldLabel: Strings.sharedName,
                 allowBlank: false
diff --git a/web/app/view/dialog/Notification.js b/web/app/view/dialog/Notification.js
index dc4362d9..51af5b8e 100644
--- a/web/app/view/dialog/Notification.js
+++ b/web/app/view/dialog/Notification.js
@@ -41,7 +41,10 @@ Ext.define('Traccar.view.dialog.Notification', {
                 displayField: 'name',
                 valueField: 'type',
                 editable: false,
-                allowBlank: false
+                allowBlank: false,
+                listeners: {
+                    change: 'onTypeChange'
+                }
             }, {
                 xtype: 'checkboxfield',
                 inputValue: true,
@@ -49,8 +52,22 @@ Ext.define('Traccar.view.dialog.Notification', {
                 name: 'always',
                 fieldLabel: Strings.notificationAlways
             }, {
-                fieldLabel: Strings.notificationNotificators,
                 xtype: 'tagfield',
+                reference: 'alarmsField',
+                fieldLabel: Strings.sharedAlarms,
+                maxWidth: Traccar.Style.formFieldWidth,
+                store: 'AlarmTypes',
+                valueField: 'key',
+                displayField: 'name',
+                queryMode: 'local',
+                hidden: true,
+                listeners: {
+                    beforerender: 'onAlarmsLoad',
+                    change: 'onAlarmsChange'
+                }
+            }, {
+                xtype: 'tagfield',
+                fieldLabel: Strings.notificationNotificators,
                 name: 'notificators',
                 maxWidth: Traccar.Style.formFieldWidth,
                 store: 'AllNotificators',
diff --git a/web/app/view/dialog/NotificationController.js b/web/app/view/dialog/NotificationController.js
index ad65c333..5da669a4 100644
--- a/web/app/view/dialog/NotificationController.js
+++ b/web/app/view/dialog/NotificationController.js
@@ -23,5 +23,31 @@ Ext.define('Traccar.view.dialog.NotificationController', {
     init: function () {
         this.lookupReference('calendarCombo').setHidden(
             Traccar.app.getBooleanAttributePreference('ui.disableCalendars'));
+    },
+
+    onTypeChange: function (view, value) {
+        this.lookupReference('alarmsField').setHidden(value !== 'alarm');
+    },
+
+    onAlarmsLoad: function (view) {
+        var attributes, record = view.up('form').getRecord();
+        attributes = record.get('attributes') || {};
+        if (attributes['alarms']) {
+            view.suspendEvents(false);
+            view.setValue(attributes['alarms'].split(','));
+            view.resumeEvents();
+        }
+    },
+
+    onAlarmsChange: function (view, value) {
+        var attributes, record = view.up('window').down('form').getRecord();
+        attributes = record.get('attributes') || {};
+
+        value = value.join();
+        if (attributes['alarms'] !== value) {
+            attributes['alarms'] = value;
+            record.set('attributes', attributes);
+            record.dirty = true;
+        }
     }
 });
diff --git a/web/app/view/dialog/SavedCommand.js b/web/app/view/dialog/SavedCommand.js
index 4759143a..b1aeae73 100644
--- a/web/app/view/dialog/SavedCommand.js
+++ b/web/app/view/dialog/SavedCommand.js
@@ -19,7 +19,8 @@ Ext.define('Traccar.view.dialog.SavedCommand', {
     extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.dialog.SavedCommandController'
+        'Traccar.view.dialog.SavedCommandController',
+        'Traccar.view.UnescapedTextField'
     ],
 
     controller: 'savedCommand',
@@ -34,7 +35,7 @@ Ext.define('Traccar.view.dialog.SavedCommand', {
             xtype: 'fieldset',
             title: Strings.sharedRequired,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'description',
                 fieldLabel: Strings.sharedDescription
             }, {
@@ -42,7 +43,7 @@ Ext.define('Traccar.view.dialog.SavedCommand', {
                 name: 'textChannel',
                 inputValue: true,
                 uncheckedValue: false,
-                fieldLabel: Strings.notificationSms
+                fieldLabel: Strings.commandSendSms
             }, {
                 xtype: 'combobox',
                 name: 'type',
diff --git a/web/app/view/dialog/SendCommand.js b/web/app/view/dialog/SendCommand.js
index 9e07cbf3..79954739 100644
--- a/web/app/view/dialog/SendCommand.js
+++ b/web/app/view/dialog/SendCommand.js
@@ -54,7 +54,7 @@ Ext.define('Traccar.view.dialog.SendCommand', {
                 reference: 'textChannelCheckBox',
                 inputValue: true,
                 uncheckedValue: false,
-                fieldLabel: Strings.notificationSms,
+                fieldLabel: Strings.commandSendSms,
                 listeners: {
                     change: 'onTextChannelChange'
                 }
diff --git a/web/app/view/dialog/Server.js b/web/app/view/dialog/Server.js
index fbfb3c6a..b72dbb0c 100644
--- a/web/app/view/dialog/Server.js
+++ b/web/app/view/dialog/Server.js
@@ -20,7 +20,8 @@ Ext.define('Traccar.view.dialog.Server', {
 
     requires: [
         'Traccar.view.ClearableComboBox',
-        'Traccar.view.dialog.MapPickerController'
+        'Traccar.view.dialog.MapPickerController',
+        'Traccar.view.UnescapedTextField'
     ],
 
     controller: 'mapPicker',
@@ -39,13 +40,14 @@ Ext.define('Traccar.view.dialog.Server', {
                 displayField: 'name',
                 valueField: 'key'
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'bingKey',
                 fieldLabel: Strings.mapBingKey
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
+                reference: 'mapUrlField',
                 name: 'mapUrl',
-                fieldLabel: Strings.mapCustom
+                fieldLabel: Strings.mapCustomLabel
             }, {
                 xtype: 'numberfield',
                 reference: 'latitude',
@@ -83,7 +85,7 @@ Ext.define('Traccar.view.dialog.Server', {
                 displayField: 'name',
                 valueField: 'key'
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'poiLayer',
                 fieldLabel: Strings.mapPoiLayer
             }]
diff --git a/web/app/view/dialog/User.js b/web/app/view/dialog/User.js
index 86f91672..917f110c 100644
--- a/web/app/view/dialog/User.js
+++ b/web/app/view/dialog/User.js
@@ -20,7 +20,8 @@ Ext.define('Traccar.view.dialog.User', {
 
     requires: [
         'Traccar.view.ClearableComboBox',
-        'Traccar.view.dialog.UserController'
+        'Traccar.view.dialog.UserController',
+        'Traccar.view.UnescapedTextField'
     ],
 
     controller: 'user',
@@ -32,11 +33,11 @@ Ext.define('Traccar.view.dialog.User', {
             xtype: 'fieldset',
             title: Strings.sharedRequired,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'name',
                 fieldLabel: Strings.sharedName
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'email',
                 fieldLabel: Strings.userEmail,
                 allowBlank: false
@@ -53,7 +54,7 @@ Ext.define('Traccar.view.dialog.User', {
             collapsible: true,
             collapsed: true,
             items: [{
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'phone',
                 fieldLabel: Strings.sharedPhone
             }, {
@@ -94,7 +95,7 @@ Ext.define('Traccar.view.dialog.User', {
                 displayField: 'name',
                 valueField: 'key'
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'poiLayer',
                 fieldLabel: Strings.mapPoiLayer
             }]
@@ -164,7 +165,7 @@ Ext.define('Traccar.view.dialog.User', {
                 disabled: true,
                 reference: 'userLimitField'
             }, {
-                xtype: 'textfield',
+                xtype: 'unescapedTextField',
                 name: 'token',
                 reference: 'tokenField',
                 fieldLabel: Strings.userToken,
diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js
index 2b4ff14f..16e54b21 100644
--- a/web/app/view/edit/DevicesController.js
+++ b/web/app/view/edit/DevicesController.js
@@ -35,7 +35,8 @@ Ext.define('Traccar.view.edit.DevicesController', {
         listen: {
             controller: {
                 '*': {
-                    selectreport: 'selectReport'
+                    selectreport: 'deselectDevice',
+                    selectevent: 'deselectDevice'
                 },
                 'root': {
                     selectdevice: 'selectDevice'
@@ -109,12 +110,10 @@ Ext.define('Traccar.view.edit.DevicesController', {
         this.lookupReference('deviceCommandButton').setDisabled(empty || readonly);
     },
 
-    onSelectionChange: function (selection, selected) {
-        this.updateButtons(selected);
-        if (selected.length > 0) {
-            this.fireEvent('selectdevice', selected[0], true);
-        } else {
-            this.fireEvent('deselectfeature');
+    onSelectionChange: function (el, records) {
+        if (records && records.length) {
+            this.updateButtons(records);
+            this.fireEvent('selectdevice', records[0], true);
         }
     },
 
@@ -124,8 +123,8 @@ Ext.define('Traccar.view.edit.DevicesController', {
         this.getView().getView().focusRow(device);
     },
 
-    selectReport: function (position) {
-        if (position !== undefined) {
+    deselectDevice: function (object) {
+        if (object) {
             this.deselectFeature();
         }
     },
diff --git a/web/app/view/edit/Drivers.js b/web/app/view/edit/Drivers.js
index 9aac8cd6..7bd10a68 100644
--- a/web/app/view/edit/Drivers.js
+++ b/web/app/view/edit/Drivers.js
@@ -46,7 +46,7 @@ Ext.define('Traccar.view.edit.Drivers', {
             dataIndex: 'name',
             filter: 'string'
         }, {
-            text: Strings.sharedDescription,
+            text: Strings.deviceIdentifier,
             dataIndex: 'uniqueId',
             filter: 'string'
         }]
diff --git a/web/app/view/edit/Groups.js b/web/app/view/edit/Groups.js
index 06974201..8b09316c 100644
--- a/web/app/view/edit/Groups.js
+++ b/web/app/view/edit/Groups.js
@@ -76,7 +76,7 @@ Ext.define('Traccar.view.edit.Groups', {
             handler: 'onMaintenancesClick',
             reference: 'toolbarMaintenancesButton',
             glyph: 'xf0ad@FontAwesome',
-            tooltip: Strings.sharedMaintenances,
+            tooltip: Strings.sharedMaintenance,
             tooltipType: 'title'
         }]
     },
diff --git a/web/app/view/edit/GroupsController.js b/web/app/view/edit/GroupsController.js
index 2e62a283..ae96a248 100644
--- a/web/app/view/edit/GroupsController.js
+++ b/web/app/view/edit/GroupsController.js
@@ -41,7 +41,7 @@ Ext.define('Traccar.view.edit.GroupsController', {
             Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
         this.lookupReference('toolbarCommandsButton').setHidden(Traccar.app.getPreference('limitCommands', false));
         this.lookupReference('toolbarMaintenancesButton').setHidden(
-            Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenances'));
+            Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenance'));
     },
 
     onGeofencesClick: function () {
@@ -117,7 +117,7 @@ Ext.define('Traccar.view.edit.GroupsController', {
     onMaintenancesClick: function () {
         var group = this.getView().getSelectionModel().getSelection()[0];
         Ext.create('Traccar.view.BaseWindow', {
-            title: Strings.sharedMaintenances,
+            title: Strings.sharedMaintenance,
             items: {
                 xtype: 'linkMaintenancesView',
                 baseObjectName: 'groupId',
diff --git a/web/app/view/edit/Notifications.js b/web/app/view/edit/Notifications.js
index 9e24d3d0..9cf97b19 100644
--- a/web/app/view/edit/Notifications.js
+++ b/web/app/view/edit/Notifications.js
@@ -60,6 +60,23 @@ Ext.define('Traccar.view.edit.Notifications', {
             renderer: Traccar.AttributeFormatter.getFormatter('always'),
             filter: 'boolean'
         }, {
+            text: Strings.sharedAlarms,
+            dataIndex: 'attributes',
+            renderer: function (value) {
+                var i, key, result = '', alarms = value && value['alarms'];
+                if (alarms) {
+                    alarms = alarms.split(',');
+                    for (i = 0; i < alarms.length; i++) {
+                        key = 'alarm' + alarms[i].charAt(0).toUpperCase() + alarms[i].slice(1);
+                        if (result) {
+                            result += ', ';
+                        }
+                        result += Strings[key] || key;
+                    }
+                }
+                return result;
+            }
+        }, {
             text: Strings.notificationNotificators,
             dataIndex: 'notificators',
             flex: 2,
diff --git a/web/app/view/edit/SavedCommands.js b/web/app/view/edit/SavedCommands.js
index 794e95e4..9e5f4869 100644
--- a/web/app/view/edit/SavedCommands.js
+++ b/web/app/view/edit/SavedCommands.js
@@ -56,7 +56,7 @@ Ext.define('Traccar.view.edit.SavedCommands', {
             },
             renderer: Traccar.AttributeFormatter.getFormatter('commandType')
         }, {
-            text: Strings.notificationSms,
+            text: Strings.commandSendSms,
             dataIndex: 'textChannel',
             renderer: Traccar.AttributeFormatter.getFormatter('textChannel'),
             filter: 'boolean'
diff --git a/web/app/view/edit/Users.js b/web/app/view/edit/Users.js
index 2bcaefad..5d9a14f0 100644
--- a/web/app/view/edit/Users.js
+++ b/web/app/view/edit/Users.js
@@ -101,7 +101,7 @@ Ext.define('Traccar.view.edit.Users', {
             handler: 'onMaintenancesClick',
             reference: 'userMaintenancesButton',
             glyph: 'xf0ad@FontAwesome',
-            tooltip: Strings.sharedMaintenances,
+            tooltip: Strings.sharedMaintenance,
             tooltipType: 'title'
         }]
     },
diff --git a/web/app/view/edit/UsersController.js b/web/app/view/edit/UsersController.js
index 9d998162..9e810435 100644
--- a/web/app/view/edit/UsersController.js
+++ b/web/app/view/edit/UsersController.js
@@ -51,7 +51,7 @@ Ext.define('Traccar.view.edit.UsersController', {
             Traccar.app.getBooleanAttributePreference('ui.disableCalendars'));
         this.lookupReference('userCommandsButton').setHidden(Traccar.app.getPreference('limitCommands', false));
         this.lookupReference('userMaintenancesButton').setHidden(
-            Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenances'));
+            Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenance'));
     },
 
     onEditClick: function () {
@@ -215,7 +215,7 @@ Ext.define('Traccar.view.edit.UsersController', {
     onMaintenancesClick: function () {
         var user = this.getView().getSelectionModel().getSelection()[0];
         Ext.create('Traccar.view.BaseWindow', {
-            title: Strings.sharedMaintenances,
+            title: Strings.sharedMaintenance,
             items: {
                 xtype: 'linkMaintenancesView',
                 baseObjectName: 'userId',
diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index 07e391ff..6c6522bd 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -30,7 +30,7 @@ Ext.define('Traccar.view.map.BaseMap', {
     },
 
     initMap: function () {
-        var server, layer, type, bingKey, lat, lon, zoom, maxZoom, target, poiLayer;
+        var server, layer, type, bingKey, lat, lon, zoom, maxZoom, target, poiLayer, self = this;
 
         server = Traccar.app.getServer();
 
@@ -41,11 +41,18 @@ Ext.define('Traccar.view.map.BaseMap', {
             case 'custom':
                 layer = new ol.layer.Tile({
                     source: new ol.source.XYZ({
-                        url: server.get('mapUrl'),
+                        url: Ext.String.htmlDecode(server.get('mapUrl')),
                         attributions: ''
                     })
                 });
                 break;
+            case 'customArcgis':
+                layer = new ol.layer.Tile({
+                    source: new ol.source.TileArcGISRest({
+                        url: Ext.String.htmlDecode(server.get('mapUrl'))
+                    })
+                });
+                break;
             case 'bingRoad':
                 layer = new ol.layer.Tile({
                     source: new ol.source.BingMaps({
@@ -96,7 +103,7 @@ Ext.define('Traccar.view.map.BaseMap', {
                             if (y < 0) {
                                 y = 'M' + -y;
                             }
-                            return 'http://online{}.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles=pl'
+                            return 'https://online{}.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles=pl'
                                 .replace('{}', index).replace('{x}', x).replace('{y}', y).replace('{z}', z);
                         },
                         tileGrid: new ol.tilegrid.TileGrid({
@@ -108,7 +115,7 @@ Ext.define('Traccar.view.map.BaseMap', {
                                 1024, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1, 0.5
                             ]
                         }),
-                        attributions: '&copy; <a href="http://map.baidu.com/">Baidu</a>'
+                        attributions: '&copy; <a href="https://map.baidu.com/">Baidu</a>'
                     })
                 });
                 break;
@@ -130,16 +137,16 @@ Ext.define('Traccar.view.map.BaseMap', {
                     })
                 });
                 break;
-            case 'osm':
+            case 'wikimedia':
                 layer = new ol.layer.Tile({
-                    source: new ol.source.OSM({})
+                    source: new ol.source.OSM({
+                        url: 'https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png'
+                    })
                 });
                 break;
             default:
                 layer = new ol.layer.Tile({
-                    source: new ol.source.OSM({
-                        url: 'https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png'
-                    })
+                    source: new ol.source.OSM({})
                 });
                 break;
         }
@@ -207,19 +214,19 @@ Ext.define('Traccar.view.map.BaseMap', {
         });
 
         this.map.on('click', function (e) {
-            var i, features = this.map.getFeaturesAtPixel(e.pixel, {
+            var i, features = self.map.getFeaturesAtPixel(e.pixel, {
                 layerFilter: function (layer) {
                     return !layer.get('name');
                 }
             });
             if (features) {
                 for (i = 0; i < features.length; i++) {
-                    this.fireEvent('selectfeature', features[i]);
+                    self.fireEvent('selectfeature', features[i]);
                 }
             } else {
-                this.fireEvent('deselectfeature');
+                self.fireEvent('deselectfeature');
             }
-        }, this);
+        });
     },
 
     listeners: {
@@ -232,7 +239,12 @@ Ext.define('Traccar.view.map.BaseMap', {
         }
     }
 }, function () {
+    var projection;
     proj4.defs('BD-MC', '+proj=merc +lon_0=0 +units=m +ellps=clrk66 +no_defs');
     proj4.defs('EPSG:3395', '+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs');
-    ol.proj.get('EPSG:3395').setExtent([-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]);
+    ol.proj.proj4.register(proj4);
+    projection = ol.proj.get('EPSG:3395');
+    if (projection) {
+        projection.setExtent([-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]);
+    }
 });
diff --git a/web/app/view/map/GeofenceMap.js b/web/app/view/map/GeofenceMap.js
index 6b06ae98..8cef574b 100644
--- a/web/app/view/map/GeofenceMap.js
+++ b/web/app/view/map/GeofenceMap.js
@@ -105,13 +105,14 @@ Ext.define('Traccar.view.map.GeofenceMap', {
     },
 
     addInteraction: function (type) {
+        var self = this;
         this.draw = new ol.interaction.Draw({
             features: this.features,
             type: type
         });
         this.draw.on('drawstart', function () {
-            this.features.clear();
-        }, this);
+            self.features.clear();
+        });
         this.map.addInteraction(this.draw);
     },
 
diff --git a/web/app/view/map/MapController.js b/web/app/view/map/MapController.js
index 38b2340c..7ba0ee3b 100644
--- a/web/app/view/map/MapController.js
+++ b/web/app/view/map/MapController.js
@@ -83,7 +83,8 @@ Ext.define('Traccar.view.map.MapController', {
                 var feature = new ol.Feature(
                     Traccar.GeofenceConverter.wktToGeometry(this.getView().getMapView(), geofence.get('area')));
                 feature.setStyle(this.getAreaStyle(
-                    geofence.get('name'), geofence.get('attributes') ? geofence.get('attributes').color : null));
+                    Ext.String.htmlDecode(geofence.get('name')),
+                    geofence.get('attributes') ? geofence.get('attributes').color : null));
                 this.getView().getGeofencesSource().addFeature(feature);
                 return true;
             }, this);
diff --git a/web/app/view/map/MapMarkerController.js b/web/app/view/map/MapMarkerController.js
index bf6b0d49..785fcc68 100644
--- a/web/app/view/map/MapMarkerController.js
+++ b/web/app/view/map/MapMarkerController.js
@@ -130,7 +130,7 @@ Ext.define('Traccar.view.map.MapMarkerController', {
     },
 
     updateDevice: function (store, data) {
-        var i, device, deviceId, marker, style;
+        var i, device, deviceId, deviceName, marker, style;
 
         if (!Ext.isArray(data)) {
             data = [data];
@@ -148,8 +148,9 @@ Ext.define('Traccar.view.map.MapMarkerController', {
                     this.updateDeviceMarker(style, this.getDeviceColor(device), device.get('category'));
                     marker.changed();
                 }
-                if (style.getText().getText() !== device.get('name')) {
-                    style.getText().setText(device.get('name'));
+                deviceName = Ext.String.htmlDecode(device.get('name'));
+                if (style.getText().getText() !== deviceName) {
+                    style.getText().setText(deviceName);
                     marker.changed();
                 }
             }
@@ -187,6 +188,39 @@ Ext.define('Traccar.view.map.MapMarkerController', {
         }
     },
 
+    animateMarker: function (marker, geometry, course) {
+        var start, end, duration, timeout, line, updatePosition, self;
+
+        start = marker.getGeometry().getCoordinates();
+        end = geometry.getCoordinates();
+        line = new ol.geom.LineString([start, end]);
+        duration = Traccar.Style.mapAnimateMarkerDuration;
+        timeout = Traccar.Style.mapAnimateMarkerTimeout;
+        self = this;
+
+        updatePosition = function (position, marker) {
+            var coordinate, style;
+            coordinate = marker.get('line').getCoordinateAt(position / (duration / timeout));
+            style = marker.getStyle();
+            marker.setGeometry(new ol.geom.Point(coordinate));
+            if (position < duration / timeout) {
+                setTimeout(updatePosition, timeout, position + 1, marker);
+            } else {
+                if (style.getImage().angle !== marker.get('nextCourse')) {
+                    self.rotateMarker(style, marker.get('nextCourse'));
+                }
+                marker.set('animating', false);
+            }
+        };
+
+        marker.set('line', line);
+        marker.set('nextCourse', course);
+        if (!marker.get('animating')) {
+            marker.set('animating', true);
+            updatePosition(1, marker);
+        }
+    },
+
     updateLatest: function (store, data) {
         var i, position, device, deviceStore;
 
@@ -209,15 +243,13 @@ Ext.define('Traccar.view.map.MapMarkerController', {
     },
 
     updateAccuracy: function (position, device) {
-        var center, radius, feature, mapView, projection, pointResolution;
-        mapView = this.getView().getMapView();
+        var center, radius, feature;
         feature = this.accuracyCircles[position.get('deviceId')];
 
         if (position.get('accuracy')) {
-            projection = mapView.getProjection();
             center = ol.proj.fromLonLat([position.get('longitude'), position.get('latitude')]);
-            pointResolution = ol.proj.getPointResolution(projection, mapView.getResolution(), center);
-            radius = position.get('accuracy') / ol.proj.METERS_PER_UNIT.m * mapView.getResolution() / pointResolution;
+            radius = Ext.getStore('DistanceUnits').convertValue(
+                position.get('accuracy'), Traccar.app.getAttributePreference('distanceUnit'), true);
 
             if (feature) {
                 feature.getGeometry().setCenter(center);
@@ -248,11 +280,7 @@ Ext.define('Traccar.view.map.MapMarkerController', {
         deviceId = position.get('deviceId');
         if (deviceId in this.latestMarkers) {
             marker = this.latestMarkers[deviceId];
-            style = marker.getStyle();
-            if (style.getImage().angle !== position.get('course')) {
-                this.rotateMarker(style, position.get('course'));
-            }
-            marker.setGeometry(geometry);
+            this.animateMarker(marker, geometry, position.get('course'));
         } else {
             marker = new ol.Feature(geometry);
             marker.set('record', device);
@@ -260,7 +288,7 @@ Ext.define('Traccar.view.map.MapMarkerController', {
             style = this.getLatestMarker(this.getDeviceColor(device),
                 position.get('course'),
                 device.get('category'));
-            style.getText().setText(device.get('name'));
+            style.getText().setText(Ext.String.htmlDecode(device.get('name')));
             marker.setStyle(style);
             marker.setId(device.get('id'));
             this.latestMarkers[deviceId] = marker;
@@ -457,9 +485,6 @@ Ext.define('Traccar.view.map.MapMarkerController', {
         if (this.selectedMarker) {
             if (this.selectedMarker.get('event')) {
                 this.getView().getMarkersSource().removeFeature(this.selectedMarker);
-                if (!marker || !marker.get('event')) {
-                    this.fireEvent('deselectevent');
-                }
             } else if (!Ext.getStore('ReportRoute').showMarkers &&
                     this.selectedMarker.get('record') instanceof Traccar.model.Position) {
                 this.getView().getMarkersSource().removeFeature(this.selectedMarker);
@@ -496,12 +521,13 @@ Ext.define('Traccar.view.map.MapMarkerController', {
                 this.reportMarkers[position.get('id')] = this.addReportMarker(position);
             }
             this.selectMarker(this.reportMarkers[position.get('id')], center);
+        } else if (this.selectedMarker) {
+            this.selectMarker(null, false);
         }
     },
 
     selectEvent: function (position) {
         var marker;
-        this.fireEvent('deselectfeature');
         if (position) {
             marker = this.addReportMarker(position);
             marker.set('event', true);
diff --git a/web/app/view/permissions/SavedCommands.js b/web/app/view/permissions/SavedCommands.js
index 52b759bb..b57c07a0 100644
--- a/web/app/view/permissions/SavedCommands.js
+++ b/web/app/view/permissions/SavedCommands.js
@@ -40,7 +40,7 @@ Ext.define('Traccar.view.permissions.SavedCommands', {
             },
             renderer: Traccar.AttributeFormatter.getFormatter('commandType')
         }, {
-            text: Strings.notificationSms,
+            text: Strings.commandSendSms,
             dataIndex: 'textChannel',
             flex: 1,
             minWidth: Traccar.Style.columnWidthNormal,
diff --git a/web/images/animal.svg b/web/images/animal.svg
index 39b9042d..a077029b 100644
--- a/web/images/animal.svg
+++ b/web/images/animal.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="animal.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.4083333px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 19.524552,15.801568 q 0,0.5865 -0.173722,1.114351 -0.173721,0.518076 -0.576024,0.899301 -0.402302,0.381225 -0.960039,0.381225 -0.694887,0 -1.261767,-0.557176 -0.566881,-0.56695 -0.841178,-1.329401 -0.274297,-0.762451 -0.274297,-1.476026 0,-0.5865 0.173721,-1.104576 0.173722,-0.527851 0.576024,-0.909076 0.402303,-0.381225 0.96004,-0.381225 0.704029,0 1.261767,0.56695 0.56688,0.557175 0.841178,1.319626 0.274297,0.752677 0.274297,1.476027 z m -3.126988,4.721329 q 0,0.782001 -0.384015,1.358727 -0.384016,0.576725 -1.088045,0.576725 -0.694886,0 -1.29834,-0.537626 -0.59431,-0.5474 -0.914324,-1.309851 -0.320013,-0.76245 -0.320013,-1.485801 0,-0.782001 0.384016,-1.358727 0.384016,-0.5865 1.088046,-0.5865 0.694885,0 1.289195,0.547401 0.603454,0.537626 0.923468,1.309851 0.320012,0.762451 0.320012,1.485801 z M 20,20.258972 q 1.078902,0 2.331525,0.95795 1.252624,0.948177 2.093802,2.316678 0.841177,1.358727 0.841177,2.482852 0,0.449651 -0.155435,0.742902 -0.155435,0.303025 -0.448018,0.439875 -0.28344,0.146624 -0.585167,0.1955 -0.301727,0.05865 -0.694887,0.05865 -0.621739,0 -1.718928,-0.439875 Q 20.576024,26.573625 20,26.573625 q -0.603454,0 -1.764644,0.4301 -1.152048,0.439876 -1.828648,0.439876 -1.673212,0 -1.673212,-1.427152 0,-0.840651 0.512021,-1.867027 0.512021,-1.03615 1.27091,-1.886576 0.768031,-0.850426 1.718929,-1.427152 Q 19.186252,20.258968 20,20.258968 Z m 2.185233,-2.062527 q -0.557737,0 -0.96004,-0.381225 -0.402302,-0.381225 -0.576023,-0.899301 -0.173722,-0.527851 -0.173722,-1.114351 0,-0.72335 0.274297,-1.476027 0.274298,-0.762451 0.832035,-1.319626 0.566881,-0.56695 1.27091,-0.56695 0.557737,0 0.960039,0.381225 0.402303,0.381225 0.576025,0.909076 0.173721,0.518076 0.173721,1.104576 0,0.713575 -0.274297,1.476026 -0.274297,0.762451 -0.841178,1.329401 -0.56688,0.557176 -1.261767,0.557176 z m 3.949878,-1.016601 q 0.704029,0 1.088046,0.5865 0.384016,0.576726 0.384016,1.358727 0,0.723351 -0.320014,1.485801 -0.320013,0.762451 -0.923467,1.309851 -0.59431,0.537626 -1.289196,0.537626 -0.704029,0 -1.088045,-0.576725 -0.384016,-0.576726 -0.384016,-1.358727 0,-0.72335 0.320013,-1.485801 0.320014,-0.772225 0.914324,-1.309851 0.603454,-0.547401 1.298339,-0.547401 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m19.525 15.802q0 0.5865-0.17372 1.1144-0.17372 0.51808-0.57602 0.8993t-0.96004 0.38122q-0.69489 0-1.2618-0.55718-0.56688-0.56695-0.84118-1.3294t-0.2743-1.476q0-0.5865 0.17372-1.1046 0.17372-0.52785 0.57602-0.90908 0.4023-0.38122 0.96004-0.38122 0.70403 0 1.2618 0.56695 0.56688 0.55718 0.84118 1.3196 0.2743 0.75268 0.2743 1.476zm-3.127 4.7213q0 0.782-0.38402 1.3587-0.38402 0.57672-1.088 0.57672-0.69489 0-1.2983-0.53763-0.59431-0.5474-0.91432-1.3099-0.32001-0.76245-0.32001-1.4858 0-0.782 0.38402-1.3587 0.38402-0.5865 1.088-0.5865 0.69488 0 1.2892 0.5474 0.60345 0.53763 0.92347 1.3099 0.32001 0.76245 0.32001 1.4858zm3.602-0.264q1.0789 0 2.3315 0.95795 1.2526 0.94818 2.0938 2.3167 0.84118 1.3587 0.84118 2.4829 0 0.44965-0.15544 0.7429-0.15544 0.30302-0.44802 0.43988-0.28344 0.14662-0.58517 0.1955-0.30173 0.05865-0.69489 0.05865-0.62174 0-1.7189-0.43988-1.088-0.44-1.664-0.44-0.60345 0-1.7646 0.4301-1.152 0.43988-1.8286 0.43988-1.6732 0-1.6732-1.4272 0-0.84065 0.51202-1.867 0.51202-1.0362 1.2709-1.8866 0.76803-0.85043 1.7189-1.4272 0.951-0.577 1.765-0.577zm2.1852-2.0625q-0.55774 0-0.96004-0.38122t-0.57602-0.8993q-0.17372-0.52785-0.17372-1.1144 0-0.72335 0.2743-1.476 0.2743-0.76245 0.83204-1.3196 0.56688-0.56695 1.2709-0.56695 0.55774 0 0.96004 0.38122t0.57602 0.90908q0.17372 0.51808 0.17372 1.1046 0 0.71358-0.2743 1.476-0.2743 0.76245-0.84118 1.3294-0.56688 0.55718-1.2618 0.55718zm3.9499-1.0166q0.70403 0 1.088 0.5865 0.38402 0.57673 0.38402 1.3587 0 0.72335-0.32001 1.4858t-0.92347 1.3099q-0.59431 0.53763-1.2892 0.53763-0.70403 0-1.088-0.57672-0.38402-0.57673-0.38402-1.3587 0-0.72335 0.32001-1.4858 0.32001-0.77222 0.91432-1.3099 0.60345-0.5474 1.2983-0.5474z"/>
+ </g>
 </svg>
diff --git a/web/images/arrow.svg b/web/images/arrow.svg
index a85201d8..1aed6e03 100644
--- a/web/images/arrow.svg
+++ b/web/images/arrow.svg
@@ -1 +1,4 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1px;" transform="" /></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3369" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="26" viewBox="0 0 26 26" width="26" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <polygon id="arrow" stroke="#000" points="19 22 13 19 7 22 13 4" stroke-width="1px" fill="#008000"/>
+</svg>
diff --git a/web/images/bicycle.svg b/web/images/bicycle.svg
index 3e3a463e..4eb82eaa 100644
--- a/web/images/bicycle.svg
+++ b/web/images/bicycle.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="bicycle.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.17888892px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 16.792922,22.105158 -2.582108,0 q -0.328931,0 -0.47695,-0.287814 -0.139797,-0.287815 0.05757,-0.550959 l 1.545976,-2.064042 q -0.534513,-0.254922 -1.126589,-0.254922 -1.085472,0 -1.85846,0.772988 -0.772988,0.772988 -0.772988,1.85846 0,1.085473 0.772988,1.858461 0.772988,0.772988 1.85846,0.772988 0.945677,0 1.669324,-0.592076 0.72365,-0.600299 0.912785,-1.513084 z m -1.529529,-1.052579 1.529529,0 q -0.148019,-0.698978 -0.616745,-1.217045 l -0.912784,1.217045 z m 3.947172,0 2.368304,-3.157737 -3.947172,0 -0.814105,1.085472 q 0.863444,0.846998 1.036133,2.072265 l 1.35684,0 z m 8.437082,2.384751 q 0.772988,-0.772988 0.772988,-1.858461 0,-1.085472 -0.772988,-1.85846 -0.772988,-0.772988 -1.858461,-0.772988 -0.493395,0 -0.995016,0.197359 l 1.43085,2.138052 q 0.12335,0.189135 0.08224,0.40294 -0.04112,0.213805 -0.22203,0.328931 -0.123348,0.09046 -0.296038,0.09046 -0.287814,0 -0.435833,-0.238474 l -1.43085,-2.138053 q -0.764764,0.781212 -0.764764,1.850238 0,1.085472 0.772988,1.85846 0.772987,0.772988 1.858459,0.772988 1.085473,0 1.858461,-0.772988 z m 0.740094,-4.457016 q 1.085473,1.077249 1.085473,2.598555 0,1.521306 -1.085473,2.606778 -1.077248,1.07725 -2.598555,1.07725 -1.521305,0 -2.606778,-1.07725 -1.07725,-1.085472 -1.07725,-2.606778 0,-0.797657 0.320709,-1.50486 0.328931,-0.715425 0.90456,-1.233491 l -0.534513,-0.805881 -2.902817,3.856717 q -0.148019,0.213804 -0.419386,0.213804 l -1.619986,0 q -0.189136,1.348619 -1.225268,2.253179 -1.036133,0.90456 -2.417643,0.90456 -1.521307,0 -2.606779,-1.07725 -1.077249,-1.085472 -1.077249,-2.606778 0,-1.521306 1.077249,-2.598555 1.085472,-1.085472 2.606779,-1.085472 0.937453,0 1.768004,0.452279 l 1.126589,-1.504859 -1.842014,0 q -0.213806,0 -0.370047,-0.156242 -0.156243,-0.156242 -0.156243,-0.370048 0,-0.213804 0.156243,-0.370047 0.156241,-0.156242 0.370047,-0.156242 l 3.157738,0 0,1.052579 3.577126,0 -0.698979,-1.052579 -1.825567,0 q -0.213806,0 -0.370049,-0.156243 -0.156241,-0.156241 -0.156241,-0.370047 0,-0.213806 0.156241,-0.370047 0.156243,-0.156243 0.370049,-0.156243 l 2.105158,0 q 0.271369,0 0.435834,0.230252 l 2.195615,3.289311 q 0.748317,-0.361824 1.578868,-0.361824 1.521307,0 2.598555,1.085472 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m16.793 22.105h-2.5821q-0.32893 0-0.47695-0.28781-0.1398-0.28782 0.05757-0.55096l1.546-2.064q-0.53451-0.25492-1.1266-0.25492-1.0855 0-1.8585 0.77299-0.77299 0.77299-0.77299 1.8585t0.77299 1.8585q0.77299 0.77299 1.8585 0.77299 0.94568 0 1.6693-0.59208 0.72365-0.6003 0.91278-1.5131zm-1.5295-1.0526h1.5295q-0.14802-0.69898-0.61674-1.217l-0.91278 1.217zm3.9472 0 2.3683-3.1577h-3.9472l-0.8141 1.0855q0.86344 0.847 1.0361 2.0723h1.3568zm8.4371 2.3848q0.77299-0.77299 0.77299-1.8585t-0.77299-1.8585q-0.77299-0.77299-1.8585-0.77299-0.4934 0-0.99502 0.19736l1.4308 2.1381q0.12335 0.18914 0.08224 0.40294-0.04112 0.2138-0.22203 0.32893-0.12335 0.09046-0.29604 0.09046-0.28781 0-0.43583-0.23847l-1.4308-2.1381q-0.76476 0.78121-0.76476 1.8502 0 1.0855 0.77299 1.8585 0.77299 0.77299 1.8585 0.77299t1.8585-0.77299zm0.74009-4.457q1.0855 1.0772 1.0855 2.5986 0 1.5213-1.0855 2.6068-1.0772 1.0772-2.5986 1.0772-1.5213 0-2.6068-1.0772-1.0772-1.0855-1.0772-2.6068 0-0.79766 0.32071-1.5049 0.32893-0.71542 0.90456-1.2335l-0.53451-0.80588-2.9028 3.8567q-0.14802 0.2138-0.41939 0.2138h-1.62q-0.18914 1.3486-1.2253 2.2532-1.0361 0.90456-2.4176 0.90456-1.5213 0-2.6068-1.0772-1.0772-1.0855-1.0772-2.6068t1.0772-2.5986q1.0855-1.0855 2.6068-1.0855 0.93745 0 1.768 0.45228l1.1266-1.5049h-1.842q-0.21381 0-0.37005-0.15624t-0.15624-0.37005q0-0.2138 0.15624-0.37005 0.15624-0.15624 0.37005-0.15624h3.1577v1.0526h3.5771l-0.69898-1.0526h-1.8256q-0.21381 0-0.37005-0.15624t-0.15624-0.37005 0.15624-0.37005 0.37005-0.15624h2.1052q0.27137 0 0.43583 0.23025l2.1956 3.2893q0.74832-0.36182 1.5789-0.36182 1.5213 0 2.5986 1.0855z"/>
+ </g>
 </svg>
diff --git a/web/images/boat.svg b/web/images/boat.svg
index 6fd77b93..f1620ca6 100644
--- a/web/images/boat.svg
+++ b/web/images/boat.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="boat.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
-       id="background" />
-    <path
-       style="stroke-width:0.78952903"
-       d="m 20,11.145921 c -2.131729,5.526703 -6.316232,6.785015 -6.316232,6.785015 L 20,19.83074 20,11.145921 Z m 0,8.684819 -6.710997,0 0,0.641492 c 0,0.930433 0.778079,1.763278 1.801113,2.368588 -0.362154,0.123868 -0.729886,0.148037 -1.011584,0.148037 -0.55267,0 -1.421153,-0.157906 -1.973822,-0.789529 l 0,1.579058 c 0.552669,0.631623 1.421152,0.789529 1.973822,0.789529 0.55267,0 1.421153,-0.157906 1.973822,-0.789529 0.552671,0.631623 1.421153,0.789529 1.973823,0.789529 0.552671,0 1.421152,-0.157906 1.973823,-0.789529 0.552671,0.631623 1.421152,0.789529 1.973823,0.789529 0.55267,0 1.421152,-0.157906 1.973823,-0.789529 0.552669,0.631623 1.421152,0.789529 1.973822,0.789529 0.55267,0 1.421153,-0.157906 1.973822,-0.789529 l 0,-1.579058 c -0.552669,0.631623 -1.421152,0.789529 -1.973822,0.789529 -0.395858,0 -0.94322,-0.09201 -1.431022,-0.370092 1.079388,-0.59227 2.154428,-1.46526 2.936061,-2.788025 l -2.689332,0 -4.737175,0 z m 4.737175,0 c 0,0 0.0099,-4.016729 -3.306154,-7.253798 0.631624,4.342409 -0.641492,5.921468 -0.641492,5.921468 l 3.947646,1.33233 z m -12.632465,4.737175 0,1.579057 c 0.552669,0.631624 1.421152,0.789529 1.973822,0.789529 0.55267,0 1.421153,-0.157905 1.973822,-0.789529 0.552671,0.631624 1.421153,0.789529 1.973823,0.789529 0.552671,0 1.421152,-0.157905 1.973823,-0.789529 0.552671,0.631624 1.421152,0.789529 1.973823,0.789529 0.55267,0 1.421152,-0.157905 1.973823,-0.789529 0.552669,0.631624 1.421152,0.789529 1.973822,0.789529 0.55267,0 1.421153,-0.157905 1.973822,-0.789529 l 0,-1.579057 c -0.552669,0.631623 -1.421152,0.789528 -1.973822,0.789528 -0.55267,0 -1.421153,-0.157905 -1.973822,-0.789528 -0.552671,0.631623 -1.421153,0.789528 -1.973823,0.789528 -0.552671,0 -1.421152,-0.157905 -1.973823,-0.789528 -0.552671,0.631623 -1.421152,0.789528 -1.973823,0.789528 -0.55267,0 -1.421152,-0.157905 -1.973823,-0.789528 -0.552669,0.631623 -1.421152,0.789528 -1.973822,0.789528 -0.55267,0 -1.421153,-0.157905 -1.973822,-0.789528 z"
-       id="icon" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816-1.1309 3.3906a12.374 12.374 0 0 1 1.1309 -0.0625 12.374 12.374 0 0 1 1.1289 0.056641l-1.129-3.3847zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" stroke-width=".78953" d="m20 11.146c-2.1317 5.5267-6.3162 6.785-6.3162 6.785l6.316 1.9v-8.685zm0 8.6848h-6.711v0.64149c0 0.93043 0.77808 1.7633 1.8011 2.3686-0.36215 0.12387-0.72989 0.14804-1.0116 0.14804-0.55267 0-1.4212-0.15791-1.9738-0.78953v1.5791c0.55267 0.63162 1.4212 0.78953 1.9738 0.78953 0.55267 0 1.4212-0.15791 1.9738-0.78953 0.55267 0.63162 1.4212 0.78953 1.9738 0.78953 0.55267 0 1.4212-0.15791 1.9738-0.78953 0.55267 0.63162 1.4212 0.78953 1.9738 0.78953 0.55267 0 1.4212-0.15791 1.9738-0.78953 0.55267 0.63162 1.4212 0.78953 1.9738 0.78953 0.55267 0 1.4212-0.15791 1.9738-0.78953v-1.5791c-0.55267 0.63162-1.4212 0.78953-1.9738 0.78953-0.39586 0-0.94322-0.09201-1.431-0.37009 1.0794-0.59227 2.1544-1.4653 2.9361-2.788h-2.6893-4.7372zm4.7372 0s0.0099-4.0167-3.3062-7.2538c0.63162 4.3424-0.64149 5.9215-0.64149 5.9215l3.9476 1.3323zm-12.632 4.7372v1.5791c0.55267 0.63162 1.4212 0.78953 1.9738 0.78953 0.55267 0 1.4212-0.1579 1.9738-0.78953 0.55267 0.63162 1.4212 0.78953 1.9738 0.78953 0.55267 0 1.4212-0.1579 1.9738-0.78953 0.55267 0.63162 1.4212 0.78953 1.9738 0.78953 0.55267 0 1.4212-0.1579 1.9738-0.78953 0.55267 0.63162 1.4212 0.78953 1.9738 0.78953 0.55267 0 1.4212-0.1579 1.9738-0.78953v-1.5791c-0.55267 0.63162-1.4212 0.78953-1.9738 0.78953-0.55267 0-1.4212-0.1579-1.9738-0.78953-0.55267 0.63162-1.4212 0.78953-1.9738 0.78953-0.55267 0-1.4212-0.1579-1.9738-0.78953-0.55267 0.63162-1.4212 0.78953-1.9738 0.78953-0.55267 0-1.4212-0.1579-1.9738-0.78953-0.55267 0.63162-1.4212 0.78953-1.9738 0.78953-0.55267 0-1.4212-0.1579-1.9738-0.78953z"/>
+ </g>
 </svg>
diff --git a/web/images/bus.svg b/web/images/bus.svg
index 15e6c749..2f3b9234 100644
--- a/web/images/bus.svg
+++ b/web/images/bus.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="bus.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.31000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 16.143829,23.755651 q 0.347238,-0.347238 0.347238,-0.831544 0,-0.484305 -0.347238,-0.822405 -0.338101,-0.347237 -0.822405,-0.347237 -0.484306,0 -0.831543,0.347237 -0.3381,0.3381 -0.3381,0.822405 0,0.484306 0.3381,0.831544 0.347237,0.338099 0.831543,0.338099 0.484304,0 0.822405,-0.338099 z m 9.357143,0 q 0.347237,-0.347238 0.347237,-0.831544 0,-0.484305 -0.347237,-0.822405 -0.3381,-0.347237 -0.822405,-0.347237 -0.484306,0 -0.831544,0.347237 -0.338099,0.3381 -0.338099,0.822405 0,0.484306 0.338099,0.831544 0.347238,0.338099 0.831544,0.338099 0.484305,0 0.822405,-0.338099 z m -0.0731,-4.450127 -0.657926,-3.508928 q -0.04569,-0.210169 -0.210169,-0.3381 -0.155343,-0.137067 -0.365514,-0.137067 l -8.388533,0 q -0.21017,0 -0.37465,0.137067 -0.155343,0.127934 -0.201033,0.3381 l -0.657924,3.508928 Q 14.526432,19.57966 14.70006,19.78983 14.873679,20 15.147814,20 l 9.70438,0 q 0.274136,0 0.447754,-0.21017 0.17362,-0.21017 0.127935,-0.484306 z M 23.23479,14.023856 q 0.127935,-0.127935 0.127935,-0.310686 0,-0.182757 -0.127935,-0.310686 -0.127934,-0.127935 -0.310686,-0.127935 l -5.848213,0 q -0.182757,0 -0.310688,0.127935 -0.127934,0.127934 -0.127934,0.310686 0,0.182757 0.127934,0.310686 0.127935,0.127935 0.310688,0.127935 l 5.848213,0 q 0.182757,0 0.310686,-0.127935 z m 3.783065,6.314245 0,5.510114 -1.169644,0 0,1.169642 q 0,0.484306 -0.347237,0.822405 -0.3381,0.347238 -0.822405,0.347238 -0.484306,0 -0.831544,-0.347238 -0.338099,-0.338099 -0.338099,-0.822405 l 0,-1.169642 -7.017857,0 0,1.169642 q 0,0.484306 -0.347238,0.822405 -0.338101,0.347238 -0.822405,0.347238 -0.484306,0 -0.831544,-0.347238 -0.338099,-0.338099 -0.338099,-0.822405 l 0,-1.169642 -1.169642,0 0,-5.510114 q 0,-1.023438 0.228445,-2.037738 l 0.941197,-4.148578 q 0.08224,-0.71275 0.88637,-1.251883 0.813268,-0.539132 2.101702,-0.813266 1.297568,-0.274136 2.860138,-0.274136 1.56257,0 2.851005,0.274136 1.297572,0.274134 2.101701,0.813266 0.813268,0.539133 0.895508,1.251883 l 0.959475,4.148578 q 0.210169,0.93206 0.210169,2.037738 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m16.144 23.756q0.34724-0.34724 0.34724-0.83154t-0.34724-0.8224q-0.3381-0.34724-0.8224-0.34724-0.48431 0-0.83154 0.34724-0.3381 0.3381-0.3381 0.8224 0 0.48431 0.3381 0.83154 0.34724 0.3381 0.83154 0.3381t0.8224-0.3381zm9.3571 0q0.34724-0.34724 0.34724-0.83154t-0.34724-0.8224q-0.3381-0.34724-0.8224-0.34724-0.48431 0-0.83154 0.34724-0.3381 0.3381-0.3381 0.8224 0 0.48431 0.3381 0.83154 0.34724 0.3381 0.83154 0.3381t0.8224-0.3381zm-0.0731-4.4501-0.65793-3.5089q-0.04569-0.21017-0.21017-0.3381-0.15534-0.13707-0.36551-0.13707h-8.3885q-0.21017 0-0.37465 0.13707-0.15534 0.12793-0.20103 0.3381l-0.65792 3.5089q-0.046 0.274 0.128 0.484t0.448 0.21h9.7044q0.27414 0 0.44775-0.21017 0.17362-0.21017 0.12794-0.48431zm-2.193-5.282q0.12794-0.12794 0.12794-0.31069 0-0.18276-0.12794-0.31069-0.12793-0.12794-0.31069-0.12794h-5.8482q-0.18276 0-0.31069 0.12794-0.12793 0.12793-0.12793 0.31069t0.12793 0.31069q0.12794 0.12794 0.31069 0.12794h5.8482q0.18276 0 0.31069-0.12794zm3.7831 6.3142v5.5101h-1.1696v1.1696q0 0.48431-0.34724 0.8224-0.3381 0.34724-0.8224 0.34724-0.48431 0-0.83154-0.34724-0.3381-0.3381-0.3381-0.8224v-1.1696h-7.0179v1.1696q0 0.48431-0.34724 0.8224-0.3381 0.34724-0.8224 0.34724-0.48431 0-0.83154-0.34724-0.3381-0.3381-0.3381-0.8224v-1.1696h-1.1696v-5.5101q0-1.0234 0.22844-2.0377l0.9412-4.1486q0.08224-0.71275 0.88637-1.2519 0.81327-0.53913 2.1017-0.81327 1.2976-0.27414 2.8601-0.27414 1.5626 0 2.851 0.27414 1.2976 0.27413 2.1017 0.81327 0.81327 0.53913 0.89551 1.2519l0.95948 4.1486q0.21017 0.93206 0.21017 2.0377z"/>
+ </g>
 </svg>
diff --git a/web/images/car.svg b/web/images/car.svg
index a39a7ce7..da5b5553 100644
--- a/web/images/car.svg
+++ b/web/images/car.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="car.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#333333;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 15.028653,22.29641 q 0.395353,-0.395353 0.395353,-0.950528 0,-0.555177 -0.395353,-0.95053 Q 14.633301,20 14.078125,20 q -0.555176,0 -0.950528,0.395352 -0.395353,0.395353 -0.395353,0.95053 0,0.555175 0.395353,0.950528 0.395352,0.395352 0.950528,0.395352 0.555176,0 0.950528,-0.395352 z m 0.698176,-3.642291 8.546345,0 -0.748646,-3.002997 q -0.01682,-0.06729 -0.117769,-0.143 -0.100935,-0.08412 -0.176646,-0.08412 l -6.46023,0 q -0.07572,0 -0.176647,0.08412 -0.100946,0.07571 -0.117767,0.143 l -0.748648,3.002997 z m 11.145578,3.642291 q 0.395352,-0.395353 0.395352,-0.950528 0,-0.555177 -0.395352,-0.95053 Q 26.477054,20 25.921879,20 q -0.555177,0 -0.95053,0.395352 -0.395352,0.395353 -0.395352,0.95053 0,0.555175 0.395352,0.950528 0.395353,0.395352 0.95053,0.395352 0.555175,0 0.950528,-0.395352 z m 1.741234,-1.758057 0,3.230113 q 0,0.11777 -0.07571,0.193472 -0.07572,0.07571 -0.193472,0.07571 l -0.807528,0 0,1.076704 q 0,0.67294 -0.471058,1.143998 -0.471059,0.471059 -1.144,0.471059 -0.672941,0 -1.143999,-0.471059 -0.471058,-0.471058 -0.471058,-1.143998 l 0,-1.076704 -8.613639,0 0,1.076704 q 0,0.67294 -0.471058,1.143998 -0.471059,0.471059 -1.144,0.471059 -0.672939,0 -1.143998,-0.471059 -0.471057,-0.47106 -0.471057,-1.143999 l 0,-1.076705 -0.807529,0 q -0.117769,0 -0.193472,-0.07571 -0.07571,-0.07572 -0.07571,-0.193472 l 0,-3.230114 q 0,-0.782294 0.546764,-1.329058 0.555177,-0.555176 1.337469,-0.555176 l 0.23553,0 0.883235,-3.524525 q 0.19347,-0.790705 0.874822,-1.320646 0.681352,-0.538353 1.505705,-0.538353 l 6.460229,0 q 0.824353,0 1.505705,0.538353 0.681352,0.529941 0.874822,1.320646 l 0.883234,3.524525 0.23553,0 q 0.782293,0 1.329058,0.555176 0.555176,0.546764 0.555176,1.329058 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1" stroke="#333">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m15.029 22.296q0.39535-0.39535 0.39535-0.95053t-0.39535-0.95053q-0.396-0.395-0.951-0.395-0.55518 0-0.95053 0.39535t-0.39535 0.95053 0.39535 0.95053 0.95053 0.39535 0.95053-0.39535zm0.69818-3.6423h8.5463l-0.74865-3.003q-0.01682-0.06729-0.11777-0.143-0.10094-0.08412-0.17665-0.08412h-6.4602q-0.07572 0-0.17665 0.08412-0.10095 0.07571-0.11777 0.143l-0.74865 3.003zm11.146 3.6423q0.39535-0.39535 0.39535-0.95053t-0.39535-0.95053q-0.396-0.395-0.951-0.395-0.55518 0-0.95053 0.39535t-0.39535 0.95053 0.39535 0.95053 0.95053 0.39535 0.95053-0.39535zm1.7412-1.7581v3.2301q0 0.11777-0.07571 0.19347-0.07572 0.07571-0.19347 0.07571h-0.80753v1.0767q0 0.67294-0.47106 1.144t-1.144 0.47106-1.144-0.47106-0.47106-1.144v-1.0767h-8.6136v1.0767q0 0.67294-0.47106 1.144t-1.144 0.47106-1.144-0.47106-0.47106-1.144v-1.0767h-0.80753q-0.11777 0-0.19347-0.07571-0.07571-0.07572-0.07571-0.19347v-3.2301q0-0.78229 0.54676-1.3291 0.55518-0.55518 1.3375-0.55518h0.23553l0.88324-3.5245q0.19347-0.7907 0.87482-1.3206 0.68135-0.53835 1.5057-0.53835h6.4602q0.82435 0 1.5057 0.53835 0.68135 0.52994 0.87482 1.3206l0.88323 3.5245h0.23553q0.78229 0 1.3291 0.55518 0.55518 0.54676 0.55518 1.3291z" stroke-width=".1"/>
+ </g>
 </svg>
diff --git a/web/images/crane.svg b/web/images/crane.svg
index 487a2c40..6b66b779 100644
--- a/web/images/crane.svg
+++ b/web/images/crane.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="crane.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
-       id="background" />
-    <path
-       style="stroke-width:0.75357449"
-       d="m 24.334389,12.464255 -4.215308,3.014298 c 0.103994,0.11605 0.203466,0.238883 0.282591,0.376787 l 0.518083,0.91842 2.025231,-1.460051 -1.577796,2.237174 0.494532,0.871321 c 0.140166,0.186132 0.252825,0.393742 0.329689,0.612279 l 4.592095,-6.570228 -2.449117,0 z m 2.449117,1.318755 -1.507149,2.142978 0,4.074012 c 0,0.415973 0.337602,0.753574 0.753575,0.753574 0.415219,0 0.753574,0.338356 0.753574,0.753575 0,0.41522 -0.338355,0.753574 -0.753574,0.753574 -0.41522,0 -0.753575,-0.338354 -0.753575,-0.753574 l -1.507149,0 c 0,1.385823 1.252064,2.476622 2.684609,2.213625 0.887711,-0.162772 1.616418,-0.879987 1.78974,-1.76619 0.229086,-1.171809 -0.453275,-2.207408 -1.460051,-2.566863 l 0,-5.604711 z m -12.057192,1.695543 c -0.8327,0 -1.507149,0.674449 -1.507149,1.507149 l 0,3.767872 c 0,0.415973 0.337602,0.753575 0.753575,0.753575 l 0.753574,0 0,0.753574 5.275021,0 0,-0.753574 0.753575,0 c 0.415973,0 0.753575,-0.337602 0.753575,-0.753575 l 0,-1.507148 -1.836839,-3.014298 C 19.402621,15.764158 18.916,15.478553 18.37644,15.478553 l -3.650126,0 z m 1.507149,1.507149 2.142977,0 1.295206,2.260724 -3.438183,0 0,-2.260724 z m -2.260723,6.028596 c -1.248673,0 -2.260723,1.012051 -2.260723,2.260723 0,1.248673 1.01205,2.260724 2.260723,2.260724 l 6.78217,0 c 1.248673,0 2.260724,-1.012051 2.260724,-2.260724 0,-1.248672 -1.012051,-2.260723 -2.260724,-2.260723 l -6.78217,0 z m 0,1.507149 c 0.415973,0 0.753574,0.337601 0.753574,0.753574 0,0.415974 -0.337601,0.753575 -0.753574,0.753575 -0.415973,0 -0.753575,-0.337601 -0.753575,-0.753575 0,-0.415973 0.337602,-0.753574 0.753575,-0.753574 z m 2.260723,0 c 0.415973,0 0.753575,0.337601 0.753575,0.753574 0,0.415974 -0.337602,0.753575 -0.753575,0.753575 -0.415973,0 -0.753574,-0.337601 -0.753574,-0.753575 0,-0.415973 0.337601,-0.753574 0.753574,-0.753574 z m 2.260723,0 c 0.415974,0 0.753575,0.337601 0.753575,0.753574 0,0.415974 -0.337601,0.753575 -0.753575,0.753575 -0.415973,0 -0.753574,-0.337601 -0.753574,-0.753575 0,-0.415973 0.337601,-0.753574 0.753574,-0.753574 z m 2.260724,0 c 0.415973,0 0.753575,0.337601 0.753575,0.753574 0,0.415974 -0.337602,0.753575 -0.753575,0.753575 -0.415973,0 -0.753575,-0.337601 -0.753575,-0.753575 0,-0.415973 0.337602,-0.753574 0.753575,-0.753574 z"
-       id="icon" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816-1.1309 3.3906a12.374 12.374 0 0 1 1.1309 -0.0625 12.374 12.374 0 0 1 1.1289 0.056641l-1.129-3.3847zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" stroke-width=".75357" d="m24.334 12.464-4.2153 3.0143c0.10399 0.11605 0.20347 0.23888 0.28259 0.37679l0.51808 0.91842 2.0252-1.4601-1.5778 2.2372 0.49453 0.87132c0.14017 0.18613 0.25282 0.39374 0.32969 0.61228l4.5921-6.5702h-2.4491zm2.4491 1.3188-1.5071 2.143v4.074c0 0.41597 0.3376 0.75357 0.75358 0.75357 0.41522 0 0.75357 0.33836 0.75357 0.75358s-0.33836 0.75357-0.75357 0.75357c-0.41522 0-0.75358-0.33835-0.75358-0.75357h-1.5071c0 1.3858 1.2521 2.4766 2.6846 2.2136 0.88771-0.16277 1.6164-0.87999 1.7897-1.7662 0.22909-1.1718-0.45328-2.2074-1.4601-2.5669v-5.6047zm-12.057 1.6955c-0.8327 0-1.5071 0.67445-1.5071 1.5071v3.7679c0 0.41597 0.3376 0.75358 0.75358 0.75358h0.75357v0.75357h5.275v-0.75357h0.75358c0.41597 0 0.75358-0.3376 0.75358-0.75358v-1.5071l-1.8368-3.0143c-0.269-0.468-0.756-0.753-1.296-0.753h-3.6501zm1.5071 1.5071h2.143l1.2952 2.2607h-3.4382v-2.2607zm-2.2607 6.0286c-1.2487 0-2.2607 1.0121-2.2607 2.2607 0 1.2487 1.012 2.2607 2.2607 2.2607h6.7822c1.2487 0 2.2607-1.0121 2.2607-2.2607 0-1.2487-1.0121-2.2607-2.2607-2.2607h-6.7822zm0 1.5071c0.41597 0 0.75357 0.3376 0.75357 0.75357s-0.3376 0.75358-0.75357 0.75358-0.75358-0.3376-0.75358-0.75358c0-0.41597 0.3376-0.75357 0.75358-0.75357zm2.2607 0c0.41597 0 0.75358 0.3376 0.75358 0.75357s-0.3376 0.75358-0.75358 0.75358c-0.41597 0-0.75357-0.3376-0.75357-0.75358 0-0.41597 0.3376-0.75357 0.75357-0.75357zm2.2607 0c0.41597 0 0.75358 0.3376 0.75358 0.75357s-0.3376 0.75358-0.75358 0.75358c-0.41597 0-0.75357-0.3376-0.75357-0.75358 0-0.41597 0.3376-0.75357 0.75357-0.75357zm2.2607 0c0.41597 0 0.75358 0.3376 0.75358 0.75357s-0.3376 0.75358-0.75358 0.75358c-0.41597 0-0.75358-0.3376-0.75358-0.75358 0-0.41597 0.3376-0.75357 0.75358-0.75357z"/>
+ </g>
 </svg>
diff --git a/web/images/default.svg b/web/images/default.svg
index e00a8be2..f2e9790b 100644
--- a/web/images/default.svg
+++ b/web/images/default.svg
@@ -1,50 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="default.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <circle
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.90058905;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="icon"
-       cx="20"
-       cy="20"
-       r="5.8250632" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <circle id="icon" cx="20" cy="20" r="5.8251"/>
+ </g>
 </svg>
diff --git a/web/images/helicopter.svg b/web/images/helicopter.svg
index 373c7f38..f9c82419 100644
--- a/web/images/helicopter.svg
+++ b/web/images/helicopter.svg
@@ -1,47 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="helicopter.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
-       id="background" />
-    <path
-       style="stroke-width:0.88712007"
-       d="m 14.605611,13.910009 0,1.77424 6.20984,0 0,0.88712 c -2.66136,0 -3.516544,1.72811 -3.54848,1.77424 l -3.54848,0 0,0.88712 0,0.88712 3.54848,0.88712 c 0,1.323583 1.337777,2.66136 2.66136,2.66136 l 2.66136,0 c 2.661361,0 4.435601,-0.760262 4.435601,-2.66136 0,-1.622543 -2.228446,-3.988048 -5.322721,-4.380155 l 0,-0.942565 6.209841,0 0,-1.77424 -6.209841,0.88712 0,-0.44356 c 0,-0.244846 -0.198715,-0.44356 -0.44356,-0.44356 -0.244845,0 -0.44356,0.198714 -0.44356,0.44356 l 0,0.44356 -6.20984,-0.88712 z m -0.88712,5.32272 c 0,-0.979886 -0.794355,-1.77424 -1.774241,-1.77424 -0.979885,0 -1.77424,0.794354 -1.77424,1.77424 0,0.979885 0.794355,1.77424 1.77424,1.77424 0.979886,0 1.774241,-0.794355 1.774241,-1.77424 z m 7.98408,-0.88712 c 0.282104,-0.03992 2.88314,0.790424 3.548481,2.66136 l -3.548481,0 0,-2.66136 z m 4.435601,5.32272 0,0.88712 -8.871201,0 0,1.774241 8.871201,0 c 0.980267,0 1.77424,-0.793973 1.77424,-1.774241 l 0,-0.88712 -1.77424,0 z"
-       id="icon" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816-1.1309 3.3906a12.374 12.374 0 0 1 1.1309 -0.0625 12.374 12.374 0 0 1 1.1289 0.056641l-1.129-3.3847zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" stroke-width=".88712" d="m14.606 13.91v1.7742h6.2098v0.88712c-2.6614 0-3.5165 1.7281-3.5485 1.7742h-3.5485v0.88712 0.88712l3.5485 0.88712c0 1.3236 1.3378 2.6614 2.6614 2.6614h2.6614c2.6614 0 4.4356-0.76026 4.4356-2.6614 0-1.6225-2.2284-3.988-5.3227-4.3802v-0.94256h6.2098v-1.7742l-6.2098 0.88712v-0.44356c0-0.24485-0.19872-0.44356-0.44356-0.44356s-0.44356 0.19871-0.44356 0.44356v0.44356l-6.2098-0.88712zm-0.88712 5.3227c0-0.97989-0.79436-1.7742-1.7742-1.7742-0.97988 0-1.7742 0.79435-1.7742 1.7742 0 0.97988 0.79436 1.7742 1.7742 1.7742 0.97989 0 1.7742-0.79436 1.7742-1.7742zm7.9841-0.88712c0.2821-0.03992 2.8831 0.79042 3.5485 2.6614h-3.5485v-2.6614zm4.4356 5.3227v0.88712h-8.8712v1.7742h8.8712c0.98027 0 1.7742-0.79397 1.7742-1.7742v-0.88712h-1.7742z"/>
+ </g>
 </svg>
diff --git a/web/images/motorcycle.svg b/web/images/motorcycle.svg
index a2992764..d8d18f1d 100644
--- a/web/images/motorcycle.svg
+++ b/web/images/motorcycle.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="motorcycle.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.17110145px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 29.385596,21.143289 q 0.09803,0.841402 -0.179718,1.625622 -0.277744,0.77605 -0.808726,1.331539 -0.530982,0.55549 -1.298864,0.86591 -0.759712,0.31042 -1.601115,0.253237 -1.315201,-0.08986 -2.287307,-1.021119 -0.963937,-0.931261 -1.09464,-2.238294 -0.09803,-0.906754 0.220562,-1.71548 0.326758,-0.816896 0.972105,-1.396892 l -0.579996,-0.874079 q -0.78422,0.653517 -1.233512,1.584778 -0.449293,0.931261 -0.449293,1.993225 0,0.220562 -0.15521,0.383941 -0.147041,0.15521 -0.367602,0.15521 l -2.091253,0 -0.563658,0 q -0.187887,1.339709 -1.217175,2.238294 -1.029288,0.898585 -2.401672,0.898585 -1.511257,0 -2.589559,-1.070133 -1.070133,-1.078303 -1.070133,-2.589559 0,-1.511257 1.070133,-2.581389 1.078302,-1.078303 2.589559,-1.078303 0.620841,0 1.241681,0.220562 l 0.196055,-0.367603 q -1.004781,-0.898585 -2.483362,-0.898585 l -0.522814,0 q -0.212392,0 -0.367603,-0.15521 -0.155209,-0.15521 -0.155209,-0.367603 0,-0.212392 0.155209,-0.367603 0.155211,-0.15521 0.367603,-0.15521 l 1.045626,0 q 0.637179,0 1.184499,0.11437 0.54732,0.106195 0.947599,0.31042 0.408447,0.204224 0.588165,0.326759 0.179717,0.114369 0.416617,0.294082 l 4.182504,0 0.939431,0 -0.694362,-1.045626 -1.813507,0 q -0.24507,0 -0.400279,-0.179717 -0.155211,-0.187886 -0.11437,-0.432955 0.03267,-0.187886 0.187885,-0.310421 0.15521,-0.122534 0.351265,-0.122534 l 2.066746,0 q 0.269576,0 0.432955,0.228731 l 0.571827,0.85774 0.931261,-0.931261 q 0.155209,-0.15521 0.375771,-0.15521 l 0.825064,0 q 0.212394,0 0.367603,0.15521 0.155211,0.15521 0.155211,0.367603 l 0,1.045626 q 0,0.212394 -0.155211,0.367603 -0.155209,0.155211 -0.367603,0.155211 l -1.462243,0 0.939431,1.405061 q 1.070132,-0.514646 2.246463,-0.294084 1.168159,0.212393 1.993225,1.10281 0.825064,0.882247 0.963936,2.066746 z M 14.248522,24.18214 q 0.939429,0 1.658298,-0.588164 0.718868,-0.596335 0.906754,-1.503089 l -2.565052,0 q -0.285914,0 -0.449293,-0.253237 -0.147041,-0.261407 -0.0082,-0.514644 l 1.200837,-2.262801 q -0.383941,-0.106195 -0.743375,-0.106195 -1.078303,0 -1.846184,0.767882 -0.767882,0.767881 -0.767882,1.846184 0,1.078302 0.767882,1.846184 0.767881,0.767881 1.846184,0.767881 z m 9.655705,-0.767882 q 0.767882,0.767882 1.846184,0.767882 1.078301,0 1.846183,-0.767882 0.767882,-0.767881 0.767882,-1.846184 0,-1.078302 -0.767882,-1.846184 -0.767882,-0.767881 -1.846183,-0.767881 -0.490137,0 -0.988443,0.196055 l 1.421397,2.123928 q 0.122535,0.187886 0.0817,0.400279 -0.04085,0.212392 -0.220562,0.326758 -0.122534,0.08986 -0.294082,0.08986 -0.285914,0 -0.432955,-0.236899 l -1.421404,-2.12393 q -0.759713,0.776051 -0.759713,1.838015 0,1.078303 0.767882,1.846184 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m29.386 21.143q0.09803 0.8414-0.17972 1.6256-0.27774 0.77605-0.80873 1.3315-0.53098 0.55549-1.2989 0.86591-0.75971 0.31042-1.6011 0.25324-1.3152-0.08986-2.2873-1.0211-0.96394-0.93126-1.0946-2.2383-0.09803-0.90675 0.22056-1.7155 0.32676-0.8169 0.9721-1.3969l-0.58-0.87408q-0.78422 0.65352-1.2335 1.5848-0.44929 0.93126-0.44929 1.9932 0 0.22056-0.15521 0.38394-0.14704 0.15521-0.3676 0.15521h-2.0913-0.56366q-0.18789 1.3397-1.2172 2.2383-1.0293 0.89858-2.4017 0.89858-1.5113 0-2.5896-1.0701-1.0701-1.0783-1.0701-2.5896t1.0701-2.5814q1.0783-1.0783 2.5896-1.0783 0.62084 0 1.2417 0.22056l0.19606-0.3676q-1.0048-0.89858-2.4834-0.89858h-0.52281q-0.21239 0-0.3676-0.15521t-0.15521-0.3676 0.15521-0.3676 0.3676-0.15521h1.0456q0.63718 0 1.1845 0.11437 0.54732 0.1062 0.9476 0.31042 0.40845 0.20422 0.58816 0.32676 0.17972 0.11437 0.41662 0.29408h4.1825 0.93943l-0.69436-1.0456h-1.8135q-0.24507 0-0.40028-0.17972-0.15521-0.18789-0.11437-0.43296 0.03267-0.18789 0.18788-0.31042t0.35126-0.12253h2.0667q0.26958 0 0.43296 0.22873l0.57183 0.85774 0.93126-0.93126q0.15521-0.15521 0.37577-0.15521h0.82506q0.21239 0 0.3676 0.15521t0.15521 0.3676v1.0456q0 0.21239-0.15521 0.3676t-0.3676 0.15521h-1.4622l0.93943 1.4051q1.0701-0.51465 2.2465-0.29408 1.1682 0.21239 1.9932 1.1028 0.82506 0.88225 0.96394 2.0667zm-15.137 3.039q0.93943 0 1.6583-0.58816 0.71887-0.59634 0.90675-1.5031h-2.5651q-0.28591 0-0.44929-0.25324-0.14704-0.26141-0.0082-0.51464l1.2008-2.2628q-0.38394-0.1062-0.74338-0.1062-1.0783 0-1.8462 0.76788-0.76788 0.76788-0.76788 1.8462t0.76788 1.8462q0.76788 0.76788 1.8462 0.76788zm9.6557-0.76788q0.76788 0.76788 1.8462 0.76788t1.8462-0.76788q0.76788-0.76788 0.76788-1.8462t-0.76788-1.8462q-0.76788-0.76788-1.8462-0.76788-0.49014 0-0.98844 0.19606l1.4214 2.1239q0.12254 0.18789 0.0817 0.40028-0.04085 0.21239-0.22056 0.32676-0.12253 0.08986-0.29408 0.08986-0.28591 0-0.43296-0.2369l-1.4214-2.1239q-0.75971 0.77605-0.75971 1.838 0 1.0783 0.76788 1.8462z"/>
+ </g>
 </svg>
diff --git a/web/images/offroad.svg b/web/images/offroad.svg
index f175ec48..51c9c812 100644
--- a/web/images/offroad.svg
+++ b/web/images/offroad.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="offroad.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
-       id="background" />
-    <path
-       style="line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-transform:none;block-progression:tb;overflow:visible;stroke-width:0.80151391;enable-background:accumulate"
-       d="m 12.986753,13.988646 c -0.518579,0 -0.787487,0.109406 -1.051987,0.55104 -0.2645,0.441635 -1.552933,4.392497 -1.552933,5.03451 l 0,2.780251 c 0,0.650028 0.602738,1.252366 1.202271,1.252366 l 0.400757,0 c 0,1.328108 1.076433,2.404541 2.404541,2.404541 1.328109,0 2.404542,-1.076433 2.404542,-2.404541 l 7.213626,0 c 0,1.328108 1.076433,2.404541 2.404541,2.404541 1.328109,0 2.404542,-1.076433 2.404542,-2.404541 0,-0.07005 -0.01918,-0.131856 -0.02505,-0.200379 0.375528,-0.285391 0.826561,-0.803212 0.826561,-1.051987 l 0,-2.22921 c 0,-0.868842 -1.545719,-1.18584 -4.258043,-1.853501 0,0 -2.496315,-2.934543 -3.155961,-3.73205 -0.42881,-0.518579 -0.988266,-0.55104 -1.402649,-0.55104 l -7.814761,0 z m 2.655015,1.277412 1.95369,0 0,3.531671 -2.830346,0 c -0.36549,0 -0.64622,-0.106601 -0.525993,-0.701325 0.125036,-0.620371 0.516375,-2.155471 0.626182,-2.429589 0.125037,-0.310987 0.381321,-0.400757 0.776467,-0.400757 z m 3.556718,0 1.728264,0 c 0.308583,0 0.656841,0.09879 0.851609,0.325615 l 2.279305,2.70511 c 0.25408,0.336636 0.14287,0.500946 -0.175331,0.500946 l -4.683847,0 0,-3.531671 z m -4.809084,7.138484 c 0.662853,0 1.202271,0.539419 1.202271,1.202271 0,0.662852 -0.539418,1.202271 -1.202271,1.202271 -0.662852,0 -1.20227,-0.539419 -1.20227,-1.202271 0,-0.662852 0.539418,-1.202271 1.20227,-1.202271 z m 12.022709,0 c 0.662852,0 1.202271,0.539419 1.202271,1.202271 0,0.662852 -0.539419,1.202271 -1.202271,1.202271 -0.662852,0 -1.20227,-0.539419 -1.20227,-1.202271 0,-0.662852 0.539418,-1.202271 1.20227,-1.202271 z"
-       overflow="visible"
-       id="icon" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816-1.1309 3.3906a12.374 12.374 0 0 1 1.1309 -0.0625 12.374 12.374 0 0 1 1.1289 0.056641l-1.129-3.3847zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" style="block-progression:tb;text-transform:none;text-indent:0" stroke-width=".80151" overflow="visible" d="m12.987 13.989c-0.51858 0-0.78749 0.10941-1.052 0.55104-0.2645 0.44164-1.5529 4.3925-1.5529 5.0345v2.7803c0 0.65003 0.60274 1.2524 1.2023 1.2524h0.40076c0 1.3281 1.0764 2.4045 2.4045 2.4045s2.4045-1.0764 2.4045-2.4045h7.2136c0 1.3281 1.0764 2.4045 2.4045 2.4045s2.4045-1.0764 2.4045-2.4045c0-0.07005-0.01918-0.13186-0.02505-0.20038 0.37553-0.28539 0.82656-0.80321 0.82656-1.052v-2.2292c0-0.86884-1.5457-1.1858-4.258-1.8535 0 0-2.4963-2.9345-3.156-3.732-0.42881-0.51858-0.98827-0.55104-1.4026-0.55104h-7.8148zm2.655 1.2774h1.9537v3.5317h-2.8303c-0.36549 0-0.64622-0.1066-0.52599-0.70132 0.12504-0.62037 0.51638-2.1555 0.62618-2.4296 0.12504-0.31099 0.38132-0.40076 0.77647-0.40076zm3.5567 0h1.7283c0.30858 0 0.65684 0.09879 0.85161 0.32562l2.2793 2.7051c0.25408 0.33664 0.14287 0.50095-0.17533 0.50095h-4.6838v-3.5317zm-4.8091 7.1385c0.66285 0 1.2023 0.53942 1.2023 1.2023 0 0.66285-0.53942 1.2023-1.2023 1.2023-0.66285 0-1.2023-0.53942-1.2023-1.2023 0-0.66285 0.53942-1.2023 1.2023-1.2023zm12.023 0c0.66285 0 1.2023 0.53942 1.2023 1.2023 0 0.66285-0.53942 1.2023-1.2023 1.2023-0.66285 0-1.2023-0.53942-1.2023-1.2023 0-0.66285 0.53942-1.2023 1.2023-1.2023z"/>
+ </g>
 </svg>
diff --git a/web/images/person.svg b/web/images/person.svg
index b81264b9..124bbaf7 100644
--- a/web/images/person.svg
+++ b/web/images/person.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="person.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.4083333px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 26.287203,24.941349 q 0,1.070788 -0.618898,1.837041 -0.609072,0.766253 -1.473563,0.766253 l -8.389485,0 q -0.86449,0 -1.483387,-0.766253 -0.609073,-0.766253 -0.609073,-1.837041 0,-0.835019 0.07859,-1.571802 0.08841,-0.746605 0.31436,-1.49321 0.225946,-0.756429 0.569778,-1.286911 0.353655,-0.540308 0.923433,-0.874315 0.579601,-0.34383 1.326206,-0.34383 1.286913,1.25744 3.074835,1.25744 1.787923,0 3.074836,-1.25744 0.746605,0 1.316382,0.34383 0.579602,0.334007 0.923432,0.874315 0.353655,0.530482 0.579603,1.286911 0.225946,0.746605 0.304536,1.49321 0.08842,0.736783 0.08842,1.571802 z M 22.662237,13.565442 q 1.110084,1.10026 1.110084,2.662237 0,1.561977 -1.110084,2.672061 Q 21.561977,20 20,20 q -1.561977,0 -2.672062,-1.10026 -1.10026,-1.110084 -1.10026,-2.672061 0,-1.561977 1.10026,-2.662237 Q 18.438023,12.455357 20,12.455357 q 1.561977,0 2.662237,1.110085 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m26.287 24.941q0 1.0708-0.6189 1.837-0.60907 0.76625-1.4736 0.76625h-8.3895q-0.86449 0-1.4834-0.76625-0.60907-0.76625-0.60907-1.837 0-0.83502 0.07859-1.5718 0.08841-0.7466 0.31436-1.4932 0.22595-0.75643 0.56978-1.2869 0.35366-0.54031 0.92343-0.87432 0.5796-0.34383 1.3262-0.34383 1.2869 1.2574 3.0748 1.2574t3.0748-1.2574q0.7466 0 1.3164 0.34383 0.5796 0.33401 0.92343 0.87432 0.35366 0.53048 0.5796 1.2869 0.22595 0.7466 0.30454 1.4932 0.08842 0.73678 0.08842 1.5718zm-3.625-11.376q1.1101 1.1003 1.1101 2.6622 0 1.562-1.1101 2.6721-1.1 1.101-2.662 1.101t-2.6721-1.1003q-1.1003-1.1101-1.1003-2.6721t1.1003-2.6622q1.11-1.11 2.672-1.11t2.6622 1.1101z"/>
+ </g>
 </svg>
diff --git a/web/images/pickup.svg b/web/images/pickup.svg
index 2824f502..50bf57be 100644
--- a/web/images/pickup.svg
+++ b/web/images/pickup.svg
@@ -1,47 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="pickup.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
-       id="background" />
-    <path
-       style="stroke-width:0.8815155"
-       d="m 17.19017,14.711392 a 0.8816036,0.8816036 0 0 0 -0.688684,0.661137 l -0.716232,2.864925 -3.278135,0 c -0.969667,0 -1.763031,0.793364 -1.763031,1.763031 l 0,2.121146 c 0,0.352606 0.170794,0.622571 0.5234,0.798874 l 1.267178,0.468305 c 0.147037,1.082397 1.047732,1.900767 2.176241,1.900767 1.079857,0 1.946221,-0.750665 2.148694,-1.76303 l 7.162313,0 c 0.202474,1.012365 1.068837,1.76303 2.148694,1.76303 1.156989,0 2.065191,-0.859994 2.176241,-1.983409 l 0.468305,-0.303022 c 0.264455,-0.176303 0.440758,-0.528909 0.440758,-0.881515 l 0,-1.515104 c 0,-0.352607 -0.253435,-0.683175 -0.60604,-0.771327 l -3.966821,-1.34982 -2.176241,-2.727189 -0.0551,-0.08264 -0.02755,0.02755 c -0.446231,-0.66103 -1.205887,-0.99171 -1.900764,-0.99171 l -3.167945,0 a 0.8816036,0.8816036 0 0 0 -0.08265,0 0.8816036,0.8816036 0 0 0 -0.08264,0 z m 0.853968,1.763031 2.479261,0 c 0.333018,0 0.400363,0.03368 0.495853,0.192832 a 0.8816036,0.8816036 0 0 0 0.0551,0.08264 l 1.184537,1.487557 -4.655503,0 0.440757,-1.76303 z m -3.333231,5.812492 c 0.440758,0 0.798874,0.358116 0.798874,0.798874 0,0.440758 -0.358116,0.798873 -0.798874,0.798873 -0.440758,0 -0.798873,-0.358115 -0.798873,-0.798873 0,-0.440758 0.358115,-0.798874 0.798873,-0.798874 z m 11.459701,0 c 0.440758,0 0.798874,0.358116 0.798874,0.798874 0,0.440758 -0.358116,0.798873 -0.798874,0.798873 -0.440758,0 -0.798873,-0.358115 -0.798873,-0.798873 0,-0.440758 0.358115,-0.798874 0.798873,-0.798874 z"
-       id="icon" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816-1.1309 3.3906a12.374 12.374 0 0 1 1.1309 -0.0625 12.374 12.374 0 0 1 1.1289 0.056641l-1.129-3.3847zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" stroke-width=".88152" d="m17.19 14.711a0.8816 0.8816 0 0 0 -0.68868 0.66114l-0.71623 2.8649h-3.2781c-0.96967 0-1.763 0.79336-1.763 1.763v2.1211c0 0.35261 0.17079 0.62257 0.5234 0.79887l1.2672 0.4683c0.14704 1.0824 1.0477 1.9008 2.1762 1.9008 1.0799 0 1.9462-0.75066 2.1487-1.763h7.1623c0.20247 1.0124 1.0688 1.763 2.1487 1.763 1.157 0 2.0652-0.85999 2.1762-1.9834l0.4683-0.30302c0.26446-0.1763 0.44076-0.52891 0.44076-0.88152v-1.5151c0-0.35261-0.25344-0.68318-0.60604-0.77133l-3.9668-1.3498-2.1762-2.7272-0.0551-0.08264-0.02755 0.02755c-0.44623-0.66103-1.2059-0.99171-1.9008-0.99171h-3.1679a0.8816 0.8816 0 0 0 -0.08265 0 0.8816 0.8816 0 0 0 -0.08264 0zm0.85397 1.763h2.4793c0.33302 0 0.40036 0.03368 0.49585 0.19283a0.8816 0.8816 0 0 0 0.0551 0.08264l1.1845 1.4876h-4.6555l0.44076-1.763zm-3.3332 5.8125c0.44076 0 0.79887 0.35812 0.79887 0.79887 0 0.44076-0.35812 0.79887-0.79887 0.79887-0.44076 0-0.79887-0.35812-0.79887-0.79887 0-0.44076 0.35812-0.79887 0.79887-0.79887zm11.46 0c0.44076 0 0.79887 0.35812 0.79887 0.79887 0 0.44076-0.35812 0.79887-0.79887 0.79887-0.44076 0-0.79887-0.35812-0.79887-0.79887 0-0.44076 0.35812-0.79887 0.79887-0.79887z"/>
+ </g>
 </svg>
diff --git a/web/images/plane.svg b/web/images/plane.svg
index 61f26279..a46eb748 100644
--- a/web/images/plane.svg
+++ b/web/images/plane.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="plane.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.40917063px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 26.238433,13.762554 q 0.432502,0.511139 0.117961,1.45478 -0.314547,0.94364 -1.061596,1.690689 l -1.582564,1.582565 1.572736,6.841397 q 0.04915,0.186762 -0.117962,0.324377 l -1.258188,0.943642 q -0.06881,0.05897 -0.186761,0.05897 -0.03931,0 -0.06881,-0.0099 -0.147444,-0.0295 -0.206422,-0.157274 l -2.742455,-4.993434 -2.545866,2.545864 0.520969,1.906942 q 0.04915,0.167103 -0.07864,0.304717 l -0.943641,0.943641 q -0.08847,0.08847 -0.22608,0.08847 l -0.01966,0 q -0.147445,-0.01966 -0.235911,-0.127784 l -1.857798,-2.477021 -2.477057,-1.857794 q -0.108126,-0.06881 -0.127783,-0.226081 -0.0099,-0.127784 0.08847,-0.245739 l 0.943645,-0.95343 q 0.08847,-0.08847 0.22608,-0.08847 0.05898,0 0.07864,0.0099 l 1.906942,0.520968 2.545865,-2.545864 -4.993434,-2.742458 q -0.137619,-0.07863 -0.167104,-0.235909 -0.01966,-0.157275 0.08847,-0.2654 l 1.258189,-1.258221 q 0.13762,-0.127784 0.294888,-0.07864 l 6.53668,1.562907 1.572734,-1.572736 q 0.747049,-0.74705 1.69069,-1.061596 0.943641,-0.314547 1.45478,0.117961 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m26.238 13.763q0.4325 0.51114 0.11796 1.4548-0.31455 0.94364-1.0616 1.6907l-1.5826 1.5826 1.5727 6.8414q0.04915 0.18676-0.11796 0.32438l-1.2582 0.94364q-0.06881 0.05897-0.18676 0.05897-0.03931 0-0.06881-0.0099-0.14744-0.0295-0.20642-0.15727l-2.7425-4.9934-2.5459 2.5459 0.52097 1.9069q0.04915 0.1671-0.07864 0.30472l-0.94364 0.94364q-0.08847 0.08847-0.22608 0.08847h-0.01966q-0.14744-0.01966-0.23591-0.12778l-1.8578-2.477-2.4771-1.8578q-0.10813-0.06881-0.12778-0.22608-0.0099-0.12778 0.08847-0.24574l0.94364-0.95343q0.08847-0.08847 0.22608-0.08847 0.05898 0 0.07864 0.0099l1.9069 0.52097 2.5459-2.5459-4.9934-2.7425q-0.13762-0.07863-0.1671-0.23591-0.01966-0.15728 0.08847-0.2654l1.2582-1.2582q0.13762-0.12778 0.29489-0.07864l6.5367 1.5629 1.5727-1.5727q0.74705-0.74705 1.6907-1.0616 0.94364-0.31455 1.4548 0.11796z"/>
+ </g>
 </svg>
diff --git a/web/images/scooter.svg b/web/images/scooter.svg
new file mode 100644
index 00000000..c7b531cb
--- /dev/null
+++ b/web/images/scooter.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" style="text-decoration-color:#000000;block-progression:tb;isolation:auto;mix-blend-mode:normal;text-indent:0;text-decoration-line:none;white-space:normal;text-transform:none;text-decoration-style:solid" stroke-width=".60887" d="m20.609 12.298a0.60893 0.60893 0 1 0 0 1.2177h1.3795l2.0228 6.443-2.5163 3.9077h-5.871c-0.25412-0.70466-0.92507-1.2177-1.7124-1.2177-1.0016 0-1.8266 0.82501-1.8266 1.8266s0.82501 1.8266 1.8266 1.8266c0.78736 0 1.4583-0.51307 1.7124-1.2177h6.2028a0.60893 0.60893 0 0 0 0.51135 -0.27946l2.1477-3.3345 0.49232 1.5697c-0.43114 0.33547-0.71589 0.85238-0.71589 1.4354 0 1.0016 0.82501 1.8266 1.8266 1.8266s1.8266-0.82501 1.8266-1.8266c0-0.98654-0.80143-1.7976-1.7826-1.8218l-3.1157-9.9286a0.60893 0.60893 0 0 0 -0.58151 -0.42692h-1.8266zm-6.6975 11.568c0.33112 0 0.58355 0.24891 0.60173 0.57438a0.60893 0.60893 0 0 0 0 0.07017c-0.01874 0.32487-0.27102 0.57319-0.60173 0.57319-0.34348 0-0.60887-0.26539-0.60887-0.60887s0.26539-0.60887 0.60887-0.60887zm12.177 0c0.34348 0 0.60887 0.26539 0.60887 0.60886 0 0.34348-0.26539 0.60887-0.60887 0.60887s-0.60886-0.26539-0.60886-0.60887 0.26539-0.60886 0.60886-0.60886z" white-space="normal" overflow="visible" font-weight="400"/>
+ </g>
+</svg>
diff --git a/web/images/ship.svg b/web/images/ship.svg
index dcc1f41e..f94a6bbe 100644
--- a/web/images/ship.svg
+++ b/web/images/ship.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="ship.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.11000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 26.093541,25.102469 q 0.147112,-0.147112 0.348424,-0.147112 0.201312,0 0.348423,0.147112 l 0.991072,0.991072 -0.696847,0.696847 -0.642648,-0.642647 -0.642648,0.642647 q -0.139369,0.147112 -0.348423,0.147112 -0.209054,0 -0.348424,-0.147112 l -0.642648,-0.642647 -0.642647,0.642647 q -0.147113,0.147112 -0.348424,0.147112 -0.201312,0 -0.348423,-0.147112 l -0.642649,-0.642647 -0.642649,0.642647 q -0.147112,0.147112 -0.348424,0.147112 -0.20131,0 -0.348423,-0.147112 l -0.642648,-0.642647 -0.642648,0.642647 q -0.147111,0.147112 -0.348423,0.147112 -0.201312,0 -0.348424,-0.147112 l -0.642647,-0.642647 -0.642648,0.642647 q -0.147113,0.147112 -0.348424,0.147112 -0.201312,0 -0.348423,-0.147112 l -0.642648,-0.642647 -0.642648,0.642647 q -0.147113,0.147112 -0.348424,0.147112 -0.201311,0 -0.348424,-0.147112 l -0.642648,-0.642647 -0.642647,0.642647 q -0.147112,0.147112 -0.348424,0.147112 -0.201311,0 -0.348423,-0.147112 l -0.991072,-0.991071 0.696847,-0.696848 0.642648,0.642648 0.642648,-0.642648 q 0.147113,-0.147112 0.348423,-0.147112 0.201312,0 0.348424,0.147112 l 0.642648,0.642648 0.642649,-0.642648 q 0.147111,-0.147112 0.348423,-0.147112 0.201311,0 0.348423,0.147112 l 0.642648,0.642648 0.642648,-0.642648 q 0.147112,-0.147112 0.348424,-0.147112 0.20131,0 0.348423,0.147112 l 0.642648,0.642648 0.642648,-0.642648 q 0.147112,-0.147112 0.348423,-0.147112 0.201312,0 0.348424,0.147112 l 0.642647,0.642648 0.642648,-0.642648 q 0.147113,-0.147112 0.348425,-0.147112 0.201312,0 0.348424,0.147112 l 0.642648,0.642648 0.642648,-0.642648 q 0.147112,-0.147112 0.348423,-0.147112 0.201311,0 0.348424,0.147112 l 0.642648,0.642648 0.642647,-0.642648 z M 13.906459,24.808245 q -0.147112,0.147112 -0.348424,0.147112 -0.201311,0 -0.348423,-0.147112 l -0.991072,-0.991072 0.696847,-0.696846 0.642648,0.634905 0.642648,-0.634905 q 0.147113,-0.147112 0.348423,-0.147112 0.201312,0 0.348424,0.147112 l 0.642648,0.634905 0.495536,-0.495536 0,-2.268625 -1.625977,-2.431222 q -0.131626,-0.20131 -0.0542,-0.433593 0.07743,-0.240026 0.30971,-0.317453 l 1.370466,-0.449079 0,-2.315081 0.991071,0 0,-0.991072 1.982142,0 0,-0.991071 1.982144,0 0,0.991071 1.982144,0 0,0.991072 0.991071,0 0,2.315081 1.370466,0.449079 q 0.232283,0.07742 0.30971,0.317453 0.07743,0.232283 -0.0542,0.433593 l -1.625977,2.431222 0,2.268625 0.147113,-0.139369 q 0.147111,-0.147112 0.348423,-0.147112 0.201311,0 0.348423,0.147112 l 0.642648,0.634905 0.642648,-0.634905 q 0.147112,-0.147112 0.348424,-0.147112 0.201311,0 0.348423,0.147112 l 0.991071,0.991071 -0.696847,0.696847 -0.642647,-0.642648 -0.642648,0.642648 q -0.13937,0.147112 -0.348424,0.147112 -0.209054,0 -0.348423,-0.147112 l -0.642648,-0.642648 -0.642648,0.642648 q -0.147113,0.147112 -0.348423,0.147112 -0.201312,0 -0.348424,-0.147112 l -0.642649,-0.642648 -0.642649,0.642648 q -0.147111,0.147112 -0.348423,0.147112 -0.201311,0 -0.348424,-0.147112 l -0.642647,-0.642648 -0.642648,0.642648 q -0.147112,0.147112 -0.348424,0.147112 -0.201311,0 -0.348423,-0.147112 l -0.642648,-0.642648 -0.642648,0.642648 q -0.147112,0.147112 -0.348423,0.147112 -0.201312,0 -0.348424,-0.147112 l -0.642643,-0.642648 -0.642648,0.642648 q -0.147113,0.147112 -0.348424,0.147112 -0.201311,0 -0.348424,-0.147112 l -0.642648,-0.642648 -0.642647,0.642648 z m 3.120326,-8.77253 0,0.991071 L 20,16.035715 l 2.973215,0.991071 0,-0.991071 -0.991072,0 0,-0.991072 -3.964287,0 0,0.991072 -0.991071,0 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m26.094 25.102q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.99107 0.99107-0.69685 0.69685-0.64265-0.64265-0.64265 0.64265q-0.13937 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.99107-0.99107 0.69685-0.69685 0.64265 0.64265 0.64265-0.64265q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.64265 0.64265 0.64265-0.64265q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.64265 0.64265 0.64265-0.64265q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.64265 0.64265 0.64265-0.64265q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.64265 0.64265 0.64265-0.64265q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.64265 0.64265 0.64265-0.64265q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.64265 0.64265 0.64265-0.64265zm-12.188-0.294q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.99107-0.99107 0.69685-0.69685 0.64265 0.6349 0.64265-0.6349q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.64265 0.6349 0.49554-0.49554v-2.2686l-1.626-2.4312q-0.13163-0.20131-0.0542-0.43359 0.07743-0.24003 0.30971-0.31745l1.3705-0.44908v-2.3151h0.99107v-0.99107h1.9821v-0.99107h1.9821v0.99107h1.9821v0.99107h0.99107v2.3151l1.3705 0.44908q0.23228 0.07742 0.30971 0.31745 0.07743 0.23228-0.0542 0.43359l-1.626 2.4312v2.2686l0.14711-0.13937q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.64265 0.6349 0.64265-0.6349q0.14711-0.14711 0.34842-0.14711t0.34842 0.14711l0.99107 0.99107-0.69685 0.69685-0.64265-0.64265-0.64265 0.64265q-0.13937 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64264-0.64265-0.64265 0.64265q-0.14711 0.14711-0.34842 0.14711t-0.34842-0.14711l-0.64265-0.64265-0.64265 0.64265zm3.1203-8.7725v0.99107l2.974-0.991 2.9732 0.99107v-0.99107h-0.99107v-0.99107h-3.9643v0.99107h-0.99107z"/>
+ </g>
 </svg>
diff --git a/web/images/tractor.svg b/web/images/tractor.svg
index 4d2b5ad1..96643ef9 100644
--- a/web/images/tractor.svg
+++ b/web/images/tractor.svg
@@ -1,47 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="tractor.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
-       id="background" />
-    <path
-       style="stroke-width:0.84153426"
-       d="m 13.104551,12.426654 a 0.84161836,0.84161836 0 0 0 -0.683747,0.841534 l 0,5.049206 a 0.84161836,0.84161836 0 0 0 0,0.07889 l 0,1.867154 c 0.841534,-0.673228 1.851375,-1.104514 2.94537,-1.104514 2.524602,0 4.628437,2.103835 4.628437,4.628438 l 0,0.420767 3.786905,0 c -0.25895,0.349608 -0.420768,0.785152 -0.420768,1.262302 0,1.178148 0.925688,2.103835 2.103836,2.103835 1.178148,0 2.103835,-0.925687 2.103835,-2.103835 0,-0.55373 -0.213184,-1.047793 -0.552257,-1.420089 0.497179,-0.226205 0.855209,-0.673228 0.973024,-1.262302 l 0.420767,-2.708688 c 0.08415,-0.420767 -0.336613,-0.920428 -0.841534,-0.920428 l -7.126743,-0.788938 -1.314897,-5.312185 a 0.84161836,0.84161836 0 0 0 -0.815236,-0.631149 l -5.049205,0 a 0.84161836,0.84161836 0 0 0 -0.07889,0 0.84161836,0.84161836 0 0 0 -0.07889,0 z m 0.999321,1.683069 3.550223,0 1.025619,4.049883 -4.575842,-0.499661 0,-3.550222 z m 10.098411,0 0,3.629117 1.683068,0.236681 0,-3.865798 -1.683068,0 z m -8.836109,5.89074 c -2.103836,0 -3.786905,1.683067 -3.786905,3.786903 0,2.103836 1.683069,3.786904 3.786905,3.786904 2.103835,0 3.786903,-1.683068 3.786903,-3.786904 0,-2.103836 -1.683068,-3.786903 -3.786903,-3.786903 z m 0,1.2623 c 1.430608,0 2.524602,1.093995 2.524602,2.524603 0,1.430608 -1.093994,2.524603 -2.524602,2.524603 -1.430609,0 -2.524603,-1.093995 -2.524603,-2.524603 0,-1.430608 1.093994,-2.524603 2.524603,-2.524603 z m 10.09841,3.366137 c 0.504921,0 0.841535,0.336614 0.841535,0.841535 0,0.50492 -0.336614,0.841534 -0.841535,0.841534 -0.50492,0 -0.841534,-0.336614 -0.841534,-0.841534 0,-0.504921 0.336614,-0.841535 0.841534,-0.841535 z"
-       id="icon" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816-1.1309 3.3906a12.374 12.374 0 0 1 1.1309 -0.0625 12.374 12.374 0 0 1 1.1289 0.056641l-1.129-3.3847zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" stroke-width=".84153" d="m13.105 12.427a0.84162 0.84162 0 0 0 -0.68375 0.84153v5.0492a0.84162 0.84162 0 0 0 0 0.07889v1.8672c0.84153-0.67323 1.8514-1.1045 2.9454-1.1045 2.5246 0 4.6284 2.1038 4.6284 4.6284v0.42077h3.7869c-0.25895 0.34961-0.42077 0.78515-0.42077 1.2623 0 1.1781 0.92569 2.1038 2.1038 2.1038s2.1038-0.92569 2.1038-2.1038c0-0.55373-0.21318-1.0478-0.55226-1.4201 0.49718-0.2262 0.85521-0.67323 0.97302-1.2623l0.42077-2.7087c0.08415-0.42077-0.33661-0.92043-0.84153-0.92043l-7.1267-0.78894-1.3149-5.3122a0.84162 0.84162 0 0 0 -0.81524 -0.63115h-5.0492a0.84162 0.84162 0 0 0 -0.07889 0 0.84162 0.84162 0 0 0 -0.07889 0zm0.99932 1.6831h3.5502l1.0256 4.0499-4.5758-0.49966v-3.5502zm10.098 0v3.6291l1.6831 0.23668v-3.8658h-1.6831zm-8.8361 5.8907c-2.1038 0-3.7869 1.6831-3.7869 3.7869s1.6831 3.7869 3.7869 3.7869 3.7869-1.6831 3.7869-3.7869-1.6831-3.7869-3.7869-3.7869zm0 1.2623c1.4306 0 2.5246 1.094 2.5246 2.5246s-1.094 2.5246-2.5246 2.5246-2.5246-1.094-2.5246-2.5246 1.094-2.5246 2.5246-2.5246zm10.098 3.3661c0.50492 0 0.84154 0.33661 0.84154 0.84154 0 0.50492-0.33661 0.84153-0.84154 0.84153-0.50492 0-0.84153-0.33661-0.84153-0.84153s0.33661-0.84154 0.84153-0.84154z"/>
+ </g>
 </svg>
diff --git a/web/images/train.svg b/web/images/train.svg
index 949db92f..e4b10ace 100644
--- a/web/images/train.svg
+++ b/web/images/train.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="train.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.30545557px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 18.126937,11.484292 c -0.598635,0 -1.086857,0.44565 -1.170666,1.021671 H 16.59443 c -1.314337,0 -2.383899,1.026991 -2.383899,2.288117 v 9.727159 c 0,0.877999 0.517487,1.638931 1.277089,2.022057 l -1.638931,1.362228 c -0.146333,0.121058 -0.168948,0.337897 -0.04789,0.484229 0.121057,0.146334 0.337896,0.168949 0.484229,0.04789 l 1.968844,-1.649572 c 0.111746,0.01596 0.224822,0.02128 0.340558,0.02128 h 6.81114 c 0.115736,0 0.228811,-0.0054 0.340557,-0.02128 l 1.968845,1.649572 c 0.146333,0.121057 0.363172,0.09844 0.484229,-0.04789 0.121058,-0.146332 0.09844,-0.363171 -0.04789,-0.484229 l -1.638933,-1.362228 c 0.759601,-0.383126 1.277088,-1.144058 1.277088,-2.022057 V 14.79408 c 0,-1.261126 -1.069563,-2.288117 -2.383899,-2.288117 h -0.361834 c -0.08381,-0.576021 -0.57203,-1.021671 -1.170665,-1.021671 -0.598635,0 -1.086856,0.44565 -1.170664,1.021671 h -1.404803 c -0.08381,-0.576021 -0.572029,-1.021671 -1.170664,-1.021671 z m 0,0.681114 c 0.282023,0 0.510835,0.228811 0.510835,0.510836 0,0.282023 -0.228812,0.510835 -0.510835,0.510835 -0.282024,0 -0.510836,-0.228812 -0.510836,-0.510835 0,-0.282025 0.228812,-0.510836 0.510836,-0.510836 z m 3.746126,0 c 0.282024,0 0.510836,0.228811 0.510836,0.510836 0,0.282023 -0.228812,0.510835 -0.510836,0.510835 -0.282023,0 -0.510836,-0.228812 -0.510836,-0.510835 0,-0.282025 0.228813,-0.510836 0.510836,-0.510836 z m -3.916405,2.724456 h 4.086683 c 0.188903,0 0.340558,0.152984 0.340558,0.340556 v 0.681114 h -4.767798 v -0.681114 c 0,-0.187572 0.152984,-0.340556 0.340557,-0.340556 z m -1.362228,1.702784 h 6.81114 c 0.376475,0 0.681113,0.283355 0.681113,0.627903 v 2.490323 c 0,0.344548 -0.304638,0.627901 -0.681113,0.627901 h -6.81114 c -0.376476,0 -0.681114,-0.283353 -0.681114,-0.627901 v -2.490323 c 0,-0.344548 0.304638,-0.627903 0.681114,-0.627903 z m 0.340556,6.130026 c 0.564048,0 1.021672,0.457623 1.021672,1.021671 0,0.564048 -0.457624,1.021672 -1.021672,1.021672 -0.564047,0 -1.02167,-0.457624 -1.02167,-1.021672 0,-0.564048 0.457623,-1.021671 1.02167,-1.021671 z m 6.130027,0 c 0.564047,0 1.02167,0.457623 1.02167,1.021671 0,0.564048 -0.457623,1.021672 -1.02167,1.021672 -0.564048,0 -1.021672,-0.457624 -1.021672,-1.021672 0,-0.564048 0.457624,-1.021671 1.021672,-1.021671 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m18.127 11.484c-0.59864 0-1.0869 0.44565-1.1707 1.0217h-0.362c-1.3143 0-2.3839 1.027-2.3839 2.2881v9.7272c0 0.878 0.51749 1.6389 1.2771 2.0221l-1.6389 1.3622c-0.14633 0.12106-0.16895 0.3379-0.04789 0.48423s0.3379 0.16895 0.48423 0.04789l1.9688-1.6496c0.11175 0.01596 0.22482 0.02128 0.34056 0.02128h6.8111c0.11574 0 0.22881-0.0054 0.34056-0.02128l1.9688 1.6496c0.14633 0.12106 0.36317 0.09844 0.48423-0.04789s0.09844-0.36317-0.04789-0.48423l-1.6389-1.3622c0.7596-0.38313 1.2771-1.1441 1.2771-2.0221v-9.727c0-1.2611-1.0696-2.2881-2.3839-2.2881h-0.36183c-0.08381-0.57602-0.57203-1.0217-1.1707-1.0217-0.59864 0-1.0869 0.44565-1.1707 1.0217h-1.4048c-0.08381-0.57602-0.57203-1.0217-1.1707-1.0217zm0 0.68111c0.28202 0 0.51084 0.22881 0.51084 0.51084 0 0.28202-0.22881 0.51084-0.51084 0.51084-0.28202 0-0.51084-0.22881-0.51084-0.51084 0-0.28202 0.22881-0.51084 0.51084-0.51084zm3.7461 0c0.28202 0 0.51084 0.22881 0.51084 0.51084 0 0.28202-0.22881 0.51084-0.51084 0.51084-0.28202 0-0.51084-0.22881-0.51084-0.51084 0-0.28202 0.22881-0.51084 0.51084-0.51084zm-3.9164 2.7245h4.0867c0.1889 0 0.34056 0.15298 0.34056 0.34056v0.68111h-4.7678v-0.68111c0-0.18757 0.15298-0.34056 0.34056-0.34056zm-1.3622 1.7028h6.8111c0.37648 0 0.68111 0.28336 0.68111 0.6279v2.4903c0 0.34455-0.30464 0.6279-0.68111 0.6279h-6.8111c-0.37648 0-0.68111-0.28335-0.68111-0.6279v-2.4903c0-0.34455 0.30464-0.6279 0.68111-0.6279zm0.34056 6.13c0.56405 0 1.0217 0.45762 1.0217 1.0217 0 0.56405-0.45762 1.0217-1.0217 1.0217-0.56405 0-1.0217-0.45762-1.0217-1.0217 0-0.56405 0.45762-1.0217 1.0217-1.0217zm6.13 0c0.56405 0 1.0217 0.45762 1.0217 1.0217 0 0.56405-0.45762 1.0217-1.0217 1.0217-0.56405 0-1.0217-0.45762-1.0217-1.0217 0-0.56405 0.45762-1.0217 1.0217-1.0217z"/>
+ </g>
 </svg>
diff --git a/web/images/tram.svg b/web/images/tram.svg
index 31d3108d..70a03078 100644
--- a/web/images/tram.svg
+++ b/web/images/tram.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="tram.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.30545557px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 19.999996,11.299402 c -2.576193,0 -3.828263,0.455422 -3.828263,1.392096 0,0.191685 0.156339,0.348024 0.348024,0.348024 0.191685,0 0.348024,-0.156339 0.348024,-0.348024 0,-0.171294 0.346664,-0.451344 1.424722,-0.598166 L 18.58615,13.8117 c -2.814101,0.315397 -4.502561,1.551154 -4.502561,2.70806 v 8.102434 c 0,1.072621 0.754505,1.978026 1.783624,2.251279 l -1.457351,1.218084 c -0.145463,0.122352 -0.165855,0.333071 -0.0435,0.478533 0.06797,0.08157 0.163136,0.130509 0.26102,0.130509 0.07749,0 0.163137,-0.03264 0.22839,-0.087 l 1.979387,-1.653114 h 6.329685 l 1.979386,1.653114 c 0.06525,0.05438 0.150901,0.087 0.228392,0.087 0.09788,0 0.193043,-0.04894 0.261016,-0.130509 0.122353,-0.145462 0.101962,-0.356181 -0.0435,-0.478533 l -1.457351,-1.218084 c 1.029118,-0.273253 1.783624,-1.178658 1.783624,-2.251279 v -8.102433 c 0,-1.156907 -1.68846,-2.392664 -4.50256,-2.708061 l 0.293645,-1.718368 c 1.078059,0.146822 1.424724,0.426872 1.424724,0.598166 0,0.191685 0.154979,0.348024 0.348024,0.348024 0.193044,0 0.348025,-0.156339 0.348025,-0.348024 0,-0.936674 -1.252072,-1.392096 -3.828265,-1.392096 z m 0,0.696047 c 0.377933,0 0.702846,0.01359 1.000569,0.03264 l -0.293646,1.729245 c -0.231109,-0.01223 -0.463578,-0.02175 -0.706923,-0.02175 -0.243346,0 -0.475813,0.0095 -0.706923,0.02175 L 18.999428,12.02809 c 0.297722,-0.01903 0.622637,-0.03264 1.000568,-0.03264 z m -2.088143,3.828263 h 4.176287 c 0.193044,0 0.348024,0.15634 0.348024,0.348025 v 0.696046 h -4.872337 v -0.696046 c 0,-0.191685 0.156341,-0.348025 0.348026,-0.348025 z m -1.392096,1.74012 h 6.960479 c 0.38473,0 0.696047,0.289566 0.696047,0.641669 v 2.544926 c 0,0.352102 -0.311317,0.641669 -0.696047,0.641669 h -6.960479 c -0.384731,0 -0.696048,-0.289567 -0.696048,-0.641669 v -2.544926 c 0,-0.352103 0.311317,-0.641669 0.696048,-0.641669 z m 0.348024,5.568384 c 0.576414,0 1.044072,0.467656 1.044072,1.044071 0,0.576415 -0.467658,1.044072 -1.044072,1.044072 -0.576415,0 -1.044072,-0.467657 -1.044072,-1.044072 0,-0.576415 0.467657,-1.044071 1.044072,-1.044071 z m 6.264432,0 c 0.576413,0 1.044071,0.467656 1.044071,1.044071 0,0.576415 -0.467658,1.044072 -1.044071,1.044072 -0.576415,0 -1.044073,-0.467657 -1.044073,-1.044072 0,-0.576415 0.467658,-1.044071 1.044073,-1.044071 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m20 11.299c-2.5762 0-3.8283 0.45542-3.8283 1.3921 0 0.19168 0.15634 0.34802 0.34802 0.34802s0.34802-0.15634 0.34802-0.34802c0-0.17129 0.34666-0.45134 1.4247-0.59817l0.294 1.719c-2.8141 0.3154-4.5026 1.5512-4.5026 2.7081v8.1024c0 1.0726 0.7545 1.978 1.7836 2.2513l-1.4574 1.2181c-0.14546 0.12235-0.16586 0.33307-0.0435 0.47853 0.06797 0.08157 0.16314 0.13051 0.26102 0.13051 0.07749 0 0.16314-0.03264 0.22839-0.087l1.9794-1.6531h6.3297l1.9794 1.6531c0.06525 0.05438 0.1509 0.087 0.22839 0.087 0.09788 0 0.19304-0.04894 0.26102-0.13051 0.12235-0.14546 0.10196-0.35618-0.0435-0.47853l-1.4574-1.2181c1.0291-0.27325 1.7836-1.1787 1.7836-2.2513v-8.1024c0-1.1569-1.6885-2.3927-4.5026-2.7081l0.29364-1.7184c1.0781 0.14682 1.4247 0.42687 1.4247 0.59817 0 0.19168 0.15498 0.34802 0.34802 0.34802s0.34802-0.15634 0.34802-0.34802c0-0.93667-1.2521-1.3921-3.8283-1.3921zm0 0.69605c0.37793 0 0.70285 0.01359 1.0006 0.03264l-0.29365 1.7292c-0.23111-0.01223-0.46358-0.02175-0.70692-0.02175-0.24335 0-0.47581 0.0095-0.70692 0.02175l-0.294-1.729c0.29772-0.01903 0.62264-0.03264 1.0006-0.03264zm-2.0881 3.8283h4.1763c0.19304 0 0.34802 0.15634 0.34802 0.34802v0.69605h-4.8723v-0.69605c0-0.19168 0.15634-0.34802 0.34803-0.34802zm-1.3921 1.7401h6.9605c0.38473 0 0.69605 0.28957 0.69605 0.64167v2.5449c0 0.3521-0.31132 0.64167-0.69605 0.64167h-6.9605c-0.38473 0-0.69605-0.28957-0.69605-0.64167v-2.5449c0-0.3521 0.31132-0.64167 0.69605-0.64167zm0.34802 5.5684c0.57641 0 1.0441 0.46766 1.0441 1.0441 0 0.57642-0.46766 1.0441-1.0441 1.0441-0.57642 0-1.0441-0.46766-1.0441-1.0441 0-0.57642 0.46766-1.0441 1.0441-1.0441zm6.2644 0c0.57641 0 1.0441 0.46766 1.0441 1.0441 0 0.57642-0.46766 1.0441-1.0441 1.0441-0.57642 0-1.0441-0.46766-1.0441-1.0441 0-0.57642 0.46766-1.0441 1.0441-1.0441z"/>
+ </g>
 </svg>
diff --git a/web/images/trolleybus.svg b/web/images/trolleybus.svg
index ebd72299..344ae8db 100644
--- a/web/images/trolleybus.svg
+++ b/web/images/trolleybus.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="trolleybus.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.30545557px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 16.908545,11.560864 c -0.109467,0.01846 -0.203108,0.091 -0.249268,0.192555 -0.04615,0.100237 -0.03956,0.218935 0.01715,0.313894 l 0.70692,1.181716 h -1.772574 c -1.303054,0 -2.363433,1.060381 -2.363433,2.363434 v 10.466631 c 0,0.298066 0.131888,0.563161 0.337633,0.749123 v 0.601409 c 0,0.557885 0.455014,1.0129 1.012901,1.0129 h 1.350532 c 0.557886,0 1.0129,-0.455015 1.0129,-1.0129 v -0.337634 h 6.077399 v 0.337634 c 0,0.557885 0.455012,1.0129 1.012899,1.0129 h 1.350532 c 0.557888,0 1.012901,-0.455015 1.012901,-1.0129 V 26.828217 C 26.62078,26.642255 26.75267,26.37716 26.75267,26.079094 V 15.612463 c 0,-1.303053 -1.060381,-2.363434 -2.363434,-2.363434 h -1.772575 l 0.70692,-1.181716 c 0.06594,-0.112104 0.062,-0.251906 -0.0092,-0.358735 -0.07254,-0.108148 -0.20047,-0.166178 -0.328401,-0.147714 -0.09892,0.01846 -0.183325,0.08045 -0.232123,0.168816 l -0.907386,1.519349 H 18.153607 L 17.246218,11.72968 c -0.06726,-0.120018 -0.201789,-0.185963 -0.337634,-0.168816 z m -0.960144,3.376332 h 8.103197 c 0.573712,0 1.012901,0.439187 1.012901,1.012899 v 4.726867 c 0,0.573712 -0.439188,1.012898 -1.012901,1.012898 h -8.103197 c -0.573712,0 -1.0129,-0.439186 -1.0129,-1.012898 v -4.726867 c 0,-0.573712 0.439187,-1.012899 1.0129,-1.012899 z m -3.038698,2.0258 c -0.391708,0 -0.675267,0.283558 -0.675267,0.675265 v 2.0258 c 0,0.391708 0.283559,0.675267 0.675267,0.675267 z m 14.180593,0 v 3.376332 c 0.391707,0 0.675268,-0.283559 0.675268,-0.675267 v -2.0258 c 0,-0.391707 -0.283561,-0.675265 -0.675268,-0.675265 z m -11.141895,6.415031 c 0.559203,0 1.012899,0.453695 1.012899,1.0129 0,0.559205 -0.453696,1.012899 -1.012899,1.012899 -0.559206,0 -1.0129,-0.453694 -1.0129,-1.012899 0,-0.559205 0.453694,-1.0129 1.0129,-1.0129 z m 8.103197,0 c 0.559205,0 1.0129,0.453695 1.0129,1.0129 0,0.559205 -0.453696,1.012899 -1.0129,1.012899 -0.559206,0 -1.012899,-0.453694 -1.012899,-1.012899 0,-0.559205 0.453693,-1.0129 1.012899,-1.0129 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m16.909 11.561c-0.10947 0.01846-0.20311 0.091-0.24927 0.19256-0.04615 0.10024-0.03956 0.21894 0.01715 0.31389l0.70692 1.1817h-1.7726c-1.3031 0-2.3634 1.0604-2.3634 2.3634v10.467c0 0.29807 0.13189 0.56316 0.33763 0.74912v0.60141c0 0.55788 0.45501 1.0129 1.0129 1.0129h1.3505c0.55789 0 1.0129-0.45502 1.0129-1.0129v-0.33763h6.0774v0.33763c0 0.55788 0.45501 1.0129 1.0129 1.0129h1.3505c0.55789 0 1.0129-0.45502 1.0129-1.0129v-0.601c0.204-0.186 0.336-0.451 0.336-0.749v-10.467c0-1.3031-1.0604-2.3634-2.3634-2.3634h-1.7726l0.70692-1.1817c0.06594-0.1121 0.062-0.25191-0.0092-0.35874-0.07254-0.10815-0.20047-0.16618-0.3284-0.14771-0.09892 0.01846-0.18332 0.08045-0.23212 0.16882l-0.90739 1.5193h-3.693l-0.908-1.518c-0.06726-0.12002-0.20179-0.18596-0.33763-0.16882zm-0.96014 3.3763h8.1032c0.57371 0 1.0129 0.43919 1.0129 1.0129v4.7269c0 0.57371-0.43919 1.0129-1.0129 1.0129h-8.1032c-0.57371 0-1.0129-0.43919-1.0129-1.0129v-4.7269c0-0.57371 0.43919-1.0129 1.0129-1.0129zm-3.0387 2.0258c-0.39171 0-0.67527 0.28356-0.67527 0.67526v2.0258c0 0.39171 0.28356 0.67527 0.67527 0.67527zm14.181 0v3.3763c0.39171 0 0.67527-0.28356 0.67527-0.67527v-2.0258c0-0.39171-0.28356-0.67526-0.67527-0.67526zm-11.142 6.415c0.5592 0 1.0129 0.4537 1.0129 1.0129s-0.4537 1.0129-1.0129 1.0129c-0.55921 0-1.0129-0.45369-1.0129-1.0129 0-0.5592 0.45369-1.0129 1.0129-1.0129zm8.1032 0c0.5592 0 1.0129 0.4537 1.0129 1.0129s-0.4537 1.0129-1.0129 1.0129c-0.55921 0-1.0129-0.45369-1.0129-1.0129 0-0.5592 0.45369-1.0129 1.0129-1.0129z"/>
+ </g>
 </svg>
diff --git a/web/images/truck.svg b/web/images/truck.svg
index 7bdf838b..708744d2 100644
--- a/web/images/truck.svg
+++ b/web/images/truck.svg
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="truck.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
-       id="background" />
-    <path
-       id="icon"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.30545557px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 17.031398,24.899079 q 0.346033,-0.346032 0.346033,-0.819552 0,-0.473519 -0.346033,-0.819554 -0.346033,-0.346031 -0.819553,-0.346031 -0.473519,0 -0.819552,0.346031 -0.346034,0.346034 -0.346034,0.819554 0,0.47352 0.346034,0.819552 0.346033,0.346033 0.819552,0.346033 0.47352,0 0.819553,-0.346033 z m -3.150724,-5.481894 3.496757,0 0,-2.331169 -1.43877,0 q -0.118379,0 -0.200335,0.08196 l -1.775697,1.775697 q -0.08196,0.08196 -0.08196,0.200333 l 0,0.273185 z m 11.309821,5.481894 q 0.346034,-0.346032 0.346034,-0.819552 0,-0.473519 -0.346034,-0.819554 -0.346033,-0.346031 -0.819553,-0.346031 -0.473519,0 -0.819552,0.346031 -0.346033,0.346034 -0.346033,0.819554 0,0.47352 0.346033,0.819552 0.346033,0.346033 0.819552,0.346033 0.47352,0 0.819553,-0.346033 z m 2.677205,-10.727028 0,9.324682 q 0,0.136593 -0.03642,0.245866 -0.03642,0.100168 -0.127491,0.16391 -0.08196,0.06375 -0.145698,0.109267 -0.06374,0.03642 -0.218547,0.05463 -0.145698,0.0091 -0.200336,0.01821 -0.05463,0 -0.236758,0 -0.173018,-0.0091 -0.200336,-0.0091 0,0.965252 -0.682962,1.648211 -0.682959,0.682961 -1.64821,0.682961 -0.96525,0 -1.64821,-0.682961 -0.682958,-0.682916 -0.682958,-1.648168 l -3.496756,0 q 0,0.965252 -0.682961,1.648211 -0.682959,0.682961 -1.64821,0.682961 -0.96525,0 -1.64821,-0.682961 -0.682961,-0.682959 -0.682961,-1.648211 l -0.582792,0 q -0.02732,0 -0.209442,0.0091 -0.173016,0 -0.227653,0 -0.05463,-0.0091 -0.209441,-0.01821 -0.145698,-0.01821 -0.20944,-0.05463 -0.06375,-0.04553 -0.154805,-0.109266 -0.08196,-0.06375 -0.118379,-0.163911 -0.03642,-0.109266 -0.03642,-0.245865 0,-0.23676 0.173017,-0.409776 0.173016,-0.173018 0.409776,-0.173018 l 0,-2.913963 q 0,-0.07285 -0.0091,-0.318714 0,-0.245866 0,-0.346033 0.0091,-0.100168 0.02732,-0.309609 0.01821,-0.218547 0.05463,-0.336927 0.04554,-0.127491 0.127491,-0.282291 0.09106,-0.154803 0.209441,-0.273183 l 1.803014,-1.803015 q 0.173017,-0.173017 0.455308,-0.291397 0.291396,-0.118379 0.537261,-0.118379 l 1.456983,0 0,-1.748377 q 0,-0.23676 0.173016,-0.409776 0.173017,-0.173017 0.409776,-0.173017 l 9.324684,0 q 0.23676,0 0.409776,0.173017 0.173017,0.173016 0.173017,0.409776 z" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816l-1.131 3.3907a12.374 12.374 0 0 1 1.131 -0.0625 12.374 12.374 0 0 1 1.129 0.0566l-1.129-3.3848zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" d="m17.031 24.899q0.34603-0.34603 0.34603-0.81955t-0.34603-0.81955-0.81955-0.34603-0.81955 0.34603-0.34603 0.81955 0.34603 0.81955 0.81955 0.34603 0.81955-0.34603zm-3.1507-5.4819h3.4968v-2.3312h-1.4388q-0.11838 0-0.20034 0.08196l-1.7757 1.7757q-0.08196 0.08196-0.08196 0.20033v0.27318zm11.31 5.4819q0.34603-0.34603 0.34603-0.81955t-0.34603-0.81955-0.81955-0.34603-0.81955 0.34603-0.34603 0.81955 0.34603 0.81955 0.81955 0.34603 0.81955-0.34603zm2.6772-10.727v9.3247q0 0.13659-0.03642 0.24587-0.03642 0.10017-0.12749 0.16391-0.08196 0.06375-0.1457 0.10927-0.06374 0.03642-0.21855 0.05463-0.1457 0.0091-0.20034 0.01821-0.05463 0-0.23676 0-0.17302-0.0091-0.20034-0.0091 0 0.96525-0.68296 1.6482-0.68296 0.68296-1.6482 0.68296-0.96525 0-1.6482-0.68296-0.68296-0.68292-0.68296-1.6482h-3.4968q0 0.96525-0.68296 1.6482-0.68296 0.68296-1.6482 0.68296-0.96525 0-1.6482-0.68296-0.68296-0.68296-0.68296-1.6482h-0.58279q-0.02732 0-0.20944 0.0091-0.17302 0-0.22765 0-0.05463-0.0091-0.20944-0.01821-0.1457-0.01821-0.20944-0.05463-0.06375-0.04553-0.1548-0.10927-0.08196-0.06375-0.11838-0.16391-0.03642-0.10927-0.03642-0.24586 0-0.23676 0.17302-0.40978t0.40978-0.17302v-2.914q0-0.07285-0.0091-0.31871 0-0.24587 0-0.34603 0.0091-0.10017 0.02732-0.30961 0.01821-0.21855 0.05463-0.33693 0.04554-0.12749 0.12749-0.28229 0.09106-0.1548 0.20944-0.27318l1.803-1.803q0.17302-0.17302 0.45531-0.2914 0.2914-0.11838 0.53726-0.11838h1.457v-1.7484q0-0.23676 0.17302-0.40978t0.40978-0.17302h9.3247q0.23676 0 0.40978 0.17302t0.17302 0.40978z"/>
+ </g>
 </svg>
diff --git a/web/images/van.svg b/web/images/van.svg
index 215b9d7b..3394b88f 100644
--- a/web/images/van.svg
+++ b/web/images/van.svg
@@ -1,47 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   width="40"
-   height="40"
-   viewBox="0 0 40 40"
-   id="svg4145"
-   version="1.1"
-   sodipodi:docname="van.svg">
-  <defs
-     id="defs4147" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     units="px" />
-  <metadata
-     id="metadata4150">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
-       id="background" />
-    <path
-       style="stroke-width:0.86999887"
-       d="m 12.17001,13.910008 c -0.480239,0 -0.869998,0.38976 -0.869998,0.869999 l 0,3.479995 0,4.349995 c 0,0.961349 0.778649,1.739998 1.739997,1.739998 l 0.05438,0 c 0.202765,0.991229 1.069336,1.739997 2.120622,1.739997 1.051284,0 1.917855,-0.748768 2.120622,-1.739997 l 5.328742,0 c 0.202766,0.991229 1.069338,1.739997 2.120622,1.739997 1.051286,0 1.917857,-0.748768 2.120622,-1.739997 l 0.05438,0 c 0.961348,0 1.739997,-0.778649 1.739997,-1.739998 l 0,-3.208121 0,-0.271875 c 0,0 -1.171888,-3.532847 -3.262496,-5.084056 -0.131369,-0.09831 -0.298627,-0.135937 -0.462186,-0.135937 l -12.805296,0 z m 10.439987,1.739997 2.011872,0 c 0.742109,0.65859 1.37873,1.707808 1.82156,2.609997 l -3.833432,0 0,-2.609997 z m -7.39499,7.394991 c 0.479369,0 0.869998,0.39063 0.869998,0.869999 0,0.479369 -0.390629,0.869998 -0.869998,0.869998 -0.47937,0 -0.87,-0.390629 -0.87,-0.869998 0,-0.479369 0.39063,-0.869999 0.87,-0.869999 z m 9.569987,0 c 0.479369,0 0.869999,0.39063 0.869999,0.869999 0,0.479369 -0.39063,0.869998 -0.869999,0.869998 -0.47937,0 -0.869999,-0.390629 -0.869999,-0.869998 0,-0.479369 0.390629,-0.869999 0.869999,-0.869999 z"
-       id="icon" />
-  </g>
+<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40">
+ <g id="layer1">
+  <path id="background" d="m20.002 3.6816-1.1309 3.3906a12.374 12.374 0 0 1 1.1309 -0.0625 12.374 12.374 0 0 1 1.1289 0.056641l-1.129-3.3847zm-0.002 3.9434a12.374 12.374 0 0 0 -12.375 12.375 12.374 12.374 0 0 0 12.375 12.375 12.374 12.374 0 0 0 12.375 -12.375 12.374 12.374 0 0 0 -12.375 -12.375z" stroke="#333" stroke-width="1.9" fill="#008000"/>
+  <path id="icon" stroke-width="0.87" d="m12.17 13.91c-0.48024 0-0.87 0.38976-0.87 0.87v3.48 4.35c0 0.96135 0.77865 1.74 1.74 1.74h0.05438c0.20276 0.99123 1.0693 1.74 2.1206 1.74s1.9179-0.74877 2.1206-1.74h5.3287c0.20277 0.99123 1.0693 1.74 2.1206 1.74s1.9179-0.74877 2.1206-1.74h0.05438c0.96135 0 1.74-0.77865 1.74-1.74v-3.2081-0.27188s-1.1719-3.5328-3.2625-5.0841c-0.13137-0.09831-0.29863-0.13594-0.46219-0.13594h-12.805zm10.44 1.74h2.0119c0.74211 0.65859 1.3787 1.7078 1.8216 2.61h-3.8334v-2.61zm-7.395 7.395c0.47937 0 0.87 0.39063 0.87 0.87s-0.39063 0.87-0.87 0.87-0.87-0.39063-0.87-0.87 0.39063-0.87 0.87-0.87zm9.57 0c0.47937 0 0.87 0.39063 0.87 0.87s-0.39063 0.87-0.87 0.87-0.87-0.39063-0.87-0.87 0.39063-0.87 0.87-0.87z"/>
+ </g>
 </svg>
diff --git a/web/l10n/ar.json b/web/l10n/ar.json
index d757f821..1bf9b2d5 100644
--- a/web/l10n/ar.json
+++ b/web/l10n/ar.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "السمات المحصاة",
     "sharedCheckComputedAttribute": "التحقق من السمة المحصاة",
     "sharedExpression": "العبارة الجبرية",
-    "sharedDeviceDistance": "مسافة الجهاز",
     "sharedDevice": "جهاز",
     "sharedTestNotification": "ارسل تنبيه تجريبي",
     "sharedCalendar": "التقويم",
@@ -75,10 +74,11 @@
     "sharedNew": "جديد...",
     "sharedShowAddress": "إظهار العنوان",
     "sharedDisabled": "معطل",
-    "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedMaintenance": "صيانة",
+    "sharedDeviceAccumulators": "تراكميات",
+    "sharedAlarms": "انذار",
     "attributeSpeedLimit": "الحد الأقصى للسرعة",
-    "attributePolylineDistance": "Polyline Distance",
+    "attributePolylineDistance": "مسافة متعددة الخطوط",
     "attributeReportIgnoreOdometer": "تقرير: إهمال عداد المسافة",
     "attributeWebReportColor": "الويب: لون التقرير",
     "attributeDevicePassword": "الرقم السري للجهاز",
@@ -104,14 +104,14 @@
     "attributeUiDisableDrivers": "واجهة المستخدم: تعطيل السائقين",
     "attributeUiDisableComputedAttributes": "واجهة المستخدم: تعطيل السمات المحصاة",
     "attributeUiDisableCalendars": "واجهة المستخدم: تعطيل التقويمات",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
+    "attributeUiDisableMaintenance": "واجهة المستخدم: اخفاء سمة الصيانة",
     "attributeUiHidePositionAttributes": "واجهة المستخدم: إخفاء سمات الموقع",
     "errorTitle": "خطأ",
     "errorGeneral": "اختيار غير صحيح او مخالفة للصلاحيات",
     "errorConnection": "خطأ في الاتصال",
     "errorSocket": "خطأ في اتصال حزم البيانات",
-    "errorZero": "Can't be zero",
-    "userEmail": "بريد إلكتروني",
+    "errorZero": "لا يمكن ان تكون صفر",
+    "userEmail": "البريد الالكتروني",
     "userPassword": "كلمة المرور",
     "userAdmin": "مدير النظام",
     "userRemember": "تذكر",
@@ -125,18 +125,18 @@
     "loginLanguage": "اللغة",
     "loginRegister": "تسجيل جديد",
     "loginLogin": "تسجيل الدخول",
-    "loginFailed": "كلمة مرور او بريد خاطئ",
+    "loginFailed": "كلمة المرور او البريد الالكتروني",
     "loginCreated": "تم تسجيل مستخدم جديد",
     "loginLogout": "تسجيل الخروج",
     "loginLogo": "الشعار",
     "devicesAndState": "الأجهزة والحالة",
     "deviceTitle": "أجهزة",
-    "deviceIdentifier": "المعرف",
+    "deviceIdentifier": "معرف الجهاز",
     "deviceModel": "الطراز",
     "deviceContact": "بيانات التواصل",
     "deviceCategory": "الصنف",
     "deviceLastUpdate": "آخر تحديث",
-    "deviceCommand": "أمر ",
+    "deviceCommand": "أمر",
     "deviceFollow": "متابعة",
     "deviceTotalDistance": "المسافة الكلية",
     "deviceStatus": "الحالة",
@@ -228,14 +228,16 @@
     "serverZoom": "تقريب",
     "serverRegistration": "تسجيل",
     "serverReadonly": "متابعة فقط",
-    "serverForceSettings": "إجبار الإعدادات ",
+    "serverForceSettings": "إجبار الإعدادات",
     "mapTitle": "خريطة",
     "mapLayer": "طبقة الخريطة",
-    "mapCustom": "خريطة مخصصة",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "خرائط Carto Base",
     "mapOsm": "خرائط اوبن ستريت",
     "mapBingKey": "مفتاح خرائط Bing",
-    "mapBingRoad": " خرائط  الطرق Bing",
+    "mapBingRoad": "خرائط  الطرق Bing",
     "mapBingAerial": "خرائط جوية Bing",
     "mapBingHybrid": "خرائط هجينة Bing",
     "mapBaidu": "Baidu",
@@ -252,8 +254,8 @@
     "stateValue": "قيمة",
     "commandTitle": "أمر",
     "commandSend": "ارسال",
-    "commandSent": "تم ارسال الأمر",
-    "commandQueued": "تم وضع الأوامر في قائمة الانتظار",
+    "commandSent": "تم ارسال الامر",
+    "commandQueued": "الامر في قائمة الانتظار",
     "commandUnit": "وحدة",
     "commandCustom": "أمر مخصص",
     "commandDeviceIdentification": "تعريف الجهاز",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "تعطيل المنبه",
     "commandSetTimezone": "حدد المنطقة الزمنية",
     "commandRequestPhoto": "اطلب صورة",
+    "commandPowerOff": "اطفاء الجهاز",
     "commandRebootDevice": "أعد تشغيل الجهاز",
     "commandSendSms": "إرسال رسالة قصيرة",
     "commandSendUssd": "إرسال الـ USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "تعديل توفير الطاقة",
     "commandModeDeepSleep": "تعديل النوم العميق",
     "commandMovementAlarm": "إنذار الحركة",
-    "commandAlarmBattery": "إنذار البطارية",
-    "commandAlarmSos": "إنذار الاستغاثة",
-    "commandAlarmRemove": "الغاء الانذار",
-    "commandAlarmClock": "إنذار الساعة",
-    "commandAlarmSpeed": "منبه تعدي السرعة",
-    "commandAlarmFall": "إنذار الفشل",
-    "commandAlarmVibration": "انذار الاهتزاز",
     "commandFrequency": "التكرر",
     "commandTimezone": "إزاحة المنطقة الزمنية",
     "commandMessage": "رسالة",
@@ -305,61 +301,69 @@
     "commandServer": "خادم",
     "commandPort": "منفذ",
     "eventAll": "جميع الأحداث",
-    "eventDeviceOnline": "الجهاز متصل",
-    "eventDeviceUnknown": "حالة الجهاز غير معروفة",
-    "eventDeviceOffline": "الجهاز غير متصل",
+    "eventDeviceOnline": "الحالة متصل",
+    "eventDeviceUnknown": "الحالة غير معروف",
+    "eventDeviceOffline": "الحالة غير متصل",
     "eventDeviceMoving": "الجهاز يتحرك",
-    "eventDeviceStopped": "توقف الجهاز",
-    "eventDeviceOverspeed": "الجهاز متعدٍّ للسرعة",
-    "eventDeviceFuelDrop": "حدث انخفاض الوقود",
+    "eventDeviceStopped": "الجهاز متوقف",
+    "eventDeviceOverspeed": "تجاوز للسرعة",
+    "eventDeviceFuelDrop": "انخفاض الوقود",
     "eventCommandResult": "نتيجة الأمر",
-    "eventGeofenceEnter": "الجهاز قد دخل السياج الجغرافي",
-    "eventGeofenceExit": "الجهاز قد خرج من السياج الجغرافي",
-    "eventAlarm": "إنذارات",
-    "eventIgnitionOn": "اشتغل المحرك",
-    "eventIgnitionOff": "توقف المحرك",
+    "eventGeofenceEnter": "دخول المنطقة الجغرافية",
+    "eventGeofenceExit": "خروج من المنطقة الجغرافية",
+    "eventAlarm": "انذار",
+    "eventIgnitionOn": "اشعال المحرك",
+    "eventIgnitionOff": "ايقاف المحرك",
     "eventMaintenance": "حان وقت الصيانة",
     "eventTextMessage": "تم استلام رسالة نصية",
     "eventDriverChanged": "تم تغيير السائق",
     "eventsScrollToLast": "الإنتقال للأخير",
-    "alarmSos": "إنذار الإستغاثة",
-    "alarmVibration": "إنذار الإهتزاز",
-    "alarmMovement": "إنذار الحركة",
-    "alarmOverspeed": "إنذار السرعة الزائدة",
-    "alarmFallDown": "إنذار السقوط",
-    "alarmLowBattery": "إنذار انخفاض البطارية",
-    "alarmLowPower": "إنذار انخفاض الطاقة",
-    "alarmFault": "إنذار الأخطاء",
-    "alarmPowerOff": "إنذار توقف الطاقة",
-    "alarmPowerOn": "إنذار تشغيل الطاقة",
-    "alarmDoor": "إنذار الأبواب",
-    "alarmGeofence": "إنذار السياج الجغرافي",
-    "alarmGeofenceEnter": "إنذار دخول السياج الجغرافي",
-    "alarmGeofenceExit": "إنذار الخروج من السياج الجغرافي",
-    "alarmGpsAntennaCut": "إنذار قطع مستقبل الـ GPS",
-    "alarmAccident": "إنذار الحاوادث",
-    "alarmTow": "إنذار الجر",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "إنذار التسارع القوي",
-    "alarmHardBraking": "إنذار المكابح العنيفة",
-    "alarmFatigueDriving": "إنذار إجهاد القيادة",
-    "alarmPowerCut": "إنذار فصل الطاقة",
-    "alarmPowerRestored": "إنذار استعادة الطاقة",
-    "alarmJamming": "إنذار التشويش",
-    "alarmTemperature": "إنذار الحرارة",
-    "alarmParking": "إنذار الاصطفاف",
-    "alarmShock": "انذار الصدمات",
-    "alarmBonnet": "انذار غطاء المحرك",
-    "alarmFootBrake": "إنذار الفراميل",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "إنذار عبث وتلاعب",
-    "alarmRemoving": "إنذار الإزالة",
+    "alarmGeneral": "عام",
+    "alarmSos": "استغاثة",
+    "alarmVibration": "اهتزاز",
+    "alarmMovement": "حركة",
+    "alarmLowspeed": "سرعة منخفظة",
+    "alarmOverspeed": "تجاوز السرعة",
+    "alarmFallDown": "سقوط",
+    "alarmLowPower": "طاقة منخفضة",
+    "alarmLowBattery": "انخفاض البطارية",
+    "alarmFault": "خلل",
+    "alarmPowerOff": "اطفاء",
+    "alarmPowerOn": "تشغيل",
+    "alarmDoor": "باب",
+    "alarmLock": "اقفال",
+    "alarmUnlock": "فتح",
+    "alarmGeofence": "سياج جغرافي",
+    "alarmGeofenceEnter": "دخول السياج الجغرافي",
+    "alarmGeofenceExit": "الخروج من السياج الجغرافي",
+    "alarmGpsAntennaCut": "انقطاع هوائي القمر الصناعي",
+    "alarmAccident": "حادث",
+    "alarmTow": "جر",
+    "alarmIdle": "خامل",
+    "alarmHighRpm": "High RPM",
+    "alarmHardAcceleration": "تسارع شديد",
+    "alarmHardBraking": "كبح فرامل شديد",
+    "alarmHardCornering": "انعطاف شديد",
+    "alarmLaneChange": "Lane Change",
+    "alarmFatigueDriving": "قيادة في حالة تعب",
+    "alarmPowerCut": "انقطاء الطاقة",
+    "alarmPowerRestored": "استعادة الطاقة",
+    "alarmJamming": "تشويوش",
+    "alarmTemperature": "حرارة",
+    "alarmParking": "اصطفاف",
+    "alarmShock": "صدمة",
+    "alarmBonnet": "غطاء محرك السيارة",
+    "alarmFootBrake": "فرامل القدم",
+    "alarmFuelLeak": "تسرب وقود",
+    "alarmTampering": "عبث وتلاعب",
+    "alarmRemoving": "الازالة",
     "notificationType": "نوع التنبيه",
     "notificationAlways": "جميع الاجهزة",
-    "notificationNotificators": "Channels",
-    "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
-    "notificatorSms": "SMS",
+    "notificationNotificators": "قنواة",
+    "notificatorWeb": "ويب",
+    "notificatorMail": "البريد",
+    "notificatorSms": "رسائل قصيرة",
+    "notificatorFirebase": "هاتف محمول",
     "reportRoute": "مسار",
     "reportEvents": "الأحداث",
     "reportTrips": "رحلات",
@@ -371,6 +375,7 @@
     "reportChartType": "نوع الرسم البياني",
     "reportShowMarkers": "إظهار العلامات",
     "reportExport": "تصدير",
+    "reportEmail": "تقرير بالبريد",
     "reportPeriod": "الفترة",
     "reportCustom": "مخصص",
     "reportToday": "اليوم",
@@ -389,6 +394,8 @@
     "reportEndTime": "وقت النهاية",
     "reportEndAddress": "عنوان النهاية",
     "reportSpentFuel": "الوقود المستنفد",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "إحصائيات",
     "statisticsCaptureTime": "وقت الالتقاط",
     "statisticsActiveUsers": "المستخدمون النشطون",
@@ -414,11 +421,12 @@
     "categoryPlane": "طائرة",
     "categoryShip": "سفينة",
     "categoryTractor": "جرار زراعى",
-    "categoryTrain": "Train",
+    "categoryTrain": "قطار",
     "categoryTram": "Tram",
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "شاحنة",
     "categoryVan": "نقل",
-    "maintenanceStart": "Start",
-    "maintenancePeriod": "Period"
+    "categoryScooter": "Scooter",
+    "maintenanceStart": "بداية",
+    "maintenancePeriod": "فترة"
 }
\ No newline at end of file
diff --git a/web/l10n/az.json b/web/l10n/az.json
index a441473f..1cd02d6a 100644
--- a/web/l10n/az.json
+++ b/web/l10n/az.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Hesablanan atributlar",
     "sharedCheckComputedAttribute": "Hesablanan atributu yoxlamaq",
     "sharedExpression": "İfadə",
-    "sharedDeviceDistance": "Cihazın hərəkət məsafəsi",
     "sharedDevice": "Cihaz",
     "sharedTestNotification": "Test bildirişi göndərmək",
     "sharedCalendar": "Təqvim",
@@ -76,9 +75,10 @@
     "sharedShowAddress": "şou ünvan",
     "sharedDisabled": "şikəst",
     "sharedMaintenance": "təmir",
-    "sharedMaintenances": "təmirler",
+    "sharedDeviceAccumulators": "akkumulyatorlar",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Sürət həddi",
-    "attributePolylineDistance": "Polyline Distance",
+    "attributePolylineDistance": "Polyline məsafə",
     "attributeReportIgnoreOdometer": "Hesabat: Odometri rədd etməki",
     "attributeWebReportColor": "Veb: Hesabat rəngi",
     "attributeDevicePassword": "Cihazın şifrəsi",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Sürücüləri deaktiv etmək",
     "attributeUiDisableComputedAttributes": "UI: Hesablanılan atributları deaktiv etmək",
     "attributeUiDisableCalendars": "UI: Təqvimləri deaktiv etmək",
-    "attributeUiDisableMaintenances": "UI: şikəst təmirler",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI : Vəzifə xüsusiyyətlərini gizləyin",
     "errorTitle": "Xəta",
     "errorGeneral": "Yanlış parametrlər və ya məhdudiyyətlərin pozulması",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Tənzimləmələri sürətləndirmək",
     "mapTitle": "Xəritə",
     "mapLayer": "Xəritə qatı",
-    "mapCustom": "İstifadəçi xəritəsi",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Dəyər",
     "commandTitle": "Komanda",
     "commandSend": "Göndərmək",
-    "commandSent": "Komanda göndərildi",
-    "commandQueued": "Komanda sıraya qoyuldu",
+    "commandSent": "Komandir göndərildi",
+    "commandQueued": "Command queued",
     "commandUnit": "Vahidlər",
     "commandCustom": "İstifadəçi komandası",
     "commandDeviceIdentification": "Cihazın identifikasiyası",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Siqnalizasiyanı deaktivləşdirmək",
     "commandSetTimezone": "Saat qurşağını tənzimləmək",
     "commandRequestPhoto": "Şəkil tələb etmək",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Cihazı yenidən yükləmək",
     "commandSendSms": "SMS göndərmək",
     "commandSendUssd": "USSD göndərmək",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Enerjiyə qənaət rejimini dəyişmək",
     "commandModeDeepSleep": "Dərin yuxu rejimini dəyişmək",
     "commandMovementAlarm": "Hərəkət həyəcanı siqnalı",
-    "commandAlarmBattery": "Batareya həyəcanı siqnalı",
-    "commandAlarmSos": "SOS həyəcan siqnalı",
-    "commandAlarmRemove": "Həyəcan siqnalını aradan qaldırmaq",
-    "commandAlarmClock": "Zəngli saat",
-    "commandAlarmSpeed": "Sürət həddinin aşma",
-    "commandAlarmFall": "Həyəcan siqnalının nasazlığı",
-    "commandAlarmVibration": "Vibrasiyalı həyəcan siqnalı",
     "commandFrequency": "Tezlik",
     "commandTimezone": "Vaxt zonasının yerdəyişməsi",
     "commandMessage": "İsmarıc",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Bütün hadisələr",
-    "eventDeviceOnline": "Şəbəkədə cihaz",
-    "eventDeviceUnknown": "Cihazın statusu naməlumdur",
-    "eventDeviceOffline": "Cihaz şəbəkədə deyil",
+    "eventDeviceOnline": "vəziyyət online",
+    "eventDeviceUnknown": "vəziyyət unknown",
+    "eventDeviceOffline": "vəziyyət offline",
     "eventDeviceMoving": "Cihaz hərəkət edir",
-    "eventDeviceStopped": "Cihaz dayandı",
-    "eventDeviceOverspeed": "Cihaz sürət həddini aşır",
-    "eventDeviceFuelDrop": "Yanacağın boşalma hadisəsi",
+    "eventDeviceStopped": "Aygıt durdu",
+    "eventDeviceOverspeed": "Sürət həddi aşıldı",
+    "eventDeviceFuelDrop": "Yanacaq düşməsi",
     "eventCommandResult": "Komanda nəticəsi",
-    "eventGeofenceEnter": "Cihaz geozonaya daxil oldu",
-    "eventGeofenceExit": "Cihaz geozonanı tərk etdi",
-    "eventAlarm": "Həyəcanlar",
-    "eventIgnitionOn": "Yandırma On",
-    "eventIgnitionOff": "Söndürmə Off",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "qudok",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Texniki xidmətə ehtiyac var",
     "eventTextMessage": "Mətn ismarıcı alındı",
-    "eventDriverChanged": "Sürücü dəyişdi",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Sonadək fırlanma",
-    "alarmSos": "SOS həyəcanı",
-    "alarmVibration": "Vibrasiya həyəcanı",
-    "alarmMovement": "Siqnalizasiya həyəcanı",
-    "alarmOverspeed": "Siqnalizasiya həyəcanı",
-    "alarmFallDown": "Düşmə həyəcanı",
-    "alarmLowBattery": "Batareyanın boşalması həyəcanı",
-    "alarmLowPower": "Aşağı gərginlik həyəcanı",
-    "alarmFault": "Nasazlıq həyəcanı",
-    "alarmPowerOff": "Sönmə həyəcanı",
-    "alarmPowerOn": "Yanma həyəcanı",
-    "alarmDoor": "Qapı həyəcanı",
-    "alarmGeofence": "Geozona həyəcanı",
-    "alarmGeofenceEnter": "Geozonaya daxil olma həyəcanı",
-    "alarmGeofenceExit": "Geozonanı tərk etmə həyəcanı",
-    "alarmGpsAntennaCut": "GPS – antenanın sönüb kəsilməsi həyəcanı",
-    "alarmAccident": "Qəza həyəcanı",
-    "alarmTow": "Yedəkləmə həyəcanı",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Qəfil sürətlənmə həyəcanı",
-    "alarmHardBraking": "Hard Braking siqnalları",
-    "alarmFatigueDriving": "Sürücünün yorğunluğu həyəcanı",
-    "alarmPowerCut": "Qidalanmanın söndürülməsi həyəcanı",
-    "alarmPowerRestored": "Qidalanmanın bərpa olunma həyəcanı",
-    "alarmJamming": "Səsboğma həyəcanı",
-    "alarmTemperature": "Temperatur həyəcanı",
-    "alarmParking": "Parklanma həyəcanı",
-    "alarmShock": "Şok həyəcanı",
-    "alarmBonnet": "Kapot həyəcanı",
-    "alarmFootBrake": "Ayaq əyləci həyəcanı",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Müdaxilə həyəcanı",
-    "alarmRemoving": "Kənarlaşdırma həyəcanı",
+    "alarmGeneral": "General",
+    "alarmSos": "fəlakət siqnalı",
+    "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": "düşərgə",
+    "alarmShock": "zərbə",
+    "alarmBonnet": "Bonnet",
+    "alarmFootBrake": "Ayaq əyləci",
+    "alarmFuelLeak": "Yanacaq sızması",
+    "alarmTampering": "Tampering",
+    "alarmRemoving": "Çıxarma",
     "notificationType": "Xəbərdarlıq növü",
     "notificationAlways": "Bütün Cihazlar",
-    "notificationNotificators": "Channels",
+    "notificationNotificators": "Kanallar",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Marşrut",
     "reportEvents": "Hadisələr",
     "reportTrips": "Gedişlər",
@@ -371,6 +375,7 @@
     "reportChartType": "Diaqram tipi",
     "reportShowMarkers": "Markerləri göstərmək",
     "reportExport": "Eksport",
+    "reportEmail": "Email Report",
     "reportPeriod": "Dövr",
     "reportCustom": "Xüsusi",
     "reportToday": "Bu gün",
@@ -389,6 +394,8 @@
     "reportEndTime": "Qurtarma vaxtı",
     "reportEndAddress": "Qurtarma ünvanı",
     "reportSpentFuel": "Yanacaq işləndi",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistika",
     "statisticsCaptureTime": "Yığım vaxtı",
     "statisticsActiveUsers": "Aktiv istifadəçilər",
@@ -414,11 +421,12 @@
     "categoryPlane": "Təyyarə",
     "categoryShip": "Gəmi",
     "categoryTractor": "Traktor",
-    "categoryTrain": "Train",
+    "categoryTrain": "qatar",
     "categoryTram": "Tram",
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Yük maşını",
     "categoryVan": "Furqon",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Başlamaq",
     "maintenancePeriod": "Dövr"
 }
\ No newline at end of file
diff --git a/web/l10n/bg.json b/web/l10n/bg.json
index d85ead18..4f0e04e1 100644
--- a/web/l10n/bg.json
+++ b/web/l10n/bg.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Изчислени параметри",
     "sharedCheckComputedAttribute": "Провери изчисления параметър",
     "sharedExpression": "Израз",
-    "sharedDeviceDistance": "Пробег на устройството",
     "sharedDevice": "Устройство",
     "sharedTestNotification": "Изпрати пробно известие",
     "sharedCalendar": "Календар",
@@ -76,11 +75,12 @@
     "sharedShowAddress": "Покажи адреса",
     "sharedDisabled": "Блокиран",
     "sharedMaintenance": "Обслужване",
-    "sharedMaintenances": "Обслужвания",
+    "sharedDeviceAccumulators": "Акумулатор",
+    "sharedAlarms": "Аларми",
     "attributeSpeedLimit": "Ограничение на скоростта",
     "attributePolylineDistance": "Дължина на линията",
     "attributeReportIgnoreOdometer": "Отчет: Игнорирай километража",
-    "attributeWebReportColor": "Цвят на дирята",
+    "attributeWebReportColor": "Цвят на Отчета",
     "attributeDevicePassword": "Парола на устройството",
     "attributeProcessingCopyAttributes": "Обработка: копиране на сензори",
     "attributeColor": "Цвят",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "Деактивирай Шофьори",
     "attributeUiDisableComputedAttributes": "Деактивирай изчислените параметри",
     "attributeUiDisableCalendars": "Деактивирай Календара",
-    "attributeUiDisableMaintenances": "Деактивирай Обслужване",
+    "attributeUiDisableMaintenance": "Деактивирай Обслужване",
     "attributeUiHidePositionAttributes": "Скрий атрибутите на позицията",
     "errorTitle": "Грешка",
     "errorGeneral": "Невалидни параметри",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Наложи настройките",
     "mapTitle": "Карта",
     "mapLayer": "Карта",
-    "mapCustom": "Потребителска карта",
+    "mapCustom": "По избор (XYZ)",
+    "mapCustomArcgis": "По избор (ArcGIS)",
+    "mapCustomLabel": "Потребителска карта",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Ключ за Bing Maps",
@@ -252,8 +254,8 @@
     "stateValue": "Стойност",
     "commandTitle": "Команда",
     "commandSend": "Изпрати",
-    "commandSent": "Командата е изпратена",
-    "commandQueued": "Командата ще бъде изпратена",
+    "commandSent": "Командата изпратена",
+    "commandQueued": "Командата на изчакване",
     "commandUnit": "Мерна ед.",
     "commandCustom": "Персонализирана команда",
     "commandDeviceIdentification": "Идентификатор на устройството",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Деактивирай Аларма",
     "commandSetTimezone": "Задай часова зона",
     "commandRequestPhoto": "Изискай снимка",
+    "commandPowerOff": "Изключи устройството",
     "commandRebootDevice": "Рестартирай устройството",
     "commandSendSms": "Изпрати SMS",
     "commandSendUssd": "Изпрати USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Промени пестене на енергия",
     "commandModeDeepSleep": "Промени Deep Sleep",
     "commandMovementAlarm": "Аларма: Движение",
-    "commandAlarmBattery": "Аларма: Батерия",
-    "commandAlarmSos": "Аларма: SOS",
-    "commandAlarmRemove": "Премахни алармата",
-    "commandAlarmClock": "Аларма: Часовник",
-    "commandAlarmSpeed": "Аларма: Превишена скорост",
-    "commandAlarmFall": "Аларма: Развален",
-    "commandAlarmVibration": "Аларма: Вибрация",
     "commandFrequency": "Честота",
     "commandTimezone": "Компенсация на часовата зона",
     "commandMessage": "Съобщение",
@@ -305,61 +301,69 @@
     "commandServer": "Сървър",
     "commandPort": "Порт",
     "eventAll": "Всички събития",
-    "eventDeviceOnline": "Устройството е на линия",
-    "eventDeviceUnknown": "Незвестно състояние на устройството",
-    "eventDeviceOffline": "Устройството няма връзка",
-    "eventDeviceMoving": "Обектът е в движение",
+    "eventDeviceOnline": "Статус на линия",
+    "eventDeviceUnknown": "Статус неизвестен",
+    "eventDeviceOffline": "Статус без връзка",
+    "eventDeviceMoving": "Обектът в движение",
     "eventDeviceStopped": "Обектът спря",
-    "eventDeviceOverspeed": "Обектът превишава скоростта",
+    "eventDeviceOverspeed": "Ограничението на скоростта превишено",
     "eventDeviceFuelDrop": "Спад на горивото",
     "eventCommandResult": "Резултат от командата",
-    "eventGeofenceEnter": "Обектът влезе в зоната",
-    "eventGeofenceExit": "Обектът излезе от зоната",
-    "eventAlarm": "Аларми",
-    "eventIgnitionOn": "Запалването е включено",
-    "eventIgnitionOff": "Запалването е изключено",
+    "eventGeofenceEnter": "Влизане в зона",
+    "eventGeofenceExit": "Излизане от зона",
+    "eventAlarm": "Аларма",
+    "eventIgnitionOn": "Запалването включено",
+    "eventIgnitionOff": "Запалването изключено",
     "eventMaintenance": "Необходимо е обслужване",
     "eventTextMessage": "Получен SMS",
     "eventDriverChanged": "Шофьорът се смени",
     "eventsScrollToLast": "Отиди на последния",
-    "alarmSos": "SOS Аларма",
-    "alarmVibration": "Аларма: Вибрация",
-    "alarmMovement": "Аларма: Движение",
-    "alarmOverspeed": "Аларма: Превишена скорост",
-    "alarmFallDown": "Аларма: Падане",
-    "alarmLowBattery": "Аларма: Слаба батерия",
-    "alarmLowPower": "Аларма: Ниско напрежение",
-    "alarmFault": "Аларма: Повреда",
-    "alarmPowerOff": "Аларма: Изключено захранване",
-    "alarmPowerOn": "Аларма: На контакг",
-    "alarmDoor": "Аларма: Отворена врата",
-    "alarmGeofence": "Аларма: Зона",
-    "alarmGeofenceEnter": "Аларма: Влизане в зона",
-    "alarmGeofenceExit": "Аларма: Излизане от зона",
-    "alarmGpsAntennaCut": "Аларма: GPS антената откачена",
-    "alarmAccident": "Аларма: Инцидент",
-    "alarmTow": "Аларма: Теглене",
-    "alarmIdle": "Аларма: Спрял",
-    "alarmHardAcceleration": "Аларма: Рязко ускорение",
-    "alarmHardBraking": "Аларма: Рязко спиране",
-    "alarmFatigueDriving": "Аларма: Уморен водач",
-    "alarmPowerCut": "Аларма: Захранването прекъснато",
-    "alarmPowerRestored": "Аларма: Захранването възстановено",
-    "alarmJamming": "Аларма: Заглушаване",
-    "alarmTemperature": "Аларма: Температура",
-    "alarmParking": "Аларма: Паркиране",
-    "alarmShock": "Аларма: Удар",
-    "alarmBonnet": "Аларма: Отворен капак",
-    "alarmFootBrake": "Аларма: Спирачен педал",
-    "alarmFuelLeak": "Аларма: Теч на гориво",
-    "alarmTampering": "Аларма: Намеса по тракера",
-    "alarmRemoving": "Аларма: Премахване на тракера",
+    "alarmGeneral": "Общи",
+    "alarmSos": "SOS",
+    "alarmVibration": "Вибрация",
+    "alarmMovement": "Движение",
+    "alarmLowspeed": "Ниска скорост",
+    "alarmOverspeed": "Превишена скорост",
+    "alarmFallDown": "Падане",
+    "alarmLowPower": "Ниска мощност",
+    "alarmLowBattery": "Слаба батерия",
+    "alarmFault": "Повреда",
+    "alarmPowerOff": "Захранването изключено",
+    "alarmPowerOn": "Захранването включено",
+    "alarmDoor": "Врата",
+    "alarmLock": "Заключи",
+    "alarmUnlock": "Отключи",
+    "alarmGeofence": "Зона",
+    "alarmGeofenceEnter": "Влизане в зона",
+    "alarmGeofenceExit": "Излизане от зона",
+    "alarmGpsAntennaCut": "GPS антената откачена",
+    "alarmAccident": "Инцидент",
+    "alarmTow": "Дърпане",
+    "alarmIdle": "В покой",
+    "alarmHighRpm": "Високи обороти",
+    "alarmHardAcceleration": "Рязко ускорение",
+    "alarmHardBraking": "Рязко спиране",
+    "alarmHardCornering": "Рязко завиване",
+    "alarmLaneChange": "Смяна на лентите",
+    "alarmFatigueDriving": "Уморен водач",
+    "alarmPowerCut": "Захранването прекъснато",
+    "alarmPowerRestored": "Захранването възстановено",
+    "alarmJamming": "Заглушаване",
+    "alarmTemperature": "Температура",
+    "alarmParking": "Паркиране",
+    "alarmShock": "Удар",
+    "alarmBonnet": "Капак",
+    "alarmFootBrake": "Спирачен педал",
+    "alarmFuelLeak": "Теч на гориво",
+    "alarmTampering": "Намеса ",
+    "alarmRemoving": "Премахване",
     "notificationType": "Тип на известието",
     "notificationAlways": "Всички устройства",
     "notificationNotificators": "Канали",
     "notificatorWeb": "Интернет",
     "notificatorMail": "Поща",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Мобилно",
     "reportRoute": "Маршрут",
     "reportEvents": "Събития",
     "reportTrips": "Пътувания",
@@ -371,6 +375,7 @@
     "reportChartType": "Тип на графиката",
     "reportShowMarkers": "Покажи маркери",
     "reportExport": "Експорт",
+    "reportEmail": "Имейл отчет",
     "reportPeriod": "Период",
     "reportCustom": "По избор",
     "reportToday": "Днес",
@@ -389,6 +394,8 @@
     "reportEndTime": "Краен час",
     "reportEndAddress": "Краен адрес",
     "reportSpentFuel": "Изразходвано гориво",
+    "reportStartOdometer": "Одометър Старт",
+    "reportEndOdometer": "Одометър Стоп",
     "statisticsTitle": "Статистики",
     "statisticsCaptureTime": "Дата",
     "statisticsActiveUsers": "Активни потребители",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Тролейбус",
     "categoryTruck": "Камион",
     "categoryVan": "Ван",
+    "categoryScooter": "Скутер",
     "maintenanceStart": "Старт",
     "maintenancePeriod": "Период"
 }
\ No newline at end of file
diff --git a/web/l10n/bn.json b/web/l10n/bn.json
index 87570055..c68152db 100644
--- a/web/l10n/bn.json
+++ b/web/l10n/bn.json
@@ -1,6 +1,6 @@
 {
     "sharedLoading": "লোড হচ্ছে ...",
-    "sharedHide": "Hide",
+    "sharedHide": "লুকিয়ে রাখুন",
     "sharedSave": " সংরক্ষণ করুন",
     "sharedSet": "স্থাপন করুন",
     "sharedCancel": " বাতিল করুন",
@@ -28,32 +28,31 @@
     "sharedSearch": "অনুসন্ধান / খোঁজা",
     "sharedGeofence": "জিওফেন্স / ভৌগোলিক বেষ্টনী",
     "sharedGeofences": "জিওফেন্স / ভৌগোলিক বেষ্টনী",
-    "sharedNotifications": "Notifications",
-    "sharedNotification": "Notification",
+    "sharedNotifications": "অধিসূচনা সামুহ",
+    "sharedNotification": "অধিসূচনা",
     "sharedAttributes": "বৈশিষ্ট্যাবলী / গুণাবলী",
     "sharedAttribute": "বৈশিষ্ট্যাবলী / গুণাবলী",
-    "sharedDrivers": "Drivers",
-    "sharedDriver": "Driver",
-    "sharedArea": "Area",
-    "sharedSound": "Notification Sound",
+    "sharedDrivers": "চালক সমুহ",
+    "sharedDriver": "চালক",
+    "sharedArea": "এলাকা",
+    "sharedSound": "অধিসূচনা শব্দ",
     "sharedType": "ধরন",
     "sharedDistance": "দূরত্ব",
-    "sharedHourAbbreviation": "h",
-    "sharedMinuteAbbreviation": "m",
-    "sharedSecondAbbreviation": "s",
+    "sharedHourAbbreviation": "ঘ",
+    "sharedMinuteAbbreviation": "মি",
+    "sharedSecondAbbreviation": "সে",
     "sharedVoltAbbreviation": "V",
     "sharedLiterAbbreviation": "l",
-    "sharedGallonAbbreviation": "gal",
-    "sharedLiter": "Liter",
-    "sharedImpGallon": "Imp. Gallon",
-    "sharedUsGallon": "U.S. Gallon",
+    "sharedGallonAbbreviation": "গ্যালন",
+    "sharedLiter": "লিটার",
+    "sharedImpGallon": "ইম্পেরিয়াল গ্যালন",
+    "sharedUsGallon": "আমেরিকি গ্যালন",
     "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "মানচিত্রের অবস্থা",
     "sharedComputedAttribute": "Computed Attribute",
     "sharedComputedAttributes": "Computed Attributes",
     "sharedCheckComputedAttribute": "Check Computed Attribute",
     "sharedExpression": "অভিব্যক্তি",
-    "sharedDeviceDistance": "ডিভাইসের দূরত্ব",
     "sharedDevice": "ডিভাইস",
     "sharedTestNotification": "Send Test Notification",
     "sharedCalendar": "পঞ্জিকা",
@@ -73,10 +72,11 @@
     "sharedSavedCommand": "Saved Command",
     "sharedSavedCommands": "Saved Commands",
     "sharedNew": "New…",
-    "sharedShowAddress": "Show Address",
+    "sharedShowAddress": "ঠিকানা দেখান",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "ডিভাইসের গতি সীমা",
     "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": "ফোর্স সেটিংস",
     "mapTitle": "মানচিত্র",
     "mapLayer": "মানচিত্র স্তর",
-    "mapCustom": "কাস্টম মানচিত্র",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "মান",
     "commandTitle": "কমান্ড",
     "commandSend": "পাঠান",
-    "commandSent": "কমান্ড পাঠানো হয়েছে",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "ইউনিট",
     "commandCustom": "Custom command",
     "commandDeviceIdentification": "ডিভাইস সনাক্তকরণ",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "অরক্ষিত করার অ্যালার্ম / সংকেত",
     "commandSetTimezone": "টাইমজোন সেট করুন",
     "commandRequestPhoto": "Request Photo",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "রিবুট ডিভাইস",
     "commandSendSms": "Send 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": "বার্তা",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "সকল ঘটনা",
-    "eventDeviceOnline": "ডিভাইস অনলাইনে আছে",
-    "eventDeviceUnknown": "ডিভাইসের অবস্থা অজানা",
-    "eventDeviceOffline": "ডিভাইস অফলাইনে আছে",
-    "eventDeviceMoving": "ডিভাইস চলনশীল",
-    "eventDeviceStopped": "ডিভাইস বন্ধ হয়েছে",
-    "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": "Command result",
-    "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": "রক্ষণাবেক্ষণ প্রয়োজন",
     "eventTextMessage": "Text message received",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "SOS অ্যালার্ম / সংকেত",
-    "alarmVibration": "Vibration Alarm",
-    "alarmMovement": "Movement Alarm",
-    "alarmOverspeed": "দ্রুতগতি নির্দেশক অ্যালার্ম / সংকেত",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "LowBattery Alarm",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Fault Alarm",
-    "alarmPowerOff": "Power Off Alarm",
-    "alarmPowerOn": "Power On Alarm",
-    "alarmDoor": "Door Alarm",
-    "alarmGeofence": "জিওফেন্স / ভৌগোলিক বেষ্টনী নির্দেশক অ্যালার্ম / সংকেত",
-    "alarmGeofenceEnter": "Geofence Enter Alarm",
-    "alarmGeofenceExit": "Geofence Exit Alarm",
-    "alarmGpsAntennaCut": "GPS Antenna Cut Alarm",
-    "alarmAccident": "দুর্ঘটনা নির্দেশক অ্যালার্ম / সংকেত",
-    "alarmTow": "Tow Alarm",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Hard Acceleration Alarm",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Fatigue Driving Alarm",
-    "alarmPowerCut": "বিদ্যুৎ বিছিন্ন নির্দেশক অ্যালার্ম / সংকেত",
-    "alarmPowerRestored": "বিদ্যুৎ পুনরুদ্ধার নির্দেশক অ্যালার্ম / সংকেত",
-    "alarmJamming": "Jamming Alarm",
-    "alarmTemperature": "তাপমাত্রা নির্দেশক অ্যালার্ম / সংকেত",
-    "alarmParking": "পার্কিং অ্যালার্ম",
-    "alarmShock": "Shock Alarm",
-    "alarmBonnet": "বনেট অ্যালার্ম",
-    "alarmFootBrake": "Foot Brake Alarm",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "অনধিকার পরিবর্তন নির্দেশক অ্যালার্ম / সংকেত",
-    "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": "Type of Notification",
     "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": "মার্কার দেখাও",
     "reportExport": "Export",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "শেষ সময়",
     "reportEndAddress": "শেষ ঠিকানা",
     "reportSpentFuel": "ব্যয়িত জ্বালানি",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "পরিসংখ্যান",
     "statisticsCaptureTime": "সময় ক্যাপচার",
     "statisticsActiveUsers": "সক্রিয় ব্যবহারকারীগণ",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "ট্রাক",
     "categoryVan": "ভ্যান",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/cs.json b/web/l10n/cs.json
index 47ae58e1..23732bea 100644
--- a/web/l10n/cs.json
+++ b/web/l10n/cs.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Vypočítané vlastnosti",
     "sharedCheckComputedAttribute": "Zkontrolovat vypočítanou vlastnost",
     "sharedExpression": "Výraz",
-    "sharedDeviceDistance": "Vzdálenost zařízení",
     "sharedDevice": "Zařízení",
     "sharedTestNotification": "Odeslat testovací oznámení",
     "sharedCalendar": "Kalendář",
@@ -76,9 +75,10 @@
     "sharedShowAddress": "Zobrazit adresu",
     "sharedDisabled": "Zakázáno",
     "sharedMaintenance": "Údržba",
-    "sharedMaintenances": "Údržby",
+    "sharedDeviceAccumulators": "Baterie",
+    "sharedAlarms": "Alarmy",
     "attributeSpeedLimit": "Rychlostní limit",
-    "attributePolylineDistance": "Polyline Distance",
+    "attributePolylineDistance": "Vzdálenost křivky",
     "attributeReportIgnoreOdometer": "Report: Počítadlo kilometrů",
     "attributeWebReportColor": "Web: Barva reportu",
     "attributeDevicePassword": "Heslo zařízení",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Zakázat řidiče",
     "attributeUiDisableComputedAttributes": "UI: Zakázat vypočítané vlastnosti",
     "attributeUiDisableCalendars": "UI: Zakázat kalendáře",
-    "attributeUiDisableMaintenances": "UI: Zakázat údržby",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Skrýt atributy pozice",
     "errorTitle": "Chyba",
     "errorGeneral": "Nesprávné parametry nebo překročení omezení",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Vynutit nastavení",
     "mapTitle": "Mapa",
     "mapLayer": "Vrstva mapy",
-    "mapCustom": "Vlastní mapa",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Základní mapy nákladu",
     "mapOsm": "Open Street mapa",
     "mapBingKey": "Bing Maps klíč",
@@ -252,8 +254,8 @@
     "stateValue": "Hodnota",
     "commandTitle": "Příkaz",
     "commandSend": "Odeslat",
-    "commandSent": "Příkaz byl odeslán",
-    "commandQueued": "Příkaz byl odeslán",
+    "commandSent": "Příkaz odeslán",
+    "commandQueued": "Příkaz zařazen do fronty",
     "commandUnit": "Jednotka",
     "commandCustom": "Volitelný příkaz",
     "commandDeviceIdentification": "Identifikace zařízení",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Deaktivovat alarm",
     "commandSetTimezone": "Nastavit časovou zónu",
     "commandRequestPhoto": "Vyžádat fotku",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Restartovat zařízení",
     "commandSendSms": "Odeslat SMS",
     "commandSendUssd": "Odeslat USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Upravit úsporu energie",
     "commandModeDeepSleep": "Upravit režim spánku",
     "commandMovementAlarm": "Pohybový alarm",
-    "commandAlarmBattery": "Alarm baterie",
-    "commandAlarmSos": "SOS alarm",
-    "commandAlarmRemove": "Odstranit alarm",
-    "commandAlarmClock": "Časový alarm",
-    "commandAlarmSpeed": "Alarm překročení rychlosti",
-    "commandAlarmFall": "Chybový alarm",
-    "commandAlarmVibration": "Vibrační alarm",
     "commandFrequency": "Frekvence",
     "commandTimezone": "Ofset časové zóny",
     "commandMessage": "Zpráva",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Všechny události",
-    "eventDeviceOnline": "Zařízení je online",
-    "eventDeviceUnknown": "Stav zařízení je neznámý",
-    "eventDeviceOffline": "Zařízení je offline",
-    "eventDeviceMoving": "Zařízení s pohybuje",
-    "eventDeviceStopped": "Zařízení se zastavilo",
-    "eventDeviceOverspeed": "Zařízení překračuje rychlost",
-    "eventDeviceFuelDrop": "Událost ztráty paliva",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status neznámý",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Zařízení se přesouvá",
+    "eventDeviceStopped": "Zařízení bylo zastaveno",
+    "eventDeviceOverspeed": "Rychlostní limit překročen",
+    "eventDeviceFuelDrop": "Pokles paliva",
     "eventCommandResult": "Výsledek příkazu",
-    "eventGeofenceEnter": "Zařízení vstoupilo do zóny",
-    "eventGeofenceExit": "Zařízení opustilo zónu",
-    "eventAlarm": "Alarmy",
-    "eventIgnitionOn": "Zapalování je ZAPNUTÉ",
-    "eventIgnitionOff": "Zapalování je VYPNUTÉ",
+    "eventGeofenceEnter": "Vstoupeno do geozóny",
+    "eventGeofenceExit": "Geozóna opuštěna",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Zážeh zapnutý",
+    "eventIgnitionOff": "Zážeh vypnutý",
     "eventMaintenance": "Vyžadována údržba",
     "eventTextMessage": "Obdržena textová zpráva",
-    "eventDriverChanged": "Řidič změnil",
+    "eventDriverChanged": "Řidič vyměněn",
     "eventsScrollToLast": "Posunout na poslední",
-    "alarmSos": "SOS alarm",
-    "alarmVibration": "Vibrační alarm",
-    "alarmMovement": "Pohybový alarm",
-    "alarmOverspeed": "Alarm překročení rychlosti",
-    "alarmFallDown": "Pádový alarm",
-    "alarmLowBattery": "Alarm vybité baterie",
-    "alarmLowPower": "Alarm slabého napájení",
-    "alarmFault": "Chybový alarm",
-    "alarmPowerOff": "Alarm vypnutí",
-    "alarmPowerOn": "Alarm zapnutí",
-    "alarmDoor": "Alarm dveří",
-    "alarmGeofence": "Alarm zón",
-    "alarmGeofenceEnter": "Alarm vstupu do zóny",
-    "alarmGeofenceExit": "Alarm opuštení zóny",
-    "alarmGpsAntennaCut": "Alarm odstřihnutí GPS antény",
-    "alarmAccident": "Alarm nehody",
-    "alarmTow": "Alarm vleku",
-    "alarmIdle": "Alarm nečinnosti",
-    "alarmHardAcceleration": "Alarm prudké akcelerace",
-    "alarmHardBraking": "Alarm prudkého brždění",
-    "alarmFatigueDriving": "Alarm unaveného řízení",
-    "alarmPowerCut": "Alarm výpadku napájení",
-    "alarmPowerRestored": "Alarm obnovení napájení",
-    "alarmJamming": "Alarm zácpy",
-    "alarmTemperature": "Alarm teploty",
-    "alarmParking": "Alarm parkování",
-    "alarmShock": "Alarm šoku",
-    "alarmBonnet": "Alarm krytu",
-    "alarmFootBrake": "Alarm nožní brzdy",
-    "alarmFuelLeak": "Alarm úniku paliva",
-    "alarmTampering": "Alarm poškození",
-    "alarmRemoving": "Odstraňuji alarm",
+    "alarmGeneral": "Hlavní",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibrace",
+    "alarmMovement": "Pohyb",
+    "alarmLowspeed": "Nízká rychlost",
+    "alarmOverspeed": "Překročení rychlosti",
+    "alarmFallDown": "Pád",
+    "alarmLowPower": "Nízký výkon",
+    "alarmLowBattery": "Nízké napětí baterie",
+    "alarmFault": "Chyba",
+    "alarmPowerOff": "Vypnout",
+    "alarmPowerOn": "Zapnout",
+    "alarmDoor": "Dveře",
+    "alarmLock": "Zamknout",
+    "alarmUnlock": "Odemknout",
+    "alarmGeofence": "Geozóna",
+    "alarmGeofenceEnter": "Vstup do geozóny",
+    "alarmGeofenceExit": "Konec geozóny",
+    "alarmGpsAntennaCut": "Odpojení GPS antény",
+    "alarmAccident": "Nehoda",
+    "alarmTow": "Vlek",
+    "alarmIdle": "Nečinnost",
+    "alarmHighRpm": "Vysoké ot/min",
+    "alarmHardAcceleration": "Silná akcelerace",
+    "alarmHardBraking": "Silné brždění",
+    "alarmHardCornering": "Jízda smykem",
+    "alarmLaneChange": "Změna pruhu",
+    "alarmFatigueDriving": "Únava při řízení",
+    "alarmPowerCut": "Výpadek napájení",
+    "alarmPowerRestored": "Napájení obnoveno",
+    "alarmJamming": "Zaseknutí",
+    "alarmTemperature": "Teplota",
+    "alarmParking": "Parkování",
+    "alarmShock": "Otřes",
+    "alarmBonnet": "Kapota",
+    "alarmFootBrake": "Nožní brzda",
+    "alarmFuelLeak": "Únik paliva",
+    "alarmTampering": "Manipulování",
+    "alarmRemoving": "Odstraňuji",
     "notificationType": "Typ oznámení",
     "notificationAlways": "Všechna zařízení",
-    "notificationNotificators": "Channels",
+    "notificationNotificators": "Kanály",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobil",
     "reportRoute": "Trasa",
     "reportEvents": "Události",
     "reportTrips": "Cesty",
@@ -371,6 +375,7 @@
     "reportChartType": "Typ grafu",
     "reportShowMarkers": "Zobrazit markery",
     "reportExport": "Exportovat",
+    "reportEmail": "Zaslat report mailem",
     "reportPeriod": "Období",
     "reportCustom": "Vlastní",
     "reportToday": "Dnes",
@@ -389,6 +394,8 @@
     "reportEndTime": "Čas konce",
     "reportEndAddress": "Adresa konce",
     "reportSpentFuel": "Spotřebované palivo",
+    "reportStartOdometer": "Start počítadla kilometrů",
+    "reportEndOdometer": "Konec počítadla kilometrů",
     "statisticsTitle": "Statistiky",
     "statisticsCaptureTime": "Čas zachycení",
     "statisticsActiveUsers": "Aktivní uživatelé",
@@ -414,11 +421,12 @@
     "categoryPlane": "Letadlo",
     "categoryShip": "Loď",
     "categoryTractor": "Traktor",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Vlak",
+    "categoryTram": "Tramvaj",
+    "categoryTrolleybus": "Trolejbus",
     "categoryTruck": "Nákladní auto",
     "categoryVan": "Dodávka",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Perioda"
 }
\ No newline at end of file
diff --git a/web/l10n/da.json b/web/l10n/da.json
index 2d3cd42f..0bf7e592 100644
--- a/web/l10n/da.json
+++ b/web/l10n/da.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Udregnede attributter",
     "sharedCheckComputedAttribute": "Kontroller udregnet attribut",
     "sharedExpression": "Udtryk",
-    "sharedDeviceDistance": "Enhed distance",
     "sharedDevice": "Enhed",
     "sharedTestNotification": "Send Test notifikation",
     "sharedCalendar": "Kalender",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Hastigheds grænse",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Rapport: Ignorer 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": "Fejl",
     "errorGeneral": "ulovlig parameter ",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Gennemtving opdatering",
     "mapTitle": "Kort",
     "mapLayer": "Kort opsætning",
-    "mapCustom": "Brugerdefineret Kort",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Værdi",
     "commandTitle": "Kommando",
     "commandSend": "Send",
-    "commandSent": "Kommando er blevet sendt",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Enhed",
     "commandCustom": "Skræddersyet kommando",
     "commandDeviceIdentification": "Enheds id",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Slå alarm fra",
     "commandSetTimezone": "Sæt tidszone",
     "commandRequestPhoto": "Tag billede",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Genstart enhed",
     "commandSendSms": "send 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": "Hastigheds alarm",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "Frekvens",
     "commandTimezone": "Tidszone forskel",
     "commandMessage": "Meddelelse",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Alle begivenheder",
-    "eventDeviceOnline": "Enhed online",
-    "eventDeviceUnknown": "Enheds status er ukendt",
-    "eventDeviceOffline": "Enhed offline",
-    "eventDeviceMoving": "Enhed i bevægelse",
-    "eventDeviceStopped": "Enhed stoppet",
-    "eventDeviceOverspeed": "Enhed overskrider hastighed",
-    "eventDeviceFuelDrop": "Mistet brændstof",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Resultat af kommando",
-    "eventGeofenceEnter": "Enhed kom indenfor geofence",
-    "eventGeofenceExit": "Enhed kom udenfor geofence",
-    "eventAlarm": "Alarmer",
-    "eventIgnitionOn": "Tænding slået til",
-    "eventIgnitionOff": "Tænding slået fra",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Vedligeholdelse krævet",
     "eventTextMessage": "Tekst besked modtaget",
-    "eventDriverChanged": "Ny chauffør",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Rul til sidste",
-    "alarmSos": "SOS alarm",
-    "alarmVibration": "Vibrations alarm",
-    "alarmMovement": "Bevægelses alarm",
-    "alarmOverspeed": "Hastigheds alarm",
-    "alarmFallDown": "Fald alarm",
-    "alarmLowBattery": "Lavt batteri alarm",
-    "alarmLowPower": "Lav Strøm alarm",
-    "alarmFault": "Fejl alarm",
-    "alarmPowerOff": "Strøm frakoblet - ALARM",
-    "alarmPowerOn": "Strøm tilsluttet - ALARM",
-    "alarmDoor": "Dør - ALARM",
-    "alarmGeofence": "Geofence - ALARM",
-    "alarmGeofenceEnter": "Geofence indtræden - ALARM",
-    "alarmGeofenceExit": "Geofence udtræden - ALARM",
-    "alarmGpsAntennaCut": "GPS antenne fjernet - ALARM",
-    "alarmAccident": "Ulykke - ALARM",
-    "alarmTow": "Slæbe - ALARM",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Kraftig acceleration - ALARM",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Kørsel - ALARM",
-    "alarmPowerCut": "Strøm frakoblet - ALARM",
-    "alarmPowerRestored": "Strøm genetbleret",
-    "alarmJamming": "Enhed jammet - ALARM",
-    "alarmTemperature": "Temperatur - ALARM",
-    "alarmParking": "Parkering - ALARM",
-    "alarmShock": "Vibration - ALARM",
-    "alarmBonnet": "Kølerhjelm - ALARM",
-    "alarmFootBrake": "Fodbremse - ALARM",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Enhed åbnet - ALARM",
-    "alarmRemoving": "Fjernet 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": "Type af notifikation",
     "notificationAlways": "All Devices",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Rute",
     "reportEvents": "Begivenheder",
     "reportTrips": "Ture",
@@ -371,6 +375,7 @@
     "reportChartType": "Graf type",
     "reportShowMarkers": "Vis markeringer",
     "reportExport": "Eksporter",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "Slut tidspunkt",
     "reportEndAddress": "Slut adresse",
     "reportSpentFuel": "Brændstof forbrug",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistik",
     "statisticsCaptureTime": "Noter tid",
     "statisticsActiveUsers": "Aktive brugere",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Lastbil",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/de.json b/web/l10n/de.json
index 8cae0ac0..d279caaa 100644
--- a/web/l10n/de.json
+++ b/web/l10n/de.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Verarbeitete Attribute",
     "sharedCheckComputedAttribute": "Verarbeitetes Attribut prüfen",
     "sharedExpression": "Ausdruck",
-    "sharedDeviceDistance": "Kilometerzähler einstellen",
     "sharedDevice": "Gerät",
     "sharedTestNotification": "Testbenachrichtigung senden",
     "sharedCalendar": "Kalender",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Adresse anzeigen",
     "sharedDisabled": "Deaktiviert",
     "sharedMaintenance": "Wartung",
-    "sharedMaintenances": "Wartungen",
+    "sharedDeviceAccumulators": "Akkus",
+    "sharedAlarms": "Alarme",
     "attributeSpeedLimit": "Höchstgeschwindigkeit",
     "attributePolylineDistance": "Polyliniendistanz",
     "attributeReportIgnoreOdometer": "Bericht: Kilometerzähler ignorieren",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Fahrer deaktivieren",
     "attributeUiDisableComputedAttributes": "UI: Verarbeitete Attribute deaktivieren",
     "attributeUiDisableCalendars": "UI: Kalender deaktivieren",
-    "attributeUiDisableMaintenances": "UI: Wartungen deaktivieren",
+    "attributeUiDisableMaintenance": "UI: Wartung deaktivieren",
     "attributeUiHidePositionAttributes": "UI: Positionsattribute ausblenden",
     "errorTitle": "Fehler",
     "errorGeneral": "Ungültige Eingabe oder keine Berechtigung",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Einstellungen erzwingen",
     "mapTitle": "Karte",
     "mapLayer": "Karten Layer",
-    "mapCustom": "Benutzerspezifische Karte",
+    "mapCustom": "Benutzerdefiniert (XYZ)",
+    "mapCustomArcgis": "Benutzerdefiniert (ArcGIS)",
+    "mapCustomLabel": "Benutzerdefinierte Karte",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Wert",
     "commandTitle": "Befehl",
     "commandSend": "Senden",
-    "commandSent": "Befehl wurde gesendet",
-    "commandQueued": "Befehl wurde eingereiht",
+    "commandSent": "Befehl gesendet",
+    "commandQueued": "Befehl eingereiht",
     "commandUnit": "Einheit",
     "commandCustom": "Benutzerdefinierter Befehl",
     "commandDeviceIdentification": "Gerätekennung",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Unscharf schalten",
     "commandSetTimezone": "Zeitzone festlegen",
     "commandRequestPhoto": "Foto anfordern",
+    "commandPowerOff": "Gerät ausschalten",
     "commandRebootDevice": "Gerät neustarten",
     "commandSendSms": "SMS senden",
     "commandSendUssd": "USSD senden",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Energiesparmodus ändern",
     "commandModeDeepSleep": "Tiefschlafeinstellungen ändern",
     "commandMovementAlarm": "Bewegungsalarm",
-    "commandAlarmBattery": "Batteriealarm",
-    "commandAlarmSos": "SOS Alarm",
-    "commandAlarmRemove": "Alarm löschen",
-    "commandAlarmClock": "Uhrzeit Alarm",
-    "commandAlarmSpeed": "Geschwindigkeitsalarm",
-    "commandAlarmFall": "Fehler Alarm",
-    "commandAlarmVibration": "Erschütterungsalarm",
     "commandFrequency": "Frequenz",
     "commandTimezone": "Zeitzonendifferenz",
     "commandMessage": "Nachricht",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Alle Ereignisse",
-    "eventDeviceOnline": "Gerät ist online",
-    "eventDeviceUnknown": "Gerätestatus ist unbekannt",
-    "eventDeviceOffline": "Gerät ist offline",
-    "eventDeviceMoving": "Gerät ist in Bewegung",
-    "eventDeviceStopped": "Gerät hat angehalten",
-    "eventDeviceOverspeed": "Gerät überschreitet Tempolimit",
-    "eventDeviceFuelDrop": "Treibstoffleck Ereignis",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unbekannt",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Gerät in Bewegung",
+    "eventDeviceStopped": "Gerät gestoppt",
+    "eventDeviceOverspeed": "Tempolimit überschritten",
+    "eventDeviceFuelDrop": "Treibstoffleck",
     "eventCommandResult": "Ergebnis des Befehls",
-    "eventGeofenceEnter": "Gerät hat Geo-Zaun betreten",
-    "eventGeofenceExit": "Gerät hat Geo-Zaun verlassen",
-    "eventAlarm": "Alarme",
+    "eventGeofenceEnter": "Geozaun betreten",
+    "eventGeofenceExit": "Geozaun verlassen",
+    "eventAlarm": "Alarm",
     "eventIgnitionOn": "Zündung an",
     "eventIgnitionOff": "Zündung aus",
     "eventMaintenance": "Wartung erforderlich",
     "eventTextMessage": "Textnachricht empfangen",
-    "eventDriverChanged": "Fahrer hat gewechselt",
+    "eventDriverChanged": "Fahrer gewechselt",
     "eventsScrollToLast": "Zur Neuesten scrollen",
-    "alarmSos": "SOS Alarm",
-    "alarmVibration": "Erschütterungsalarm",
-    "alarmMovement": "Bewegungsalarm",
-    "alarmOverspeed": "Geschwindigkeitsalarm",
-    "alarmFallDown": "Sturzalarm",
-    "alarmLowBattery": "Batteriealarm",
-    "alarmLowPower": "Akku schwach - Alarm",
-    "alarmFault": "Fehleralarm",
-    "alarmPowerOff": "Ausschalten Alarm",
-    "alarmPowerOn": "Einschalten Alarm",
-    "alarmDoor": "Tür Alarm",
-    "alarmGeofence": "Geozaun Alarm",
-    "alarmGeofenceEnter": "Geozaun betreten Alarm",
-    "alarmGeofenceExit": "Geozaun verlassen Alarm",
-    "alarmGpsAntennaCut": "GPS-Antenne beschädigt Alarm",
-    "alarmAccident": "Unfall Alarm",
-    "alarmTow": "Abschlepp Alarm",
-    "alarmIdle": "Ruhe Alarm",
-    "alarmHardAcceleration": "Starke Beschleunigung Alarm",
-    "alarmHardBraking": "Notbremsung-Alarm",
-    "alarmFatigueDriving": "Ermüdung Alarm",
-    "alarmPowerCut": "Spannungsverlust Alarm",
-    "alarmPowerRestored": "Spannungsrückkehr Alarm",
-    "alarmJamming": "Störung Alarm",
-    "alarmTemperature": "Temperatur Alarm",
-    "alarmParking": "Parken Alarm",
-    "alarmShock": "Erschütterung Alarm",
-    "alarmBonnet": "Motorhaube Alarm",
-    "alarmFootBrake": "Fußbremse Alarm",
-    "alarmFuelLeak": "Kraftstoffleck Alarm",
-    "alarmTampering": "Manipulation Alarm",
-    "alarmRemoving": "Entfernen Alarm",
+    "alarmGeneral": "Allgemein",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibration",
+    "alarmMovement": "Bewegung",
+    "alarmLowspeed": "Geringe Geschwindigkeit",
+    "alarmOverspeed": "Geschwindigkeitsüberschreitung",
+    "alarmFallDown": "Sturz",
+    "alarmLowPower": "Geringe Spannung",
+    "alarmLowBattery": "Geringer Batteriestand",
+    "alarmFault": "Fehler",
+    "alarmPowerOff": "Ausschalten",
+    "alarmPowerOn": "Einschalten",
+    "alarmDoor": "Tür",
+    "alarmLock": "Sperren",
+    "alarmUnlock": "Entsperren",
+    "alarmGeofence": "Geozaun",
+    "alarmGeofenceEnter": "Geozaun betreten",
+    "alarmGeofenceExit": "Geofence verlassen",
+    "alarmGpsAntennaCut": "GPS Antenne entfernt",
+    "alarmAccident": "Unfall",
+    "alarmTow": "Abschleppen",
+    "alarmIdle": "Ruhezustand",
+    "alarmHighRpm": "Hohe RPM",
+    "alarmHardAcceleration": "Starke Beschleunigung",
+    "alarmHardBraking": "Starkes Bremsen",
+    "alarmHardCornering": "Scharfes Kurvenfahren",
+    "alarmLaneChange": "Spurwechsel",
+    "alarmFatigueDriving": "Müdigkeitserkennung",
+    "alarmPowerCut": "Stromversorgung unterbrochen",
+    "alarmPowerRestored": "Stromversorgung wiederhergestellt",
+    "alarmJamming": "Jamming",
+    "alarmTemperature": "Temperatur",
+    "alarmParking": "Parken",
+    "alarmShock": "Schock",
+    "alarmBonnet": "Haube",
+    "alarmFootBrake": "Betriebsbremse",
+    "alarmFuelLeak": "Treibstoffleck",
+    "alarmTampering": "Manipulation",
+    "alarmRemoving": "Entfernen",
     "notificationType": "Art der Benachrichtigung",
     "notificationAlways": "Alle Geräte",
     "notificationNotificators": "Kanäle",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobil",
     "reportRoute": "Route",
     "reportEvents": "Ereignis",
     "reportTrips": "Trips",
@@ -371,7 +375,8 @@
     "reportChartType": "Diagramm Typ",
     "reportShowMarkers": "Zeige Markierungen",
     "reportExport": "Export",
-    "reportPeriod": "Periode",
+    "reportEmail": "E-Mail Report",
+    "reportPeriod": "Zeitraum",
     "reportCustom": "Eigene",
     "reportToday": "Heute",
     "reportYesterday": "Gestern",
@@ -389,6 +394,8 @@
     "reportEndTime": "Zielzeit",
     "reportEndAddress": "Zielort",
     "reportSpentFuel": "Kraftstoffverbrauch",
+    "reportStartOdometer": "Kilometerstand Start",
+    "reportEndOdometer": "Kilometerstand Ende",
     "statisticsTitle": "Statistiken",
     "statisticsCaptureTime": "Zeitpunkt",
     "statisticsActiveUsers": "Aktive Benutzer",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Oberleitungsbus",
     "categoryTruck": "LKW",
     "categoryVan": "Van",
+    "categoryScooter": "Roller",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Periode"
 }
\ No newline at end of file
diff --git a/web/l10n/el.json b/web/l10n/el.json
index f5f558c5..75ea7522 100644
--- a/web/l10n/el.json
+++ b/web/l10n/el.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Υπολογισμένα χαρακτηριστικά",
     "sharedCheckComputedAttribute": "Ελέξτε την υπολογισμένη ιδιότητα",
     "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Απόσταση Συσκευής",
     "sharedDevice": "Συσκευή",
     "sharedTestNotification": "Αποστολή δοκιμαστικής ειδοποίησης",
     "sharedCalendar": "Ημερολόγιο",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Δείξε Διεύθυνση",
     "sharedDisabled": "Απενεργοποιημένο",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Όριο ταχύτητας",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Αναφορά: Αγνόηση οδομέτρου",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "Διεπαφή: Απενεργοποίηση Οδηγών",
     "attributeUiDisableComputedAttributes": "Διεπαφή: Απενεργοποίηση Υπολογισμένων Ιδιοτήτων",
     "attributeUiDisableCalendars": "Διεπαφή: Απενεργοποίηση Ημερολογίων",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "Διεπαφή: Απόκρυψη Ιδιοτήτων Θέσης",
     "errorTitle": "Σφάλμα",
     "errorGeneral": "Μη έγκυρες παράμετροι ή παραβίαση περιορισμών",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Επιβολή ρυθμίσεων",
     "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": "Η Εντολή έχει δρομολογηθεί",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Μονάδα",
     "commandCustom": "Προσαρμοσμένη εντολή",
     "commandDeviceIdentification": "Αναγνωριστικό συσκευής",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Απενεργοποίηση συναγερμού",
     "commandSetTimezone": "Καθορισμός ζώνης ώρας",
     "commandRequestPhoto": "Αίτημα για φωτογραφία",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Επανεκκίνηση συσκευής",
     "commandSendSms": "Αποστολή γραπτού μηνύματος (SMS)",
     "commandSendUssd": "Αποστολή USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Τροποποίησε Εξοικονόμηση Ενέργειας",
     "commandModeDeepSleep": "Modify Deep Sleep",
     "commandMovementAlarm": "Προειδοποίηση Κίνησης",
-    "commandAlarmBattery": "Προειδοποίηση Συσσωρευτή",
-    "commandAlarmSos": "SOS Alarm",
-    "commandAlarmRemove": "Διαγραφή Συναγερμού",
-    "commandAlarmClock": "Clock Alarm",
-    "commandAlarmSpeed": "Υπέρβαση ορίου ταχύτητας",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "Συχνότητα",
     "commandTimezone": "Timezone Offset",
     "commandMessage": "Μήνυμα",
@@ -305,61 +301,69 @@
     "commandServer": "Εξυπηρετητής",
     "commandPort": "Θύρα",
     "eventAll": "Όλα τα γεγονότα",
-    "eventDeviceOnline": "Η συσκευή είναι συνδεδεμένη",
-    "eventDeviceUnknown": "Άγνωστη κατάσταση συσκευής",
-    "eventDeviceOffline": "Η συσκευή είναι αποσυνδεδεμένη",
-    "eventDeviceMoving": "Η συσκευή βρίσκεται σε κίνηση",
-    "eventDeviceStopped": "Η συσκευή είναι σταματημένη",
-    "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": "Ανάφλεξη Ενερή",
-    "eventIgnitionOff": "Ανάφλεξη Ανενεργή",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Απαιτείται συντήρηση",
     "eventTextMessage": "Ελήφθη γραπτό μήνυμα",
-    "eventDriverChanged": "Ο Οδηγός άλλαξε",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Κύλιση στο τέλος",
-    "alarmSos": "Προειδοποίηση SOS",
-    "alarmVibration": "Προειδοποίηση δόνησης",
-    "alarmMovement": "Προειδοποίηση κίνησης",
-    "alarmOverspeed": "Προειδοποίηση υπέρβασης ορίου ταχύτητας",
-    "alarmFallDown": "Προειδοποίηση πτώσης",
-    "alarmLowBattery": "Προειδοποίηση χαμηλής μπαταρίας",
-    "alarmLowPower": "Συναγερμός χαμηλής ισχύος",
-    "alarmFault": "Προειδοποίηση σφάλματος",
-    "alarmPowerOff": "Απενεργοποίηση συναγερμού",
-    "alarmPowerOn": "Ενεργοποίηση συναγερμού",
-    "alarmDoor": "Συναγερμός θύρας",
-    "alarmGeofence": "Συναγερμός γεωφράχτη",
-    "alarmGeofenceEnter": "Συναγερμός εισόδου σε γεωφράχτη",
-    "alarmGeofenceExit": "Συναγερμός εξόδου από γεωφράχτη",
-    "alarmGpsAntennaCut": "GPS Antenna Cut Alarm",
-    "alarmAccident": "Συναγερμός ατυχήματος",
-    "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": "Όλες οι συσκευές",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Διαδρομή",
     "reportEvents": "Γεγονότα",
     "reportTrips": "Ταξίδια",
@@ -371,6 +375,7 @@
     "reportChartType": "Τύπος διαγράμματος",
     "reportShowMarkers": "Δείξε Δείκτες",
     "reportExport": "Εξαγωγή",
+    "reportEmail": "Email Report",
     "reportPeriod": "Περίοδος",
     "reportCustom": "Προσαρμοσμένος",
     "reportToday": "Σήμερα",
@@ -389,6 +394,8 @@
     "reportEndTime": "Ώρα λήξης",
     "reportEndAddress": "Διεύθυνση τερματισμού",
     "reportSpentFuel": "Κατανάλωση καυσίμων",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Στατιστικά",
     "statisticsCaptureTime": "Ώρα Καταγραφής",
     "statisticsActiveUsers": "Ενεργοί Χρήστες",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Φορτηγό",
     "categoryVan": "Κλειστό Φορτηγό",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 5acc1ea1..c449a481 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -75,8 +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": "Error",
     "errorGeneral": "Invalid parameters or constraints violation",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Force Settings",
     "mapTitle": "Map",
     "mapLayer": "Map Layer",
-    "mapCustom": "Custom Map",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Disarm Alarm",
     "commandSetTimezone": "Set Timezone",
     "commandRequestPhoto": "Request Photo",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Reboot Device",
     "commandSendSms": "Send 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": "Overspeed Alarm",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "Frequency",
     "commandTimezone": "Timezone Offset",
     "commandMessage": "Message",
@@ -322,17 +318,21 @@
     "eventTextMessage": "Text message received",
     "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Scroll To Last",
+    "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
     "alarmMovement": "Movement",
+    "alarmLowspeed": "Low Speed",
     "alarmOverspeed": "Overspeed",
-    "alarmFallDown": "FallDown",
-    "alarmLowBattery": "LowBattery",
-    "alarmLowPower": "LowPower",
+    "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",
@@ -340,8 +340,11 @@
     "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",
@@ -360,6 +363,7 @@
     "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
diff --git a/web/l10n/es.json b/web/l10n/es.json
index 65e37b30..5a6ff030 100644
--- a/web/l10n/es.json
+++ b/web/l10n/es.json
@@ -8,10 +8,10 @@
     "sharedEdit": "Editar",
     "sharedRemove": "Eliminar",
     "sharedRemoveConfirm": "¿Eliminar elemento?",
-    "sharedKm": "KM",
+    "sharedKm": "Km",
     "sharedMi": "MI",
     "sharedNmi": "nmi",
-    "sharedKn": "Nudo",
+    "sharedKn": "Nudos",
     "sharedKmh": "km/h",
     "sharedMph": "mph",
     "sharedHour": "Hora",
@@ -43,7 +43,7 @@
     "sharedSecondAbbreviation": "s",
     "sharedVoltAbbreviation": "V",
     "sharedLiterAbbreviation": "I",
-    "sharedGallonAbbreviation": "gal",
+    "sharedGallonAbbreviation": "Galón",
     "sharedLiter": "Litro",
     "sharedImpGallon": "Imp. Galón",
     "sharedUsGallon": "U.S. Galón",
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Atributos calculados",
     "sharedCheckComputedAttribute": "Revisar atributo calculado",
     "sharedExpression": "Expresión",
-    "sharedDeviceDistance": "Distancia del dispositivo",
     "sharedDevice": "Dispositivo",
     "sharedTestNotification": "Enviar notificación de prueba",
     "sharedCalendar": "Calendario",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Mostrar Dirección",
     "sharedDisabled": "Deshabilitado",
     "sharedMaintenance": "Mantenimientos",
-    "sharedMaintenances": "Mantenimientos",
+    "sharedDeviceAccumulators": "Acumulador",
+    "sharedAlarms": "Alarmas",
     "attributeSpeedLimit": "Límite de velocidad",
     "attributePolylineDistance": "Distancia de polilínea",
     "attributeReportIgnoreOdometer": "Reporte: Ignorar el odómetro",
@@ -85,7 +85,7 @@
     "attributeProcessingCopyAttributes": "Procesando: Copia de atributos",
     "attributeColor": "Color",
     "attributeWebLiveRouteLength": "Web: Longitud de la ruta en vivo",
-    "attributeWebSelectZoom": "Web: hacer zoom en seleccionar",
+    "attributeWebSelectZoom": "Web: hacer zoom al seleccionar",
     "attributeWebMaxZoom": "Web: Zoom Máximo",
     "attributeMailSmtpHost": "Correo: Servidor SMTP",
     "attributeMailSmtpPort": "Correo: Puerto SMTP",
@@ -104,12 +104,12 @@
     "attributeUiDisableDrivers": "UI: Deshabilitar Conductores",
     "attributeUiDisableComputedAttributes": "UI: Deshabilitar Atributos Calculados",
     "attributeUiDisableCalendars": "UI: Deshabilitar Calendario",
-    "attributeUiDisableMaintenances": "UI: Deshabilitar mantenimientos",
+    "attributeUiDisableMaintenance": "UI: Deshabilitar Mantenimiento",
     "attributeUiHidePositionAttributes": "UI: Ocultar Atributos de Posición",
     "errorTitle": "Error",
-    "errorGeneral": "Parámetros inválidos o violación de restricción",
+    "errorGeneral": "Parámetros inválidos o violación de restricciónes",
     "errorConnection": "Error de Conexión",
-    "errorSocket": "Error en toma de conexión web",
+    "errorSocket": "Error de conexión web",
     "errorZero": "No puede ser cero",
     "userEmail": "Email",
     "userPassword": "Contraseña",
@@ -154,7 +154,7 @@
     "settingsDistanceUnit": "Unidad de Distancia",
     "settingsSpeedUnit": "Unidad de Velocidad",
     "settingsVolumeUnit": "Unidad de Volumen",
-    "settingsTwelveHourFormat": "Formato de 12 Hrs",
+    "settingsTwelveHourFormat": "Formato de 12 horas",
     "settingsCoordinateFormat": "Formato de coordenadas",
     "reportTitle": "Reportes",
     "reportDevice": "Dispositivos",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Forzar Valores",
     "mapTitle": "Mapa",
     "mapLayer": "Capa de Mapa",
-    "mapCustom": "Mapa Personalizado",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "ArcGIS Personalizado",
+    "mapCustomLabel": "Mapa Personalizado",
     "mapCarto": "Mapas base Carto",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Valor",
     "commandTitle": "Comando",
     "commandSend": "Enviar",
-    "commandSent": "El Comando ha sido enviado",
-    "commandQueued": "El comando fue programado",
+    "commandSent": "Comando enviado",
+    "commandQueued": "Comando en cola",
     "commandUnit": "Unidad",
     "commandCustom": "Comando personalizado",
     "commandDeviceIdentification": "Identificación de Dispositivo",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Desarmar Alarma",
     "commandSetTimezone": "Establecer zona horaria",
     "commandRequestPhoto": "Solicitar Foto",
+    "commandPowerOff": "Dispositivo apagado",
     "commandRebootDevice": "Reiniciar dispositivo",
     "commandSendSms": "Enviar SMS",
     "commandSendUssd": "Enviar USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Modificar Ahorro de Energía",
     "commandModeDeepSleep": "Modificar Ahorro Profundo",
     "commandMovementAlarm": "Alarma de Movimiento",
-    "commandAlarmBattery": "Alarma de Batería",
-    "commandAlarmSos": "Alarma de SOS",
-    "commandAlarmRemove": "Eliminar Alarma",
-    "commandAlarmClock": "Alarma de Reloj",
-    "commandAlarmSpeed": "Alerta de Velocidad",
-    "commandAlarmFall": "Alarma de Falla",
-    "commandAlarmVibration": "Alarma de Vibración",
     "commandFrequency": "Frequencia",
     "commandTimezone": "Compensación horaria",
     "commandMessage": "Mensaje",
@@ -305,61 +301,69 @@
     "commandServer": "Servidor",
     "commandPort": "Puerto",
     "eventAll": "Todos los Eventos",
-    "eventDeviceOnline": "El dispositivo está en linea",
-    "eventDeviceUnknown": "El estado del dispositivo es desconocido",
-    "eventDeviceOffline": "El dispositivo está fuera de linea",
-    "eventDeviceMoving": "El dispositivo se está moviendo",
-    "eventDeviceStopped": "El dispositivo se ha detenido",
-    "eventDeviceOverspeed": "El dispositivo excedió el limite de velocidad",
-    "eventDeviceFuelDrop": "Pérdida de combustible",
+    "eventDeviceOnline": "El Dispositivo Esta en Línea",
+    "eventDeviceUnknown": "El Estado del Dispositivo es Desconocido ",
+    "eventDeviceOffline": "El Dispositivo esta Fuera de Línea",
+    "eventDeviceMoving": "El Dispositivo esta en Movimiento ",
+    "eventDeviceStopped": "El Dispositivo se ha Detenido ",
+    "eventDeviceOverspeed": "El Dispositivo ha Excedido el Limite de Velocidad ",
+    "eventDeviceFuelDrop": "Perdida de Combustible ",
     "eventCommandResult": "Resultado de comando",
-    "eventGeofenceEnter": "El dispositivo ha ingresado a la geocerca",
-    "eventGeofenceExit": "El dispositivo ha salido de la geocerca",
-    "eventAlarm": "Alarmas",
+    "eventGeofenceEnter": "El Dispositivo ha entrado en la Geocerca ",
+    "eventGeofenceExit": "El Dispositivo ha salido de la Geocerca ",
+    "eventAlarm": "Alarma ",
     "eventIgnitionOn": "Encendido ON",
     "eventIgnitionOff": "Encendido OFF",
     "eventMaintenance": "Requiere mantenimiento",
     "eventTextMessage": "Mensaje de texto recibido",
     "eventDriverChanged": "El Conductor ha Cambiado",
     "eventsScrollToLast": "Desplazarse hasta el último",
-    "alarmSos": "Alarma de SOS",
-    "alarmVibration": "Alarma de vibración",
-    "alarmMovement": "Alarma de movimiento",
-    "alarmOverspeed": "Alarma de exceso de velocidad",
+    "alarmGeneral": "General",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibración",
+    "alarmMovement": "Movimiento",
+    "alarmLowspeed": " Rápida Aceleración",
+    "alarmOverspeed": "Exceso de Velocidad ",
     "alarmFallDown": "Alarma de caida",
-    "alarmLowBattery": "Alarma de bateria baja",
-    "alarmLowPower": "Alarma por pérdida de corriente",
+    "alarmLowPower": "Energía baja",
+    "alarmLowBattery": "Batería Baja",
     "alarmFault": "Alarma de fallo",
-    "alarmPowerOff": "Alarma por apagado",
-    "alarmPowerOn": "Alarma por encendido",
-    "alarmDoor": "Alarma de puerta",
-    "alarmGeofence": "Alarma de geocerca",
-    "alarmGeofenceEnter": "Alarma al entrar en geocerca",
-    "alarmGeofenceExit": "Alarma al salir de geocerca",
-    "alarmGpsAntennaCut": "Alarma por falta de cobertura GPS",
-    "alarmAccident": "Alarma por accidente",
-    "alarmTow": "Alarma por remolque",
-    "alarmIdle": "Alarma inactiva",
-    "alarmHardAcceleration": "Alarma por aceleración brusca",
-    "alarmHardBraking": "Alarma de Frenado Extremo",
-    "alarmFatigueDriving": "Alarma por fatiga de conducciòn",
-    "alarmPowerCut": "Alarma por corte de corriente",
-    "alarmPowerRestored": "Alarma de corriente restaurada",
-    "alarmJamming": "Alarma de interferencia",
+    "alarmPowerOff": "Apagado",
+    "alarmPowerOn": "Encendido",
+    "alarmDoor": "Puerta",
+    "alarmLock": "Bloqueado",
+    "alarmUnlock": "Desbloquear",
+    "alarmGeofence": "Geocerca",
+    "alarmGeofenceEnter": "El Dispositivo ha entrado a la Geocerca",
+    "alarmGeofenceExit": "El Dispositivo ha salido de la Geocerca ",
+    "alarmGpsAntennaCut": "Antena del GPS Cortada ",
+    "alarmAccident": "Accidente",
+    "alarmTow": "Remolque",
+    "alarmIdle": "Reposo",
+    "alarmHighRpm": "Altas revoluciones",
+    "alarmHardAcceleration": "Aceleración brusca",
+    "alarmHardBraking": "Frenado extremo",
+    "alarmHardCornering": "Giro brusco",
+    "alarmLaneChange": "Cambio de carril",
+    "alarmFatigueDriving": "Conducción fatigosa",
+    "alarmPowerCut": "Fuente de poder desconectada",
+    "alarmPowerRestored": "Fuente de poder restaurada",
+    "alarmJamming": "Interferencia",
     "alarmTemperature": "Alarma de temperatura",
-    "alarmParking": "Alarma de estacionamiento",
-    "alarmShock": "Alarma por golpe",
-    "alarmBonnet": "Alarma de capó",
-    "alarmFootBrake": "Alarma freno de pie",
-    "alarmFuelLeak": "Alarma de drenaje de combustible",
-    "alarmTampering": "Alarma por manipulación",
-    "alarmRemoving": "Eliminar la alarma",
+    "alarmParking": "Aparcamiento",
+    "alarmShock": "Choque",
+    "alarmBonnet": "Capó",
+    "alarmFootBrake": "Freno de pie",
+    "alarmFuelLeak": "Drenaje de combustible",
+    "alarmTampering": "Manipulación",
+    "alarmRemoving": "Eliminando",
     "notificationType": "Tipo de Notificación",
     "notificationAlways": "Todos los Dispositivos",
-    "notificationNotificators": "Channels",
+    "notificationNotificators": "Canales",
     "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
+    "notificatorMail": "Correo",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Móvil",
     "reportRoute": "Ruta",
     "reportEvents": "Eventos",
     "reportTrips": "Viajes",
@@ -371,6 +375,7 @@
     "reportChartType": "Tipo de gráfica",
     "reportShowMarkers": "Mostrar marcadores",
     "reportExport": "Exportar",
+    "reportEmail": "Reporte por correo",
     "reportPeriod": "Período",
     "reportCustom": "Personalizado",
     "reportToday": "Hoy",
@@ -389,6 +394,8 @@
     "reportEndTime": "Hora de Fin",
     "reportEndAddress": "Dirección de Fin",
     "reportSpentFuel": "Combustible utilizado",
+    "reportStartOdometer": "Odómetro inical",
+    "reportEndOdometer": "Odómetro final",
     "statisticsTitle": "Estadísticas",
     "statisticsCaptureTime": "Tiempo de captura",
     "statisticsActiveUsers": "Usuarios Activos",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolebús",
     "categoryTruck": "Camión",
     "categoryVan": "Van",
+    "categoryScooter": "Moto",
     "maintenanceStart": "Iniciar",
     "maintenancePeriod": "Período"
 }
\ No newline at end of file
diff --git a/web/l10n/fa.json b/web/l10n/fa.json
index 60aac66d..8a0c970e 100644
--- a/web/l10n/fa.json
+++ b/web/l10n/fa.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "ویژگیهای محاسبه شده",
     "sharedCheckComputedAttribute": "بررسی ویژگی محاسبه شده",
     "sharedExpression": "اصطلاح",
-    "sharedDeviceDistance": "مسافت دستگاه",
     "sharedDevice": "دستگاه",
     "sharedTestNotification": "ارسال تست اخطار",
     "sharedCalendar": "تقویم",
@@ -76,9 +75,10 @@
     "sharedShowAddress": "نمایش آدرس",
     "sharedDisabled": "غیرفعال شده",
     "sharedMaintenance": "تعمیر و نگهداری",
-    "sharedMaintenances": "تعمیرات",
+    "sharedDeviceAccumulators": "باطری",
+    "sharedAlarms": "هشدارها",
     "attributeSpeedLimit": "محدودیت سرعت",
-    "attributePolylineDistance": "Polyline Distance",
+    "attributePolylineDistance": "مسافت چند مسیری",
     "attributeReportIgnoreOdometer": "گزارش : بدون کیلومتر شمار",
     "attributeWebReportColor": "وب : گزارش رنگ",
     "attributeDevicePassword": "رمز عبور ردیاب",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "غیرفعالسازی رانندگان",
     "attributeUiDisableComputedAttributes": "غیرفعالسازی محاسبات",
     "attributeUiDisableCalendars": "غیرفعالسازی تقویم",
-    "attributeUiDisableMaintenances": "UI : تعمیرات غیر فعال",
+    "attributeUiDisableMaintenance": "تعمیر غیر فعال",
     "attributeUiHidePositionAttributes": "مخفی شدن موقعیت صفات",
     "errorTitle": "خطا",
     "errorGeneral": "پارامترهای نامعتبر یا نقص محدودیت",
@@ -231,7 +231,9 @@
     "serverForceSettings": "تنظیمات اجباری",
     "mapTitle": "نقشه",
     "mapLayer": "لایه های نقشه",
-    "mapCustom": "نقشه سفارشی",
+    "mapCustom": "سفارشی (XYZ)",
+    "mapCustomArcgis": "سفارشی (ArcGIS)",
+    "mapCustomLabel": "نقشه اختیاری",
     "mapCarto": "نقشه کارتو",
     "mapOsm": "نقشه باز خیابان",
     "mapBingKey": "کلید نقشه Bing",
@@ -241,7 +243,7 @@
     "mapBaidu": "بایدو",
     "mapYandexMap": "نقشه یاندکس",
     "mapYandexSat": "ماهواره یاندکس",
-    "mapWikimedia": "Wikimedia",
+    "mapWikimedia": "ویکی مدیا",
     "mapShapePolygon": "چند ضلعی",
     "mapShapeCircle": "دایره ",
     "mapShapePolyline": "چند خطی",
@@ -252,8 +254,8 @@
     "stateValue": "مقدار",
     "commandTitle": "ارسال دستور به دستگاه",
     "commandSend": "ارسال",
-    "commandSent": "دستور ارسال گردید",
-    "commandQueued": "دستور در صف قرار گرفت",
+    "commandSent": "ارسال دستور",
+    "commandQueued": "دستور در صف",
     "commandUnit": "واحد",
     "commandCustom": "دستور سفارشی",
     "commandDeviceIdentification": "شناسایی دستگاه",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "آلارم غیر فعال",
     "commandSetTimezone": "تنظیم ساعت محلی",
     "commandRequestPhoto": "درخواست عکس",
+    "commandPowerOff": "خاموش شدن دستگاه",
     "commandRebootDevice": "ریست کردن دستگاه",
     "commandSendSms": "ارسال پیام کوتاه",
     "commandSendUssd": "ارسال کد USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "تغییر ذخیره انرژی",
     "commandModeDeepSleep": "تغییر حالت خواب",
     "commandMovementAlarm": "هشدار حرکت",
-    "commandAlarmBattery": "هشدار باطری",
-    "commandAlarmSos": "هشدار پیام اضطراری",
-    "commandAlarmRemove": "رفع هشدار",
-    "commandAlarmClock": "هشدار ساعت",
-    "commandAlarmSpeed": "هشدار سرعت غیرمجاز",
-    "commandAlarmFall": "رد هشدار",
-    "commandAlarmVibration": "هشدار ضربه",
     "commandFrequency": "تاخیر ارسال",
     "commandTimezone": "فاصله زمانی مبدا",
     "commandMessage": "پیام",
@@ -305,61 +301,69 @@
     "commandServer": "سرور",
     "commandPort": "پورت",
     "eventAll": "همه رویدادها",
-    "eventDeviceOnline": "ردیاب آنلاین است ",
-    "eventDeviceUnknown": "وضعیت ردیاب نامعلوم",
-    "eventDeviceOffline": "ردیاب آفلاین است ",
-    "eventDeviceMoving": "ردیاب در حال حرکت است",
-    "eventDeviceStopped": "ردیاب متوقف است",
-    "eventDeviceOverspeed": "دستگاه از سرعت تعیین شده تجاوز کرده است ",
-    "eventDeviceFuelDrop": "رویداد خالی کردن باک",
+    "eventDeviceOnline": "وضعیت آنلاین",
+    "eventDeviceUnknown": "وضعیت نامعلوم",
+    "eventDeviceOffline": "وضعیت آفلاین",
+    "eventDeviceMoving": "حرکت دستگاه",
+    "eventDeviceStopped": "ایست دستگاه",
+    "eventDeviceOverspeed": "محدودیت سرعت بالا",
+    "eventDeviceFuelDrop": "افت سوخت",
     "eventCommandResult": "نتیجه ارسال دستور",
-    "eventGeofenceEnter": "ردیاب وارد حصار جغرافیایی شد ",
-    "eventGeofenceExit": "ردیاب از حصار جغرافیایی خارج شد",
-    "eventAlarm": "هشدار ها",
-    "eventIgnitionOn": "وسیله روشن هست  ",
-    "eventIgnitionOff": "وسیله خاموش است ",
+    "eventGeofenceEnter": "ورود محدوده جغرافیایی",
+    "eventGeofenceExit": "خروج محدوده جغرافیایی",
+    "eventAlarm": "هشدار",
+    "eventIgnitionOn": "سویچ روشن",
+    "eventIgnitionOff": "سوئیچ خاموش",
     "eventMaintenance": "نیاز به تعمیر",
     "eventTextMessage": "پیامک دریافت شد",
-    "eventDriverChanged": "راننده تغییر یافت",
+    "eventDriverChanged": "تعویض راننده",
     "eventsScrollToLast": "اسکرول تا آخر",
-    "alarmSos": "هشدار کمک اضطراری",
-    "alarmVibration": "هشدار ضربه",
-    "alarmMovement": "هشدار حرکت",
-    "alarmOverspeed": "هشدار سرعت غیر مجاز",
-    "alarmFallDown": "هشدار سقوط ",
-    "alarmLowBattery": "هشدار کم شدن باتری",
-    "alarmLowPower": "هشدار کم شدن نیرو",
-    "alarmFault": "هشدار خطا در دستگاه",
-    "alarmPowerOff": "هشدار خاموش شدن",
-    "alarmPowerOn": "هشدار روشن شدن",
-    "alarmDoor": "هشدار درب",
-    "alarmGeofence": "هشدار محدوده",
-    "alarmGeofenceEnter": "هشدار ورود به محدوده",
-    "alarmGeofenceExit": "هشدار خروج از محدوده",
-    "alarmGpsAntennaCut": "هشدار قطع آنتن GPS",
-    "alarmAccident": "هشدار تصادف",
-    "alarmTow": "هشدار دوم",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "هشدار شتاب زیاد",
-    "alarmHardBraking": "هشدار ترمز ناگهانی",
-    "alarmFatigueDriving": "هشدار رانندگی خواب آلود",
-    "alarmPowerCut": "هشدار قطع منبع تغذیه",
-    "alarmPowerRestored": "هشدار وصل منبع تغذیه",
-    "alarmJamming": "هشدار مسدود کردن",
-    "alarmTemperature": "هشدار دما",
-    "alarmParking": "هشدار پارک",
-    "alarmShock": "هشدار ضربه",
-    "alarmBonnet": "هشدار صندوق عقب",
-    "alarmFootBrake": "هشدار ترمز پا",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "هشدار دما",
-    "alarmRemoving": "حذف هشدار",
+    "alarmGeneral": "اصلی",
+    "alarmSos": "درخواست کمک",
+    "alarmVibration": "لرزش",
+    "alarmMovement": "جابجایی",
+    "alarmLowspeed": "سرعت کم",
+    "alarmOverspeed": "سرعت بالا",
+    "alarmFallDown": "سقوط",
+    "alarmLowPower": "انرژی کم",
+    "alarmLowBattery": "باطری کم",
+    "alarmFault": "ایراد",
+    "alarmPowerOff": "خاموش",
+    "alarmPowerOn": "روشن",
+    "alarmDoor": "در",
+    "alarmLock": "قفل",
+    "alarmUnlock": "باز کردن",
+    "alarmGeofence": "جغرافیایی",
+    "alarmGeofenceEnter": "ورود محدوده جغرافیایی",
+    "alarmGeofenceExit": "خروج محدوده جغرافیایی",
+    "alarmGpsAntennaCut": "قطع آنتن GPS",
+    "alarmAccident": "تصادف",
+    "alarmTow": "یدک کش",
+    "alarmIdle": "بیکار",
+    "alarmHighRpm": "دورموتور بالا",
+    "alarmHardAcceleration": "شتاب تند",
+    "alarmHardBraking": "ترمز تند",
+    "alarmHardCornering": "زاویه شدید",
+    "alarmLaneChange": "تغییر مسیر",
+    "alarmFatigueDriving": "رانندگی خسته",
+    "alarmPowerCut": "قطع ولتاژ",
+    "alarmPowerRestored": "برگشت ولتاژ",
+    "alarmJamming": "مسدود",
+    "alarmTemperature": "دما",
+    "alarmParking": "پارکینگ",
+    "alarmShock": "شوک",
+    "alarmBonnet": "صندوق",
+    "alarmFootBrake": "پدال ترمز",
+    "alarmFuelLeak": "نشت باک",
+    "alarmTampering": "دستکاری",
+    "alarmRemoving": "حذف",
     "notificationType": "تعیین نوع رویداد ",
     "notificationAlways": "همه ردیابها",
-    "notificationNotificators": "Channels",
-    "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
-    "notificatorSms": "SMS",
+    "notificationNotificators": "کانالها",
+    "notificatorWeb": "وب",
+    "notificatorMail": "ایمیل",
+    "notificatorSms": "پیامک",
+    "notificatorFirebase": "همراه",
     "reportRoute": "مسیر های پیموده شده ",
     "reportEvents": "رویداد ها",
     "reportTrips": "مسافرتها",
@@ -371,6 +375,7 @@
     "reportChartType": "نوع نمودار",
     "reportShowMarkers": "نمایش علامتها",
     "reportExport": "خروجی فایل",
+    "reportEmail": "گزارش پست الکترونیکی",
     "reportPeriod": "بازه",
     "reportCustom": "سفارشی",
     "reportToday": "امروز",
@@ -389,6 +394,8 @@
     "reportEndTime": "زمان پایانی",
     "reportEndAddress": "آدرس پایانی",
     "reportSpentFuel": "مصرف سوخت",
+    "reportStartOdometer": "شروع کیلومترشمار",
+    "reportEndOdometer": "پایان کیلومتر شمار",
     "statisticsTitle": "گزارشات",
     "statisticsCaptureTime": "زمان ضبط",
     "statisticsActiveUsers": "کاربران فعال",
@@ -414,11 +421,12 @@
     "categoryPlane": "هواپیما",
     "categoryShip": "کشتی",
     "categoryTractor": "تراکتور",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "قطار",
+    "categoryTram": "تراموا",
+    "categoryTrolleybus": "تریلر",
     "categoryTruck": "تریلی",
     "categoryVan": "ون",
+    "categoryScooter": "اسکوتر",
     "maintenanceStart": "شروع",
     "maintenancePeriod": "بازه"
 }
\ No newline at end of file
diff --git a/web/l10n/fi.json b/web/l10n/fi.json
index f9cb33e6..3a1e4a61 100644
--- a/web/l10n/fi.json
+++ b/web/l10n/fi.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Lasketut ominaisuudet",
     "sharedCheckComputedAttribute": "Tarkista laskettu ominaisuus",
     "sharedExpression": "Lauseke",
-    "sharedDeviceDistance": "Laitteen matka",
     "sharedDevice": "Laite",
     "sharedTestNotification": "Lähetä testi-ilmoitus",
     "sharedCalendar": "Kalenteri",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Näytä osoite",
     "sharedDisabled": "Poistettu käytöstä",
     "sharedMaintenance": "Huolto",
-    "sharedMaintenances": "Huollot",
+    "sharedDeviceAccumulators": "Laskurit",
+    "sharedAlarms": "Hälytykset",
     "attributeSpeedLimit": "Nopeusrajoitus",
     "attributePolylineDistance": "Etäisyys murtoviivaan",
     "attributeReportIgnoreOdometer": "Raportti: Älä huomioi matkamittaria",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Piilota kuljettajat",
     "attributeUiDisableComputedAttributes": "UI: Piilota lasketut ominaisuudet",
     "attributeUiDisableCalendars": "UI: Piilota kalenterit",
-    "attributeUiDisableMaintenances": "UI: Piilota huollot",
+    "attributeUiDisableMaintenance": "UI: Piilota huolto",
     "attributeUiHidePositionAttributes": "UI: Piilota sijainnin ominaisuudet",
     "errorTitle": "Virhe",
     "errorGeneral": "Epäkelvot parametrit tai rajoitteiden rikkomus",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Pakota asetukset",
     "mapTitle": "Kartta",
     "mapLayer": "Karttataso",
-    "mapCustom": "Oma kartta",
+    "mapCustom": "Oma kartta (XYZ)",
+    "mapCustomArcgis": "Oma kartta (ArcGIS)",
+    "mapCustomLabel": "Oma kartta",
     "mapCarto": "Carto-pohjakartat",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps -avain",
@@ -252,8 +254,8 @@
     "stateValue": "Arvo",
     "commandTitle": "Komento",
     "commandSend": "Lähetä",
-    "commandSent": "Komento on lähetetty",
-    "commandQueued": "Komento on jonossa",
+    "commandSent": "Komento lähetetty",
+    "commandQueued": "Komento jonossa",
     "commandUnit": "Yksikkö",
     "commandCustom": "Oma komento",
     "commandDeviceIdentification": "Laitteen tunnistus",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Hälytys pois",
     "commandSetTimezone": "Aseta aikavyöhyke",
     "commandRequestPhoto": "Pyydä kuva",
+    "commandPowerOff": "Sammuta laite",
     "commandRebootDevice": "Käynnistä laite uudelleen",
     "commandSendSms": "Lähetä tekstiviesti",
     "commandSendUssd": "Lähetä USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Muuta virransäästöä",
     "commandModeDeepSleep": "Muuta syvää unitilaa",
     "commandMovementAlarm": "Liikehälytys",
-    "commandAlarmBattery": "Akkuhälytys",
-    "commandAlarmSos": "SOS-hälytys",
-    "commandAlarmRemove": "Poista hälytys",
-    "commandAlarmClock": "Kellohälytys",
-    "commandAlarmSpeed": "Ylinopeushälytys",
-    "commandAlarmFall": "Hälytys - virhe",
-    "commandAlarmVibration": "Tärinähälytys",
     "commandFrequency": "Taajuus",
     "commandTimezone": "Aikavyöhykkeen poikkeama",
     "commandMessage": "Viesti",
@@ -305,61 +301,69 @@
     "commandServer": "Palvelin",
     "commandPort": "Portti",
     "eventAll": "Kaikki tapahtumat",
-    "eventDeviceOnline": "Laite on online-tilassa",
-    "eventDeviceUnknown": "Laitteen tila on tuntematon",
-    "eventDeviceOffline": "Laite on offline-tilassa",
+    "eventDeviceOnline": "Tila online",
+    "eventDeviceUnknown": "Tila tuntematon",
+    "eventDeviceOffline": "Tila offline",
     "eventDeviceMoving": "Laite liikkuu",
-    "eventDeviceStopped": "Laite on pysähtynyt",
-    "eventDeviceOverspeed": "Laite liikuu ylinopeutta",
-    "eventDeviceFuelDrop": "Äkillinen polttoainevähenemä",
+    "eventDeviceStopped": "Laite pysähtynyt",
+    "eventDeviceOverspeed": "Nopeusrajoitus ylitetty",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Komennon tulos",
     "eventGeofenceEnter": "Laite saapui geoaitaan",
     "eventGeofenceExit": "Laite poistui geoaidasta",
     "eventAlarm": "Hälytykset",
-    "eventIgnitionOn": "Sytytysvirta on PÄÄLLÄ",
-    "eventIgnitionOff": "Sytytysvirta on POIS PÄÄLTÄ",
+    "eventIgnitionOn": "Sytytysvirta päällä",
+    "eventIgnitionOff": "Sytytysvirta pois päältä",
     "eventMaintenance": "Huoltoa tarvitaan",
     "eventTextMessage": "Tekstiviesti vastaanotettu",
-    "eventDriverChanged": "Kuljettaja on vaihtunut",
+    "eventDriverChanged": "Kuljettaja vaihtunut",
     "eventsScrollToLast": "Vieritä viimeiseen",
-    "alarmSos": "SOS-hälytys",
-    "alarmVibration": "Tärinähälytys",
-    "alarmMovement": "Liikehälytys",
-    "alarmOverspeed": "Ylinopeushälytys",
-    "alarmFallDown": "Kaatumishälytys",
-    "alarmLowBattery": "Akku vähissä -hälytys",
-    "alarmLowPower": "Hälytys - jännite",
-    "alarmFault": "Vikahälytys",
-    "alarmPowerOff": "Virran sammutushälytys",
-    "alarmPowerOn": "Virran kytkemishälytys",
-    "alarmDoor": "Ovihälytys",
-    "alarmGeofence": "Geoaitahälytys",
-    "alarmGeofenceEnter": "Geoaitaan saapumishälytys",
-    "alarmGeofenceExit": "Geoaidasta poistumishälytys",
-    "alarmGpsAntennaCut": "GPS-antennikatkohälytys",
-    "alarmAccident": "Onnettomuushälytys",
-    "alarmTow": "Hinaushälytys",
-    "alarmIdle": "Tyhjäkäyntihälytys",
-    "alarmHardAcceleration": "Rajun kiihdytyksen hälytys",
-    "alarmHardBraking": "Paniikkijarrutuksen hälytys",
-    "alarmFatigueDriving": "Väsyneenä ajamisen hälytys",
-    "alarmPowerCut": "Sähkökatkohälytys",
-    "alarmPowerRestored": "Sähkökatkon loppumishälytys",
-    "alarmJamming": "Häirintähälytys",
-    "alarmTemperature": "Lämpötilahälytys",
-    "alarmParking": "Pysäköintihälytys",
-    "alarmShock": "Iskuhälytys",
-    "alarmBonnet": "Konepeltihälytys",
-    "alarmFootBrake": "Jalkajarruhälytys",
-    "alarmFuelLeak": "Polttoainevuodon hälytys",
-    "alarmTampering": "Peukalointihälytys",
-    "alarmRemoving": "Poistetaan hälytystä",
+    "alarmGeneral": "Yleinen",
+    "alarmSos": "SOS",
+    "alarmVibration": "Tärinä",
+    "alarmMovement": "Liike",
+    "alarmLowspeed": "Alhainen nopeus",
+    "alarmOverspeed": "Ylinopeus",
+    "alarmFallDown": "Fall Down",
+    "alarmLowPower": "Low Power",
+    "alarmLowBattery": "Low Battery",
+    "alarmFault": "Vikaantuminen",
+    "alarmPowerOff": "Virran sammutus",
+    "alarmPowerOn": "Virran käynnistys",
+    "alarmDoor": "Ovi",
+    "alarmLock": "Lukittu",
+    "alarmUnlock": "Lukitus avattu",
+    "alarmGeofence": "Geoaita",
+    "alarmGeofenceEnter": "Geoaitaan saapuminen",
+    "alarmGeofenceExit": "Geoaidasta poistuminen",
+    "alarmGpsAntennaCut": "GPS Antenna Cut",
+    "alarmAccident": "Onnettomuus",
+    "alarmTow": "Hinaus",
+    "alarmIdle": "Tyhjäkäynti",
+    "alarmHighRpm": "Korkea kierrosluku",
+    "alarmHardAcceleration": "Nopea kiihdytys",
+    "alarmHardBraking": "Nopea jarrutus",
+    "alarmHardCornering": "Hard Cornering",
+    "alarmLaneChange": "Kaistan vaihto",
+    "alarmFatigueDriving": "Väsyneenä ajaminen",
+    "alarmPowerCut": "Sähkökatko",
+    "alarmPowerRestored": "Sähkökatkon loppuminen",
+    "alarmJamming": "Häirintä",
+    "alarmTemperature": "Lämpötila",
+    "alarmParking": "Pysäköinti",
+    "alarmShock": "Isku",
+    "alarmBonnet": "Konepelti",
+    "alarmFootBrake": "Jalkajarru",
+    "alarmFuelLeak": "Polttoainevuoto",
+    "alarmTampering": "Peukalointi",
+    "alarmRemoving": "Siirto",
     "notificationType": "Ilmoituksen tyyppi",
     "notificationAlways": "Kaikki laitteet",
     "notificationNotificators": "Kanavat",
     "notificatorWeb": "Web",
     "notificatorMail": "Sähköposti",
     "notificatorSms": "Tekstiviesti",
+    "notificatorFirebase": "Mobiili",
     "reportRoute": "Reitti",
     "reportEvents": "Tapahtumat",
     "reportTrips": "Matkat",
@@ -371,6 +375,7 @@
     "reportChartType": "Kuvaajatyypit",
     "reportShowMarkers": "Näytä merkit",
     "reportExport": "Vie",
+    "reportEmail": "Sähköpostiraportti",
     "reportPeriod": "Jakso",
     "reportCustom": "Oma",
     "reportToday": "Tänään",
@@ -389,6 +394,8 @@
     "reportEndTime": "Lopetusaika",
     "reportEndAddress": "Lopetusosoite",
     "reportSpentFuel": "Käytetty polttoaine",
+    "reportStartOdometer": "Matkamittari alussa",
+    "reportEndOdometer": "Matkamittari lopussa",
     "statisticsTitle": "Tilastot",
     "statisticsCaptureTime": "Tarkasteluaika",
     "statisticsActiveUsers": "Aktiivisia käyttäjiä",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Johdinauto",
     "categoryTruck": "Kuorma-auto",
     "categoryVan": "Pakettiauto",
+    "categoryScooter": "Potkulauta",
     "maintenanceStart": "Alku",
     "maintenancePeriod": "Huoltoväli"
 }
\ No newline at end of file
diff --git a/web/l10n/fr.json b/web/l10n/fr.json
index b88359d2..dd7eb286 100644
--- a/web/l10n/fr.json
+++ b/web/l10n/fr.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Attributs calculés",
     "sharedCheckComputedAttribute": "Verifier l'attribut calculé",
     "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Distance de l'appareil",
     "sharedDevice": "Appareil",
     "sharedTestNotification": "Test d'envoi de notification",
     "sharedCalendar": "Calendrier",
@@ -76,9 +75,10 @@
     "sharedShowAddress": "Montrer adresse",
     "sharedDisabled": "Désactivé",
     "sharedMaintenance": "Entretien",
-    "sharedMaintenances": "Entretiens",
+    "sharedDeviceAccumulators": "Accumulateurs",
+    "sharedAlarms": "Alarmes",
     "attributeSpeedLimit": "Limite de vitesse",
-    "attributePolylineDistance": "Polyline Distance",
+    "attributePolylineDistance": "Distance polyligne",
     "attributeReportIgnoreOdometer": "Rapport: Ignorer l'odomètre",
     "attributeWebReportColor": "Web: couleur du rapport",
     "attributeDevicePassword": "Mot de passe de l'appareil",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Désactiver les conducteurs",
     "attributeUiDisableComputedAttributes": "UI: Désactiver les attributs calculés",
     "attributeUiDisableCalendars": "UI: Désactiver les calendiers",
-    "attributeUiDisableMaintenances": "UI: désactiver les entretiens",
+    "attributeUiDisableMaintenance": "UI/ Désactiver l'entretien",
     "attributeUiHidePositionAttributes": "UI: Cacher Attributs de Position",
     "errorTitle": "Erreur",
     "errorGeneral": "Paramètres invalides ou violation de contrainte",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Forcer les paramètres",
     "mapTitle": "Carte",
     "mapLayer": "Couche cartographique",
-    "mapCustom": "Carte personnalisée",
+    "mapCustom": "Personnalisé (XYZ)",
+    "mapCustomArcgis": "Personnalisé (ArcGIS)",
+    "mapCustomLabel": "Carte Personnalisée",
     "mapCarto": "Cartographie Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Clé Bing Maps",
@@ -253,7 +255,7 @@
     "commandTitle": "Commande",
     "commandSend": "Envoyer",
     "commandSent": "Commande envoyée",
-    "commandQueued": "Commande a été ajouté a la queue",
+    "commandQueued": "Commande mise en queue",
     "commandUnit": "Unité",
     "commandCustom": "Commande personnalisée",
     "commandDeviceIdentification": "Identification de l'appareil",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Désactiver l'alarme",
     "commandSetTimezone": "Régler le fuseau horaire",
     "commandRequestPhoto": "Demander une photo",
+    "commandPowerOff": "Eteindre l'appareil",
     "commandRebootDevice": "Redémarrer l'appareil",
     "commandSendSms": "Envoyer un SMS",
     "commandSendUssd": "Envoyer un USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Modifier la sauvegarde de courant",
     "commandModeDeepSleep": "Modifier le sommeil profond",
     "commandMovementAlarm": "Alarme mouvement",
-    "commandAlarmBattery": "Alarme batterie",
-    "commandAlarmSos": "Alarme SOS",
-    "commandAlarmRemove": "Retirer l'alarme",
-    "commandAlarmClock": "Alarme horloge",
-    "commandAlarmSpeed": "Alarme de dépassement de vitesse",
-    "commandAlarmFall": "Alarme échec",
-    "commandAlarmVibration": "Alarme vibration",
     "commandFrequency": "Fréquence",
     "commandTimezone": "Décalage horaire",
     "commandMessage": "Message",
@@ -305,61 +301,69 @@
     "commandServer": "Serveur",
     "commandPort": "Port",
     "eventAll": "Tous les événements",
-    "eventDeviceOnline": "L'appareil est en ligne",
-    "eventDeviceUnknown": "Le statut de l'appareil est inconnu",
-    "eventDeviceOffline": "L'appareil est hors-ligne",
-    "eventDeviceMoving": "L'appareil est en mouvement",
-    "eventDeviceStopped": "L'appareil s'est arrêté",
-    "eventDeviceOverspeed": "L'appareil dépasse la vitesse",
+    "eventDeviceOnline": "Statut: en ligne",
+    "eventDeviceUnknown": "Statut: inconnu",
+    "eventDeviceOffline": "Statut: hors ligne",
+    "eventDeviceMoving": "Appareil en mouvement",
+    "eventDeviceStopped": "Appareil arrêté",
+    "eventDeviceOverspeed": "Vitesse limite dépassée",
     "eventDeviceFuelDrop": "Perte de carburant",
     "eventCommandResult": "Résultat de la commande",
-    "eventGeofenceEnter": "L'appareil est entré dans un périmètre virtuel",
-    "eventGeofenceExit": "L'appareil est sorti d'un périmètre virtuel",
-    "eventAlarm": "Alarmes",
+    "eventGeofenceEnter": "Entrée dans le périmètre virtuel",
+    "eventGeofenceExit": "Sortie du périmètre virtuel",
+    "eventAlarm": "Alarme",
     "eventIgnitionOn": "Contact mis",
     "eventIgnitionOff": "Contact coupé",
     "eventMaintenance": "Entretien requis",
     "eventTextMessage": "Message textuel reçu",
-    "eventDriverChanged": "Le pilote a changé",
+    "eventDriverChanged": "Changement de conducteur",
     "eventsScrollToLast": "Faire défiler jusqu'à la fin",
-    "alarmSos": "Alarme SOS",
-    "alarmVibration": "Alarme vibration",
-    "alarmMovement": "Alarme mouvement",
-    "alarmOverspeed": "Alarme de survitesse",
-    "alarmFallDown": "Alarme de chute",
-    "alarmLowBattery": "Alarme de batterie faible",
-    "alarmLowPower": "Alarme de puissance faible",
-    "alarmFault": "Alarme de problème",
-    "alarmPowerOff": "Alarme d'extinction",
-    "alarmPowerOn": "Alarme de démarrage",
-    "alarmDoor": "Alarme de porte",
-    "alarmGeofence": "Alarme de barrière géographique",
-    "alarmGeofenceEnter": "Alarme d'entrée de barrière géographique",
-    "alarmGeofenceExit": "Alarme de sortie de barrière géographique",
-    "alarmGpsAntennaCut": "Alarme de coupure d'antenne GPS",
-    "alarmAccident": "Alarme accident",
-    "alarmTow": "Alarme remorquage",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Alarme d'accélération brusque",
-    "alarmHardBraking": "Alarme de freinage brusque",
-    "alarmFatigueDriving": "Alarme de fatigue",
-    "alarmPowerCut": "Alarme de coupure de courant",
-    "alarmPowerRestored": "Alarme de puissance restaurée",
-    "alarmJamming": "Alrame brouillage",
-    "alarmTemperature": "Alarme de température",
-    "alarmParking": "Alarme de parking",
-    "alarmShock": "Alarme de choc",
-    "alarmBonnet": "Alarme capot",
-    "alarmFootBrake": "Alarme de frein à pied",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Alarme d'altération",
-    "alarmRemoving": "Retrait de l'alarme",
+    "alarmGeneral": "Général",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibration",
+    "alarmMovement": "Mouvement",
+    "alarmLowspeed": "Basse vitesse",
+    "alarmOverspeed": "Vitesse trop haute",
+    "alarmFallDown": "Chute",
+    "alarmLowPower": "Tension basse",
+    "alarmLowBattery": "Batterie basse",
+    "alarmFault": "Défaut",
+    "alarmPowerOff": "Eteindre",
+    "alarmPowerOn": "Allumer",
+    "alarmDoor": "Porte",
+    "alarmLock": "Verrouiller",
+    "alarmUnlock": "Déverrouiller",
+    "alarmGeofence": "Périmètre virtuel",
+    "alarmGeofenceEnter": "Entrée dans le périmètre virtuel",
+    "alarmGeofenceExit": "Sortie du périmètre virtuel",
+    "alarmGpsAntennaCut": "Antenne GPS coupée",
+    "alarmAccident": "Accident",
+    "alarmTow": "Remorquage",
+    "alarmIdle": "Au repos",
+    "alarmHighRpm": "Tours par minute élevés",
+    "alarmHardAcceleration": "Accélération brusque",
+    "alarmHardBraking": "Freinage brusque",
+    "alarmHardCornering": "Virage sec",
+    "alarmLaneChange": "Changement de bande",
+    "alarmFatigueDriving": "Conduite en état de fatigue",
+    "alarmPowerCut": "Courant coupé",
+    "alarmPowerRestored": "Courant restauré",
+    "alarmJamming": "Brouillage",
+    "alarmTemperature": "Température",
+    "alarmParking": "Parking",
+    "alarmShock": "Choc",
+    "alarmBonnet": "Capot",
+    "alarmFootBrake": "Frein à pied",
+    "alarmFuelLeak": "Fuite de carburant",
+    "alarmTampering": "Altération",
+    "alarmRemoving": "Retrait",
     "notificationType": "Type de notification",
     "notificationAlways": "Tous les appareils",
-    "notificationNotificators": "Channels",
+    "notificationNotificators": "Canaux",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Route",
     "reportEvents": "Évènements",
     "reportTrips": "Trajets",
@@ -371,6 +375,7 @@
     "reportChartType": "Type de graphique",
     "reportShowMarkers": "Montrer les marqueurs",
     "reportExport": "Exporter",
+    "reportEmail": "Rapport par email",
     "reportPeriod": "Période",
     "reportCustom": "Personnalisé",
     "reportToday": "Aujourd'hui",
@@ -389,6 +394,8 @@
     "reportEndTime": "Date de fin",
     "reportEndAddress": "Adresse de fin",
     "reportSpentFuel": "Consommation de carburant",
+    "reportStartOdometer": "Départ de l'odomètre",
+    "reportEndOdometer": "Arrêt de l'odomètre",
     "statisticsTitle": "Statistiques",
     "statisticsCaptureTime": "Heure de capture",
     "statisticsActiveUsers": "Utilisateurs actifs",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Camion",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Départ",
     "maintenancePeriod": "Période"
 }
\ No newline at end of file
diff --git a/web/l10n/he.json b/web/l10n/he.json
index c9275769..eb042ff7 100644
--- a/web/l10n/he.json
+++ b/web/l10n/he.json
@@ -1,17 +1,17 @@
 {
-    "sharedLoading": "בטעינה...",
+    "sharedLoading": "טוען...",
     "sharedHide": "הסתר",
-    "sharedSave": "שמור",
-    "sharedSet": "הגדר",
+    "sharedSave": "שמירה",
+    "sharedSet": "הגדרה",
     "sharedCancel": "ביטול",
-    "sharedAdd": "הוסף",
-    "sharedEdit": "ערוך",
-    "sharedRemove": "הסר",
-    "sharedRemoveConfirm": "הסר פריט",
+    "sharedAdd": "הוספה",
+    "sharedEdit": "עריכה",
+    "sharedRemove": "הסרה",
+    "sharedRemoveConfirm": "הסרת פריט",
     "sharedKm": "ק\"מ",
     "sharedMi": "מייל",
     "sharedNmi": "nmi",
-    "sharedKn": "kn",
+    "sharedKn": "קשר",
     "sharedKmh": "ק\"מ/שעה",
     "sharedMph": "מייל/שעה",
     "sharedHour": "שעה",
@@ -29,88 +29,88 @@
     "sharedGeofence": "גדר וירטואלית",
     "sharedGeofences": "גדרות וירטואליות",
     "sharedNotifications": "התראות",
-    "sharedNotification": "Notification",
-    "sharedAttributes": "מאפיינים",
-    "sharedAttribute": "מאפיין",
-    "sharedDrivers": "Drivers",
-    "sharedDriver": "Driver",
+    "sharedNotification": "התראה",
+    "sharedAttributes": "תכונות",
+    "sharedAttribute": "תכונה",
+    "sharedDrivers": "נהגים",
+    "sharedDriver": "נהג",
     "sharedArea": "איזור",
     "sharedSound": "צליל התראה",
     "sharedType": "סוג",
     "sharedDistance": "מרחק",
     "sharedHourAbbreviation": "ש'",
     "sharedMinuteAbbreviation": "דק'",
-    "sharedSecondAbbreviation": "s",
+    "sharedSecondAbbreviation": "שנ'",
     "sharedVoltAbbreviation": "V",
-    "sharedLiterAbbreviation": "l",
-    "sharedGallonAbbreviation": "gal",
-    "sharedLiter": "Liter",
-    "sharedImpGallon": "Imp. Gallon",
-    "sharedUsGallon": "U.S. Gallon",
-    "sharedLiterPerHourAbbreviation": "l/h",
+    "sharedLiterAbbreviation": "ל",
+    "sharedGallonAbbreviation": "גלון",
+    "sharedLiter": "ליטר",
+    "sharedImpGallon": "גלון",
+    "sharedUsGallon": "גלון",
+    "sharedLiterPerHourAbbreviation": "ליטר/ שעה",
     "sharedGetMapState": "הגדר מהמפה",
-    "sharedComputedAttribute": "Computed Attribute",
-    "sharedComputedAttributes": "Computed Attributes",
-    "sharedCheckComputedAttribute": "Check Computed Attribute",
-    "sharedExpression": "Expression",
-    "sharedDeviceDistance": "קילומטרז'",
-    "sharedDevice": "רכב",
+    "sharedComputedAttribute": "תכונה ממוחשבת",
+    "sharedComputedAttributes": "תכונה ממוחשבת",
+    "sharedCheckComputedAttribute": "בדוק תכונות ממוחשבות",
+    "sharedExpression": "ביטוי",
+    "sharedDevice": "התקן",
     "sharedTestNotification": "שלח הודעת בדיקה",
-    "sharedCalendar": "לוח זמנים",
-    "sharedCalendars": "לוחות זמנים",
+    "sharedCalendar": "יומן",
+    "sharedCalendars": "יומנים",
     "sharedFile": "קובץ",
     "sharedSelectFile": "בחר קובץ",
     "sharedPhone": "טלפון",
-    "sharedRequired": "חובה",
+    "sharedRequired": "נדרש",
     "sharedPreferences": "עדיפויות",
     "sharedPermissions": "הרשאות",
     "sharedExtra": "תוספת",
-    "sharedTypeString": "String",
-    "sharedTypeNumber": "Number",
-    "sharedTypeBoolean": "Boolean",
+    "sharedTypeString": "מחרוזת",
+    "sharedTypeNumber": "מספר",
+    "sharedTypeBoolean": "בוליאני",
     "sharedTimezone": "אזור זמן",
-    "sharedInfoTitle": "Info",
-    "sharedSavedCommand": "Saved Command",
-    "sharedSavedCommands": "Saved Commands",
-    "sharedNew": "New…",
-    "sharedShowAddress": "Show Address",
-    "sharedDisabled": "Disabled",
-    "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
-    "attributeSpeedLimit": "Speed Limit",
-    "attributePolylineDistance": "Polyline Distance",
-    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
-    "attributeWebReportColor": "Web: Report Color",
-    "attributeDevicePassword": "Device Password",
-    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "sharedInfoTitle": "פרטים",
+    "sharedSavedCommand": "פקודות שמורות",
+    "sharedSavedCommands": "פקודות שמורות",
+    "sharedNew": "חדש",
+    "sharedShowAddress": "הצג כתובת",
+    "sharedDisabled": "מושבת",
+    "sharedMaintenance": "תחזוקה",
+    "sharedDeviceAccumulators": "מצברים",
+    "sharedAlarms": "אזעקות",
+    "attributeSpeedLimit": "הגבלת מהירות",
+    "attributePolylineDistance": "מרחק מצולע",
+    "attributeReportIgnoreOdometer": "דוח : התעלם ממד המרחק",
+    "attributeWebReportColor": "אתר : בחר צבע",
+    "attributeDevicePassword": "סיסמת התקן ",
+    "attributeProcessingCopyAttributes": "עיבוד: העתקת תכונות",
     "attributeColor": "צבע",
-    "attributeWebLiveRouteLength": "Web: Live Route Length",
-    "attributeWebSelectZoom": "Web: Zoom On Select",
-    "attributeWebMaxZoom": "Web: Maximum Zoom",
-    "attributeMailSmtpHost": "Mail: SMTP Host",
-    "attributeMailSmtpPort": "Mail: SMTP Port",
-    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable",
-    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS Required",
-    "attributeMailSmtpSslEnable": "Mail: SMTP SSL Enable",
-    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Trust",
-    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL Protocols",
-    "attributeMailSmtpFrom": "Mail: SMTP From",
-    "attributeMailSmtpAuth": "Mail: SMTP Auth Enable",
-    "attributeMailSmtpUsername": "Mail: SMTP Username",
-    "attributeMailSmtpPassword": "Mail: SMTP Password",
-    "attributeUiDisableReport": "UI: Disable Report",
-    "attributeUiDisableEvents": "UI: Disable Events",
-    "attributeUiDisableVehicleFetures": "UI: Disable Vehicle Fetures",
-    "attributeUiDisableDrivers": "UI: Disable Drivers",
-    "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
-    "attributeUiDisableCalendars": "UI: Disable Calendars",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
-    "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
+    "attributeWebLiveRouteLength": "ממשק : אורך מסלול זמן אמת",
+    "attributeWebSelectZoom": "אתר : בחר הפעלת זום",
+    "attributeWebMaxZoom": "אתר :  זום מקסימלי",
+    "attributeMailSmtpHost": "כתובת שרת דואר SMTP",
+    "attributeMailSmtpPort": "שרת דואר: פורט גישה ",
+    "attributeMailSmtpStarttlsEnable": "אפשר מייל מאובטח באמצעות TLS",
+    "attributeMailSmtpStarttlsRequired": "נדרש SMTP STARTTLS ",
+    "attributeMailSmtpSslEnable": "אפשר SSL לשרת דואר",
+    "attributeMailSmtpSslTrust": "דואר:SMTP SSL Trust",
+    "attributeMailSmtpSslProtocols": "פרוטוקול חיבור SSL לשרת דואר",
+    "attributeMailSmtpFrom": "כתובת השולח ",
+    "attributeMailSmtpAuth": "אפשר אימות לSMTP",
+    "attributeMailSmtpUsername": "שם משתמש SMTP ",
+    "attributeMailSmtpPassword": "סיסמת SMTP",
+    "attributeUiDisableReport": "ממשק: בטל דוחות",
+    "attributeUiDisableEvents": "ממשק: בטל ארועים",
+    "attributeUiDisableVehicleFetures": "ממשק: בטל תכונות רכב",
+    "attributeUiDisableDrivers": "ממשק : בטל נהגים ",
+    "attributeUiDisableComputedAttributes": "ממשק : בטל תכונה ממוחשבת",
+    "attributeUiDisableCalendars": "ממשק : בטל יומנים",
+    "attributeUiDisableMaintenance": "אל תציג :תחזוקה",
+    "attributeUiHidePositionAttributes": "ממשק : הסתר מיקום תכונות",
     "errorTitle": "שגיאה",
-    "errorGeneral": "Invalid parameters or constraints violation",
+    "errorGeneral": "גורם לא בתוקף או הפרת אילוצים ",
     "errorConnection": "בעייה בחיבור",
     "errorSocket": "בעיית רשת",
-    "errorZero": "Can't be zero",
+    "errorZero": "ערך לא יכול להיות אפס",
     "userEmail": "אימייל",
     "userPassword": "סיסמה",
     "userAdmin": "מנהל",
@@ -119,7 +119,7 @@
     "userDeviceLimit": "מגבלת מכשירים",
     "userUserLimit": "מגבלת משתמשים",
     "userDeviceReadonly": "מכשירים - לקריאה בלבד",
-    "userLimitCommands": "Limit Commands",
+    "userLimitCommands": "הגבל פקודות ",
     "userToken": "אסימון",
     "loginTitle": "כניסה",
     "loginLanguage": "שפה",
@@ -151,9 +151,9 @@
     "settingsGroups": "קבוצות",
     "settingsServer": "שרת",
     "settingsUsers": "משתמשים",
-    "settingsDistanceUnit": "Distance Unit",
-    "settingsSpeedUnit": "Speed Unit",
-    "settingsVolumeUnit": "Volume Unit",
+    "settingsDistanceUnit": "יח מרחק",
+    "settingsSpeedUnit": "יח מהירות ",
+    "settingsVolumeUnit": "יחידת נפח",
     "settingsTwelveHourFormat": "פורמט של 12 שעות",
     "settingsCoordinateFormat": "פורמט קואורדינטות",
     "reportTitle": "דו\"חות",
@@ -174,28 +174,28 @@
     "positionAddress": "כתובת",
     "positionProtocol": "פרוטוקול",
     "positionDistance": "מרחק",
-    "positionRpm": "RPM",
-    "positionFuel": "Fuel",
-    "positionPower": "Power",
+    "positionRpm": "סל\"ד ",
+    "positionFuel": "דלק",
+    "positionPower": "כוח",
     "positionBattery": "סוללה",
-    "positionRaw": "Raw",
-    "positionIndex": "Index",
+    "positionRaw": "גלם",
+    "positionIndex": "אינדקס",
     "positionHdop": "HDOP",
     "positionVdop": "VDOP",
     "positionPdop": "PDOP",
-    "positionSat": "Satellites",
-    "positionSatVisible": "Visible Satellites",
+    "positionSat": "לווינים",
+    "positionSatVisible": "לווניינים בשימוש ",
     "positionRssi": "RSSI",
-    "positionGps": "GPS",
-    "positionRoaming": "Roaming",
+    "positionGps": "מערכת איתור לוונית ",
+    "positionRoaming": "נדידה",
     "positionEvent": "אירוע",
     "positionAlarm": "התראה",
     "positionStatus": "סטטוס",
     "positionOdometer": "מד מרחק",
-    "positionServiceOdometer": "Service Odometer",
-    "positionTripOdometer": "Trip Odometer",
+    "positionServiceOdometer": "טיפול לפי ספידומטר",
+    "positionTripOdometer": "מד מרחק נסיעה",
     "positionHours": "שעות",
-    "positionSteps": "Steps",
+    "positionSteps": "צעדים",
     "positionInput": "כניסה",
     "positionOutput": "יציאה",
     "positionBatteryLevel": "רמת הסוללה",
@@ -204,26 +204,26 @@
     "positionVersionFw": "גרסת קושחה",
     "positionVersionHw": "גרסת חומרה",
     "positionIgnition": "הצתה",
-    "positionFlags": "Flags",
+    "positionFlags": "איתות -סימון",
     "positionCharge": "טעינה",
-    "positionIp": "IP",
+    "positionIp": "כתובת IP",
     "positionArchive": "ארכיון",
-    "positionVin": "VIN",
-    "positionApproximate": "Approximate",
-    "positionThrottle": "Throttle",
+    "positionVin": "מס זיהוי רכב יצרן",
+    "positionApproximate": "משוער",
+    "positionThrottle": "מצערת",
     "positionMotion": "תנועה",
-    "positionArmed": "Armed",
+    "positionArmed": "דרוך",
     "positionAcceleration": "תאוצה",
     "positionDeviceTemp": "טמפרטורת המכשיר",
-    "positionOperator": "Operator",
-    "positionCommand": "Command",
+    "positionOperator": "מפעיל",
+    "positionCommand": "פקודה",
     "positionBlocked": "חסום",
-    "positionDtcs": "DTCs",
-    "positionObdSpeed": "OBD Speed",
-    "positionObdOdometer": "OBD Odometer",
-    "positionDriverUniqueId": "Driver Unique Id",
-    "positionImage": "Image",
-    "positionAudio": "Audio",
+    "positionDtcs": "מערכת תקשורת טקטית מבוזרת",
+    "positionObdSpeed": "מהירות לפי OBD",
+    "positionObdOdometer": "מד מרחק OBD",
+    "positionDriverUniqueId": "מזהה נהג יחודי",
+    "positionImage": "תמונה",
+    "positionAudio": "קול",
     "serverTitle": "הגדרות שרת",
     "serverZoom": "זום",
     "serverRegistration": "הרשמה",
@@ -231,29 +231,31 @@
     "serverForceSettings": "כפה הגדרות",
     "mapTitle": "מפה",
     "mapLayer": "שכבת מפה",
-    "mapCustom": "מפה בהתאמה",
-    "mapCarto": "Carto Basemaps",
-    "mapOsm": "Open Street Map",
-    "mapBingKey": "Bing Maps Key",
-    "mapBingRoad": "Bing Maps Road",
-    "mapBingAerial": "Bing Maps Aerial",
-    "mapBingHybrid": "Bing Maps Hybrid",
-    "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
-    "mapWikimedia": "Wikimedia",
+    "mapCustom": "מותאם  (XYZ)",
+    "mapCustomArcgis": "מפה מותאמת (ArcGIS)",
+    "mapCustomLabel": "מפה מותאמת ",
+    "mapCarto": "Carto Basemaps\n",
+    "mapOsm": "מפות OSM -הכי שוות ",
+    "mapBingKey": "מפתח מפות בינג",
+    "mapBingRoad": "מפות כביש בינג",
+    "mapBingAerial": "מפות אוויריות בינג",
+    "mapBingHybrid": "מפות היברדיות בינג",
+    "mapBaidu": "מפות סיניות ביידו",
+    "mapYandexMap": "מפות רוסיות Yandex",
+    "mapYandexSat": "מפות רוסיות לווין  Yandex",
+    "mapWikimedia": "ויקימדיה",
     "mapShapePolygon": "פוליגון",
     "mapShapeCircle": "מעגל",
-    "mapShapePolyline": "Polyline",
+    "mapShapePolyline": "צלע",
     "mapLiveRoutes": "מסלול נסיעה",
-    "mapPoiLayer": "POI Layer",
+    "mapPoiLayer": "שכבת נק' עניין",
     "stateTitle": "מצב",
     "stateName": "תכונה",
     "stateValue": "ערך",
     "commandTitle": "פקודה",
     "commandSend": "שליחה",
-    "commandSent": "הפקודה נשלחה",
-    "commandQueued": "Command has been queued",
+    "commandSent": "פקודה נשלחה",
+    "commandQueued": "הפקודה ממתינה ",
     "commandUnit": "יחידה",
     "commandCustom": "פקודה בהתאמה אישית",
     "commandDeviceIdentification": "זיהוי מכשיר",
@@ -266,100 +268,102 @@
     "commandAlarmDisarm": "נטרול אזעקה",
     "commandSetTimezone": "קבע איזור זמן",
     "commandRequestPhoto": "בקשה לתמונה",
+    "commandPowerOff": "כיבוי התקן ",
     "commandRebootDevice": "איתחול המכשיר",
     "commandSendSms": "שלח סמס",
-    "commandSendUssd": "Send USSD",
+    "commandSendUssd": "שלח נתוני שירות משלימים לא מובנים",
     "commandSosNumber": "קבע מספר חירום",
     "commandSilenceTime": "קבע משך זמן הדממה",
     "commandSetPhonebook": "הגדר ספר טלפונים",
     "commandVoiceMessage": "הודעה קולית",
     "commandOutputControl": "בקרת פלט",
-    "commandVoiceMonitoring": "Voice Monitoring",
-    "commandSetAgps": "Set AGPS",
-    "commandSetIndicator": "Set Indicator",
-    "commandConfiguration": "Configuration",
-    "commandGetVersion": "Get Version",
-    "commandFirmwareUpdate": "Update Firmware",
-    "commandSetConnection": "Set Connection",
-    "commandSetOdometer": "Set Odometer",
-    "commandGetModemStatus": "Get Modem Status",
-    "commandGetDeviceStatus": "Get Device Status",
-    "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",
+    "commandVoiceMonitoring": "האזנה ",
+    "commandSetAgps": "הפעל AGPS",
+    "commandSetIndicator": "הגדר מד ",
+    "commandConfiguration": "תצורה",
+    "commandGetVersion": "קבל גרסה",
+    "commandFirmwareUpdate": "עדכן גרסת חומרה",
+    "commandSetConnection": "הגדר תקשורת",
+    "commandSetOdometer": "הגדר מד מרחק",
+    "commandGetModemStatus": "הבא מצב מודם",
+    "commandGetDeviceStatus": "הבא מצב התקן ",
+    "commandModePowerSaving": "שינוי צריכת חשמל",
+    "commandModeDeepSleep": "שינוי שינה עמוקה",
+    "commandMovementAlarm": "התראת תזוזה",
     "commandFrequency": "תדירות",
-    "commandTimezone": "Timezone Offset",
+    "commandTimezone": "איזון אזור זמן ",
     "commandMessage": "הודעה",
-    "commandRadius": "Radius",
-    "commandEnable": "Enable",
+    "commandRadius": "רדיוס",
+    "commandEnable": "מאופשר",
     "commandData": "נתונים",
     "commandIndex": "אינדקס",
     "commandPhone": "טלפון",
-    "commandServer": "Server",
-    "commandPort": "Port",
+    "commandServer": "שרת",
+    "commandPort": "פורט",
     "eventAll": "כל ההתראות",
-    "eventDeviceOnline": "המכשיר און לין",
-    "eventDeviceUnknown": "מצב המכשיר אינו ידועה",
-    "eventDeviceOffline": "המכשיר מנותק",
-    "eventDeviceMoving": "המכשיר בתזוזה",
-    "eventDeviceStopped": "המכשיר עצר",
-    "eventDeviceOverspeed": "המכשיר עבר את המהירות המותרת",
-    "eventDeviceFuelDrop": "Fuel drop event",
+    "eventDeviceOnline": "מצב אונליין",
+    "eventDeviceUnknown": "מצב לא ידוע",
+    "eventDeviceOffline": "מצב מנותק",
+    "eventDeviceMoving": "ההתקן בתנועה",
+    "eventDeviceStopped": "ההתקן עצר",
+    "eventDeviceOverspeed": "חרג מהמהירות המותרת ",
+    "eventDeviceFuelDrop": "שחרור מיכל דלק",
     "eventCommandResult": "תוצאות הפקודה",
-    "eventGeofenceEnter": "המכשיר נכנס לתחום המוגדר",
-    "eventGeofenceExit": "המכשיר יצא מהתחום המוגדר",
-    "eventAlarm": "אזעקות",
-    "eventIgnitionOn": "התנעת הרכב",
-    "eventIgnitionOff": "כיבוי מנוע",
+    "eventGeofenceEnter": "נכנס אל האזור המתוחם",
+    "eventGeofenceExit": "יצא מהאזור המתוחם",
+    "eventAlarm": "התראה",
+    "eventIgnitionOn": "התנעה",
+    "eventIgnitionOff": "מנוע נכבה",
     "eventMaintenance": "תחזוקה נדרשת",
     "eventTextMessage": "התקבלה הודעת טקסט",
-    "eventDriverChanged": "Driver has changed",
-    "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "אתרעת SOS",
-    "alarmVibration": "אזעקת רטט",
-    "alarmMovement": "אזעקת תנועה",
-    "alarmOverspeed": "אזעקת מהירות יתר",
-    "alarmFallDown": "אזעקת נפילה",
-    "alarmLowBattery": "אזעקת סוללה חלשה",
-    "alarmLowPower": "התראת סוללה חלשה",
-    "alarmFault": "אזעקת שווא",
-    "alarmPowerOff": "התראת ניתוק עשמל",
-    "alarmPowerOn": "התראת חיבור עשמל",
-    "alarmDoor": "התראת פתיחת דלת",
-    "alarmGeofence": "התראת איזור מגודר",
-    "alarmGeofenceEnter": "התראת כניסה לאיזור מגודר",
-    "alarmGeofenceExit": "התראת יציאה מאיזור מגודר",
-    "alarmGpsAntennaCut": "התראת ניתוק אנטנה",
-    "alarmAccident": "התראה על תאונה",
-    "alarmTow": "התראה על גרירה",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "האצה פתאומית",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "התראת התעייפות",
-    "alarmPowerCut": "התראת ניתוק חשמל",
-    "alarmPowerRestored": "Power Restored Alarm",
-    "alarmJamming": "התראת Jamming",
-    "alarmTemperature": "התראת טמפרטורה גבוהה",
-    "alarmParking": "התראת חנייה",
-    "alarmShock": "Shock Alarm",
-    "alarmBonnet": "Bonnet Alarm",
-    "alarmFootBrake": "Foot Brake Alarm",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Tampering Alarm",
-    "alarmRemoving": "Removing Alarm",
+    "eventDriverChanged": "נהג הוחלף",
+    "eventsScrollToLast": "גלול אל האחרון",
+    "alarmGeneral": "כללי",
+    "alarmSos": "חירום",
+    "alarmVibration": "ויברציה",
+    "alarmMovement": "תנועה",
+    "alarmLowspeed": "מהירות נמוכה",
+    "alarmOverspeed": "עבר מהירות מותרת",
+    "alarmFallDown": "ליפול",
+    "alarmLowPower": "מצבר חלש",
+    "alarmLowBattery": "סוללה חלשה",
+    "alarmFault": "תקלה",
+    "alarmPowerOff": "כיבוי",
+    "alarmPowerOn": "הדלקה",
+    "alarmDoor": "דלת",
+    "alarmLock": "נעילה",
+    "alarmUnlock": "פתיחה",
+    "alarmGeofence": "גדר וירטואלית ",
+    "alarmGeofenceEnter": "נכנס לתחום המוגדר",
+    "alarmGeofenceExit": "יצא מהתחום המוגדר",
+    "alarmGpsAntennaCut": "ניתוק GPS",
+    "alarmAccident": "תאונה",
+    "alarmTow": "גרירה",
+    "alarmIdle": "מצב מנוחה",
+    "alarmHighRpm": "סלד גבוה",
+    "alarmHardAcceleration": "האצה קשה",
+    "alarmHardBraking": "בלם יד",
+    "alarmHardCornering": "פניה חדה",
+    "alarmLaneChange": "סטיה מהנתיב",
+    "alarmFatigueDriving": "עייפות נהיגה",
+    "alarmPowerCut": "ניתוק",
+    "alarmPowerRestored": "חשמל חזר",
+    "alarmJamming": "שיבוש",
+    "alarmTemperature": "טמפרטורה",
+    "alarmParking": "חניה",
+    "alarmShock": "בולם",
+    "alarmBonnet": "מכסה מנוע",
+    "alarmFootBrake": "בלם ",
+    "alarmFuelLeak": "דליפת דלק",
+    "alarmTampering": "מפריע",
+    "alarmRemoving": "מסיר",
     "notificationType": "סוג ההתראה",
-    "notificationAlways": "All Devices",
-    "notificationNotificators": "Channels",
-    "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
-    "notificatorSms": "SMS",
+    "notificationAlways": "כל ההתקנים",
+    "notificationNotificators": "ערוצים",
+    "notificatorWeb": "אתר",
+    "notificatorMail": "מייל",
+    "notificatorSms": "סמס",
+    "notificatorFirebase": "נייד",
     "reportRoute": "מסלול",
     "reportEvents": "אירועים",
     "reportTrips": "נסיעות",
@@ -371,14 +375,15 @@
     "reportChartType": "סוג תרשים",
     "reportShowMarkers": "הצג חצים",
     "reportExport": "יצוא",
-    "reportPeriod": "Period",
-    "reportCustom": "Custom",
-    "reportToday": "Today",
-    "reportYesterday": "Yesterday",
-    "reportThisWeek": "This Week",
-    "reportPreviousWeek": "Previous Week",
-    "reportThisMonth": "This Month",
-    "reportPreviousMonth": "Previous Month",
+    "reportEmail": "דוח במייל",
+    "reportPeriod": "תקופה",
+    "reportCustom": "מותאם אישית",
+    "reportToday": "היום",
+    "reportYesterday": "אתמול",
+    "reportThisWeek": "השבוע",
+    "reportPreviousWeek": "שבוע שעבר",
+    "reportThisMonth": "חודש נוכחי",
+    "reportPreviousMonth": "חודש קודם",
     "reportDeviceName": "שם המכשיר",
     "reportAverageSpeed": "מהירות ממוצעת",
     "reportMaximumSpeed": "מהירות מירבית",
@@ -389,6 +394,8 @@
     "reportEndTime": "זמן סיום",
     "reportEndAddress": "נקודת יעד",
     "reportSpentFuel": "צריכת דלק",
+    "reportStartOdometer": "ספידומטר קמ התחלתי",
+    "reportEndOdometer": "ספידומטר קמ סוף ",
     "statisticsTitle": "סטטיסטיקה",
     "statisticsCaptureTime": "פרק זמן",
     "statisticsActiveUsers": "משתמשים פעילים",
@@ -396,11 +403,11 @@
     "statisticsRequests": "בקשות",
     "statisticsMessagesReceived": "הודעות שהתקבלו",
     "statisticsMessagesStored": "הודעות שנשמרו",
-    "statisticsGeocoder": "Geocoder Requests",
-    "statisticsGeolocation": "Geolocation Requests",
+    "statisticsGeocoder": "בקשת מיקום גיאוגרפי\n",
+    "statisticsGeolocation": "בקשות מיקום גיאוגרפי",
     "categoryArrow": "חץ",
     "categoryDefault": "ברירת מחדל",
-    "categoryAnimal": "חייה",
+    "categoryAnimal": "חיה",
     "categoryBicycle": "אופניים",
     "categoryBoat": "סירה",
     "categoryBus": "אוטובוס",
@@ -414,11 +421,12 @@
     "categoryPlane": "מטוס",
     "categoryShip": "ספינה",
     "categoryTractor": "טרקטור",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "רכבת",
+    "categoryTram": "חשמלית ",
+    "categoryTrolleybus": "אוטובוס",
     "categoryTruck": "משאית",
-    "categoryVan": "Van",
-    "maintenanceStart": "Start",
-    "maintenancePeriod": "Period"
+    "categoryVan": "מסחרית",
+    "categoryScooter": "קטנוע",
+    "maintenanceStart": "התחל",
+    "maintenancePeriod": "פרק זמן "
 }
\ No newline at end of file
diff --git a/web/l10n/hi.json b/web/l10n/hi.json
index 216c8112..0613e1b7 100644
--- a/web/l10n/hi.json
+++ b/web/l10n/hi.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "गणना गुण",
     "sharedCheckComputedAttribute": "गणना गुण की जांच करें",
     "sharedExpression": "अभिव्यक्ति",
-    "sharedDeviceDistance": "उपकरण दूरी",
     "sharedDevice": "उपकरण",
     "sharedTestNotification": "कसौटी अधिसूचना भेजें",
     "sharedCalendar": "कैलेंडर",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "पता दिखाएं",
     "sharedDisabled": "अक्षम करें",
     "sharedMaintenance": "रखरखाव",
-    "sharedMaintenances": "रखरखाव",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "गति सीमा",
     "attributePolylineDistance": "पॉलीलाइन दूरी",
     "attributeReportIgnoreOdometer": "रिपोर्ट: ओडोमीटर को अनदेखा करें",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "यूआई: ड्राइवर्स को अक्षम करें",
     "attributeUiDisableComputedAttributes": "यूआई: गणना गुणों को अक्षम करें",
     "attributeUiDisableCalendars": "यूआई: कैलेंडर अक्षम करें",
-    "attributeUiDisableMaintenances": "यूआई: रखरखाव अक्षम करें",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "यूआई: स्थिति गुण छुपाएं",
     "errorTitle": "त्रुटि",
     "errorGeneral": "अमान्य पैरामीटर या बाधाओं का उल्लंघन",
@@ -231,7 +231,9 @@
     "serverForceSettings": "बल सेटिंग्स",
     "mapTitle": "मानचित्र",
     "mapLayer": "मानचित्र की परत",
-    "mapCustom": "विशिष्ट रूप से निर्मित मानचित्र",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "ओपन स्ट्रीट मानचित्र",
     "mapBingKey": "बिंग मैप्स की कुंजी",
@@ -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": "एसएमएस भेजें / प्रेषित करें",
     "commandSendUssd": "यूएसएसडी  कोड भेजें / प्रेषित करें",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "पावर सेविंग संशोधित करें",
     "commandModeDeepSleep": "गहरी नींद को संशोधित करें",
     "commandMovementAlarm": "Movement अलार्म",
-    "commandAlarmBattery": "बैटरी अलार्म",
-    "commandAlarmSos": "मुसीबत अलार्म",
-    "commandAlarmRemove": "Remove अलार्म",
-    "commandAlarmClock": "समय़ी अलार्म",
-    "commandAlarmSpeed": "गति सीमा से बाहर होने का अलार्म",
-    "commandAlarmFall": "असफलता अलार्म",
-    "commandAlarmVibration": "कंपन अलार्म",
     "commandFrequency": "फ्रीक्वेंसी / आवृत्ति",
     "commandTimezone": "टाइमज़ोन ऑफ़सेट",
     "commandMessage": "संदेश / मेसेज",
@@ -305,61 +301,69 @@
     "commandServer": "सर्वर",
     "commandPort": "पोर्ट",
     "eventAll": "सभी घटनाएँ / इवेंट्स",
-    "eventDeviceOnline": "उपकरण / उपकरण ऑनलाइन है",
-    "eventDeviceUnknown": "उपकरण की स्थिति अज्ञात है",
-    "eventDeviceOffline": "उपकरण / उपकरण ऑफ़लाइन है",
-    "eventDeviceMoving": "उपकरण / उपकरण गतिमान है",
-    "eventDeviceStopped": "उपकरण / उपकरण रुक गया  है",
-    "eventDeviceOverspeed": "उपकरण / उपकरण ने गति सीमा का उल्लंघन किया है",
-    "eventDeviceFuelDrop": "ईंधन ड्रॉप घटना",
+    "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": "इग्निशन ऑन / चालू  है",
-    "eventIgnitionOff": "इग्निशन ऑफ / बंद है",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "रखरखाव की आवश्यकता है",
     "eventTextMessage": "पाठ संदेश प्राप्त हुआ",
-    "eventDriverChanged": "चालक बदल गया है",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "अंतिम तक स्क्रॉल करें",
-    "alarmSos": "एसओएस / एमर्जेन्सी अलार्म",
-    "alarmVibration": "कंपन होने का अलार्म",
-    "alarmMovement": "गतिमय होने का अलार्म",
-    "alarmOverspeed": "गति सीमा से बाहर होने का अलार्म",
-    "alarmFallDown": "नीचे गिरने का अलार्म",
-    "alarmLowBattery": "बैटरी कम होने का अलार्म",
-    "alarmLowPower": "लोपावर अलार्म",
-    "alarmFault": "खराबी आने का अलार्म",
-    "alarmPowerOff": "पावर ऑफ अलार्म",
-    "alarmPowerOn": "पावर on अलार्म्",
-    "alarmDoor": "द्वार अलार्म्",
-    "alarmGeofence": "Geofence अलार्म्",
-    "alarmGeofenceEnter": "Geofence दर्ज अलार्म्",
-    "alarmGeofenceExit": "Geofence निकास अलार्म्",
-    "alarmGpsAntennaCut": "जीपीएस एंटीना कट अलार्म",
-    "alarmAccident": "दुर्घटना अलार्म",
-    "alarmTow": "रस्सा अलार्म",
-    "alarmIdle": "बेकार अलार्म",
-    "alarmHardAcceleration": "हार्ड त्वरण अलार्म",
-    "alarmHardBraking": "हार्ड ब्रेकिंग अलार्म",
-    "alarmFatigueDriving": "Fatigue Driving अलार्म",
-    "alarmPowerCut": "पावर कट अलार्म",
-    "alarmPowerRestored": "पावर बहाल अलार्म",
-    "alarmJamming": "Jamming अलार्म",
-    "alarmTemperature": "तापमान अलार्म",
-    "alarmParking": "पार्किंग अलार्म",
-    "alarmShock": "झटका अलार्म",
-    "alarmBonnet": "ढक्कन अलार्म",
-    "alarmFootBrake": "फुट ब्रेक अलार्म",
-    "alarmFuelLeak": "ईंधन रिसाव अलार्म",
-    "alarmTampering": "छेड़छाड़ अलार्म",
-    "alarmRemoving": "Removing अलार्म",
+    "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": "सभी उपकरण",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "मार्ग",
     "reportEvents": "घटनाएँ / इवेंट्स",
     "reportTrips": "यात्राएँ / ट्रिप्स",
@@ -371,6 +375,7 @@
     "reportChartType": "चार्ट टाइप",
     "reportShowMarkers": "मार्कर दिखाएं",
     "reportExport": "निर्यात",
+    "reportEmail": "Email Report",
     "reportPeriod": "अवधि",
     "reportCustom": "Custom",
     "reportToday": "आज",
@@ -389,6 +394,8 @@
     "reportEndTime": "अंतिम समय",
     "reportEndAddress": "अंत पता",
     "reportSpentFuel": "ईंधन खर्च",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "आंकड़े",
     "statisticsCaptureTime": "समय कैप्चर करें",
     "statisticsActiveUsers": "सक्रिय उपयोगकर्ता",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "ट्रक",
     "categoryVan": "वैन",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "प्रारंभ",
     "maintenancePeriod": "अवधि"
 }
\ No newline at end of file
diff --git a/web/l10n/hr.json b/web/l10n/hr.json
index 991557ed..cc070466 100644
--- a/web/l10n/hr.json
+++ b/web/l10n/hr.json
@@ -29,11 +29,11 @@
     "sharedGeofence": "Geo-ograda",
     "sharedGeofences": "Geo-ograde",
     "sharedNotifications": "Obavijesti",
-    "sharedNotification": "Notification",
+    "sharedNotification": "Obavijest",
     "sharedAttributes": "Atributi",
     "sharedAttribute": "Atribut",
-    "sharedDrivers": "Drivers",
-    "sharedDriver": "Driver",
+    "sharedDrivers": "Vozači",
+    "sharedDriver": "Vozač",
     "sharedArea": "Područje",
     "sharedSound": "Zvuk obavijesti",
     "sharedType": "Tip",
@@ -43,17 +43,16 @@
     "sharedSecondAbbreviation": "s",
     "sharedVoltAbbreviation": "V",
     "sharedLiterAbbreviation": "l",
-    "sharedGallonAbbreviation": "gal",
-    "sharedLiter": "Liter",
-    "sharedImpGallon": "Imp. Gallon",
-    "sharedUsGallon": "U.S. Gallon",
+    "sharedGallonAbbreviation": "galon",
+    "sharedLiter": "Litra",
+    "sharedImpGallon": "Imperijalni galon",
+    "sharedUsGallon": "američki galon",
     "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Dohvati stanje karte",
     "sharedComputedAttribute": "Izračunati atribut",
     "sharedComputedAttributes": "Izračunati atributi",
     "sharedCheckComputedAttribute": "Provjeri izračunati atribut",
     "sharedExpression": "Izraz",
-    "sharedDeviceDistance": "Udaljenost uređaja",
     "sharedDevice": "Uređaj",
     "sharedTestNotification": "Pošalji testnu obavijest",
     "sharedCalendar": "Kalendar",
@@ -70,13 +69,14 @@
     "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Vremenska zona",
     "sharedInfoTitle": "Info",
-    "sharedSavedCommand": "Saved Command",
-    "sharedSavedCommands": "Saved Commands",
-    "sharedNew": "New…",
-    "sharedShowAddress": "Show Address",
+    "sharedSavedCommand": "Snimljena naredba",
+    "sharedSavedCommands": "Snimljene naredbe",
+    "sharedNew": "Novo",
+    "sharedShowAddress": "Prikaži adresu",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Ograničenje brzine",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Izvještaj: ignoriraj kilometražu",
@@ -104,13 +104,13 @@
     "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": "Greška",
     "errorGeneral": "Nevažeći parametri ili kršenje ograničenja",
     "errorConnection": "Greška konekcije",
     "errorSocket": "WebSocket konekcijska greška",
-    "errorZero": "Can't be zero",
+    "errorZero": "Ne može biti nula.",
     "userEmail": "E-mail",
     "userPassword": "Lozinka",
     "userAdmin": "Administrator",
@@ -151,8 +151,8 @@
     "settingsGroups": "Grupe",
     "settingsServer": "Server",
     "settingsUsers": "Korisnici",
-    "settingsDistanceUnit": "Distance Unit",
-    "settingsSpeedUnit": "Speed Unit",
+    "settingsDistanceUnit": "Jedinica udaljenosti",
+    "settingsSpeedUnit": "Jedinica brzine",
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "12-satno vrijeme",
     "settingsCoordinateFormat": "Format koordinata",
@@ -183,11 +183,11 @@
     "positionHdop": "HDOP",
     "positionVdop": "VDOP",
     "positionPdop": "PDOP",
-    "positionSat": "Satellites",
-    "positionSatVisible": "Visible Satellites",
+    "positionSat": "Sateliti",
+    "positionSatVisible": "Vidljivi sateliti",
     "positionRssi": "RSSI",
     "positionGps": "GPS",
-    "positionRoaming": "Roaming",
+    "positionRoaming": "Roming",
     "positionEvent": "Događaj",
     "positionAlarm": "Alarm",
     "positionStatus": "Stanje",
@@ -195,7 +195,7 @@
     "positionServiceOdometer": "Kilometara do servisa",
     "positionTripOdometer": "Kilometraža puta",
     "positionHours": "Sati",
-    "positionSteps": "Steps",
+    "positionSteps": "Koraci",
     "positionInput": "Ulaz",
     "positionOutput": "Izlaz",
     "positionBatteryLevel": "Razina baterije",
@@ -216,7 +216,7 @@
     "positionAcceleration": "Ubrzavanje",
     "positionDeviceTemp": "Temperatura uređaja",
     "positionOperator": "Operater",
-    "positionCommand": "Command",
+    "positionCommand": "Naredba",
     "positionBlocked": "Blokirano",
     "positionDtcs": "DTC kodovi",
     "positionObdSpeed": "OBD brzina",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Nametni postavke",
     "mapTitle": "Karta",
     "mapLayer": "Sloj karte",
-    "mapCustom": "Prilagođena mapa",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -246,14 +248,14 @@
     "mapShapeCircle": "Krug",
     "mapShapePolyline": "Razlomljena linija",
     "mapLiveRoutes": "Rute uživo",
-    "mapPoiLayer": "POI Layer",
+    "mapPoiLayer": "Točke interesa sloj",
     "stateTitle": "Stanje",
     "stateName": "Atribut",
     "stateValue": "Vrijednost",
     "commandTitle": "Naredba",
     "commandSend": "Pošalji",
-    "commandSent": "Naredba poslana",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Jedinica",
     "commandCustom": "Prilagođena naredba",
     "commandDeviceIdentification": "Identifikacija uređaja",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Deaktiviraj alarm",
     "commandSetTimezone": "Postavi vremensku zonu",
     "commandRequestPhoto": "Zatraži sliku",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Ponovno pokretanje uređaja",
     "commandSendSms": "Pošalji SMS",
     "commandSendUssd": "Pošalji 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": "Alarm prekoračenja brzine",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "Učestalost",
     "commandTimezone": "Korekcija vremenske zone",
     "commandMessage": "Poruka",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Svi događaji",
-    "eventDeviceOnline": "Uređaj je na vezi",
-    "eventDeviceUnknown": "Status uređaja nepoznat",
-    "eventDeviceOffline": "Uređaj nije na vezi",
-    "eventDeviceMoving": "Uređaj se kreće",
-    "eventDeviceStopped": "Uređaj se zaustavio",
-    "eventDeviceOverspeed": "Uređaj je prekoračio brzinu",
-    "eventDeviceFuelDrop": "Pad goriva",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Rezultat naredbe",
-    "eventGeofenceEnter": "Uređaj je ušao u geo-ogradu",
-    "eventGeofenceExit": "Uređaj je izašao iz geo-ograde",
-    "eventAlarm": "Alarmi",
-    "eventIgnitionOn": "Vozilo upaljeno",
-    "eventIgnitionOff": "Vozilo ugašeno",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Potrebno održavanje",
     "eventTextMessage": "Primljena tekstualna poruka",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Pomakni na zadnji",
-    "alarmSos": "SOS Alarm",
-    "alarmVibration": "Alarm vibracija",
-    "alarmMovement": "Alarm kretanja",
-    "alarmOverspeed": "Alarm ograničenja brzine",
-    "alarmFallDown": "Alarm padanja",
-    "alarmLowBattery": "Alarm niske razine baterije",
-    "alarmLowPower": "Alarm niske razine napajanja",
-    "alarmFault": "Alarm pogreške",
-    "alarmPowerOff": "Alarm gašenja",
-    "alarmPowerOn": "Alarm paljenja",
-    "alarmDoor": "Alarm vrata",
-    "alarmGeofence": "Alarm geo-ograda",
-    "alarmGeofenceEnter": "Alarm ulaženja u geo-ograde",
-    "alarmGeofenceExit": "Alarm izlaženja iz geo-ograde",
-    "alarmGpsAntennaCut": "Alarm prekida GPS antene",
-    "alarmAccident": "Alarm nesreće",
-    "alarmTow": "Alarm šlepanja",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Alarm brzog ubrzavanja",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Alarm umora vozača",
-    "alarmPowerCut": "Alarm prekinutog napajanja",
-    "alarmPowerRestored": "Alarm uključenja napajanja",
-    "alarmJamming": "Alarm zastoja",
-    "alarmTemperature": "Alarm temperature",
-    "alarmParking": "Alarm parkiranja",
-    "alarmShock": "Alarm udarca",
-    "alarmBonnet": "Alarm haube",
-    "alarmFootBrake": "Alarm kočnice",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Alarm neovlaštenog izmjenjivanja",
-    "alarmRemoving": "Alarm otklanjanja",
+    "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": "Tip obavijesti",
     "notificationAlways": "All Devices",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Ruta",
     "reportEvents": "Događaji",
     "reportTrips": "Putovanja",
@@ -371,6 +375,7 @@
     "reportChartType": "Vrsta grafa",
     "reportShowMarkers": "Pokaži markere",
     "reportExport": "Izvoz",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "Vrijeme završetka",
     "reportEndAddress": "Završna adresa",
     "reportSpentFuel": "Potrošeno goriva",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistike",
     "statisticsCaptureTime": "Vrijeme dohvaćanja",
     "statisticsActiveUsers": "Aktivnih korisnika",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Kamion",
     "categoryVan": "Kombi",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/hu.json b/web/l10n/hu.json
index 3345bc9f..820b33f7 100644
--- a/web/l10n/hu.json
+++ b/web/l10n/hu.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Számított attribútumok",
     "sharedCheckComputedAttribute": "Számított attribútum ellenőrzése",
     "sharedExpression": "Kifejezés",
-    "sharedDeviceDistance": "Eszköz távolság",
     "sharedDevice": "Eszköz",
     "sharedTestNotification": "Próba értesítés küldése",
     "sharedCalendar": "Naptár",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Cím megjelenítése",
     "sharedDisabled": "Letiltva",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Sebesség határ",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Jelentés: Odométer figyelmen kívül hagyása",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Sofőrök letiltása",
     "attributeUiDisableComputedAttributes": "UI: Számított attribútumok letiltása",
     "attributeUiDisableCalendars": "UI: Naptárak letiltása",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Pozíciós attribútumok elrejtése",
     "errorTitle": "Hiba",
     "errorGeneral": "Érvénytelen paraméterek vagy integritási szabályok megsértése",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Erő beállítások",
     "mapTitle": "Térkép",
     "mapLayer": "Térkép réteg",
-    "mapCustom": "Egyéni térkép",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps kulcs",
@@ -252,8 +254,8 @@
     "stateValue": "Érték",
     "commandTitle": "Parancs",
     "commandSend": "Küld",
-    "commandSent": "A parancs elküldve",
-    "commandQueued": "A parancs várólistára került",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Egység",
     "commandCustom": "Egyedi parancs",
     "commandDeviceIdentification": "Eszköz azonosító",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Riasztó kikapcsolás",
     "commandSetTimezone": "Időzóna beállítás",
     "commandRequestPhoto": "Kép lekérés",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Eszköz újraindítása",
     "commandSendSms": "SMS küldés",
     "commandSendUssd": "USSD küldés",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Energiatakarékosság módosítása",
     "commandModeDeepSleep": "Mély alvás módosítása",
     "commandMovementAlarm": "Mozgás riasztás",
-    "commandAlarmBattery": "Akkumulátor riasztás",
-    "commandAlarmSos": "SOS Riasztás",
-    "commandAlarmRemove": "Riasztás eltávolítása",
-    "commandAlarmClock": "Idő riasztás",
-    "commandAlarmSpeed": "Riasztás Gyorshajtásról",
-    "commandAlarmFall": "Hiba riasztás",
-    "commandAlarmVibration": "Rezgés riasztás",
     "commandFrequency": "Frekvencia",
     "commandTimezone": "Időzóna eltoása",
     "commandMessage": "Üzenet",
@@ -305,61 +301,69 @@
     "commandServer": "Szerver",
     "commandPort": "Port",
     "eventAll": "Minden esemény",
-    "eventDeviceOnline": "Eszköz online",
-    "eventDeviceUnknown": "Eszköz státusza ismeretlen",
-    "eventDeviceOffline": "Eszköz offline",
-    "eventDeviceMoving": "Eszköz mozog",
-    "eventDeviceStopped": "Eszköz megállt",
-    "eventDeviceOverspeed": "Eszköz túllépte a sebességkorlátot",
-    "eventDeviceFuelDrop": "Üzemanyagszint esés",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Parancs eredmény",
-    "eventGeofenceEnter": "Eszköz belépett a geokerítésbe",
-    "eventGeofenceExit": "Eszköz kilépett a geokerítésből",
-    "eventAlarm": "Riasztások",
-    "eventIgnitionOn": "Gyújtás BE",
-    "eventIgnitionOff": "Gyújtás KI",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Karbantartás szükséges",
     "eventTextMessage": "Szöveges üzenet érkezett",
-    "eventDriverChanged": "Sofőr cserélve",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Utolsóhoz ugrás",
-    "alarmSos": "SOS Riasztás",
-    "alarmVibration": "Rezgés riasztás",
-    "alarmMovement": "Mozgás riasztás",
-    "alarmOverspeed": "Gyorshajtás riasztás",
-    "alarmFallDown": "Leesés riasztás",
-    "alarmLowBattery": "Lemerült riasztás",
-    "alarmLowPower": "Alacsony feszültség riasztás",
-    "alarmFault": "Sikertelen riasztás",
-    "alarmPowerOff": "Kikapcsolás riasztás",
-    "alarmPowerOn": "Bekapcsolás riasztás",
-    "alarmDoor": "Ajtó riasztás",
-    "alarmGeofence": "Geokerítés riasztás",
-    "alarmGeofenceEnter": "Geokerítésbe belépéskor riasztás",
-    "alarmGeofenceExit": "Geokerítésből kilépéskor riasztás",
-    "alarmGpsAntennaCut": "GPS antenna elvágás riasztás",
-    "alarmAccident": "Baleseti riasztás",
-    "alarmTow": "Vontatási riasztás",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Erős gyorsítás riasztás",
-    "alarmHardBraking": "Vészfékezés riasztás",
-    "alarmFatigueDriving": "Fáradt vezető riasztás",
-    "alarmPowerCut": "Áram elvágás riasztás",
-    "alarmPowerRestored": "Áramforrás helyreállt riasztás",
-    "alarmJamming": "Jelzavarási riasztás",
-    "alarmTemperature": "Hőmérséklet riasztás",
-    "alarmParking": "Parkolási riasztás",
-    "alarmShock": "Áramütés riasztás",
-    "alarmBonnet": "Motorháztető riasztás",
-    "alarmFootBrake": "Lábfék riasztás",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Illetéktelen riasztás",
-    "alarmRemoving": "Riasztás eltávolítása",
+    "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": "Értesítés Típusa",
     "notificationAlways": "Minden eszköz",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Útvonal",
     "reportEvents": "Események",
     "reportTrips": "Utazások",
@@ -371,6 +375,7 @@
     "reportChartType": "Diagram típusa",
     "reportShowMarkers": "Jelölők megjelenítése",
     "reportExport": "Exportálás",
+    "reportEmail": "Email Report",
     "reportPeriod": "Periódus",
     "reportCustom": "Egyéni",
     "reportToday": "Ma",
@@ -389,6 +394,8 @@
     "reportEndTime": "Megérkezés ideje",
     "reportEndAddress": "Megérkezés címe",
     "reportSpentFuel": "Elhasznált üzemanyag",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statisztika",
     "statisticsCaptureTime": "Rögzítés ideje",
     "statisticsActiveUsers": "Aktív felhasználók",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Kamion",
     "categoryVan": "Teherkocsi",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/id.json b/web/l10n/id.json
index 45125710..65086ee9 100644
--- a/web/l10n/id.json
+++ b/web/l10n/id.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Semua Atribut Terkomputerisasi",
     "sharedCheckComputedAttribute": "Pilih Atribut Terkomputerisasi",
     "sharedExpression": "Ekspresi",
-    "sharedDeviceDistance": "Jarak Perangkat",
     "sharedDevice": "Perangkat",
     "sharedTestNotification": "Kirim Test Notifikasi",
     "sharedCalendar": "Kalender",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Batas Kecepatan",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Laporan: Biarkan Odometer",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI : Nonaktifkan Antarmuka",
     "attributeUiDisableComputedAttributes": "UI : Nonaktifkan Computed Attributes",
     "attributeUiDisableCalendars": "UI : Nonaktifkan Kalender",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "errorTitle": "Bermasalah",
     "errorGeneral": "Semua Parameter Salah Atau Salah Aturan",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Semua Pengaturan Paksa",
     "mapTitle": "Peta",
     "mapLayer": "Layer Peta",
-    "mapCustom": "Peta Buatan",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Peta Carto",
     "mapOsm": "Peta Open Street",
     "mapBingKey": "Key Peta Bing",
@@ -252,8 +254,8 @@
     "stateValue": "Nilai",
     "commandTitle": "Perintah",
     "commandSend": "Kirim",
-    "commandSent": "Perintah Terkirim",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Unit",
     "commandCustom": "Perintah Buatan",
     "commandDeviceIdentification": "Identifikasi Perangkat",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Alarm Tidak Aktif",
     "commandSetTimezone": "Setel Zona Waktu",
     "commandRequestPhoto": "Permintaan Foto",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Hidupkan Ulang Perangkat",
     "commandSendSms": "Kirim SMS",
     "commandSendUssd": "Kirim USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Modify Power Saving",
     "commandModeDeepSleep": "Modify Deep Sleep",
     "commandMovementAlarm": "Movement Alarm",
-    "commandAlarmBattery": "Alarm Baterai",
-    "commandAlarmSos": "Alarm SOS",
-    "commandAlarmRemove": "Remove Alarm",
-    "commandAlarmClock": "Clock Alarm",
-    "commandAlarmSpeed": "Alarm Melebihi Kecepatan",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Alarm Getaran",
     "commandFrequency": "Frekuensi",
     "commandTimezone": "Zona Waktu Tidak Tepat",
     "commandMessage": "Pesan",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Semua Peristiwa",
-    "eventDeviceOnline": "Perangkat Online",
-    "eventDeviceUnknown": "Perangkat Tidak Diketahui",
-    "eventDeviceOffline": "Perangkat Offline",
-    "eventDeviceMoving": "Perangkat bergerak",
-    "eventDeviceStopped": "Perangkat Berhenti",
-    "eventDeviceOverspeed": "Perangkat Melebihi Kecepatan",
-    "eventDeviceFuelDrop": "Peristiwa BBM Berkurang",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Hasil Perintah",
-    "eventGeofenceEnter": "Perangkat Memasuki Batas Wilayah",
-    "eventGeofenceExit": "Perangkat Keluar Batas Wilayah",
-    "eventAlarm": "Semua Alarm",
-    "eventIgnitionOn": "Mesin Hidup",
-    "eventIgnitionOff": "Mesin Mati",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Perlu Perbaikan",
     "eventTextMessage": "Pesan Teks Diterima",
-    "eventDriverChanged": "Antarmuka berubah",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Bergulir Ke Terakhir",
-    "alarmSos": "Alarm Darurat",
-    "alarmVibration": "Alarm Getar",
-    "alarmMovement": "Alarm Pergerakan",
-    "alarmOverspeed": "Alarm Melebihi Kecepatan",
-    "alarmFallDown": "Alarm Jatuh",
-    "alarmLowBattery": "Alarm Baterai Lemah",
-    "alarmLowPower": "Alarm Tenaga Lemah",
-    "alarmFault": "Alarm Kesalahan",
-    "alarmPowerOff": "Matikan Alarm",
-    "alarmPowerOn": "Hidupkan Alarm",
-    "alarmDoor": "Alarm Pintu",
-    "alarmGeofence": "Alarm Batas Wilayah",
-    "alarmGeofenceEnter": "Alarm Masuk Batas Wilayah",
-    "alarmGeofenceExit": "Alarm Keluar Batas Wilayah",
-    "alarmGpsAntennaCut": "Alarm GPS Antenna Terputus",
-    "alarmAccident": "Alarm Kecelakaan",
-    "alarmTow": "Alarm Tow",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Alarm Ngebut",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Alarm Mengemudi Ugal-ugalan",
-    "alarmPowerCut": "Alarm Listrik Terputus",
-    "alarmPowerRestored": "Alarm Tenaga Dipulihkan",
-    "alarmJamming": "Alarm Pengacau Signal",
-    "alarmTemperature": "Alarm Suhu",
-    "alarmParking": "Alarm Parkir",
-    "alarmShock": "Alarm Kejut",
-    "alarmBonnet": "Alarm Kap Mesin",
-    "alarmFootBrake": "Alarm Rem",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Alarm Temper",
-    "alarmRemoving": "Alarm Dihapus",
+    "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": "Tipe Notifikasi",
     "notificationAlways": "All Devices",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Rute",
     "reportEvents": "Semua Peristiwa",
     "reportTrips": "Perjalanan",
@@ -371,6 +375,7 @@
     "reportChartType": "Tipe Grafik",
     "reportShowMarkers": "Tampilkan Tanda",
     "reportExport": "Ekspor",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "Waktu Akhir",
     "reportEndAddress": "Alamat Akhir",
     "reportSpentFuel": "BBM Terpakai",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistik",
     "statisticsCaptureTime": "Waktu Didapat",
     "statisticsActiveUsers": "Pengguna Aktif",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Truk",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/it.json b/web/l10n/it.json
index b796e3e1..5130c8a2 100644
--- a/web/l10n/it.json
+++ b/web/l10n/it.json
@@ -26,8 +26,8 @@
     "sharedName": "Nome",
     "sharedDescription": "Descrizione",
     "sharedSearch": "Cerca",
-    "sharedGeofence": "GeoRecinto",
-    "sharedGeofences": "GeoRecinto",
+    "sharedGeofence": "Geo Area",
+    "sharedGeofences": "Geo Area",
     "sharedNotifications": "Notifiche",
     "sharedNotification": "Notifica",
     "sharedAttributes": "Attributi",
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Attributi calcolati",
     "sharedCheckComputedAttribute": "Controllo attributo calcolato",
     "sharedExpression": "Espressione",
-    "sharedDeviceDistance": "Distanza dispositivo",
     "sharedDevice": "Dispositivo",
     "sharedTestNotification": "Invia Test Notifica",
     "sharedCalendar": "Calendario",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Mostra indirizzo",
     "sharedDisabled": "Disattivata",
     "sharedMaintenance": "Manutenzione",
-    "sharedMaintenances": "Manutenzioni",
+    "sharedDeviceAccumulators": "Accumulatori",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Limite di velocità",
     "attributePolylineDistance": "Distanza polylinea",
     "attributeReportIgnoreOdometer": "Rapporto: ignora odometro",
@@ -84,7 +84,7 @@
     "attributeDevicePassword": "Password dispositivo",
     "attributeProcessingCopyAttributes": "Elaborazione: copia attributi",
     "attributeColor": "Colore",
-    "attributeWebLiveRouteLength": "Web: lunghezza percorso live",
+    "attributeWebLiveRouteLength": "Web: lunghezza percorso diretta",
     "attributeWebSelectZoom": "Web: zoom su selezione",
     "attributeWebMaxZoom": "Web: zoom massimo",
     "attributeMailSmtpHost": "Mail: host SMTP",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: disattiva autisti",
     "attributeUiDisableComputedAttributes": "UI: disattiva attributi calcolati",
     "attributeUiDisableCalendars": "UI: disattiva calendari",
-    "attributeUiDisableMaintenances": "UI: disattiva manutenzioni",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: nascondi attributi posizione",
     "errorTitle": "Errore",
     "errorGeneral": "Parametri non validi o violazione dei vincoli",
@@ -127,7 +127,7 @@
     "loginLogin": "Accesso",
     "loginFailed": "Indirizzo email  o password errati",
     "loginCreated": "Un nuovo utente si e` registrato",
-    "loginLogout": "Logout",
+    "loginLogout": "Esci",
     "loginLogo": "Logo",
     "devicesAndState": "Dispositivi e stato",
     "deviceTitle": "Dispositivi",
@@ -174,7 +174,7 @@
     "positionAddress": "Indirizzo",
     "positionProtocol": "Protocollo",
     "positionDistance": "Distanza",
-    "positionRpm": "RPM",
+    "positionRpm": "Contagiri",
     "positionFuel": "Carburante",
     "positionPower": "Energia",
     "positionBattery": "Batteria",
@@ -185,7 +185,7 @@
     "positionPdop": "PDOP",
     "positionSat": "Satelliti",
     "positionSatVisible": "Satelliti visibili",
-    "positionRssi": "RSSI",
+    "positionRssi": "Segnale Gsm",
     "positionGps": "GPS",
     "positionRoaming": "Roaming",
     "positionEvent": "Evento",
@@ -197,7 +197,7 @@
     "positionHours": "Ore",
     "positionSteps": "Passi",
     "positionInput": "Ingresso",
-    "positionOutput": "Output",
+    "positionOutput": "Uscita",
     "positionBatteryLevel": "Livello batteria",
     "positionFuelConsumption": "Consumo carburante",
     "positionRfid": "RFID",
@@ -231,29 +231,31 @@
     "serverForceSettings": "Forza le impostazioni",
     "mapTitle": "Mappa",
     "mapLayer": "Livelli Mappa",
-    "mapCustom": "Mappa Personalizzata",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Mappe base di Carto",
     "mapOsm": "Open Street Map",
-    "mapBingKey": "Bing Maps Key",
-    "mapBingRoad": "Bing Maps Road",
-    "mapBingAerial": "Bing Maps Aerial",
-    "mapBingHybrid": "Bing Mappe ibrido",
+    "mapBingKey": "Bing Chiave Mappa",
+    "mapBingRoad": "Bing Mappa Stradale",
+    "mapBingAerial": "Bing Mappa Aerea",
+    "mapBingHybrid": "Bing Mappa ibrida",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
+    "mapYandexMap": "Yandex Mappa",
     "mapYandexSat": "Yandex Satellite",
     "mapWikimedia": "Wikimedia",
     "mapShapePolygon": "Poligono",
     "mapShapeCircle": "Cerchio",
     "mapShapePolyline": "Polylinea",
-    "mapLiveRoutes": "Tragitti live",
+    "mapLiveRoutes": "Diretta Tragitti",
     "mapPoiLayer": "Layer POI",
     "stateTitle": "Stato",
     "stateName": "Attributo",
     "stateValue": "Valore",
     "commandTitle": "Commando",
     "commandSend": "Invia",
-    "commandSent": "Commando inviato",
-    "commandQueued": "Il comando è in coda",
+    "commandSent": "Comando inviato",
+    "commandQueued": "Comando accodato",
     "commandUnit": "Unità",
     "commandCustom": "Comando personalizzato",
     "commandDeviceIdentification": "Identificativo dispositivo",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Disattiva Allarme",
     "commandSetTimezone": "Imposta Fuso Orario",
     "commandRequestPhoto": "Richiedi foto",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Riavvia dispositivo",
     "commandSendSms": "Invia SMS",
     "commandSendUssd": "Invia USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Modifica risparmio energetico",
     "commandModeDeepSleep": "Modifica sonno profondo",
     "commandMovementAlarm": "Allarme movimento",
-    "commandAlarmBattery": "Allarme batteria",
-    "commandAlarmSos": "Allarme SOS",
-    "commandAlarmRemove": "Rimuovi allarme",
-    "commandAlarmClock": "Allarme orologio",
-    "commandAlarmSpeed": "Allarme Velocità Elevata",
-    "commandAlarmFall": "Allarme guasto",
-    "commandAlarmVibration": "Allarme vibrazione",
     "commandFrequency": "Frequenza",
     "commandTimezone": "Differenza Fuso Orario",
     "commandMessage": "Messaggio",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Porta",
     "eventAll": "Tutti gli Eventi",
-    "eventDeviceOnline": "Dispositivo online",
-    "eventDeviceUnknown": "Stato del dispositivo sconosciuto",
-    "eventDeviceOffline": "Dispositivo offline",
+    "eventDeviceOnline": "Connesso al Server",
+    "eventDeviceUnknown": "Stato sconosciuto",
+    "eventDeviceOffline": "Disconnesso dal Server",
     "eventDeviceMoving": "Dispositivo in movimento",
-    "eventDeviceStopped": "Il dispositivo si è feramto",
-    "eventDeviceOverspeed": "Il dispositivo ha superato il limite di velocità",
-    "eventDeviceFuelDrop": "Evento perdita carburante",
+    "eventDeviceStopped": "Il dispositivo si è fermato",
+    "eventDeviceOverspeed": "Limite di velocità superato",
+    "eventDeviceFuelDrop": "Perdita di carburante",
     "eventCommandResult": "Risultato comando",
-    "eventGeofenceEnter": "Il dipositivo e` entrato nel GeoRecinto",
-    "eventGeofenceExit": "Il dipositivo e` uscito dal GeoRecinto",
-    "eventAlarm": "Allarmi",
-    "eventIgnitionOn": "Accensione è inserita",
-    "eventIgnitionOff": "Accensione è disinserita",
+    "eventGeofenceEnter": "Entrato nella Geo Area",
+    "eventGeofenceExit": "Uscito dalla Geo Area",
+    "eventAlarm": "Allarme",
+    "eventIgnitionOn": "Accensione inserita",
+    "eventIgnitionOff": "Accensione disinserita",
     "eventMaintenance": "Richiesta manutenzione",
     "eventTextMessage": "Messaggio di testo ricevuto",
-    "eventDriverChanged": "Il guidatore è cambiato",
-    "eventsScrollToLast": "Scorri fino all'utimo",
-    "alarmSos": "Allarme SOS",
-    "alarmVibration": "Allarme Vibrazione",
-    "alarmMovement": "Allarme Movimento",
-    "alarmOverspeed": "Allarme Velocità Elevata",
-    "alarmFallDown": "Allarme Caduta",
-    "alarmLowBattery": "Allarme Livello Batteria Basso",
-    "alarmLowPower": "Allarme BassaEnergia",
-    "alarmFault": "Allarme Guasto",
-    "alarmPowerOff": "Spegni Allarme",
-    "alarmPowerOn": "Accendi Allarme",
-    "alarmDoor": "Allarme Porta",
-    "alarmGeofence": "Geofence Allarme",
-    "alarmGeofenceEnter": "Geofence Entrata Allarme",
-    "alarmGeofenceExit": "Geofence Uscita Allarme",
-    "alarmGpsAntennaCut": "Antenna GPS Scollegata Allarme",
-    "alarmAccident": "Allarme Incidente",
-    "alarmTow": "Ferma Allarme",
-    "alarmIdle": "Allarme inattività",
-    "alarmHardAcceleration": "Allarme Accelerazione Brusca",
-    "alarmHardBraking": "Allarme frenata dura",
-    "alarmFatigueDriving": "Allarme Affaticamento Guidatore",
-    "alarmPowerCut": "Allarme Energia Scollegata",
-    "alarmPowerRestored": "Allarme Energia Ripristinata",
-    "alarmJamming": "Allarme Bloccato",
-    "alarmTemperature": "Allarme Temperatura",
-    "alarmParking": "Allarme Parcheggio",
-    "alarmShock": "Allarme Shock",
-    "alarmBonnet": "Allarme Serratura",
-    "alarmFootBrake": "Allarme Freno a Pedale",
-    "alarmFuelLeak": "Allarme perdita carburante",
-    "alarmTampering": "Allarme Manomissione",
-    "alarmRemoving": "Rimuovere Allarme",
-    "notificationType": "Tipo notica",
+    "eventDriverChanged": "Guidatore cambiato",
+    "eventsScrollToLast": "Scorri fino all'ultimo",
+    "alarmGeneral": "General",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibrazione",
+    "alarmMovement": "Movimento",
+    "alarmLowspeed": "Low Speed",
+    "alarmOverspeed": "Velocità elevata",
+    "alarmFallDown": "Fall Down",
+    "alarmLowPower": "Low Power",
+    "alarmLowBattery": "Low Battery",
+    "alarmFault": "Guasto",
+    "alarmPowerOff": "Spegni",
+    "alarmPowerOn": "Accendi",
+    "alarmDoor": "Porta",
+    "alarmLock": "Lock",
+    "alarmUnlock": "Unlock",
+    "alarmGeofence": "Geo Area",
+    "alarmGeofenceEnter": "Entrata Geo Area",
+    "alarmGeofenceExit": "Uscita Geo Area",
+    "alarmGpsAntennaCut": "Antenna GPS scollegata",
+    "alarmAccident": "Incidente",
+    "alarmTow": "Inclinazione",
+    "alarmIdle": "Inattivo",
+    "alarmHighRpm": "High RPM",
+    "alarmHardAcceleration": "Accelerazione brusca",
+    "alarmHardBraking": "Frenata brusca",
+    "alarmHardCornering": "Hard Cornering",
+    "alarmLaneChange": "Lane Change",
+    "alarmFatigueDriving": "Affaticamento guidatore",
+    "alarmPowerCut": "Energia scollegata",
+    "alarmPowerRestored": "Energia ripristinata",
+    "alarmJamming": "Disturbatore Frequenze",
+    "alarmTemperature": "Temperatura",
+    "alarmParking": "Parcheggio",
+    "alarmShock": "Incidente",
+    "alarmBonnet": "Cofano",
+    "alarmFootBrake": "Freno a pedale",
+    "alarmFuelLeak": "Perdita carburante",
+    "alarmTampering": "Manomissione",
+    "alarmRemoving": "Rimozione",
+    "notificationType": "Tipo notifica",
     "notificationAlways": "Tutti i dispositivi",
     "notificationNotificators": "Canali",
     "notificatorWeb": "Web",
     "notificatorMail": "Email",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Percorso",
     "reportEvents": "Eventi",
     "reportTrips": "Viaggi",
@@ -371,6 +375,7 @@
     "reportChartType": "Tipo Grafico",
     "reportShowMarkers": "Mostra i Markers",
     "reportExport": "Esporta",
+    "reportEmail": "Email Report",
     "reportPeriod": "Periodo",
     "reportCustom": "Personalizzato",
     "reportToday": "Oggi",
@@ -389,6 +394,8 @@
     "reportEndTime": "Ora di Arrivo",
     "reportEndAddress": "Indirizzo di Arrivo",
     "reportSpentFuel": "Carburante Consumato",
+    "reportStartOdometer": "Odometro Inizio",
+    "reportEndOdometer": "Odometro Fine",
     "statisticsTitle": "Statistiche",
     "statisticsCaptureTime": "Tempo di Cattura",
     "statisticsActiveUsers": "Utenti attivi",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Filobus",
     "categoryTruck": "Camion",
     "categoryVan": "Furgone",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Inizio",
     "maintenancePeriod": "Periodo"
 }
\ No newline at end of file
diff --git a/web/l10n/ja.json b/web/l10n/ja.json
index c8c6e024..29ed2ee2 100644
--- a/web/l10n/ja.json
+++ b/web/l10n/ja.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "算出属性",
     "sharedCheckComputedAttribute": "算出属性を確認",
     "sharedExpression": "式",
-    "sharedDeviceDistance": "デバイスの距離",
     "sharedDevice": "デバイス",
     "sharedTestNotification": "テスト通知を送信",
     "sharedCalendar": "カレンダー",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "住所を表示",
     "sharedDisabled": "無効",
     "sharedMaintenance": "メンテナンス",
-    "sharedMaintenances": "メンテナンス",
+    "sharedDeviceAccumulators": "蓄電池",
+    "sharedAlarms": "警報",
     "attributeSpeedLimit": "速度制限",
     "attributePolylineDistance": "経路距離",
     "attributeReportIgnoreOdometer": "レポート: 走行距離計を無視する",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: ドライバーを無効にする",
     "attributeUiDisableComputedAttributes": "UI: 計算された属性を無効にする",
     "attributeUiDisableCalendars": "UI: カレンダーを無効にする",
-    "attributeUiDisableMaintenances": "メンテナンスを無効にする",
+    "attributeUiDisableMaintenance": "UI: メンテナンスを無効にする",
     "attributeUiHidePositionAttributes": "UI: 位置属性を非表示にする",
     "errorTitle": "エラー",
     "errorGeneral": "無効なパラメータまたは制約違反",
@@ -231,7 +231,9 @@
     "serverForceSettings": "強制的に設定",
     "mapTitle": "地図",
     "mapLayer": "使用する地図",
-    "mapCustom": "カスタム地図",
+    "mapCustom": "カスタム (XYZ)",
+    "mapCustomArcgis": "カスタム (ArcGIS)",
+    "mapCustomLabel": "カスタム地図",
     "mapCarto": "Cartoベースマップ",
     "mapOsm": "Open Streetマップ",
     "mapBingKey": "Bingマップキー",
@@ -252,8 +254,8 @@
     "stateValue": "値",
     "commandTitle": "コマンド",
     "commandSend": "送信",
-    "commandSent": "コマンドを送信しました",
-    "commandQueued": "コマンドをキューに入れました",
+    "commandSent": "コマンドを送信した。",
+    "commandQueued": "コマンド実行待ち",
     "commandUnit": "単位",
     "commandCustom": "カスタムコマンド",
     "commandDeviceIdentification": "デバイス ID",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "警報解除",
     "commandSetTimezone": "タイムゾーンを設定",
     "commandRequestPhoto": "写真をリクエスト",
+    "commandPowerOff": "デバイス電源 OFF",
     "commandRebootDevice": "デバイスを再起動",
     "commandSendSms": "SMSを送信",
     "commandSendUssd": "USSDを送信",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "パワーセーブの変更",
     "commandModeDeepSleep": "ディープスリープの変更",
     "commandMovementAlarm": "移動警報",
-    "commandAlarmBattery": "バッテリー警報",
-    "commandAlarmSos": "SOS警報",
-    "commandAlarmRemove": "警報の削除",
-    "commandAlarmClock": "時計アラーム",
-    "commandAlarmSpeed": "速度超過警報",
-    "commandAlarmFall": "フェイルアラーム",
-    "commandAlarmVibration": "振動警報",
     "commandFrequency": "周期",
     "commandTimezone": "世界標準時との時差",
     "commandMessage": "メッセージ",
@@ -305,61 +301,69 @@
     "commandServer": "サーバー",
     "commandPort": "ポート",
     "eventAll": "全てのイベント",
-    "eventDeviceOnline": "デバイスはオンラインです。",
-    "eventDeviceUnknown": "デバイスの状態が不明です",
-    "eventDeviceOffline": "デバイスはオフラインです。",
-    "eventDeviceMoving": "デバイスは移動中です。",
-    "eventDeviceStopped": "デバイスは停止中です。",
-    "eventDeviceOverspeed": "デバイスが速度超過しています。",
-    "eventDeviceFuelDrop": "燃料残量が低下しています。",
+    "eventDeviceOnline": "オンライン状態",
+    "eventDeviceUnknown": "状態不明",
+    "eventDeviceOffline": "オフライン状態",
+    "eventDeviceMoving": "デバイス移動中",
+    "eventDeviceStopped": "デバイス停止中",
+    "eventDeviceOverspeed": "速度制限を超過",
+    "eventDeviceFuelDrop": "燃料残量低下",
     "eventCommandResult": "コマンドの実行結果",
-    "eventGeofenceEnter": "デバイスがジオフェンスに入りました。",
-    "eventGeofenceExit": "デバイスがジオフェンスから出ました。",
+    "eventGeofenceEnter": "ジオフェンスに進入しました。",
+    "eventGeofenceExit": "ジオフェンスから退出しました。",
     "eventAlarm": "警報",
     "eventIgnitionOn": "イグニッション ON",
     "eventIgnitionOff": "イグニッション OFF",
     "eventMaintenance": "メンテナンスが必要です。",
     "eventTextMessage": "テキストメッセージを受信しました。",
-    "eventDriverChanged": "ドライバーが変更されました。",
+    "eventDriverChanged": "ドライバーが交代しました。",
     "eventsScrollToLast": "最後にスクロール",
-    "alarmSos": "SOS警報",
-    "alarmVibration": "振動警報",
-    "alarmMovement": "移動警報",
-    "alarmOverspeed": "速度超過警報",
-    "alarmFallDown": "転倒警報",
-    "alarmLowBattery": "バッテリー残量低下警報",
-    "alarmLowPower": "バッテリー残量低下警報",
-    "alarmFault": "測位失敗警報",
-    "alarmPowerOff": "電源OFF警報",
-    "alarmPowerOn": "電源ON警報",
-    "alarmDoor": "ドア警報",
-    "alarmGeofence": "ジオフェンス警報",
-    "alarmGeofenceEnter": "ジオフェンス進入警報",
-    "alarmGeofenceExit": "ジオフェンス退出警報",
-    "alarmGpsAntennaCut": "GPSアンテナ切断警報",
-    "alarmAccident": "事故警報",
-    "alarmTow": "レッカー移動警報",
-    "alarmIdle": "アイドリング警報",
-    "alarmHardAcceleration": "急加速警報",
-    "alarmHardBraking": "急ブレーキアラーム",
-    "alarmFatigueDriving": "過労運転警報",
-    "alarmPowerCut": "電源OFF警報",
-    "alarmPowerRestored": "電源回復警報",
-    "alarmJamming": "電波障害警報",
-    "alarmTemperature": "温度警報",
-    "alarmParking": "駐車警報",
-    "alarmShock": "衝撃検知警報",
-    "alarmBonnet": "ボンネット開閉警報",
-    "alarmFootBrake": "フットブレーキ警報",
-    "alarmFuelLeak": "燃料漏れ警報",
-    "alarmTampering": "窃盗警報",
-    "alarmRemoving": "警報の削除中",
+    "alarmGeneral": "全般",
+    "alarmSos": "SOS",
+    "alarmVibration": "振動",
+    "alarmMovement": "移動",
+    "alarmLowspeed": "低速",
+    "alarmOverspeed": "速度超過",
+    "alarmFallDown": "転倒",
+    "alarmLowPower": "電力低下",
+    "alarmLowBattery": "バッテリー残量低下",
+    "alarmFault": "測位失敗",
+    "alarmPowerOff": "電源 OFF",
+    "alarmPowerOn": "電源 ON",
+    "alarmDoor": "ドア",
+    "alarmLock": "ロック",
+    "alarmUnlock": "ロック解除",
+    "alarmGeofence": "ジオフェンス",
+    "alarmGeofenceEnter": "ジオフェンスに進入",
+    "alarmGeofenceExit": "ジオフェンスから退出",
+    "alarmGpsAntennaCut": "GPSアンテナ切断",
+    "alarmAccident": "事故",
+    "alarmTow": "牽引",
+    "alarmIdle": "アイドリング",
+    "alarmHighRpm": "高 RPM",
+    "alarmHardAcceleration": "急加速",
+    "alarmHardBraking": "急ブレーキ",
+    "alarmHardCornering": "急転回",
+    "alarmLaneChange": "車線変更",
+    "alarmFatigueDriving": "過労運転",
+    "alarmPowerCut": "電源カット",
+    "alarmPowerRestored": "電源が復旧した。",
+    "alarmJamming": "ジャミング",
+    "alarmTemperature": "温度",
+    "alarmParking": "駐車",
+    "alarmShock": "衝撃",
+    "alarmBonnet": "ボンネット",
+    "alarmFootBrake": "フットブレーキ",
+    "alarmFuelLeak": "燃料漏れ",
+    "alarmTampering": "窃盗",
+    "alarmRemoving": "取り外し",
     "notificationType": "通知の種別",
     "notificationAlways": "すべてのデバイス",
     "notificationNotificators": "チャンネル",
     "notificatorWeb": "Web",
     "notificatorMail": "メール",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "モバイル",
     "reportRoute": "移動経路",
     "reportEvents": "イベント",
     "reportTrips": "走行距離",
@@ -371,6 +375,7 @@
     "reportChartType": "表示するグラフ",
     "reportShowMarkers": "マーカーを表示",
     "reportExport": "エクスポート",
+    "reportEmail": "Eメールレポート",
     "reportPeriod": "期間",
     "reportCustom": "カスタム",
     "reportToday": "今日",
@@ -389,6 +394,8 @@
     "reportEndTime": "終了日時",
     "reportEndAddress": "到着地",
     "reportSpentFuel": "燃料消費量",
+    "reportStartOdometer": "走行距離計開始",
+    "reportEndOdometer": "走行距離計終了",
     "statisticsTitle": "統計",
     "statisticsCaptureTime": "位置補足時間",
     "statisticsActiveUsers": "稼働中ユーザー",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "トロリーバス",
     "categoryTruck": "トラック",
     "categoryVan": "バン",
+    "categoryScooter": "スクーター",
     "maintenanceStart": "メンテナンス開始",
     "maintenancePeriod": "メンテナンス終了"
 }
\ No newline at end of file
diff --git a/web/l10n/ka.json b/web/l10n/ka.json
index a5cca26c..1b1868dc 100644
--- a/web/l10n/ka.json
+++ b/web/l10n/ka.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 Key",
@@ -252,8 +254,8 @@
     "stateValue": "მნიშვნელობა",
     "commandTitle": "ბრძანება",
     "commandSend": "გაგზავნა",
-    "commandSent": "ბრძანება გაიგზავნა",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "ერთეული",
     "commandCustom": "Custom command",
     "commandDeviceIdentification": "Device Identification",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Disarm Alarm",
     "commandSetTimezone": "Set Timezone",
     "commandRequestPhoto": "Request Photo",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Reboot Device",
     "commandSendSms": "Send 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": "Overspeed Alarm",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "სიხშირე",
     "commandTimezone": "Timezone Offset",
     "commandMessage": "Message",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "All Events",
-    "eventDeviceOnline": "Device is online",
-    "eventDeviceUnknown": "Device status is unknown",
-    "eventDeviceOffline": "Device is offline",
-    "eventDeviceMoving": "Device is moving",
-    "eventDeviceStopped": "Device has stopped",
-    "eventDeviceOverspeed": "Device exceeds the speed",
-    "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": "Command result",
-    "eventGeofenceEnter": "Device has entered geofence",
-    "eventGeofenceExit": "Device has exited geofence",
-    "eventAlarm": "Alarms",
-    "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 Alarm",
-    "alarmVibration": "Vibration Alarm",
-    "alarmMovement": "Movement Alarm",
-    "alarmOverspeed": "Overspeed Alarm",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "LowBattery Alarm",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Fault Alarm",
-    "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": "Type of Notification",
     "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
diff --git a/web/l10n/kk.json b/web/l10n/kk.json
index 2d8902e1..71e7c538 100644
--- a/web/l10n/kk.json
+++ b/web/l10n/kk.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Computed Attributes",
     "sharedCheckComputedAttribute": "Check Computed Attribute",
     "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Құрылғы Жылдамдығы",
     "sharedDevice": "Құрылғы",
     "sharedTestNotification": "Тестілік Хабарландыру Жіберу",
     "sharedCalendar": "Күнтізбе",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Жылдамдықты Шектеу",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Есеп: одометр елемеу",
@@ -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": "Қолайсыз бұзылуы параметрлері немесе шектеулер",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Баптауды жылдамдату",
     "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": "СМС жіберу",
     "commandSendUssd": "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": "Уақытша аймақты жылжыту",
     "commandMessage": "Хабарлама",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Барлық",
-    "eventDeviceOnline": "Құрылғы желіде",
-    "eventDeviceUnknown": "Құрылғы мәртебесі белгісіз",
-    "eventDeviceOffline": "Құрылғы желіде жоқ",
-    "eventDeviceMoving": "Құрылғы қозғалады",
-    "eventDeviceStopped": "Құрылғы тоқтады",
-    "eventDeviceOverspeed": "Құрылғы жылдамдықты арттырады",
-    "eventDeviceFuelDrop": "Отын қысқарту оқиға",
+    "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": "ВКЛ жағу",
-    "eventIgnitionOff": "ВЫКЛ жағу",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Қызмет көрсету геозону",
     "eventTextMessage": "Мәтіндік хабарлама алынды",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "SOS дабыл",
-    "alarmVibration": "Вибрация қауіпі",
-    "alarmMovement": "Сигнал беру қауіпі",
-    "alarmOverspeed": "Жылдамдықты арттыру қауіпі",
-    "alarmFallDown": "Төмендеу қауіпі",
-    "alarmLowBattery": "Батареяны тоғынан ажырату қауіпі",
-    "alarmLowPower": "Төмен қуат деңгейі қауіпі",
-    "alarmFault": "Жарамсыздық қауіпі",
-    "alarmPowerOff": "Жарамсыздық қауіпі",
-    "alarmPowerOn": "Іске қосу қауіпі",
-    "alarmDoor": "Есік қауіпі",
-    "alarmGeofence": "Геозона қауіпі",
-    "alarmGeofenceEnter": "Геозонға кіру қауіпі",
-    "alarmGeofenceExit": "Геозонадан щығу қауіпі",
-    "alarmGpsAntennaCut": "GPS-антенналарды айыру қауіпі",
-    "alarmAccident": "Жол апаты қауіпі",
-    "alarmTow": "Тіркеп сүйреу қауіпі",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Оқыс жеделдету қауіпі",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Жүргізушінің шаршау қауіпі",
-    "alarmPowerCut": "Қуат көзі алып тастау қауіпі",
-    "alarmPowerRestored": "Қуат көзі келтірілді қауіпі",
-    "alarmJamming": "Өшіру қауіпі",
-    "alarmTemperature": "Температура қауіпі",
-    "alarmParking": "Көлік қою қауіпі",
-    "alarmShock": "Шок қауіпі",
-    "alarmBonnet": "Кақпақ қауіпі",
-    "alarmFootBrake": "Аяқ тежеуіш қауіпі",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Араласу қауіпі",
-    "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": "Бағыт",
     "reportEvents": "Оқиғалар",
     "reportTrips": "Сапарлар",
@@ -371,6 +375,7 @@
     "reportChartType": "Түр Диаграммалар",
     "reportShowMarkers": "Маркерлер көрсету",
     "reportExport": "Экспорт",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "Ақырғы уақыт",
     "reportEndAddress": "Ақырғы мекен-жай",
     "reportSpentFuel": "Отын пайдаланылды",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Статистика",
     "statisticsCaptureTime": "Жинау уақыты",
     "statisticsActiveUsers": "Белсенді қолданушылар",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Жүк автомобилі",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/km.json b/web/l10n/km.json
index d5855978..9e8cdf89 100644
--- a/web/l10n/km.json
+++ b/web/l10n/km.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Computed Attributes",
     "sharedCheckComputedAttribute": "Check Computed Attribute",
     "sharedExpression": "Expression",
-    "sharedDeviceDistance": "ចម្ងាយឧបករណ៍",
     "sharedDevice": "ឧបករណ៍",
     "sharedTestNotification": "Send Test Notification",
     "sharedCalendar": "ប្រតិទិន",
@@ -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": "ការកំណត់កម្លាំង",
     "mapTitle": "ផែនទី",
     "mapLayer": "ស្រទាប់ផែនទី",
-    "mapCustom": "ពាក្យបញ្ជាផ្ទាល់ខ្លួន",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "ផែនទីគោល Carto",
     "mapOsm": "Open Street Map",
     "mapBingKey": "គន្លឹះផែនទី Bing",
@@ -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": "ផ្ញើ 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": "តំបន់ពេលវេលា",
     "commandMessage": "សារ",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "ព្រឹត្តិការណ៍ទាំងអស់",
-    "eventDeviceOnline": "ឧបករណ៍លើបណ្តាញ",
-    "eventDeviceUnknown": "ស្ថានភាពឧបករណ៍គឺមិនស្គាល់",
-    "eventDeviceOffline": "ឧបករណ៍បានបិទ",
-    "eventDeviceMoving": "ឧបករណ៍ធ្វើចលនា",
-    "eventDeviceStopped": "ឧបករណ៍បានបញ្ឈប់",
-    "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": "ចំណុចបញ្ឆេះត្រូវបានបើក",
-    "eventIgnitionOff": "ចំណុចបញ្ឆេះត្រូវបានបិទ",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "ថែទាំត្រូវការជាចាំបាច់",
     "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": "ផ្លូវ",
     "reportEvents": "ព្រឹត្តិការណ៍",
     "reportTrips": "ការ​ធ្វើដំណើរ",
@@ -371,6 +375,7 @@
     "reportChartType": "ប្រភេទគំនូសតាង",
     "reportShowMarkers": "បង្ហាញសញ្ញាសម្គាល់",
     "reportExport": "ការនាំចេញ",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "ម៉ោងបញ្ចប់",
     "reportEndAddress": "អាសយដ្ឋានចុង",
     "reportSpentFuel": "ការចំណាយប្រេងឥន្ធនៈ",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "ស្ថិតិ",
     "statisticsCaptureTime": "ពេលការចាប់យក",
     "statisticsActiveUsers": "អ្នកប្រើប្រាស់សកម្ម",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "រថយន្តដឹកទំនិញ",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/ko.json b/web/l10n/ko.json
index 97b718b9..84dc4fa4 100644
--- a/web/l10n/ko.json
+++ b/web/l10n/ko.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Computed Attributes",
     "sharedCheckComputedAttribute": "Check Computed Attribute",
     "sharedExpression": "Expression",
-    "sharedDeviceDistance": "장치 거리",
     "sharedDevice": "장치",
     "sharedTestNotification": "테스트 알림 보내기",
     "sharedCalendar": "달력",
@@ -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": "강제설정",
     "mapTitle": "지도",
     "mapLayer": "지도 계층",
-    "mapCustom": "고객지도",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "카토 지도",
     "mapOsm": "열린거리지도",
     "mapBingKey": "빙 지도키",
@@ -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": "문자보내기",
     "commandSendUssd": "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": "시간대 옵셋",
     "commandMessage": "메세지",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "모든 이벤트",
-    "eventDeviceOnline": "장치는 온라인입니다.",
-    "eventDeviceUnknown": "장치상태는 모릅니다.",
-    "eventDeviceOffline": "장치는 오프라인입니다.",
-    "eventDeviceMoving": "장치는 움직입니다.",
-    "eventDeviceStopped": "장치가 멈췄습니다.",
-    "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": "점화 되었습니다.",
-    "eventIgnitionOff": "점화되지 않았습니다.",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "유지보수가 필요",
     "eventTextMessage": "텍스트 메세지 받았습니다.",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "긴급경보",
-    "alarmVibration": "진동 경보",
-    "alarmMovement": "운동 경보",
-    "alarmOverspeed": "과속 경보",
-    "alarmFallDown": "낙석 경보",
-    "alarmLowBattery": "낮은배터리 경보",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "실패 경보",
-    "alarmPowerOff": "전원 꺼짐 경보",
-    "alarmPowerOn": "전원 켜짐 경보",
-    "alarmDoor": "도어 경보",
-    "alarmGeofence": "보호지역 경보",
-    "alarmGeofenceEnter": "보호지역 진입 경보",
-    "alarmGeofenceExit": "보호지역 탈출 경보",
-    "alarmGpsAntennaCut": "GPS안테나 절단 경보",
-    "alarmAccident": "사고 경보",
-    "alarmTow": "견인 경보",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "하드 가속 경보",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "피로 운전 경보",
-    "alarmPowerCut": "파워 절단 경보",
-    "alarmPowerRestored": "Power Restored Alarm",
-    "alarmJamming": "방해 경보",
-    "alarmTemperature": "온도 경보",
-    "alarmParking": "주차 경보",
-    "alarmShock": "충격 경보",
-    "alarmBonnet": "보닛 경보",
-    "alarmFootBrake": "발 브레이크 경보",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "변조 경보",
-    "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": "노선",
     "reportEvents": "이벤트",
     "reportTrips": "여행",
@@ -371,6 +375,7 @@
     "reportChartType": "차트유형",
     "reportShowMarkers": "마커표시",
     "reportExport": "수출",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "종료시간",
     "reportEndAddress": "종료주소",
     "reportSpentFuel": "사용한 연료",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "통계",
     "statisticsCaptureTime": "캡처시간",
     "statisticsActiveUsers": "활동사용자",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "트럭",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
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
diff --git a/web/l10n/lt.json b/web/l10n/lt.json
index 0b67abff..d10978fc 100644
--- a/web/l10n/lt.json
+++ b/web/l10n/lt.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Apskaičiuoti parametrai",
     "sharedCheckComputedAttribute": "Patikrinti apskaičiuotą parametrą",
     "sharedExpression": "Išraiška",
-    "sharedDeviceDistance": "Prietaiso atstumas",
     "sharedDevice": "Prietaisas",
     "sharedTestNotification": "Siųsti bandomąjį perspėjimą",
     "sharedCalendar": "Kalendorius",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Rodyti adresą",
     "sharedDisabled": "Išjungtas",
     "sharedMaintenance": "Aptarnavimas",
-    "sharedMaintenances": "Aptarnavimai",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Greičio limitas",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Ataskaita: Ignoruoti odometrą",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Išjungti vairuotojus",
     "attributeUiDisableComputedAttributes": "UI: Išjungti apskaičiuotus parametrus",
     "attributeUiDisableCalendars": "UI: Išjungti kalendorius",
-    "attributeUiDisableMaintenances": "UI: Išjungti aptarnavimus",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Slėpti pozicijos adresą",
     "errorTitle": "Klaida",
     "errorGeneral": "Netinkami parametrai ar apribojimų pažeidimas",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Priverstiniai nustatymai",
     "mapTitle": "Žemėlapis",
     "mapLayer": "Žemėlapio sluoksnis",
-    "mapCustom": "Pasirinktinis Žemėlapis",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto žemėlapiai",
     "mapOsm": "Open Street žemėlapis",
     "mapBingKey": "Bing Maps raktas",
@@ -252,8 +254,8 @@
     "stateValue": "Reikšmė",
     "commandTitle": "Komanda",
     "commandSend": "Siųsti",
-    "commandSent": "Komanda buvo išsiųsta",
-    "commandQueued": "Komanda buvo padėta į eilę",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Vienetas",
     "commandCustom": "Vartotojo komanda",
     "commandDeviceIdentification": "Įrenginio identifikacija",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Nuimti signalą",
     "commandSetTimezone": "Nustatyti laiko zoną",
     "commandRequestPhoto": "Gauti nuotrauką",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Perkrauti prietaisą",
     "commandSendSms": "Siųsti SMS",
     "commandSendUssd": "Siųsti USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Keisti energijos taupymą",
     "commandModeDeepSleep": "Modifikuoti gilų budėjimą",
     "commandMovementAlarm": "Judesio signalas",
-    "commandAlarmBattery": "Baterijos signalas",
-    "commandAlarmSos": "SOS signalas",
-    "commandAlarmRemove": "Pašalinti signalą",
-    "commandAlarmClock": "Laikrodžio signalas",
-    "commandAlarmSpeed": "Greičio viršijimo signalas",
-    "commandAlarmFall": "Nesekmės signalas",
-    "commandAlarmVibration": "Vibracijos signalas",
     "commandFrequency": "Dažnis",
     "commandTimezone": "Laiko zonos pataisa",
     "commandMessage": "Žinutė",
@@ -305,61 +301,69 @@
     "commandServer": "Serveris",
     "commandPort": "Prievadas",
     "eventAll": "Visi įvykiai",
-    "eventDeviceOnline": "Prietaisas prisijungęs",
-    "eventDeviceUnknown": "Prietaiso būsena nežinoma",
-    "eventDeviceOffline": "Prietaisas neprisijungęs",
-    "eventDeviceMoving": "Prietaisas juda",
-    "eventDeviceStopped": "Prietaisas sustojo",
-    "eventDeviceOverspeed": "Prietaisas viršija greitį",
-    "eventDeviceFuelDrop": "Kuro lygio kritimas",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Komandos rezultatas",
-    "eventGeofenceEnter": "Prietaisas pateko į georibą",
-    "eventGeofenceExit": "Prietaisas paliko georibą",
-    "eventAlarm": "Signalai",
-    "eventIgnitionOn": "Degimas įjungtas",
-    "eventIgnitionOff": "Degimas išjungtas",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Aptarnavimo poreikis",
     "eventTextMessage": "Gauta tekstinė žinutė",
-    "eventDriverChanged": "Pasikeitė vairuotojas",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Slinkti iki paskutinio",
-    "alarmSos": "SOS signalas",
-    "alarmVibration": "Vibracijos signalas",
-    "alarmMovement": "Judėjimo signalas",
-    "alarmOverspeed": "Greičio viršijimo signalas",
-    "alarmFallDown": "Nukritimo signalas",
-    "alarmLowBattery": "Žemo baterijos lygio signalas",
-    "alarmLowPower": "Žemo maitinimo lygio signalas",
-    "alarmFault": "Klaidos signalas",
-    "alarmPowerOff": "Maitinimo išjungimo signalas",
-    "alarmPowerOn": "Maitinimo įjungimo signalas",
-    "alarmDoor": "Durų signalas",
-    "alarmGeofence": "Georibos signalas",
-    "alarmGeofenceEnter": "Georibos patekimo signalas",
-    "alarmGeofenceExit": "Georibos palikimo signalas",
-    "alarmGpsAntennaCut": "GPS antenos nutrūkimo signalas",
-    "alarmAccident": "Avarijos signalas",
-    "alarmTow": "Vilkimo signalas",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Didelės akseleracijos signalas",
-    "alarmHardBraking": "Staigaus stabdymo signalas",
-    "alarmFatigueDriving": "Varginančio važiavimo signalas",
-    "alarmPowerCut": "Maitinimo nutrūkimo signalas",
-    "alarmPowerRestored": "Maitinimo atstatymo signalas",
-    "alarmJamming": "Spūsties signalas",
-    "alarmTemperature": "Temperatūros signalas",
-    "alarmParking": "Parkavimo signalas",
-    "alarmShock": "Smūgio signalas",
-    "alarmBonnet": "Variklio dangčio signalas",
-    "alarmFootBrake": "Kojinio stabdžio signalas",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Pažeidimo signalas",
-    "alarmRemoving": "Pašalinamas signalas",
+    "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": "Įspėjimo tipas",
     "notificationAlways": "Visi prietaisai",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Maršrutas",
     "reportEvents": "Įvykiai",
     "reportTrips": "Kelionės",
@@ -371,6 +375,7 @@
     "reportChartType": "Diagramų tipai",
     "reportShowMarkers": "Rodyti žymeklius",
     "reportExport": "Eksportuoti",
+    "reportEmail": "Email Report",
     "reportPeriod": "Periodas",
     "reportCustom": "Custom",
     "reportToday": "Šiandien",
@@ -389,6 +394,8 @@
     "reportEndTime": "Pabaigos laikas",
     "reportEndAddress": "Pabaigos adresas",
     "reportSpentFuel": "Suvartoto kuro",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistika",
     "statisticsCaptureTime": "Užfiksuotas laikas",
     "statisticsActiveUsers": "Aktyvus vartotojai",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Vilkikas",
     "categoryVan": "Autobusiuskas",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Pradėti",
     "maintenancePeriod": "Periodas"
 }
\ No newline at end of file
diff --git a/web/l10n/lv.json b/web/l10n/lv.json
index a67f9e0b..cb210a6e 100644
--- a/web/l10n/lv.json
+++ b/web/l10n/lv.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Aprēķinātās vērtības",
     "sharedCheckComputedAttribute": "Pārbaudīt aprēķinātās vērtības",
     "sharedExpression": "Izteiksme",
-    "sharedDeviceDistance": "Ierīces attālums",
     "sharedDevice": "Ierīce",
     "sharedTestNotification": "Nosūtīt testa paziņojumu",
     "sharedCalendar": "Kalendārs",
@@ -76,9 +75,10 @@
     "sharedShowAddress": "Rādīt adresi",
     "sharedDisabled": "Atspējots",
     "sharedMaintenance": "Uzturēšana",
-    "sharedMaintenances": "Uzturēšana",
+    "sharedDeviceAccumulators": "Akumulatori",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Ātruma ierobežojums",
-    "attributePolylineDistance": "Polyline Distance",
+    "attributePolylineDistance": "Maršruta Distance",
     "attributeReportIgnoreOdometer": "Ziņojums: Ignorēt Odometru",
     "attributeWebReportColor": "Web: Atskaites krāsa",
     "attributeDevicePassword": "Ierīces parole",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Atslēgt vadītājus",
     "attributeUiDisableComputedAttributes": "UI: Atslēgt aprēķinātos atribūtus",
     "attributeUiDisableCalendars": "UI: Atslēgt kalendārus",
-    "attributeUiDisableMaintenances": "UI: Atslēgt uzturēšanu",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Slēpt pozīcijas atribūtus",
     "errorTitle": "Kļūda",
     "errorGeneral": "Kļūdaini parametri vai satur kļūdas",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Pāriestatīt Iestatījumus",
     "mapTitle": "Karte",
     "mapLayer": "Kartes slānis",
-    "mapCustom": "Pielāgota karte",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Kartes",
     "mapBingKey": "Bing Karšu Atslēga",
@@ -252,8 +254,8 @@
     "stateValue": "Vērtība",
     "commandTitle": "Komanda",
     "commandSend": "Sūtīt",
-    "commandSent": "Komanda ir nosūtīta",
-    "commandQueued": "Komanda ir ierindota",
+    "commandSent": "Komanda nosūtīta",
+    "commandQueued": "Komanda ierindota",
     "commandUnit": "Vienība",
     "commandCustom": "Pielāgota komanda",
     "commandDeviceIdentification": "Ierīces Identifikācija",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Izslēgt Trauksmi",
     "commandSetTimezone": "Iestatīt Laika Zonu",
     "commandRequestPhoto": "Pieprasīt Fotoattēlu",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Pārstartēt Ierīci",
     "commandSendSms": "Nosūtīt Īsziņu",
     "commandSendUssd": "Nosūtīt USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Izmainīt enerģijas taupīšanu",
     "commandModeDeepSleep": "Izmainīt dziļā miega režīmu",
     "commandMovementAlarm": "Kustības trauksme",
-    "commandAlarmBattery": "Baterijas trauksme",
-    "commandAlarmSos": "SOS trauksme",
-    "commandAlarmRemove": "Noņemt trauksmi",
-    "commandAlarmClock": "Pulksteņa trauksme",
-    "commandAlarmSpeed": "Ātruma Pārsniegšanas Signāls",
-    "commandAlarmFall": "Kļūdas trauksme",
-    "commandAlarmVibration": "Vibrācijas trauksme",
     "commandFrequency": "Biežums",
     "commandTimezone": "Laika Joslas Nobīde",
     "commandMessage": "Ziņa",
@@ -305,61 +301,69 @@
     "commandServer": "Serveris",
     "commandPort": "Ports",
     "eventAll": "Visi Notikumi",
-    "eventDeviceOnline": "Ierīce ir tiešsaistē",
-    "eventDeviceUnknown": "Ierīces statuss nav zināms",
-    "eventDeviceOffline": "Ierīce ir bezsaistē",
+    "eventDeviceOnline": "Statuss aktīvs",
+    "eventDeviceUnknown": "Statuss nezināms",
+    "eventDeviceOffline": "Statuss bezsaistē",
     "eventDeviceMoving": "Ierīce pārvietojas",
-    "eventDeviceStopped": "Ierīce ir apstājusies",
-    "eventDeviceOverspeed": "Ierīce pārsniedz ātrumu",
-    "eventDeviceFuelDrop": "Degvielas padeves notikums",
+    "eventDeviceStopped": "Ierīce apturēta",
+    "eventDeviceOverspeed": "Ātruma limits pārsniegts",
+    "eventDeviceFuelDrop": "Degvielas kritums",
     "eventCommandResult": "Komandas rezultāts",
-    "eventGeofenceEnter": "Ierīce ir apgabalā",
-    "eventGeofenceExit": "Ierīce pameta apgabalu",
-    "eventAlarm": "Trauksmes",
-    "eventIgnitionOn": "Aizdedze ir ieslēgta",
-    "eventIgnitionOff": "Aizdedze ir izslēgta",
+    "eventGeofenceEnter": "Ienāca apgabalā",
+    "eventGeofenceExit": "Pameta apgabalu",
+    "eventAlarm": "Trauksme",
+    "eventIgnitionOn": "Aizdedze Iesl.",
+    "eventIgnitionOff": "Aizdedze Izsl.",
     "eventMaintenance": "Nepieciešama tehniskā apkope",
     "eventTextMessage": "Saņemta īsziņa",
-    "eventDriverChanged": "Nomainījās vadītājs",
+    "eventDriverChanged": "Mainījies vadītājs",
     "eventsScrollToLast": "Ritināt Uz Pēdējo",
-    "alarmSos": "SOS Trauksme",
-    "alarmVibration": "Vibrācijas Trauksme",
-    "alarmMovement": "Kustības Trauksme",
-    "alarmOverspeed": "Ātruma Pārsniegšanas Trauksme",
-    "alarmFallDown": "Krišanas Trauksme",
-    "alarmLowBattery": "Izlādētas Baterijas Trauksme",
-    "alarmLowPower": "Nepietiekamas Barošanas Trauksme",
-    "alarmFault": "Kļūdas Trauksme",
-    "alarmPowerOff": "Atslēgšanas Trauksme",
-    "alarmPowerOn": "Ieslēgšanas Trauksme",
-    "alarmDoor": "Durvju Trauksme",
-    "alarmGeofence": "Apgabala Trauksme",
-    "alarmGeofenceEnter": "Apgabalā Ieiešanas Trauksme",
-    "alarmGeofenceExit": "Apgabala Pamešanas Trauksme",
-    "alarmGpsAntennaCut": "GPS Antenas Atvienošanas Trauksme",
-    "alarmAccident": "Negadījuma Trauksme",
-    "alarmTow": "Vilkšanas Trauksme",
-    "alarmIdle": "Dīkstāves trauksme",
-    "alarmHardAcceleration": "Straujas Ieskriešanās Trauksme",
-    "alarmHardBraking": "Smagas bremzēšanas trauksme",
-    "alarmFatigueDriving": "Noguruša Vadītāja Trauksme",
-    "alarmPowerCut": "Barošanas Atslēgšanas Trauksme",
-    "alarmPowerRestored": "Barošanas Atjaunošanas Trauksme",
-    "alarmJamming": "Sastrēguma Trauksme",
-    "alarmTemperature": "Temperatūras Trauksme",
-    "alarmParking": "Stāvēšanas Trauksme",
-    "alarmShock": "Trieciena Trauksme",
-    "alarmBonnet": "Motora Pārsega Trauksme",
-    "alarmFootBrake": "Kājas Bremžu Trauksme",
-    "alarmFuelLeak": "Degvielas noplūdes trauksme",
-    "alarmTampering": "Piekļuves Trauksme",
-    "alarmRemoving": "Noņemšanas Trauksme",
+    "alarmGeneral": "General",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibrācija",
+    "alarmMovement": "Kustība",
+    "alarmLowspeed": "Low Speed",
+    "alarmOverspeed": "Ātruma pārsniegšana",
+    "alarmFallDown": "Fall Down",
+    "alarmLowPower": "Low Power",
+    "alarmLowBattery": "Low Battery",
+    "alarmFault": "Kļūda",
+    "alarmPowerOff": "Barošana Izsl.",
+    "alarmPowerOn": "Barošana Iesl.",
+    "alarmDoor": "Durvis",
+    "alarmLock": "Lock",
+    "alarmUnlock": "Unlock",
+    "alarmGeofence": "Apgabals",
+    "alarmGeofenceEnter": "Ienākšana Apgabalā",
+    "alarmGeofenceExit": "Apgabala pamešana",
+    "alarmGpsAntennaCut": "GPS Antena Atvienota",
+    "alarmAccident": "Negadījums",
+    "alarmTow": "Vilkšana",
+    "alarmIdle": "Tukšgaita",
+    "alarmHighRpm": "High RPM",
+    "alarmHardAcceleration": "Straujšs paātrinājums",
+    "alarmHardBraking": "Strauja Bremzēšana",
+    "alarmHardCornering": "Hard Cornering",
+    "alarmLaneChange": "Lane Change",
+    "alarmFatigueDriving": "Neadekvāta Braukšana",
+    "alarmPowerCut": "Barošana Noslēgta",
+    "alarmPowerRestored": "Barošana Atjaunota",
+    "alarmJamming": "Sastrēgums",
+    "alarmTemperature": "Temperatūra",
+    "alarmParking": "Stāvvieta",
+    "alarmShock": "Trieciens",
+    "alarmBonnet": "Motora pārsegs",
+    "alarmFootBrake": "Kājas bremze",
+    "alarmFuelLeak": "Degvielas noplūde",
+    "alarmTampering": "Iespaido",
+    "alarmRemoving": "Noņem",
     "notificationType": "Ziņojuma Tips",
     "notificationAlways": "Visas ierīces",
-    "notificationNotificators": "Channels",
+    "notificationNotificators": "Kanāli",
     "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
+    "notificatorMail": "e-pasts",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Maršruts",
     "reportEvents": "Notikumi",
     "reportTrips": "Braucieni",
@@ -371,6 +375,7 @@
     "reportChartType": "Grafika Veids",
     "reportShowMarkers": "Rādīt Marķierus",
     "reportExport": "Eksportēt",
+    "reportEmail": "e-pasta Ziņojums",
     "reportPeriod": "Periods",
     "reportCustom": "Pielāgoti",
     "reportToday": "Šodien",
@@ -389,6 +394,8 @@
     "reportEndTime": "Beigu Laiks",
     "reportEndAddress": "Beigu Adrese",
     "reportSpentFuel": "Patērētā Degviela",
+    "reportStartOdometer": "Odometra sākums",
+    "reportEndOdometer": "Odometra beigas",
     "statisticsTitle": "Statistika",
     "statisticsCaptureTime": "Uzņemšanas Laiks",
     "statisticsActiveUsers": "Aktīvie Lietotāji",
@@ -414,11 +421,12 @@
     "categoryPlane": "Lidmašīna",
     "categoryShip": "Kuģis",
     "categoryTractor": "Traktors",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Vilciens",
+    "categoryTram": "Tramvajs",
+    "categoryTrolleybus": "Trolejbuss",
     "categoryTruck": "Smagā mašīna",
     "categoryVan": "Busiņš",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Sākt",
     "maintenancePeriod": "Periods"
 }
\ No newline at end of file
diff --git a/web/l10n/ml.json b/web/l10n/ml.json
index 065df11c..5f17b462 100644
--- a/web/l10n/ml.json
+++ b/web/l10n/ml.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "കമ്പ്യൂട്ടേഡ്‌ അട്രിബൂട്ടുകൾ ",
     "sharedCheckComputedAttribute": "കമ്പ്യൂട്ടേഡ്‌ അട്രീബൂട്ട് പരിശോധിക്കുക ",
     "sharedExpression": "എക്സ്പ്രെഷൻ ",
-    "sharedDeviceDistance": "വാഹനം ഓടിയ ദൂരം ",
     "sharedDevice": "വാഹനം",
     "sharedTestNotification": "ടെസ്റ്റ് നോട്ടിഫിക്കേഷൻ അയക്കുക ",
     "sharedCalendar": "കലണ്ടർ ",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "സ്പീഡ് ലിമിറ്റ്‌ ",
     "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": "പാരാമീറ്റർ  എറർ !",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Force Settings",
     "mapTitle": "ഭൂപടം",
     "mapLayer": "Map Layer",
-    "mapCustom": "Custom Map",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Value",
     "commandTitle": "Command",
     "commandSend": "Send",
-    "commandSent": "Command has been sent",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Unit",
     "commandCustom": "Custom command",
     "commandDeviceIdentification": "Device Identification",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Disarm Alarm",
     "commandSetTimezone": "Set Timezone",
     "commandRequestPhoto": "Request Photo",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Reboot Device",
     "commandSendSms": "Send 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": "Overspeed Alarm",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "Frequency",
     "commandTimezone": "Timezone Offset",
     "commandMessage": "Message",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "All Events",
-    "eventDeviceOnline": "Device is online",
-    "eventDeviceUnknown": "Device status is unknown",
-    "eventDeviceOffline": "Device is offline",
-    "eventDeviceMoving": "Device is moving",
-    "eventDeviceStopped": "Device has stopped",
-    "eventDeviceOverspeed": "Device exceeds the speed",
-    "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": "Command result",
-    "eventGeofenceEnter": "Device has entered geofence",
-    "eventGeofenceExit": "Device has exited geofence",
-    "eventAlarm": "Alarms",
-    "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 Alarm",
-    "alarmVibration": "Vibration Alarm",
-    "alarmMovement": "Movement Alarm",
-    "alarmOverspeed": "Overspeed Alarm",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "LowBattery Alarm",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Fault Alarm",
-    "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": "Type of Notification",
     "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
diff --git a/web/l10n/ms.json b/web/l10n/ms.json
index c59237f9..b83687e1 100644
--- a/web/l10n/ms.json
+++ b/web/l10n/ms.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": "Ralat",
     "errorGeneral": "Invalid parameters or constraints violation",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Force Settings",
     "mapTitle": "Peta",
     "mapLayer": "Map Layer",
-    "mapCustom": "Peta Lain",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Nilai",
     "commandTitle": "Arahan",
     "commandSend": "Hantar",
-    "commandSent": "Arahan telah dihantar",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Unit",
     "commandCustom": "Custom command",
     "commandDeviceIdentification": "Device Identification",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Disarm Alarm",
     "commandSetTimezone": "Set Timezone",
     "commandRequestPhoto": "Request Photo",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Reboot Device",
     "commandSendSms": "Send 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": "Overspeed Alarm",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "Frekuensi",
     "commandTimezone": "Timezone Offset",
     "commandMessage": "Message",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "All Events",
-    "eventDeviceOnline": "Device is online",
-    "eventDeviceUnknown": "Device status is unknown",
-    "eventDeviceOffline": "Device is offline",
-    "eventDeviceMoving": "Device is moving",
-    "eventDeviceStopped": "Device has stopped",
-    "eventDeviceOverspeed": "Device exceeds the speed",
-    "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": "Command result",
-    "eventGeofenceEnter": "Device has entered geofence",
-    "eventGeofenceExit": "Device has exited geofence",
-    "eventAlarm": "Alarms",
-    "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 Alarm",
-    "alarmVibration": "Vibration Alarm",
-    "alarmMovement": "Movement Alarm",
-    "alarmOverspeed": "Overspeed Alarm",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "LowBattery Alarm",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Fault Alarm",
-    "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": "Type of Notification",
     "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
diff --git a/web/l10n/nb.json b/web/l10n/nb.json
index 6d840ab1..5fa37685 100644
--- a/web/l10n/nb.json
+++ b/web/l10n/nb.json
@@ -30,7 +30,7 @@
     "sharedGeofences": "Geo-gjerder",
     "sharedNotifications": "Varsler",
     "sharedNotification": "Varsel",
-    "sharedAttributes": "Egenskaper",
+    "sharedAttributes": "Atributter",
     "sharedAttribute": "Egenskap",
     "sharedDrivers": "Sjåfører",
     "sharedDriver": "Sjåfør",
@@ -49,11 +49,10 @@
     "sharedUsGallon": "Amerikansk Gallon",
     "sharedLiterPerHourAbbreviation": "l/t",
     "sharedGetMapState": "Få karttilstand",
-    "sharedComputedAttribute": "Utregnede egenskaper",
-    "sharedComputedAttributes": "Utregnede egenskaper",
-    "sharedCheckComputedAttribute": "Sjekk utregnede egenskaper",
+    "sharedComputedAttribute": "Utregnede atributter",
+    "sharedComputedAttributes": "Utregnede atributter",
+    "sharedCheckComputedAttribute": "Sjekk utregnede atributter",
     "sharedExpression": "Uttrykk",
-    "sharedDeviceDistance": "Enhetsavstand",
     "sharedDevice": "Enhet",
     "sharedTestNotification": "Send testvarsling",
     "sharedCalendar": "Kalender",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Vis adresse",
     "sharedDisabled": "Deaktivert",
     "sharedMaintenance": "Vedlikehold",
-    "sharedMaintenances": "Vedlikehold",
+    "sharedDeviceAccumulators": "Målere",
+    "sharedAlarms": "Alarmer",
     "attributeSpeedLimit": "Fartsgrense",
     "attributePolylineDistance": "Polylinjedistanse",
     "attributeReportIgnoreOdometer": "Rapport: Ignorer odometer",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Deaktiver sjåfører",
     "attributeUiDisableComputedAttributes": "UI: Deaktiver utregnede egenskaper",
     "attributeUiDisableCalendars": "UI: Deaktiver kalendere",
-    "attributeUiDisableMaintenances": "UI: Deaktiver Vedlikehold",
+    "attributeUiDisableMaintenance": "UI: Deaktiver Vedlikehold",
     "attributeUiHidePositionAttributes": "UI: Skjul posisjonsegenskaper",
     "errorTitle": "Feil",
     "errorGeneral": "Ugyldige parametere eller begrensingsbrudd",
@@ -176,7 +176,7 @@
     "positionDistance": "Avstand",
     "positionRpm": "r/min",
     "positionFuel": "Drivstoff",
-    "positionPower": "Kraft",
+    "positionPower": "Spenning",
     "positionBattery": "Batteri",
     "positionRaw": "Rå",
     "positionIndex": "Register",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Tving innstillinger",
     "mapTitle": "Kart",
     "mapLayer": "Kartlag",
-    "mapCustom": "Egendefinert kart",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto basiskart",
     "mapOsm": "Open Street-kart",
     "mapBingKey": "Bing Maps-nøkkel",
@@ -252,7 +254,7 @@
     "stateValue": "Verdi",
     "commandTitle": "Kommando",
     "commandSend": "Send",
-    "commandSent": "Kommando har blitt sendt",
+    "commandSent": "Kommando er sent",
     "commandQueued": "Kommando er satt i kø",
     "commandUnit": "Enhet",
     "commandCustom": "Egendefinert kommando",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Slå alarm av",
     "commandSetTimezone": "Sett tidssone",
     "commandRequestPhoto": "Be om foto",
+    "commandPowerOff": "Skru av enhet",
     "commandRebootDevice": "Omstart enhet",
     "commandSendSms": "Send SMS",
     "commandSendUssd": "Send USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Endre strømsparing",
     "commandModeDeepSleep": "Endre dyp søvn",
     "commandMovementAlarm": "Bevegelsesalarm",
-    "commandAlarmBattery": "Batterialarm",
-    "commandAlarmSos": "SOS-Alarm",
-    "commandAlarmRemove": "Fjern alarm",
-    "commandAlarmClock": "Klokkealarm",
-    "commandAlarmSpeed": "Fartsgrensealarm",
-    "commandAlarmFall": "Feilalarm",
-    "commandAlarmVibration": "Vibrasjonsalarm",
     "commandFrequency": "Frekvens",
     "commandTimezone": "Tidszoneforskyvning",
     "commandMessage": "Melding",
@@ -305,61 +301,69 @@
     "commandServer": "Tjener",
     "commandPort": "Port",
     "eventAll": "Alle hendelser",
-    "eventDeviceOnline": "Enhet er tilkoblet",
-    "eventDeviceUnknown": "Enhetsstatus er ukjent",
-    "eventDeviceOffline": "Enhet er frakoblet",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Enhetsstatus ukjent",
+    "eventDeviceOffline": "Status offline",
     "eventDeviceMoving": "Enheten beveger seg",
-    "eventDeviceStopped": "Enheten har stoppet",
-    "eventDeviceOverspeed": "Enheten bryter fartsgrensen",
-    "eventDeviceFuelDrop": "Fall i drivstoff hendelse",
+    "eventDeviceStopped": "Enhet stoppet",
+    "eventDeviceOverspeed": "Fartsgrense overskredet",
+    "eventDeviceFuelDrop": "Drivstoffall",
     "eventCommandResult": "Kommandoresultat",
-    "eventGeofenceEnter": "Enheten har kommet inn i geo-gjerde",
-    "eventGeofenceExit": "Enheten har forlatt geo-gjerde",
-    "eventAlarm": "Alarmer",
-    "eventIgnitionOn": "Tenning er PÅ",
-    "eventIgnitionOff": "Tenning er AV",
+    "eventGeofenceEnter": "Ankommet geogjerde",
+    "eventGeofenceExit": "Forlatt geogjerde",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Tenning på",
+    "eventIgnitionOff": "Tenning av",
     "eventMaintenance": "Vedlikehold Kreves",
     "eventTextMessage": "Tekst melding mottatt",
     "eventDriverChanged": "Sjåfør endret",
     "eventsScrollToLast": "Vis siste",
-    "alarmSos": "SOS-alarm",
-    "alarmVibration": "Vibrasjonsalarm",
-    "alarmMovement": "Bevegelsesalarm",
-    "alarmOverspeed": "Fartsgrensealarm",
-    "alarmFallDown": "Fallalarm",
-    "alarmLowBattery": "Lavt-batteri-alarm",
-    "alarmLowPower": "Lavt-batteri-alarm",
-    "alarmFault": "Feilalarm",
-    "alarmPowerOff": "Strøm frakoblet-alarm",
-    "alarmPowerOn": "Strøm tilkoblet-alarm",
-    "alarmDoor": "Døralarm",
-    "alarmGeofence": "Geo-Gjerde Alarm",
-    "alarmGeofenceEnter": "Geo-gjerde innefor-alarm",
-    "alarmGeofenceExit": "Geo-gjerde utenfor-alarm",
-    "alarmGpsAntennaCut": "GPS-antenne fjernet-alarm",
-    "alarmAccident": "Ulykke-alarm",
-    "alarmTow": "Tauing-alarm",
-    "alarmIdle": "Tomgangsalarm",
-    "alarmHardAcceleration": "Hard akselerasjon-alarm",
-    "alarmHardBraking": "Hard oppbremsing-alarm",
-    "alarmFatigueDriving": "Tretthet-alarm",
-    "alarmPowerCut": "Strøm frakoblet-alarm",
-    "alarmPowerRestored": "Strøm gjenopprettet-alarm",
-    "alarmJamming": "Jamming-alarm",
-    "alarmTemperature": "Tempratur-alarm",
-    "alarmParking": "Parkering-alarm",
-    "alarmShock": "Vibrasjon-alarm",
-    "alarmBonnet": "Motorpanser-Alarm",
-    "alarmFootBrake": "Bremsepedal-alarm",
-    "alarmFuelLeak": "Drivstofflekasjealarm",
-    "alarmTampering": "Tuklingsalarm",
-    "alarmRemoving": "Fjern alarm",
+    "alarmGeneral": "Generell",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibrasjon",
+    "alarmMovement": "Bevegelse",
+    "alarmLowspeed": "Lav hastighet",
+    "alarmOverspeed": "Høgt turtall",
+    "alarmFallDown": "Fall",
+    "alarmLowPower": "Lite strøm",
+    "alarmLowBattery": "Lavt batterinivå",
+    "alarmFault": "Feil",
+    "alarmPowerOff": "Spenning av",
+    "alarmPowerOn": "Spenning På",
+    "alarmDoor": "Dør",
+    "alarmLock": "Lås",
+    "alarmUnlock": "lås opp",
+    "alarmGeofence": "Geo-gjerde",
+    "alarmGeofenceEnter": "Ankommet Geogjerde",
+    "alarmGeofenceExit": "Forlatt Geogjerde",
+    "alarmGpsAntennaCut": "GPS-Antenne Fjernet",
+    "alarmAccident": "Ulykke",
+    "alarmTow": "Tauing",
+    "alarmIdle": "Tomgang",
+    "alarmHighRpm": "Høyt turtall",
+    "alarmHardAcceleration": "Hard Akselerasjon",
+    "alarmHardBraking": "Hard Oppbremsing",
+    "alarmHardCornering": "Hard svingning",
+    "alarmLaneChange": "Filskifte",
+    "alarmFatigueDriving": "Tretthetskjøring",
+    "alarmPowerCut": "Spenning Kuttet",
+    "alarmPowerRestored": "Spenning Gjenopprettet",
+    "alarmJamming": "Jamming",
+    "alarmTemperature": "Tempratur",
+    "alarmParking": "Parkering",
+    "alarmShock": "Støt",
+    "alarmBonnet": "Panser",
+    "alarmFootBrake": "Bremsepedal",
+    "alarmFuelLeak": "Drivstofflekasje",
+    "alarmTampering": "Tukling",
+    "alarmRemoving": "Fjerner",
     "notificationType": "Varseltype",
     "notificationAlways": "Alle enheter",
-    "notificationNotificators": "Channels",
+    "notificationNotificators": "Kanaler",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobil",
     "reportRoute": "Rute",
     "reportEvents": "Hendelser",
     "reportTrips": "Turer",
@@ -371,6 +375,7 @@
     "reportChartType": "Diagramtype",
     "reportShowMarkers": "Vis markører",
     "reportExport": "Eksporter",
+    "reportEmail": "E-post-rapport",
     "reportPeriod": "Periode",
     "reportCustom": "Egendefinert",
     "reportToday": "Idag",
@@ -389,6 +394,8 @@
     "reportEndTime": "Sluttidspunkt",
     "reportEndAddress": "Sluttadresse",
     "reportSpentFuel": "Brukt drivstoff",
+    "reportStartOdometer": "Kilometerteller start",
+    "reportEndOdometer": "Kilometerteller stopp",
     "statisticsTitle": "Statistikk",
     "statisticsCaptureTime": "Opptakstidspunkt",
     "statisticsActiveUsers": "Aktive brukere",
@@ -414,11 +421,12 @@
     "categoryPlane": "Fly",
     "categoryShip": "Skip",
     "categoryTractor": "Traktor",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Tog",
+    "categoryTram": "Trikk",
+    "categoryTrolleybus": "Strømbuss",
     "categoryTruck": "Lastebil",
     "categoryVan": "Varebil",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Periode"
 }
\ No newline at end of file
diff --git a/web/l10n/ne.json b/web/l10n/ne.json
index c37ed483..63e7a4f1 100644
--- a/web/l10n/ne.json
+++ b/web/l10n/ne.json
@@ -19,7 +19,7 @@
     "sharedSecond": "सेकेन्ड ",
     "sharedDays": "दिन ",
     "sharedHours": "घण्टा ",
-    "sharedMinutes": "minutes",
+    "sharedMinutes": "मिनेट",
     "sharedDecimalDegrees": "डेसिमल डिग्री ",
     "sharedDegreesDecimalMinutes": "डिग्री डेसिमल मिनेट ",
     "sharedDegreesMinutesSeconds": "डिग्री मिनेट सेकेन्ड ",
@@ -27,19 +27,19 @@
     "sharedDescription": "विवरण ",
     "sharedSearch": "खोज्ने ",
     "sharedGeofence": "भू परिधि ",
-    "sharedGeofences": "भू परिधि ",
+    "sharedGeofences": "भू परिधिहरू ",
     "sharedNotifications": "सूचनाहरु ",
     "sharedNotification": "सूचना ",
-    "sharedAttributes": "एट्रिब्युट ",
-    "sharedAttribute": "एट्रिब्युट ",
+    "sharedAttributes": "विशेषताहरू",
+    "sharedAttribute": "विशेषता",
     "sharedDrivers": "चालकहरु ",
     "sharedDriver": "चालक ",
     "sharedArea": "क्षेत्र ",
     "sharedSound": "सूचना ध्वनि ",
-    "sharedType": "Type",
+    "sharedType": "प्रकार ",
     "sharedDistance": "दूरी ",
     "sharedHourAbbreviation": "घ ",
-    "sharedMinuteAbbreviation": "mi",
+    "sharedMinuteAbbreviation": "मि",
     "sharedSecondAbbreviation": "से ",
     "sharedVoltAbbreviation": "भोल्ट ",
     "sharedLiterAbbreviation": "ई",
@@ -49,42 +49,42 @@
     "sharedUsGallon": "अमेरिकी ग्यालन ",
     "sharedLiterPerHourAbbreviation": "ई/घ",
     "sharedGetMapState": "नक्साको स्थिति पाउने ",
-    "sharedComputedAttribute": "Computed Attribute",
-    "sharedComputedAttributes": "Computed Attributes",
-    "sharedCheckComputedAttribute": "Check Computed Attribute",
-    "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Device Distance",
-    "sharedDevice": "Device",
-    "sharedTestNotification": "Send Test Notification",
-    "sharedCalendar": "Calendar",
-    "sharedCalendars": "Calendars",
-    "sharedFile": "File",
-    "sharedSelectFile": "Select File",
-    "sharedPhone": "Phone",
-    "sharedRequired": "Required",
-    "sharedPreferences": "Preferences",
-    "sharedPermissions": "Permissions",
-    "sharedExtra": "Extra",
-    "sharedTypeString": "String",
-    "sharedTypeNumber": "Number",
-    "sharedTypeBoolean": "Boolean",
-    "sharedTimezone": "Timezone",
-    "sharedInfoTitle": "Info",
-    "sharedSavedCommand": "Saved Command",
-    "sharedSavedCommands": "Saved Commands",
-    "sharedNew": "New…",
-    "sharedShowAddress": "Show Address",
-    "sharedDisabled": "Disabled",
-    "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
-    "attributeSpeedLimit": "Speed Limit",
-    "attributePolylineDistance": "Polyline Distance",
-    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
-    "attributeWebReportColor": "Web: Report Color",
-    "attributeDevicePassword": "Device Password",
+    "sharedComputedAttribute": "गणना गरिएको विशेषता",
+    "sharedComputedAttributes": "गणना गरिएको विशेषताहरू",
+    "sharedCheckComputedAttribute": "गणना गरिएको विशेषता जाँच गर्नुहोस्",
+    "sharedExpression": "अभिव्यक्ति",
+    "sharedDevice": "यन्त्र ",
+    "sharedTestNotification": "परीक्षण सूचना पठाउनुहोस्",
+    "sharedCalendar": "पात्रो",
+    "sharedCalendars": "पात्रोहरू",
+    "sharedFile": "फाइल",
+    "sharedSelectFile": "फाइल चयन गर्नुहोस्",
+    "sharedPhone": "फोन",
+    "sharedRequired": "आवश्यक छ",
+    "sharedPreferences": "प्राथमिकताहरू",
+    "sharedPermissions": "अनुमतिहरू",
+    "sharedExtra": "अतिरिक्त",
+    "sharedTypeString": "स्ट्रिंग",
+    "sharedTypeNumber": "संख्या",
+    "sharedTypeBoolean": "बूलियन",
+    "sharedTimezone": "समय क्षेत्र",
+    "sharedInfoTitle": "जानकारी",
+    "sharedSavedCommand": "संचित आदेश",
+    "sharedSavedCommands": "संचित आदेशहरू",
+    "sharedNew": "नयाँ...",
+    "sharedShowAddress": "ठेगाना देखाउनुहोस्",
+    "sharedDisabled": "अक्षम",
+    "sharedMaintenance": "मर्मत",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
+    "attributeSpeedLimit": "गति सिमित",
+    "attributePolylineDistance": "बहुरेखा दूरि",
+    "attributeReportIgnoreOdometer": "प्रतिबेदन: ओडोमिटर वेवास्ता",
+    "attributeWebReportColor": "वेब: प्रतिबेदन रङ्ग",
+    "attributeDevicePassword": "यन्त्र गोप्य शब्द",
     "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
-    "attributeColor": "Color",
-    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeColor": "रङ्ग",
+    "attributeWebLiveRouteLength": "वेब: प्रत्यक्ष मार्ग लम्बाई",
     "attributeWebSelectZoom": "Web: Zoom On Select",
     "attributeWebMaxZoom": "Web: Maximum Zoom",
     "attributeMailSmtpHost": "Mail: SMTP Host",
@@ -98,13 +98,13 @@
     "attributeMailSmtpAuth": "Mail: SMTP Auth Enable",
     "attributeMailSmtpUsername": "Mail: SMTP Username",
     "attributeMailSmtpPassword": "Mail: SMTP Password",
-    "attributeUiDisableReport": "UI: Disable Report",
-    "attributeUiDisableEvents": "UI: Disable Events",
-    "attributeUiDisableVehicleFetures": "UI: Disable Vehicle Fetures",
-    "attributeUiDisableDrivers": "UI: Disable Drivers",
+    "attributeUiDisableReport": "UI: प्रतिबेदनअक्षम पार्नुहोस्",
+    "attributeUiDisableEvents": "UI: अक्षम घटनाहरू",
+    "attributeUiDisableVehicleFetures": "UI: अक्षम सवारी बिशेषताहरू",
+    "attributeUiDisableDrivers": "UI: अक्षम ड्राईभरहरू",
     "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
-    "attributeUiDisableCalendars": "UI: Disable Calendars",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
+    "attributeUiDisableCalendars": "UI: अक्षम पात्रो",
+    "attributeUiDisableMaintenance": "UI: अक्षम मर्मत",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "errorTitle": "त्रुटी",
     "errorGeneral": "Invalid parameters or constraints violation",
@@ -114,13 +114,13 @@
     "userEmail": "इ मेल ",
     "userPassword": "गोप्य शब्द ",
     "userAdmin": "ब्यबस्थापक",
-    "userRemember": "Remember",
-    "userExpirationTime": "Expiration",
-    "userDeviceLimit": "Device Limit",
-    "userUserLimit": "User Limit",
-    "userDeviceReadonly": "Device Readonly",
-    "userLimitCommands": "Limit Commands",
-    "userToken": "Token",
+    "userRemember": "सम्झनु",
+    "userExpirationTime": "मिति समाप्ति",
+    "userDeviceLimit": "यन्त्र सिमित",
+    "userUserLimit": "प्रयोगकर्ता सिमित",
+    "userDeviceReadonly": "यन्त्र पढ्ने मात्र",
+    "userLimitCommands": "सिमित आदेशहरू",
+    "userToken": "टोकन",
     "loginTitle": "लगिन गर्ने ",
     "loginLanguage": "भाषा ",
     "loginRegister": "दर्ता गर्ने",
@@ -128,37 +128,37 @@
     "loginFailed": "इ मेल वा गोप्य शब्द गलत भयो ",
     "loginCreated": "नया प्रयोगकर्ता दर्ता भयो ",
     "loginLogout": "बाहिरिने ",
-    "loginLogo": "Logo",
+    "loginLogo": "लोगो",
     "devicesAndState": "यन्त्रहरू तथा अवस्था ",
     "deviceTitle": "यन्त्रहरू ",
     "deviceIdentifier": "परिचायक ",
-    "deviceModel": "Model",
-    "deviceContact": "Contact",
-    "deviceCategory": "Category",
+    "deviceModel": "मोडेल",
+    "deviceContact": "सम्पर्क गर्नुहोस्",
+    "deviceCategory": "वर्ग",
     "deviceLastUpdate": "अन्तिम अपडेट ",
     "deviceCommand": "आदेश ",
     "deviceFollow": "पिछा गर्ने ",
-    "deviceTotalDistance": "Total Distance",
-    "deviceStatus": "Status",
-    "deviceStatusOnline": "Online",
-    "deviceStatusOffline": "Offline",
-    "deviceStatusUnknown": "Unknown",
-    "groupDialog": "Group",
-    "groupParent": "Group",
-    "groupNoGroup": "No Group",
-    "settingsTitle": "सेटिंग ",
+    "deviceTotalDistance": "कुल दूरि",
+    "deviceStatus": "स्थिति",
+    "deviceStatusOnline": "अनलाईन",
+    "deviceStatusOffline": "अफलाईन",
+    "deviceStatusUnknown": "अज्ञात",
+    "groupDialog": "समुह",
+    "groupParent": "समुह",
+    "groupNoGroup": "समुह नभएको",
+    "settingsTitle": "सेटिङ्ग ",
     "settingsUser": "खाता ",
-    "settingsGroups": "Groups",
+    "settingsGroups": "समुहहरू",
     "settingsServer": "सर्भर ",
     "settingsUsers": "प्रयोगकर्ताहरु ",
-    "settingsDistanceUnit": "Distance Unit",
-    "settingsSpeedUnit": "Speed Unit",
-    "settingsVolumeUnit": "Volume Unit",
-    "settingsTwelveHourFormat": "12-hour Format",
-    "settingsCoordinateFormat": "Coordinates Format",
+    "settingsDistanceUnit": "दूरि एकाई",
+    "settingsSpeedUnit": "गति एकाई",
+    "settingsVolumeUnit": "आयातन एकाई",
+    "settingsTwelveHourFormat": "12-घण्टे ढाचाँ",
+    "settingsCoordinateFormat": "निर्देशांक ढाचाँ",
     "reportTitle": "प्रतिबेदनहरु ",
     "reportDevice": "यन्त्र ",
-    "reportGroup": "Group",
+    "reportGroup": "समुह",
     "reportFrom": "बाट ",
     "reportTo": "सम्म ",
     "reportShow": "देखाउने ",
@@ -173,57 +173,57 @@
     "positionCourse": "दिशा ",
     "positionAddress": "ठेगाना ",
     "positionProtocol": "प्रोटोकल ",
-    "positionDistance": "Distance",
+    "positionDistance": "दूरि",
     "positionRpm": "RPM",
-    "positionFuel": "Fuel",
+    "positionFuel": "ईन्धन",
     "positionPower": "Power",
-    "positionBattery": "Battery",
+    "positionBattery": "ब्याट्री",
     "positionRaw": "Raw",
     "positionIndex": "Index",
     "positionHdop": "HDOP",
     "positionVdop": "VDOP",
     "positionPdop": "PDOP",
-    "positionSat": "Satellites",
-    "positionSatVisible": "Visible Satellites",
+    "positionSat": "भू-उपग्रहहरू",
+    "positionSatVisible": "देखिने भू-उपग्रहहरू",
     "positionRssi": "RSSI",
-    "positionGps": "GPS",
+    "positionGps": "जिपियस्",
     "positionRoaming": "Roaming",
-    "positionEvent": "Event",
+    "positionEvent": "घटना",
     "positionAlarm": "Alarm",
-    "positionStatus": "Status",
+    "positionStatus": "स्थिति",
     "positionOdometer": "Odometer",
     "positionServiceOdometer": "Service Odometer",
     "positionTripOdometer": "Trip Odometer",
-    "positionHours": "Hours",
-    "positionSteps": "Steps",
-    "positionInput": "Input",
+    "positionHours": "घण्टा",
+    "positionSteps": "पाइलाहरू",
+    "positionInput": "निवेश",
     "positionOutput": "Output",
     "positionBatteryLevel": "Battery Level",
-    "positionFuelConsumption": "Fuel Consumption",
+    "positionFuelConsumption": "इन्धन खपत",
     "positionRfid": "RFID",
-    "positionVersionFw": "Firmware Version",
-    "positionVersionHw": "Hardware Version",
+    "positionVersionFw": "फर्मवेयर संस्करण",
+    "positionVersionHw": "हार्डवेयर संस्करण",
     "positionIgnition": "Ignition",
     "positionFlags": "Flags",
     "positionCharge": "Charge",
     "positionIp": "IP",
     "positionArchive": "Archive",
     "positionVin": "VIN",
-    "positionApproximate": "Approximate",
+    "positionApproximate": "अनुमान",
     "positionThrottle": "Throttle",
     "positionMotion": "Motion",
     "positionArmed": "Armed",
     "positionAcceleration": "Acceleration",
-    "positionDeviceTemp": "Device Temperature",
-    "positionOperator": "Operator",
-    "positionCommand": "Command",
+    "positionDeviceTemp": "यन्त्र तापक्रम",
+    "positionOperator": "सञ्चालक",
+    "positionCommand": "आदेश",
     "positionBlocked": "Blocked",
     "positionDtcs": "DTCs",
-    "positionObdSpeed": "OBD Speed",
+    "positionObdSpeed": "OBD गति",
     "positionObdOdometer": "OBD Odometer",
     "positionDriverUniqueId": "Driver Unique Id",
-    "positionImage": "Image",
-    "positionAudio": "Audio",
+    "positionImage": "छवि",
+    "positionAudio": "ध्वनि",
     "serverTitle": "सर्भर सेटिंग",
     "serverZoom": "ठुलो बनाउने ",
     "serverRegistration": "दर्ता ",
@@ -231,33 +231,35 @@
     "serverForceSettings": "Force Settings",
     "mapTitle": "नक्शा ",
     "mapLayer": "नक्शा को तह ",
-    "mapCustom": "अनुकुल नक्शा ",
-    "mapCarto": "Carto Basemaps",
-    "mapOsm": "ओपन स्ट्रिट नक्शा ",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "अनुकूल नक्शा",
+    "mapCarto": "कार्टो आधारनक्सा",
+    "mapOsm": "ओपन सडक नक्शा ",
     "mapBingKey": "बिंग नक्शाको चाबी (कि) ",
     "mapBingRoad": "बिंग नक्शा (सडक)",
     "mapBingAerial": "बिंग नक्शा (एरियल)",
     "mapBingHybrid": "Bing Maps Hybrid",
-    "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
-    "mapWikimedia": "Wikimedia",
-    "mapShapePolygon": "Polygon",
-    "mapShapeCircle": "Circle",
-    "mapShapePolyline": "Polyline",
+    "mapBaidu": "बाईडु",
+    "mapYandexMap": "यान्डेक्स नक्सा",
+    "mapYandexSat": "यान्डेक्स भू-उपग्रह",
+    "mapWikimedia": "विकिमिडिया",
+    "mapShapePolygon": "बहुभुज",
+    "mapShapeCircle": "वृत्त",
+    "mapShapePolyline": "बहुरेखा",
     "mapLiveRoutes": "Live Routes",
     "mapPoiLayer": "POI Layer",
     "stateTitle": "अवस्था ",
-    "stateName": "गुण ",
+    "stateName": "बिषेशता",
     "stateValue": "मूल्य ",
     "commandTitle": "आदेश ",
     "commandSend": "पठाउने ",
-    "commandSent": "आदेश पठाईएको छ ",
-    "commandQueued": "Command has been queued",
+    "commandSent": "आदेश पठाइयो",
+    "commandQueued": "Command queued",
     "commandUnit": "इकाई ",
-    "commandCustom": "Custom command",
-    "commandDeviceIdentification": "Device Identification",
-    "commandPositionSingle": "Single Reporting",
+    "commandCustom": "अनुकुल आदेश",
+    "commandDeviceIdentification": "यन्त्र पहिचान",
+    "commandPositionSingle": "एकल प्रतिबेदन",
     "commandPositionPeriodic": "आवधिक प्रतिबेदन ",
     "commandPositionStop": "प्रतिबेदन बन्द गर्ने ",
     "commandEngineStop": "इन्जिन बन्द गर्ने ",
@@ -265,7 +267,8 @@
     "commandAlarmArm": "Arm Alarm",
     "commandAlarmDisarm": "Disarm Alarm",
     "commandSetTimezone": "Set Timezone",
-    "commandRequestPhoto": "Request Photo",
+    "commandRequestPhoto": "फोटो अनुरोध",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Reboot Device",
     "commandSendSms": "Send SMS",
     "commandSendUssd": "Send USSD",
@@ -275,25 +278,18 @@
     "commandVoiceMessage": "Voice Message",
     "commandOutputControl": "Output Control",
     "commandVoiceMonitoring": "Voice Monitoring",
-    "commandSetAgps": "Set AGPS",
+    "commandSetAgps": "जिपियस् सेट गर्नुहोस्",
     "commandSetIndicator": "Set Indicator",
     "commandConfiguration": "Configuration",
     "commandGetVersion": "Get Version",
     "commandFirmwareUpdate": "Update Firmware",
     "commandSetConnection": "Set Connection",
     "commandSetOdometer": "Set Odometer",
-    "commandGetModemStatus": "Get Modem Status",
-    "commandGetDeviceStatus": "Get Device Status",
+    "commandGetModemStatus": "मोदेमको स्थिति जान्नुहोस्",
+    "commandGetDeviceStatus": "यन्त्रको स्थिति जान्नुहोस्",
     "commandModePowerSaving": "Modify Power Saving",
     "commandModeDeepSleep": "Modify Deep Sleep",
     "commandMovementAlarm": "Movement Alarm",
-    "commandAlarmBattery": "Battery Alarm",
-    "commandAlarmSos": "SOS Alarm",
-    "commandAlarmRemove": "Remove Alarm",
-    "commandAlarmClock": "Clock Alarm",
-    "commandAlarmSpeed": "Overspeed Alarm",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "आव्रती ",
     "commandTimezone": "Timezone Offset",
     "commandMessage": "Message",
@@ -304,102 +300,113 @@
     "commandPhone": "Phone Number",
     "commandServer": "Server",
     "commandPort": "Port",
-    "eventAll": "All Events",
-    "eventDeviceOnline": "Device is online",
-    "eventDeviceUnknown": "Device status is unknown",
-    "eventDeviceOffline": "Device is offline",
-    "eventDeviceMoving": "Device is moving",
-    "eventDeviceStopped": "Device has stopped",
-    "eventDeviceOverspeed": "Device exceeds the speed",
-    "eventDeviceFuelDrop": "Fuel drop event",
+    "eventAll": "सबै घटना",
+    "eventDeviceOnline": "अनलाईन स्थिति",
+    "eventDeviceUnknown": "अज्ञात स्थिति",
+    "eventDeviceOffline": "अफलाईन स्थिति",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "गति सिमा नाघ्यो",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Command result",
-    "eventGeofenceEnter": "Device has entered geofence",
-    "eventGeofenceExit": "Device has exited geofence",
-    "eventAlarm": "Alarms",
-    "eventIgnitionOn": "Ignition is ON",
-    "eventIgnitionOff": "Ignition is OFF",
-    "eventMaintenance": "Maintenance required",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
+    "eventMaintenance": "मर्मत आवश्यक",
     "eventTextMessage": "Text message received",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "SOS Alarm",
-    "alarmVibration": "Vibration Alarm",
-    "alarmMovement": "Movement Alarm",
-    "alarmOverspeed": "Overspeed Alarm",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "LowBattery Alarm",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Fault Alarm",
-    "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",
-    "notificationType": "Type of Notification",
+    "alarmGeneral": "General",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibration",
+    "alarmMovement": "Movement",
+    "alarmLowspeed": "कम गति",
+    "alarmOverspeed": "अधिक गति",
+    "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": "काटिएको जिपियस् आन्टेना",
+    "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": "तापक्रम",
+    "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",
+    "notificatorWeb": "वेब",
+    "notificatorMail": "पत्र",
+    "notificatorSms": "यसएमयस",
+    "notificatorFirebase": "मोबाईल",
     "reportRoute": "Route",
-    "reportEvents": "Events",
+    "reportEvents": "घटनाहरू",
     "reportTrips": "Trips",
     "reportStops": "Stops",
-    "reportSummary": "Summary",
-    "reportChart": "Chart",
+    "reportSummary": "सारांश",
+    "reportChart": "मानचित्र",
     "reportConfigure": "Configure",
-    "reportEventTypes": "Event Types",
-    "reportChartType": "Chart Type",
-    "reportShowMarkers": "Show Markers",
-    "reportExport": "Export",
-    "reportPeriod": "Period",
-    "reportCustom": "Custom",
-    "reportToday": "Today",
-    "reportYesterday": "Yesterday",
-    "reportThisWeek": "This Week",
-    "reportPreviousWeek": "Previous Week",
-    "reportThisMonth": "This Month",
-    "reportPreviousMonth": "Previous Month",
-    "reportDeviceName": "Device Name",
-    "reportAverageSpeed": "Average Speed",
-    "reportMaximumSpeed": "Maximum Speed",
+    "reportEventTypes": "घटना प्रकार",
+    "reportChartType": "मानचित्र प्रकार",
+    "reportShowMarkers": "मार्करहरू देखाउनुहोस्",
+    "reportExport": "निकास",
+    "reportEmail": "प्रतिबेदन ई-मेल गर्ने",
+    "reportPeriod": "अवधि",
+    "reportCustom": "अनुकुल",
+    "reportToday": "आज",
+    "reportYesterday": "हिजो",
+    "reportThisWeek": "हालको हप्ता",
+    "reportPreviousWeek": "अघिल्लो हप्ता",
+    "reportThisMonth": "हालको महिना",
+    "reportPreviousMonth": "अघिल्लो महिना",
+    "reportDeviceName": "यन्त्र नाम",
+    "reportAverageSpeed": "औसत गति",
+    "reportMaximumSpeed": "अधिकतम गति",
     "reportEngineHours": "Engine Hours",
-    "reportDuration": "Duration",
-    "reportStartTime": "Start Time",
-    "reportStartAddress": "Start Address",
-    "reportEndTime": "End Time",
-    "reportEndAddress": "End Address",
-    "reportSpentFuel": "Spent Fuel",
-    "statisticsTitle": "Statistics",
+    "reportDuration": "अवधि",
+    "reportStartTime": "शुरु समय",
+    "reportStartAddress": "शुरु ठेगाना",
+    "reportEndTime": "अन्त्य समय",
+    "reportEndAddress": "अन्त्य ठेगाना",
+    "reportSpentFuel": "खर्चित ईन्धन",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
+    "statisticsTitle": "तथ्याङ्क ",
     "statisticsCaptureTime": "Capture Time",
-    "statisticsActiveUsers": "Active Users",
-    "statisticsActiveDevices": "Active Devices",
-    "statisticsRequests": "Requests",
+    "statisticsActiveUsers": "सक्रिय प्रयोगकर्ता",
+    "statisticsActiveDevices": "सक्रिय यन्त्रहरू",
+    "statisticsRequests": "अनुरोधहरू",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
     "statisticsGeocoder": "Geocoder Requests",
     "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
-    "categoryDefault": "Default",
+    "categoryDefault": "पुर्वनिर्धारित",
     "categoryAnimal": "जनावर ",
     "categoryBicycle": "साइकल ",
     "categoryBoat": "डुंगा ",
@@ -413,12 +420,13 @@
     "categoryPickup": "पिकअप ",
     "categoryPlane": "हवाइजहाज ",
     "categoryShip": "जहाज ",
-    "categoryTractor": "रट्रयाक्टर",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTractor": "ट्रयाक्टर",
+    "categoryTrain": "रेल",
+    "categoryTram": "ट्राम",
+    "categoryTrolleybus": "ट्रलिबस",
     "categoryTruck": "ट्रक ",
     "categoryVan": "भ्यान ",
-    "maintenanceStart": "Start",
-    "maintenancePeriod": "Period"
+    "categoryScooter": "स्कुटर",
+    "maintenanceStart": "शुरु",
+    "maintenancePeriod": "अवधि"
 }
\ No newline at end of file
diff --git a/web/l10n/nl.json b/web/l10n/nl.json
index 22862d08..3be5ce1a 100644
--- a/web/l10n/nl.json
+++ b/web/l10n/nl.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Berekende attributen",
     "sharedCheckComputedAttribute": "Controleer berekend attribuut",
     "sharedExpression": "Uitdrukking",
-    "sharedDeviceDistance": "Afstand apparaat",
     "sharedDevice": "Apparaat",
     "sharedTestNotification": "Stuur testnotificatie",
     "sharedCalendar": "Kalender",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Toon adres",
     "sharedDisabled": "Uitgeschakeld",
     "sharedMaintenance": "Onderhoud",
-    "sharedMaintenances": "Onderhoud",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarmen",
     "attributeSpeedLimit": "Snelheidslimiet",
     "attributePolylineDistance": "Polylijn afstand",
     "attributeReportIgnoreOdometer": "Rapport: negeer odometer",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: bestuurders uitschakelen",
     "attributeUiDisableComputedAttributes": "UI: berekende attributen uitschakelen",
     "attributeUiDisableCalendars": "UI: kalenders uitschakelen",
-    "attributeUiDisableMaintenances": "UI: Onderhoud uitschakelen",
+    "attributeUiDisableMaintenance": "UI: Onderhoud uitschakelen",
     "attributeUiHidePositionAttributes": "UI: Verberg positie-eigenschappen",
     "errorTitle": "Fout",
     "errorGeneral": "Ongeldige parameters of overschrijding van beperkingen",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Instellingen forceren",
     "mapTitle": "Kaart",
     "mapLayer": "Kaart laag",
-    "mapCustom": "Aangepaste kaart",
+    "mapCustom": "Aangepast (XYZ)",
+    "mapCustomArcgis": "Aangepast (ArcGIS)",
+    "mapCustomLabel": "Aangepaste map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
     "mapBingKey": "Bing Maps sleutel",
@@ -253,7 +255,7 @@
     "commandTitle": "Commando",
     "commandSend": "Verstuur",
     "commandSent": "Commando verstuurd",
-    "commandQueued": "Command is in de wachtrij gezet",
+    "commandQueued": "Commando in de wachtrij geplaatst",
     "commandUnit": "Eenheid",
     "commandCustom": "Aangepast commando",
     "commandDeviceIdentification": "Apparaatidentificatie",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Alarm uit",
     "commandSetTimezone": "Tijdzone instellen",
     "commandRequestPhoto": "Vraag foto",
+    "commandPowerOff": "Apparaat uitschakelen",
     "commandRebootDevice": "Herstart apparaat",
     "commandSendSms": "Stuur SMS",
     "commandSendUssd": "Stuur USDD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Stroombesparing aanpassen",
     "commandModeDeepSleep": "Diepe slaap aanpassen",
     "commandMovementAlarm": "Bewegingsalarm",
-    "commandAlarmBattery": "Accualarm",
-    "commandAlarmSos": "SOS alarm",
-    "commandAlarmRemove": "Verwijder alarm",
-    "commandAlarmClock": "Klokalarm",
-    "commandAlarmSpeed": "Snelheidsalarm",
-    "commandAlarmFall": "Probleemalarm",
-    "commandAlarmVibration": "Trilalarm",
     "commandFrequency": "Frequentie",
     "commandTimezone": "Tijdzoneverschil",
     "commandMessage": "Bericht",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Poort",
     "eventAll": "Alle gebeurtenissen",
-    "eventDeviceOnline": "Apparaat is online",
-    "eventDeviceUnknown": "Apparaatstatus is onbekend",
-    "eventDeviceOffline": "Apparaat is offline",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status onbekend",
+    "eventDeviceOffline": "Status offline",
     "eventDeviceMoving": "Apparaat beweegt",
-    "eventDeviceStopped": "Apparaat is gestopt",
-    "eventDeviceOverspeed": "Apparaat overschrijdt snelheid",
-    "eventDeviceFuelDrop": "Brandstofniveau verlaagd gebeurtenis",
+    "eventDeviceStopped": "Apparaat gestopt",
+    "eventDeviceOverspeed": "Snelheidslimiet overschreden",
+    "eventDeviceFuelDrop": "Brandstofafname",
     "eventCommandResult": "Commando resultaat",
-    "eventGeofenceEnter": "Appraat is binnen geografisch gebied",
-    "eventGeofenceExit": "Apparaat verlaat geografisch gebied",
-    "eventAlarm": "Alarmen",
-    "eventIgnitionOn": "Contact aan",
-    "eventIgnitionOff": "Contact uit",
+    "eventGeofenceEnter": "Geofence binnengegaan",
+    "eventGeofenceExit": "Geofence verlaten",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ontsteking aan",
+    "eventIgnitionOff": "Ontsteking uit",
     "eventMaintenance": "Onderhoud vereist",
     "eventTextMessage": "Tekstbericht ontvangen",
-    "eventDriverChanged": "Bestuurder is veranderd",
+    "eventDriverChanged": "Bestuurder veranderd",
     "eventsScrollToLast": "Scroll naar laatste",
-    "alarmSos": "SOS alarm",
-    "alarmVibration": "Vibratiealarm",
-    "alarmMovement": "Bewegingsalarm",
-    "alarmOverspeed": "Snelheidsalarm",
-    "alarmFallDown": "Valalarm",
-    "alarmLowBattery": "Lege batterij alarm",
-    "alarmLowPower": "Lage stroom alarm",
-    "alarmFault": "Foutalarm",
-    "alarmPowerOff": "Uitschakelalarm",
-    "alarmPowerOn": "Inschakelalarm",
-    "alarmDoor": "Deuralarm",
-    "alarmGeofence": "Geofence-alarm",
-    "alarmGeofenceEnter": "Geofence binnengetreden alarm",
-    "alarmGeofenceExit": "Geofence verlaten alarm",
-    "alarmGpsAntennaCut": "GPS antenne afgesloten alarm",
-    "alarmAccident": "Ongelukalarm",
-    "alarmTow": "Sleepalarm",
-    "alarmIdle": "Stilstandalarm",
-    "alarmHardAcceleration": "Harde versnelling alarm",
-    "alarmHardBraking": "Hard remmen alarm",
-    "alarmFatigueDriving": "Vermoeidheid tijdens rijden alarm",
-    "alarmPowerCut": "Stroom verbroken alarm",
-    "alarmPowerRestored": "Stroom hersteld alarm",
-    "alarmJamming": "Verstoringalarm",
-    "alarmTemperature": "Temperatuuralarm",
-    "alarmParking": "Parkeeralarm",
-    "alarmShock": "Schokalarm",
-    "alarmBonnet": "Motorkapalarm",
-    "alarmFootBrake": "Voetremalarm",
-    "alarmFuelLeak": "Brandstoflekalarm",
-    "alarmTampering": "Knoeialarm",
-    "alarmRemoving": "Alarm verwijderen",
+    "alarmGeneral": "Algemeen",
+    "alarmSos": "SOS",
+    "alarmVibration": "Trilling",
+    "alarmMovement": "Beweging",
+    "alarmLowspeed": "Lage snelheid",
+    "alarmOverspeed": "Snelheidsoverschreiding",
+    "alarmFallDown": "Gevallen",
+    "alarmLowPower": "Lage stroom",
+    "alarmLowBattery": "Laag accuniveau",
+    "alarmFault": "Fout",
+    "alarmPowerOff": "Uitgeschakeld",
+    "alarmPowerOn": "Ingeschakeld",
+    "alarmDoor": "Deur",
+    "alarmLock": "Afgesloten",
+    "alarmUnlock": "Geopend",
+    "alarmGeofence": "Geofence",
+    "alarmGeofenceEnter": "Geofence binnengegaan",
+    "alarmGeofenceExit": "Geofence verlaten",
+    "alarmGpsAntennaCut": "GPS antenne verbroken",
+    "alarmAccident": "Ongeluk",
+    "alarmTow": "Gesleept",
+    "alarmIdle": "Rust",
+    "alarmHighRpm": "Hoge TPM",
+    "alarmHardAcceleration": "Harde versnelling",
+    "alarmHardBraking": "Harde remming",
+    "alarmHardCornering": "Scherpe bocht",
+    "alarmLaneChange": "Rijbaanwisseling",
+    "alarmFatigueDriving": "Vermoeid rijden",
+    "alarmPowerCut": "Stroomonderbreking",
+    "alarmPowerRestored": "Stroom hersteld",
+    "alarmJamming": "Verstoring",
+    "alarmTemperature": "Temperatuur",
+    "alarmParking": "Parkeren",
+    "alarmShock": "Schok",
+    "alarmBonnet": "Motorkap",
+    "alarmFootBrake": "Voetrem",
+    "alarmFuelLeak": "Brandstoflek",
+    "alarmTampering": "Knoeien",
+    "alarmRemoving": "Verwijderd",
     "notificationType": "Notificatietype",
     "notificationAlways": "Alle apparaten",
     "notificationNotificators": "Kanalen",
     "notificatorWeb": "Web",
     "notificatorMail": "E-mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobiel",
     "reportRoute": "Route",
     "reportEvents": "Gebeurtenissen",
     "reportTrips": "Ritten",
@@ -371,6 +375,7 @@
     "reportChartType": "Grafiektype",
     "reportShowMarkers": "Toon markeringen",
     "reportExport": "Exporteren",
+    "reportEmail": "E-mailrapport",
     "reportPeriod": "Periode",
     "reportCustom": "Aangepast",
     "reportToday": "Vandaag",
@@ -389,6 +394,8 @@
     "reportEndTime": "Eindtijd",
     "reportEndAddress": "Eindadres",
     "reportSpentFuel": "Verbruikte brandstof",
+    "reportStartOdometer": "Odometer start",
+    "reportEndOdometer": "Odometer einde",
     "statisticsTitle": "Statistieken",
     "statisticsCaptureTime": "Opnametijd",
     "statisticsActiveUsers": "Actieve gebruikers",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Vrachtwagen",
     "categoryVan": "Busje",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Periode"
 }
\ No newline at end of file
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
diff --git a/web/l10n/pl.json b/web/l10n/pl.json
index 1b111aed..6d2604c5 100644
--- a/web/l10n/pl.json
+++ b/web/l10n/pl.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Obliczone atrybuty",
     "sharedCheckComputedAttribute": "Sprawdź obliczony atrybut",
     "sharedExpression": "Wyrażenie",
-    "sharedDeviceDistance": "Dystans urządzenia",
     "sharedDevice": "Urządzenie",
     "sharedTestNotification": "Wyślij powiadomienie testowe",
     "sharedCalendar": "Kalendarz",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Pokaż adres",
     "sharedDisabled": "Wyłączony",
     "sharedMaintenance": "Konserwacja",
-    "sharedMaintenances": "Konserwacje",
+    "sharedDeviceAccumulators": "Akumulatory",
+    "sharedAlarms": "Alarmy",
     "attributeSpeedLimit": "Ograniczenie prędkości",
     "attributePolylineDistance": "Dystans łamanej",
     "attributeReportIgnoreOdometer": "Raport: Ignoruj licznik kilometrów",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Wyłącz kierowców",
     "attributeUiDisableComputedAttributes": "UI: Wyłącz obliczone atrybuty",
     "attributeUiDisableCalendars": "UI: Wyłącz kalendarze",
-    "attributeUiDisableMaintenances": "UI: Wyłącz konserwacje",
+    "attributeUiDisableMaintenance": "UI: Wyłącz konserwację",
     "attributeUiHidePositionAttributes": "UI: Ukryj atrybuty pozycji",
     "errorTitle": "Błąd",
     "errorGeneral": "Niepoprawny parametr albo naruszenie ograniczeń",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Wymuś ustawienia",
     "mapTitle": "Mapa",
     "mapLayer": "Rodzaj mapy",
-    "mapCustom": "Własna mapa",
+    "mapCustom": "Własny (XYZ)",
+    "mapCustomArcgis": "Własny (ArcGIS)",
+    "mapCustomLabel": "Własna mapa",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Wartość",
     "commandTitle": "Komenda",
     "commandSend": "Wyślij",
-    "commandSent": "Komenda została wysłana",
-    "commandQueued": "Komenda została dodana do kolejki",
+    "commandSent": "Polecenie wysłane",
+    "commandQueued": "Polecenie zakolejkowane",
     "commandUnit": "Jednostka",
     "commandCustom": "Własna komenda",
     "commandDeviceIdentification": "Identyfikacja urządzenia",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Wyłączanie alarmu",
     "commandSetTimezone": "Ustaw strefę czasową",
     "commandRequestPhoto": "Żądanie zdjęcia\n",
+    "commandPowerOff": "Wyłącz urządzenie",
     "commandRebootDevice": "Zresetuj urządzenie",
     "commandSendSms": "Wyślij SMS",
     "commandSendUssd": "Wyślij USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Zmień oszczędzanie energii",
     "commandModeDeepSleep": "Zmień głębokie uśpienie",
     "commandMovementAlarm": "Alarm ruchu",
-    "commandAlarmBattery": "Alarm baterii",
-    "commandAlarmSos": "Alarm SOS",
-    "commandAlarmRemove": "Alarm usunięcia",
-    "commandAlarmClock": "Alarm czasu",
-    "commandAlarmSpeed": "Alarm przekroczenia prędkości",
-    "commandAlarmFall": "Alarm błędu",
-    "commandAlarmVibration": "Alarm wibracji",
     "commandFrequency": "Częstotliwość",
     "commandTimezone": "Przesunięcie strefy czasowej",
     "commandMessage": "Wiadomość",
@@ -305,64 +301,72 @@
     "commandServer": "Serwer",
     "commandPort": "Port",
     "eventAll": "Wszystkie zdarzenia",
-    "eventDeviceOnline": "Urządzenie jest online",
-    "eventDeviceUnknown": "Status urządzenia nieznany",
-    "eventDeviceOffline": "Urządzenie jest offline",
-    "eventDeviceMoving": "Urządzenie przemieszcza się",
-    "eventDeviceStopped": "Urządzenie się zatrzymało",
-    "eventDeviceOverspeed": "Urządzenie przekroczyło prędkość",
-    "eventDeviceFuelDrop": "Zdarzenie spadku paliwa",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status nieznany",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Urządzenie się porusza",
+    "eventDeviceStopped": "Urządzenie zatrzymane",
+    "eventDeviceOverspeed": "Przekroczono ograniczenie prędkości",
+    "eventDeviceFuelDrop": "Utrata paliwa",
     "eventCommandResult": "Rezultat polecenia",
-    "eventGeofenceEnter": "Urządzenie wkroczyło w strefę nadzoru",
-    "eventGeofenceExit": "Urządzenie opuściło strefę nadzoru",
-    "eventAlarm": "Alarmy",
+    "eventGeofenceEnter": "Wkroczono w obszar monitorowany",
+    "eventGeofenceExit": "Opuszczono obszar monitorowany",
+    "eventAlarm": "Alarm",
     "eventIgnitionOn": "Zapłon włączony",
     "eventIgnitionOff": "Zapłon wyłączony",
     "eventMaintenance": "Wymagana konserwacja",
     "eventTextMessage": "Odebrano wiadomość tekstową",
-    "eventDriverChanged": "Zmiana kierowcy",
+    "eventDriverChanged": "Zmieniana kierowcy",
     "eventsScrollToLast": "Przewiń do ostatniego",
-    "alarmSos": "Alarm SOS",
-    "alarmVibration": "Alarm wibracyjny",
-    "alarmMovement": "Alarm ruchu",
-    "alarmOverspeed": "Alarm przekroczenia prędkości",
-    "alarmFallDown": "Alarm upadku",
-    "alarmLowBattery": "Alarm niskiego stanu baterii",
-    "alarmLowPower": "Alarm małej mocy",
-    "alarmFault": "Alarm usterki",
-    "alarmPowerOff": "Wyłącz alarm",
-    "alarmPowerOn": "Włącz alarm",
-    "alarmDoor": "Alarm drzwi",
-    "alarmGeofence": "Alarm obszaru",
-    "alarmGeofenceEnter": "Alarm wejścia w obszar",
-    "alarmGeofenceExit": "Alarm wyjścia z obszaru",
-    "alarmGpsAntennaCut": "Alarm odłączanie anteny GPS",
-    "alarmAccident": "Alarm wypadku",
-    "alarmTow": "Alarm holowania",
-    "alarmIdle": "Alarm bezczynności",
-    "alarmHardAcceleration": "Alarm przyśpieszania",
-    "alarmHardBraking": "Alarm nagłego hamowania",
-    "alarmFatigueDriving": "Alarm zmęczenia",
-    "alarmPowerCut": "Alarm odcięcia zasilania",
-    "alarmPowerRestored": "Alarm odzyskania mocy",
-    "alarmJamming": "Alarm zagłuszania",
-    "alarmTemperature": "Alarm temperatury",
-    "alarmParking": "Alarm parkingowy",
-    "alarmShock": "Alarm wstrząsów",
-    "alarmBonnet": "Alarm maski",
-    "alarmFootBrake": "Alarm hamulca nożnego",
-    "alarmFuelLeak": "Alarm wycieku paliwa",
-    "alarmTampering": "Alarm ruszania",
-    "alarmRemoving": "Usuwanie alarmu",
+    "alarmGeneral": "Ogólny",
+    "alarmSos": "SOS",
+    "alarmVibration": "WIbracja",
+    "alarmMovement": "Ruch",
+    "alarmLowspeed": "Niska prędkość",
+    "alarmOverspeed": "Przekroczenie prędkości",
+    "alarmFallDown": "Upadek",
+    "alarmLowPower": "Mało energii",
+    "alarmLowBattery": "Niski stan baterii",
+    "alarmFault": "Błąd",
+    "alarmPowerOff": "Wyłączenie zasilania",
+    "alarmPowerOn": "Włączenie zasilania",
+    "alarmDoor": "Drzwi",
+    "alarmLock": "Zamknięty",
+    "alarmUnlock": "Otwarty",
+    "alarmGeofence": "Obszar monitorowany",
+    "alarmGeofenceEnter": "Obszar monitorowany wejście",
+    "alarmGeofenceExit": "Obszar monitorowany wyjście",
+    "alarmGpsAntennaCut": "Odłączenie anteny GPS",
+    "alarmAccident": "Wypadek",
+    "alarmTow": "Holowanie",
+    "alarmIdle": "Bezczynność",
+    "alarmHighRpm": "Wysokie obroty silnika",
+    "alarmHardAcceleration": "Mocne przyśpiesznie",
+    "alarmHardBraking": "Mocne hamowanie",
+    "alarmHardCornering": "Ostre zakręty",
+    "alarmLaneChange": "Zmiana pasa ruchu",
+    "alarmFatigueDriving": "Zmęczenie",
+    "alarmPowerCut": "Odcięcie zasilania",
+    "alarmPowerRestored": "Zasilanie przywrócone",
+    "alarmJamming": "Zakłócanie",
+    "alarmTemperature": "Temperatura",
+    "alarmParking": "Parkowanie",
+    "alarmShock": "Wstrząs",
+    "alarmBonnet": "Maska",
+    "alarmFootBrake": "Hamulec nożny",
+    "alarmFuelLeak": "Wyciek paliwa",
+    "alarmTampering": "Manipulacja",
+    "alarmRemoving": "Usuwanie",
     "notificationType": "Rodzaj powiadomienia",
     "notificationAlways": "Wszystkie urządzenia",
     "notificationNotificators": "Kanały",
     "notificatorWeb": "Sieć",
     "notificatorMail": "Poczta",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobilny",
     "reportRoute": "Trasa",
     "reportEvents": "Zdarzenia",
-    "reportTrips": "Trips",
+    "reportTrips": "Podróże",
     "reportStops": "Zatrzymania",
     "reportSummary": "Podsumowanie",
     "reportChart": "Wykres",
@@ -371,6 +375,7 @@
     "reportChartType": "Typ wykresu",
     "reportShowMarkers": "Pokaż znaczniki",
     "reportExport": "Eksportuj",
+    "reportEmail": "Raport emailowy",
     "reportPeriod": "Okres",
     "reportCustom": "Własny",
     "reportToday": "Dzisiaj",
@@ -389,6 +394,8 @@
     "reportEndTime": "Czas końcowy",
     "reportEndAddress": "Adres końcowy",
     "reportSpentFuel": "Zużyte paliwo",
+    "reportStartOdometer": "Start drogomierza",
+    "reportEndOdometer": "Stop drogomierza",
     "statisticsTitle": "Statystyki",
     "statisticsCaptureTime": "Czas zapisu",
     "statisticsActiveUsers": "Aktywni użytkownicy",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolejbus",
     "categoryTruck": "Ciężarówka",
     "categoryVan": "Van",
+    "categoryScooter": "Skuter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Okres"
 }
\ No newline at end of file
diff --git a/web/l10n/pt.json b/web/l10n/pt.json
index 5f5b5a71..1e6a0c48 100644
--- a/web/l10n/pt.json
+++ b/web/l10n/pt.json
@@ -1,7 +1,7 @@
 {
     "sharedLoading": "A Carregar...",
     "sharedHide": "Ocultar",
-    "sharedSave": "Salvar",
+    "sharedSave": "Guardar",
     "sharedSet": "Conjunto",
     "sharedCancel": "Cancelar",
     "sharedAdd": "Adicionar",
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Atributos",
     "sharedCheckComputedAttribute": "Verificar Atributos",
     "sharedExpression": "Expressão",
-    "sharedDeviceDistance": "Distancia do Dispositivo",
     "sharedDevice": "Dispositivo",
     "sharedTestNotification": "Enviar Notificação Teste",
     "sharedCalendar": "Calendário",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Mostrar Morada",
     "sharedDisabled": "Desativado",
     "sharedMaintenance": "Manutenção",
-    "sharedMaintenances": "Manutenções",
+    "sharedDeviceAccumulators": "Acumuladores",
+    "sharedAlarms": "Alarmes",
     "attributeSpeedLimit": "Limite de Velocidade",
     "attributePolylineDistance": "Distância Polilinha",
     "attributeReportIgnoreOdometer": "Relatório: Ignorar Conta-Quilómetros",
@@ -104,21 +104,21 @@
     "attributeUiDisableDrivers": "UI: Desativar Condutores",
     "attributeUiDisableComputedAttributes": "UI: Desativar Atributos",
     "attributeUiDisableCalendars": "UI: Desativar Calendários",
-    "attributeUiDisableMaintenances": "UI: Desativar Manutenções",
+    "attributeUiDisableMaintenance": "Desativar Manutenção",
     "attributeUiHidePositionAttributes": "UI: Ocultar Atributos de Localização",
     "errorTitle": "Erro",
     "errorGeneral": "Parâmetros Inválidos",
     "errorConnection": "Erro de conexão",
     "errorSocket": "Erro de Conexão",
     "errorZero": "Não pode ser zero",
-    "userEmail": "Email / Utilizador",
+    "userEmail": "Utilizador",
     "userPassword": "Senha",
     "userAdmin": "Administrador",
     "userRemember": "Relembrar",
     "userExpirationTime": "Expira em:",
     "userDeviceLimit": "Limite de Dispositivos",
     "userUserLimit": "Limite de Utilizadores",
-    "userDeviceReadonly": "Dispositivo apenas de Leitura",
+    "userDeviceReadonly": "Leitura de Dispositivo",
     "userLimitCommands": "Limite de Comandos",
     "userToken": "Símbolo",
     "loginTitle": "Entrar",
@@ -170,8 +170,8 @@
     "positionLongitude": "Longitude",
     "positionAltitude": "Altitude",
     "positionSpeed": "Velocidade",
-    "positionCourse": "Curso",
-    "positionAddress": "Endereço",
+    "positionCourse": "Direcção",
+    "positionAddress": "Morada",
     "positionProtocol": "Protocolo",
     "positionDistance": "Distância",
     "positionRpm": "Rpm",
@@ -191,7 +191,7 @@
     "positionEvent": "Evento",
     "positionAlarm": "Alarme",
     "positionStatus": "Estado",
-    "positionOdometer": "Conta-Quilómetros ",
+    "positionOdometer": "Conta-Quilómetros",
     "positionServiceOdometer": "Serviço Conta-Quilómetros",
     "positionTripOdometer": "Conta-Quilómetros de Viagem",
     "positionHours": "Horas",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Forçar Configurações",
     "mapTitle": "Mapa",
     "mapLayer": "Mapa",
-    "mapCustom": "Mapa personalizado",
+    "mapCustom": "Padrão (XYZ)",
+    "mapCustomArcgis": "Padrão (ArcGIS)",
+    "mapCustomLabel": "Mapa Personalizado",
     "mapCarto": "Mapa Carto",
     "mapOsm": "Mapa Open Street",
     "mapBingKey": "Mapa Bing Key",
@@ -252,7 +254,7 @@
     "stateValue": "Valor",
     "commandTitle": "Comando",
     "commandSend": "Enviar",
-    "commandSent": "Comando foi enviado",
+    "commandSent": "Comando Enviado",
     "commandQueued": "Comando foi para a fila",
     "commandUnit": "Unidade",
     "commandCustom": "Comando Personalizado",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Desarmar Alarme",
     "commandSetTimezone": "Definir Fuso Horário",
     "commandRequestPhoto": "Solicitar Foto",
+    "commandPowerOff": "Dispositivo Desligado",
     "commandRebootDevice": "Reiniciar Dispositivo",
     "commandSendSms": "Enviar SMS",
     "commandSendUssd": "Enviar USSD",
@@ -273,7 +276,7 @@
     "commandSilenceTime": "Definir Tempo de Silencio",
     "commandSetPhonebook": "Definir Agenda",
     "commandVoiceMessage": "Mensagem de Voz",
-    "commandOutputControl": "Controlo de Saída ",
+    "commandOutputControl": "Controlo de Saída",
     "commandVoiceMonitoring": "Monitorização de Voz",
     "commandSetAgps": "Definir AGPS",
     "commandSetIndicator": "Definir Indicador",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Alterar Poupança de Energia",
     "commandModeDeepSleep": "Alterar Modo de Adormecer",
     "commandMovementAlarm": "Alarme de Movimento",
-    "commandAlarmBattery": "Alarme de Bateria Fraca",
-    "commandAlarmSos": "Alarme SOS",
-    "commandAlarmRemove": "Remover Alarme",
-    "commandAlarmClock": "Alarme de Choque",
-    "commandAlarmSpeed": "Alarme de Excesso de Velocidade",
-    "commandAlarmFall": "Alarme de Falha",
-    "commandAlarmVibration": "Alarme de Vibração",
     "commandFrequency": "Frequência",
     "commandTimezone": "Deslocamento do Fuso Horário",
     "commandMessage": "Mensagem",
@@ -307,59 +303,67 @@
     "eventAll": "Todos os Eventos",
     "eventDeviceOnline": "Dispositivo Conectado",
     "eventDeviceUnknown": "Estado do dispositivo desconhecido",
-    "eventDeviceOffline": "Dispositivo Desconectado",
+    "eventDeviceOffline": "Estado Desligado",
     "eventDeviceMoving": "Dispositivo em Movimento",
     "eventDeviceStopped": "Dispositivo Parado",
-    "eventDeviceOverspeed": "Dispositivo em Excesso de Velocidade",
-    "eventDeviceFuelDrop": "Evento de Perda de Combústivel",
+    "eventDeviceOverspeed": "Atingido o Excesso de Velocidade",
+    "eventDeviceFuelDrop": "Perda de Combústivel",
     "eventCommandResult": "Resultado do Comando",
-    "eventGeofenceEnter": "Dispositivo Entrou na Cerca Geográfica",
-    "eventGeofenceExit": "Dispositivo Saiu da Cerca Geográfica",
-    "eventAlarm": "Alarmes",
+    "eventGeofenceEnter": "Entrou na Cerca Geográfica",
+    "eventGeofenceExit": "Saiu da Cerca Geográfica",
+    "eventAlarm": "Alarme",
     "eventIgnitionOn": "Ignição Ligada",
     "eventIgnitionOff": "Ignição Desligada",
-    "eventMaintenance": "Necessária manutenção",
+    "eventMaintenance": "Necessária Manutenção",
     "eventTextMessage": "Mensagem de Texto Recebida",
-    "eventDriverChanged": "Condutor Alterado",
+    "eventDriverChanged": "Alteração de Condutor",
     "eventsScrollToLast": "Puxar para o Fim",
-    "alarmSos": "Alarme SOS",
-    "alarmVibration": "Alarme de Vibração",
-    "alarmMovement": "Alarme de Movimento",
-    "alarmOverspeed": "Alarme de Excesso de Velocidade",
-    "alarmFallDown": "Alarme de Queda",
-    "alarmLowBattery": "Alarme de Bateria Baixa",
-    "alarmLowPower": "Alarme de Bateria Fraca",
-    "alarmFault": "Alarme de Falha",
-    "alarmPowerOff": "Desligar Alarme",
-    "alarmPowerOn": "Ligar Alarme",
-    "alarmDoor": "Alarme de Porta",
-    "alarmGeofence": "Alarme de Cerca Geográfica",
-    "alarmGeofenceEnter": "Alarme de Entrada em Cerca Geográfica",
-    "alarmGeofenceExit": "Alarme de Saida de Cerca Geográfica",
-    "alarmGpsAntennaCut": "Alarme de Corte de Sinal GPS",
-    "alarmAccident": "Alarme de Acidente",
-    "alarmTow": "Alarme de Reboque",
-    "alarmIdle": "Alarme Ocioso",
-    "alarmHardAcceleration": "Alarme de Aceleração Brusca",
-    "alarmHardBraking": "Alarme de Travagem Agressiva",
-    "alarmFatigueDriving": "Alarme de Condução com Fadiga",
+    "alarmGeneral": "Geral",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibração",
+    "alarmMovement": "Movimento",
+    "alarmLowspeed": "Baixa Velocidade",
+    "alarmOverspeed": "Excesso de Velocidade",
+    "alarmFallDown": "Queda",
+    "alarmLowPower": "Potência Baixa",
+    "alarmLowBattery": "Bateria Fraca",
+    "alarmFault": "Falha",
+    "alarmPowerOff": "Desligado",
+    "alarmPowerOn": "Ligado",
+    "alarmDoor": "Porta",
+    "alarmLock": "Bloqueio",
+    "alarmUnlock": "Desbloqueio",
+    "alarmGeofence": "Cerca Geográfica",
+    "alarmGeofenceEnter": "Entrada na Cerca Geográfica",
+    "alarmGeofenceExit": "Saída da Cerca Geográfica",
+    "alarmGpsAntennaCut": "Corte de Antena GPS",
+    "alarmAccident": "Acidente",
+    "alarmTow": "Reboque",
+    "alarmIdle": "Inútil",
+    "alarmHighRpm": "RPM Alta",
+    "alarmHardAcceleration": "Aceleração Brusca",
+    "alarmHardBraking": "Travagem Brusca",
+    "alarmHardCornering": "Viragem Brusca",
+    "alarmLaneChange": "Mudança de Faixa",
+    "alarmFatigueDriving": "Condução Cansada",
     "alarmPowerCut": "Alarme de Corte de Corrente",
     "alarmPowerRestored": "Alarme de Energia Restaurado",
     "alarmJamming": "Alarme de Bloqueio",
-    "alarmTemperature": "Alarme de Temperatura",
-    "alarmParking": "Alarme de Estacionamento",
-    "alarmShock": "Alarme de Choque",
+    "alarmTemperature": "Temperatura",
+    "alarmParking": "Estacionamento",
+    "alarmShock": "Choque",
     "alarmBonnet": "Alarme do Capô",
     "alarmFootBrake": "Alarme de Travão de Mão",
-    "alarmFuelLeak": "Alarme de Vazamento de Combustível",
-    "alarmTampering": "Alarme de Falsificação",
-    "alarmRemoving": "Removendo Alarme",
+    "alarmFuelLeak": "Perda de Combustivel",
+    "alarmTampering": "Adulteração",
+    "alarmRemoving": "Removendo",
     "notificationType": "Tipo de Notificação",
     "notificationAlways": "Todos os Dispositivos",
-    "notificationNotificators": "Canais",
+    "notificationNotificators": "Vias",
     "notificatorWeb": "Web",
     "notificatorMail": "E-Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Portátil",
     "reportRoute": "Histórico de Rotas",
     "reportEvents": "Eventos",
     "reportTrips": "Viagens",
@@ -371,6 +375,7 @@
     "reportChartType": "Tipo de Gráfico",
     "reportShowMarkers": "Mostrar Marcadores",
     "reportExport": "Exportar",
+    "reportEmail": "Relatório de Email",
     "reportPeriod": "Periodo",
     "reportCustom": "Personalização",
     "reportToday": "Hoje",
@@ -382,13 +387,15 @@
     "reportDeviceName": "Nome do Dispositivo",
     "reportAverageSpeed": "Velocidade Média",
     "reportMaximumSpeed": "Velocidade Máxima",
-    "reportEngineHours": "Horas do Motor",
+    "reportEngineHours": "Duração Ligado",
     "reportDuration": "Duração",
     "reportStartTime": "Hora de Inicio",
-    "reportStartAddress": "Iniciar Morada",
+    "reportStartAddress": "Morada Inicial",
     "reportEndTime": "Hora de Fim",
-    "reportEndAddress": "Terminar Morada",
+    "reportEndAddress": "Morada Final",
     "reportSpentFuel": "Combustível Gasto",
+    "reportStartOdometer": "Início do Conta-Quilómetros",
+    "reportEndOdometer": "Fim do Conta-Quilómetros",
     "statisticsTitle": "Estatísticas",
     "statisticsCaptureTime": "Data",
     "statisticsActiveUsers": "Utilizadores Activos",
@@ -417,8 +424,9 @@
     "categoryTrain": "Trem",
     "categoryTram": "Bonde",
     "categoryTrolleybus": "Ônibus Elétrico",
-    "categoryTruck": "Camião",
+    "categoryTruck": "Caminhão",
     "categoryVan": "Caravana",
+    "categoryScooter": "Patinete Elétrico",
     "maintenanceStart": "Começar",
     "maintenancePeriod": "Período"
 }
\ No newline at end of file
diff --git a/web/l10n/pt_BR.json b/web/l10n/pt_BR.json
index 02e67589..43cbfcdc 100644
--- a/web/l10n/pt_BR.json
+++ b/web/l10n/pt_BR.json
@@ -8,12 +8,12 @@
     "sharedEdit": "Editar",
     "sharedRemove": "Remover",
     "sharedRemoveConfirm": "Remover item?",
-    "sharedKm": "km",
-    "sharedMi": "mi",
+    "sharedKm": "Km",
+    "sharedMi": "Mi",
     "sharedNmi": "Milhas Náuticas",
-    "sharedKn": "kn",
-    "sharedKmh": "km/h",
-    "sharedMph": "mph",
+    "sharedKn": "Kn",
+    "sharedKmh": "Km/h",
+    "sharedMph": "Mph",
     "sharedHour": "Hora",
     "sharedMinute": "Minuto",
     "sharedSecond": "Segundo",
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Atributos Calculados",
     "sharedCheckComputedAttribute": "Verificar Atributo Calculado",
     "sharedExpression": "Expressão",
-    "sharedDeviceDistance": "Distância do Dispositivo",
     "sharedDevice": "Dispositivo",
     "sharedTestNotification": "Enviar notificação de teste",
     "sharedCalendar": "Calendário",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Mostrar Endereço",
     "sharedDisabled": "Desativado",
     "sharedMaintenance": "Manutenção",
-    "sharedMaintenances": "Manutenções",
+    "sharedDeviceAccumulators": "Bateria",
+    "sharedAlarms": "Alarmes",
     "attributeSpeedLimit": "Limite de Velocidade",
     "attributePolylineDistance": "Distância da Polilinha",
     "attributeReportIgnoreOdometer": "Relatório: Ignorar Odômetro",
@@ -85,7 +85,7 @@
     "attributeProcessingCopyAttributes": "Processamento: Copiar Atributos",
     "attributeColor": "Cor",
     "attributeWebLiveRouteLength": "Web: Comprimento da Rota ao Vivo",
-    "attributeWebSelectZoom": "Web: Zoom Selecionado ",
+    "attributeWebSelectZoom": "Web: Zoom Selecionado",
     "attributeWebMaxZoom": "Web: Zoom Máximo",
     "attributeMailSmtpHost": "Email: Host SMTP",
     "attributeMailSmtpPort": "Email: Porta SMTP",
@@ -98,18 +98,18 @@
     "attributeMailSmtpAuth": "Email: Ativar Autenticação (SMTP)",
     "attributeMailSmtpUsername": "Email: Nome de Usuário (SMTP)",
     "attributeMailSmtpPassword": "Email: Senha (SMTP)",
-    "attributeUiDisableReport": "UI: Disabilita Relatório",
+    "attributeUiDisableReport": "UI: Desabilitar Relatório",
     "attributeUiDisableEvents": "UI: Eventos Desativados",
     "attributeUiDisableVehicleFetures": "UI: Desativar Características do Veículo",
     "attributeUiDisableDrivers": "UI: Desativar Motoristas",
     "attributeUiDisableComputedAttributes": "UI: Desativar Atributos Calculados",
     "attributeUiDisableCalendars": "UI: Desativar Calendários",
-    "attributeUiDisableMaintenances": "Desativar Manutenções",
+    "attributeUiDisableMaintenance": "UI: Desativar Manutenção",
     "attributeUiHidePositionAttributes": "UI: Ocultar os atributos de posição",
     "errorTitle": "Erro",
     "errorGeneral": "Parâmetros inválidos ou violação de restrições",
     "errorConnection": "Erro de conexão",
-    "errorSocket": "Erro na conexão com Web Socket ",
+    "errorSocket": "Erro na conexão com Web Socket",
     "errorZero": "Não pode ser zero",
     "userEmail": "Email",
     "userPassword": "Senha",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Forçar configurações",
     "mapTitle": "Mapa",
     "mapLayer": "Camada de Mapa",
-    "mapCustom": "Mapa Personalizado",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Personalizar mapa",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Mapas API Key",
@@ -252,8 +254,8 @@
     "stateValue": "Valor",
     "commandTitle": "Comando",
     "commandSend": "Enviar",
-    "commandSent": "O comando foi enviado",
-    "commandQueued": "O comando foi enfileirado",
+    "commandSent": "Comando enviado",
+    "commandQueued": "Comando na fila",
     "commandUnit": "Unidade",
     "commandCustom": "Comando personalizado",
     "commandDeviceIdentification": "Identificação do dispositivo",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Desativar Alarme",
     "commandSetTimezone": "Definir fuso horário",
     "commandRequestPhoto": "Pegar foto",
+    "commandPowerOff": "Desligar o Dispositivo",
     "commandRebootDevice": "Reiniciar dispositivo",
     "commandSendSms": "Enviar SMS",
     "commandSendUssd": "Enviar USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Modificar a Economia de Energia",
     "commandModeDeepSleep": "Modifique o Sono Profundo",
     "commandMovementAlarm": "Alarme de Movimento",
-    "commandAlarmBattery": "Alarme de Bateria",
-    "commandAlarmSos": "Alarme SOS",
-    "commandAlarmRemove": "Remover o Alarme",
-    "commandAlarmClock": "Alarme de Relógio",
-    "commandAlarmSpeed": "Alarme de excesso de velocidade",
-    "commandAlarmFall": "Alarme de Falha",
-    "commandAlarmVibration": "Alarme de Vibração",
     "commandFrequency": "Frequência",
     "commandTimezone": "Ajuste de Fuso horário",
     "commandMessage": "Mensagem",
@@ -305,61 +301,69 @@
     "commandServer": "Servidor",
     "commandPort": "Porta",
     "eventAll": "Todos Eventos",
-    "eventDeviceOnline": "Dispositivo está on-line",
-    "eventDeviceUnknown": "Estado do dispositivo desconhecido",
-    "eventDeviceOffline": "Dispositivo está desconectado",
-    "eventDeviceMoving": "Dispositivo está se movendo",
-    "eventDeviceStopped": "Dispositivo parou",
-    "eventDeviceOverspeed": "Dispositivo excede a velocidade",
-    "eventDeviceFuelDrop": "Evento de queda de combustível",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status desconhecido",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Dispositivo movendo",
+    "eventDeviceStopped": "Dispositivo parado",
+    "eventDeviceOverspeed": "Excedido o limite de velocidade",
+    "eventDeviceFuelDrop": "Queda de combustível",
     "eventCommandResult": "Resultado do comando",
-    "eventGeofenceEnter": "Dispositivo entrou em geocerca",
-    "eventGeofenceExit": "Dispositivo saiu de geocerca",
-    "eventAlarm": "Alarmes",
-    "eventIgnitionOn": "Ignição está ON",
-    "eventIgnitionOff": "Ignição está OFF",
+    "eventGeofenceEnter": "Entrada na cerca virtual",
+    "eventGeofenceExit": "Saída da cerca virtual",
+    "eventAlarm": "Alarme",
+    "eventIgnitionOn": "Ignição ligada",
+    "eventIgnitionOff": "Ignição desligada",
     "eventMaintenance": "Manutenção necessária",
     "eventTextMessage": "Mensagem de texto recebida",
-    "eventDriverChanged": "Motorista foi alterado",
+    "eventDriverChanged": "Condutor alterado",
     "eventsScrollToLast": "Rolar para o último",
-    "alarmSos": "Alarme SOS",
-    "alarmVibration": "Alarme de Vibração",
-    "alarmMovement": "Alarme de Movimento",
-    "alarmOverspeed": "Alarme de Alta Velocidade",
-    "alarmFallDown": "Alarme de Queda",
-    "alarmLowBattery": "Alarme de Bateria Fraca",
-    "alarmLowPower": "Alarme de Potência Baixa",
-    "alarmFault": "Alarme de Problema",
-    "alarmPowerOff": "Alarme Desligado",
-    "alarmPowerOn": "Alarme Ligado",
-    "alarmDoor": "Alarme de Porta",
-    "alarmGeofence": "Alarme de Geocerca",
-    "alarmGeofenceEnter": "Alarme de entrada Geocerca",
-    "alarmGeofenceExit": "Alarme de Saída Geocerca",
-    "alarmGpsAntennaCut": "Alarme de retirada da antena GPS",
-    "alarmAccident": "Alarme de Acidente",
-    "alarmTow": "Alarme de Reboque",
-    "alarmIdle": "Alarme Ocioso",
-    "alarmHardAcceleration": "Alarme de Aceleração Forte",
-    "alarmHardBraking": "Alarme de Frenagem Brusca",
-    "alarmFatigueDriving": "Alarme de Fadiga na Direção",
-    "alarmPowerCut": "Alarme de Corte de Energia",
-    "alarmPowerRestored": "Alarme de Potência Restaurada",
-    "alarmJamming": "Alarme de Bloqueio",
-    "alarmTemperature": "Alarme de Temperatura",
-    "alarmParking": "Alarme deEstacionamento",
-    "alarmShock": "Alarme de Choque",
-    "alarmBonnet": "Alarme de Capota",
-    "alarmFootBrake": "Alarme de freio de pé",
-    "alarmFuelLeak": "Alarme de Vazamento de Combustível",
-    "alarmTampering": "Alarme de Violação",
-    "alarmRemoving": "Removendo Alarme",
+    "alarmGeneral": "Geral",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibrando",
+    "alarmMovement": "Movendo",
+    "alarmLowspeed": "Velocidade baixa",
+    "alarmOverspeed": "Alta velocidade",
+    "alarmFallDown": "Cair",
+    "alarmLowPower": "Carga Baixa",
+    "alarmLowBattery": "Bateria baixa",
+    "alarmFault": "Falha",
+    "alarmPowerOff": "Alimentação desligada",
+    "alarmPowerOn": "Alimentação ligada",
+    "alarmDoor": "Porta",
+    "alarmLock": "Bloqueado",
+    "alarmUnlock": "Desbloqueado",
+    "alarmGeofence": "Cerca virtual",
+    "alarmGeofenceEnter": "Entrando na cerca virtual",
+    "alarmGeofenceExit": "Saiu da Cerca virtual",
+    "alarmGpsAntennaCut": "Antena de GPS cortada",
+    "alarmAccident": "Acidente",
+    "alarmTow": "Rebocar",
+    "alarmIdle": "Ocioso",
+    "alarmHighRpm": "Alta Rotação",
+    "alarmHardAcceleration": "Aceleração brusca",
+    "alarmHardBraking": "Frenagem brusca",
+    "alarmHardCornering": "Curva Acentuada",
+    "alarmLaneChange": "Mudança de Faixa",
+    "alarmFatigueDriving": "Condutor Cansado",
+    "alarmPowerCut": "Alimentação cortada",
+    "alarmPowerRestored": "Alimentação restaurada",
+    "alarmJamming": "Interferência",
+    "alarmTemperature": "Temperatura",
+    "alarmParking": "Estacionamento",
+    "alarmShock": "Choque",
+    "alarmBonnet": "Capô",
+    "alarmFootBrake": "Freio de mão",
+    "alarmFuelLeak": "Vazamento de combustível",
+    "alarmTampering": "Manipulando",
+    "alarmRemoving": "Removendo",
     "notificationType": "Tipo de Notificação",
     "notificationAlways": "Todos os Dispositivos",
     "notificationNotificators": "Canais",
     "notificatorWeb": "Web",
     "notificatorMail": "E-Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Móvel",
     "reportRoute": "Rota",
     "reportEvents": "Eventos",
     "reportTrips": "Viagens",
@@ -371,7 +375,8 @@
     "reportChartType": "Tipo do Gráfico",
     "reportShowMarkers": "Mostrar Marcadores",
     "reportExport": "Exportar",
-    "reportPeriod": "Período ",
+    "reportEmail": "Relatório de E-mail",
+    "reportPeriod": "Período",
     "reportCustom": "Personalizadas",
     "reportToday": "Hoje",
     "reportYesterday": "Ontem",
@@ -379,7 +384,7 @@
     "reportPreviousWeek": "Semana Anterior",
     "reportThisMonth": "Este Mês",
     "reportPreviousMonth": "Mês Anterior",
-    "reportDeviceName": "Nome do Dispositivo ",
+    "reportDeviceName": "Nome do Dispositivo",
     "reportAverageSpeed": "Velocidade Média",
     "reportMaximumSpeed": "Velocidade Máxima",
     "reportEngineHours": "Horas ligado",
@@ -389,6 +394,8 @@
     "reportEndTime": "Hora final",
     "reportEndAddress": "Endereço final",
     "reportSpentFuel": "Gasto de Combustível",
+    "reportStartOdometer": "Início do odômetro",
+    "reportEndOdometer": "Fim do odômetro",
     "statisticsTitle": "Estatísticas",
     "statisticsCaptureTime": "Tempo de Captura",
     "statisticsActiveUsers": "Usuários ativos",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Ônibus Elétrico",
     "categoryTruck": "Caminhão",
     "categoryVan": "Van",
+    "categoryScooter": "Patinete Elétrico",
     "maintenanceStart": "Começar",
     "maintenancePeriod": "Período"
 }
\ No newline at end of file
diff --git a/web/l10n/ro.json b/web/l10n/ro.json
index a40cd7ff..39d3df03 100644
--- a/web/l10n/ro.json
+++ b/web/l10n/ro.json
@@ -29,10 +29,10 @@
     "sharedGeofence": "Geofence",
     "sharedGeofences": "Geofences",
     "sharedNotifications": "Notificările",
-    "sharedNotification": "Notification",
+    "sharedNotification": "Notificare",
     "sharedAttributes": "Atribute",
     "sharedAttribute": "Atribute",
-    "sharedDrivers": "Drivers",
+    "sharedDrivers": "Drivere",
     "sharedDriver": "Driver",
     "sharedArea": "Area",
     "sharedSound": "Sunet notificare",
@@ -44,16 +44,15 @@
     "sharedVoltAbbreviation": "V",
     "sharedLiterAbbreviation": "l",
     "sharedGallonAbbreviation": "gal",
-    "sharedLiter": "Liter",
-    "sharedImpGallon": "Imp. Gallon",
-    "sharedUsGallon": "U.S. Gallon",
+    "sharedLiter": "litru",
+    "sharedImpGallon": "UK Galon",
+    "sharedUsGallon": "US Galon",
     "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Cere status harta",
     "sharedComputedAttribute": "Atribut Calculat",
     "sharedComputedAttributes": "Atribute Calculate",
     "sharedCheckComputedAttribute": "Verifica atributul calculat",
     "sharedExpression": "expresie",
-    "sharedDeviceDistance": "Distanta echipament",
     "sharedDevice": "Echipament",
     "sharedTestNotification": "Trimite notificare de test",
     "sharedCalendar": "Calendar",
@@ -70,23 +69,24 @@
     "sharedTypeBoolean": "boolean",
     "sharedTimezone": "Fus orar",
     "sharedInfoTitle": "Info",
-    "sharedSavedCommand": "Saved Command",
-    "sharedSavedCommands": "Saved Commands",
-    "sharedNew": "New…",
-    "sharedShowAddress": "Show Address",
-    "sharedDisabled": "Disabled",
-    "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedSavedCommand": "Comanda Salvata",
+    "sharedSavedCommands": "Comenzi Salvate",
+    "sharedNew": "Nou",
+    "sharedShowAddress": "Arata Adresa",
+    "sharedDisabled": "Dezactivat",
+    "sharedMaintenance": "Intretinere",
+    "sharedDeviceAccumulators": "Acumulatori",
+    "sharedAlarms": "Alarme",
     "attributeSpeedLimit": "Limita de viteza",
-    "attributePolylineDistance": "Polyline Distance",
+    "attributePolylineDistance": "Distanta Linie Multipla",
     "attributeReportIgnoreOdometer": "Raport: Ignora kilometrajul",
     "attributeWebReportColor": "Web: Culoare raport",
     "attributeDevicePassword": "Parola dispozitiv",
     "attributeProcessingCopyAttributes": "Procesare: Copiaza atributele",
     "attributeColor": "Culoare",
     "attributeWebLiveRouteLength": "Web: Lungime rute",
-    "attributeWebSelectZoom": "Web: Zoom On Select",
-    "attributeWebMaxZoom": "Web: Maximum Zoom",
+    "attributeWebSelectZoom": "Web: Mareste la Selectie",
+    "attributeWebMaxZoom": "Web: Zoom Maxim",
     "attributeMailSmtpHost": "Mail: SMTP Host",
     "attributeMailSmtpPort": "Mail: SMTP Port",
     "attributeMailSmtpStarttlsEnable": "Mail: Activeaza  SMTP STARTTLS ",
@@ -98,19 +98,19 @@
     "attributeMailSmtpAuth": "Mail: Activeaza autentificare SMTP ",
     "attributeMailSmtpUsername": "Mail: SMTP utilizator",
     "attributeMailSmtpPassword": "Mail: SMTP parola",
-    "attributeUiDisableReport": "UI: Disable Report",
-    "attributeUiDisableEvents": "UI: Disable Events",
-    "attributeUiDisableVehicleFetures": "UI: Disable Vehicle Fetures",
-    "attributeUiDisableDrivers": "UI: Disable Drivers",
-    "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
-    "attributeUiDisableCalendars": "UI: Disable Calendars",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
-    "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
+    "attributeUiDisableReport": "UI: Dezactivare Raport",
+    "attributeUiDisableEvents": "UI: Dezactivare Evenimente",
+    "attributeUiDisableVehicleFetures": "UI: Dezactivare Detalii Vehicul",
+    "attributeUiDisableDrivers": "UI: Dezactivare Drivere",
+    "attributeUiDisableComputedAttributes": "UI: Dezactivare Atribute Calculate",
+    "attributeUiDisableCalendars": "UI: Dezactivare Calendar",
+    "attributeUiDisableMaintenance": "UI: Dezactivare Mentenanta",
+    "attributeUiHidePositionAttributes": "UI: Ascunde Atributele de Pozitionare",
     "errorTitle": "Eroare",
     "errorGeneral": "Parametri invalizi",
     "errorConnection": "Eroare de conexiune",
     "errorSocket": "Eroare conectare socket",
-    "errorZero": "Can't be zero",
+    "errorZero": "Nu poate fi zero",
     "userEmail": "Email",
     "userPassword": "Parolă",
     "userAdmin": "Admin",
@@ -119,7 +119,7 @@
     "userDeviceLimit": "Limitare echipament",
     "userUserLimit": "Limita utilizator",
     "userDeviceReadonly": "Dispozitiv doar citire",
-    "userLimitCommands": "Limit Commands",
+    "userLimitCommands": "Comenzi pentru limite",
     "userToken": "Token",
     "loginTitle": "Autentificare",
     "loginLanguage": "Limbă",
@@ -151,9 +151,9 @@
     "settingsGroups": "Grupuri",
     "settingsServer": "Server",
     "settingsUsers": "Utilizatori",
-    "settingsDistanceUnit": "Distance Unit",
-    "settingsSpeedUnit": "Speed Unit",
-    "settingsVolumeUnit": "Volume Unit",
+    "settingsDistanceUnit": "Unitate de masura pentru distanta",
+    "settingsSpeedUnit": "Unitate de masura viteza",
+    "settingsVolumeUnit": "Unitate de masura Volum",
     "settingsTwelveHourFormat": "12-oră",
     "settingsCoordinateFormat": "Format coordonate",
     "reportTitle": "Rapoarte",
@@ -183,11 +183,11 @@
     "positionHdop": "HDOP Eroare pe orizontala",
     "positionVdop": "VDOP Eroare pe verticala",
     "positionPdop": "PDOP Eroarea pozitiei",
-    "positionSat": "Satellites",
-    "positionSatVisible": "Visible Satellites",
+    "positionSat": "Sateliti",
+    "positionSatVisible": "Sateliti Vizibili",
     "positionRssi": "RSSI",
     "positionGps": "GPS",
-    "positionRoaming": "Roaming",
+    "positionRoaming": "Migrare",
     "positionEvent": "Eveniment",
     "positionAlarm": "Alarma",
     "positionStatus": "Stare",
@@ -195,7 +195,7 @@
     "positionServiceOdometer": "Valoare kilometraj service",
     "positionTripOdometer": "Kilometraj tronson",
     "positionHours": "Ore",
-    "positionSteps": "Steps",
+    "positionSteps": "Pasi",
     "positionInput": "Intrare",
     "positionOutput": "Iesire",
     "positionBatteryLevel": "Nivel baterie",
@@ -216,13 +216,13 @@
     "positionAcceleration": "Acceleratie",
     "positionDeviceTemp": "Temperatura echipament",
     "positionOperator": "Operator",
-    "positionCommand": "Command",
+    "positionCommand": "Comenzi",
     "positionBlocked": "Blocat",
     "positionDtcs": "DTCs",
-    "positionObdSpeed": "OBD Speed",
+    "positionObdSpeed": "Viteza OBD",
     "positionObdOdometer": "Kilometraj OBD",
-    "positionDriverUniqueId": "Driver Unique Id",
-    "positionImage": "Image",
+    "positionDriverUniqueId": "Identificator Unic Sofer",
+    "positionImage": "Imagine",
     "positionAudio": "Audio",
     "serverTitle": "Setări server",
     "serverZoom": "Zoom",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Configurare fortata",
     "mapTitle": "Hartă",
     "mapLayer": "Strat Hartă",
-    "mapCustom": "Personalizare Hartă",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Harta Carto Basemaps",
     "mapOsm": "Hartă Open Street",
     "mapBingKey": "Cheie Hărți Bing",
@@ -246,14 +248,14 @@
     "mapShapeCircle": "Cerc",
     "mapShapePolyline": "Polilinie",
     "mapLiveRoutes": "Rute in timp real",
-    "mapPoiLayer": "POI Layer",
+    "mapPoiLayer": "POI ",
     "stateTitle": "Stare",
     "stateName": "Atribut",
     "stateValue": "Valoare",
     "commandTitle": "Comandă",
     "commandSend": "Trimite",
-    "commandSent": "Comandă a fost trimisa",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Comanda trimisa",
+    "commandQueued": "Comanda adaugata in coada",
     "commandUnit": "Unitate",
     "commandCustom": "Comandă personalizată",
     "commandDeviceIdentification": "Identificare dispozitiv",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Dezactivare alarmă",
     "commandSetTimezone": "Setare Fus Orar",
     "commandRequestPhoto": "Cere Foto",
+    "commandPowerOff": "Oprire Dispozitiv",
     "commandRebootDevice": "Repornire Dispozitiv",
     "commandSendSms": "Trimite SMS",
     "commandSendUssd": "Trimite USSD",
@@ -274,92 +277,93 @@
     "commandSetPhonebook": "Set Agendă telefonică",
     "commandVoiceMessage": "Mesaj Vocal",
     "commandOutputControl": "Controlul de ieșire",
-    "commandVoiceMonitoring": "Voice Monitoring",
-    "commandSetAgps": "Set AGPS",
+    "commandVoiceMonitoring": "Monitorizare Audio",
+    "commandSetAgps": "Setari AGPS",
     "commandSetIndicator": "Seteaza indicatorul",
-    "commandConfiguration": "Configuration",
-    "commandGetVersion": "Get Version",
-    "commandFirmwareUpdate": "Update Firmware",
-    "commandSetConnection": "Set Connection",
-    "commandSetOdometer": "Set Odometer",
-    "commandGetModemStatus": "Get Modem Status",
-    "commandGetDeviceStatus": "Get Device Status",
-    "commandModePowerSaving": "Modify Power Saving",
-    "commandModeDeepSleep": "Modify Deep Sleep",
-    "commandMovementAlarm": "Movement Alarm",
-    "commandAlarmBattery": "Battery Alarm",
-    "commandAlarmSos": "SOS Alarm",
-    "commandAlarmRemove": "Remove Alarm",
-    "commandAlarmClock": "Clock Alarm",
-    "commandAlarmSpeed": "Alarmă depăşire viteză",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
+    "commandConfiguration": "Configurare",
+    "commandGetVersion": "Afla Versiunea",
+    "commandFirmwareUpdate": "Actualizare Software",
+    "commandSetConnection": "Setari Conexiune",
+    "commandSetOdometer": "Setari Distanta",
+    "commandGetModemStatus": "Afla starea Modem",
+    "commandGetDeviceStatus": "Afla starea Dispozitivului",
+    "commandModePowerSaving": "Modifica setari economisire energie",
+    "commandModeDeepSleep": "Modifica modul Deep Sleep",
+    "commandMovementAlarm": "Alarma Miscare",
     "commandFrequency": "Frecvenţă",
     "commandTimezone": "Diferenta fus orar",
     "commandMessage": "Mesaj",
-    "commandRadius": "Radius",
-    "commandEnable": "Enable",
+    "commandRadius": "Raza",
+    "commandEnable": "Activeaza",
     "commandData": "Data",
     "commandIndex": "Index",
     "commandPhone": "Telefon",
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Toate evenimentele",
-    "eventDeviceOnline": "Dispozitivul este pornit",
-    "eventDeviceUnknown": "Starea dispozitivului necunoscuta",
-    "eventDeviceOffline": "Dispozitivul este oprit",
-    "eventDeviceMoving": "Dispozitivul este în mişcare",
-    "eventDeviceStopped": "Dispozitivul este stationar",
-    "eventDeviceOverspeed": "Dispozitivul a depăşit limita de viteză",
-    "eventDeviceFuelDrop": "Alarma nivel combustibil",
+    "eventDeviceOnline": "Status on-line",
+    "eventDeviceUnknown": "Status necunoscut",
+    "eventDeviceOffline": "Status off-line",
+    "eventDeviceMoving": "Dispozitivul se deplaseaza",
+    "eventDeviceStopped": "Dispozitiv Oprit",
+    "eventDeviceOverspeed": "Viteza maxima depasita",
+    "eventDeviceFuelDrop": "Scadere nivel carburant",
     "eventCommandResult": "Rezultat comandă",
-    "eventGeofenceEnter": "Dispozitivul a intrat in zona geofence",
-    "eventGeofenceExit": "Dispozitivul a ieşit din zona geofence",
-    "eventAlarm": "Alarme",
+    "eventGeofenceEnter": "Acces perimetru",
+    "eventGeofenceExit": "Perimetru a fost parasit",
+    "eventAlarm": "Alarma",
     "eventIgnitionOn": "Contact pornit",
     "eventIgnitionOff": "Contact oprit",
     "eventMaintenance": "Intretinere necesara",
     "eventTextMessage": "Mesaj test primit",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Sofer schimbat",
     "eventsScrollToLast": "Deruleaza la sfarsit",
-    "alarmSos": "Alarmă SOS",
-    "alarmVibration": "Alarmă vibraţii",
-    "alarmMovement": "Alarmă Mişcare",
-    "alarmOverspeed": "Alarmă depăsire viteză",
-    "alarmFallDown": "Alarmă cădere",
-    "alarmLowBattery": "Alarmă nivel baterie scăzută",
-    "alarmLowPower": "Avertizare lipsa alimentare",
-    "alarmFault": "Alarmă Defect",
-    "alarmPowerOff": "Alarma intrerupere alimentare",
-    "alarmPowerOn": "Alarma revenire alimentare",
-    "alarmDoor": "Alarma usa",
-    "alarmGeofence": "Alarma perimetru",
-    "alarmGeofenceEnter": "Alarma intrare perimetru",
-    "alarmGeofenceExit": "Alarma iesire perimetru",
-    "alarmGpsAntennaCut": "Alarma obstructionare antena GPS",
-    "alarmAccident": "Alarma accident",
-    "alarmTow": "Alarma remorcare",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Alarma demaraj ",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Alarma oboseala",
-    "alarmPowerCut": "Alarma intrerupere alimentare",
-    "alarmPowerRestored": "Avertizare revenire alimentare",
-    "alarmJamming": "Alarma bruiere",
-    "alarmTemperature": "Alarma de temperatura",
-    "alarmParking": "Alarma parcare",
-    "alarmShock": "Alarma senzor soc",
-    "alarmBonnet": "Alarma capota",
-    "alarmFootBrake": "Alarma de franare",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Alarma obstructionare",
-    "alarmRemoving": "Eliminare alarma",
+    "alarmGeneral": "General",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibratii",
+    "alarmMovement": "Miscare",
+    "alarmLowspeed": "Viteza redusa",
+    "alarmOverspeed": "Viteza depasita",
+    "alarmFallDown": "Reducere",
+    "alarmLowPower": "Putere redusa",
+    "alarmLowBattery": "Nivel scazut baterie",
+    "alarmFault": "Eroare",
+    "alarmPowerOff": "Pornit",
+    "alarmPowerOn": "Oprit",
+    "alarmDoor": "Usa",
+    "alarmLock": "Blocare",
+    "alarmUnlock": "Deblocare",
+    "alarmGeofence": "Perimetru restrictionat",
+    "alarmGeofenceEnter": "Acces Perimetru",
+    "alarmGeofenceExit": "Parasire perimetru",
+    "alarmGpsAntennaCut": "Antena GPS taiata",
+    "alarmAccident": "Accident",
+    "alarmTow": "Tractare",
+    "alarmIdle": "In asteptare",
+    "alarmHighRpm": "Turatie ridicata",
+    "alarmHardAcceleration": "Accelerare Puternica",
+    "alarmHardBraking": "Frana de Urgenta",
+    "alarmHardCornering": "Viraj Brusc",
+    "alarmLaneChange": "Schimbare Banda",
+    "alarmFatigueDriving": "Condus in stare de oboseala",
+    "alarmPowerCut": "Taiere Alimentare",
+    "alarmPowerRestored": "Alimentare restabilita",
+    "alarmJamming": "Bruiaj",
+    "alarmTemperature": "Temperatura",
+    "alarmParking": "Parcare",
+    "alarmShock": "Soc",
+    "alarmBonnet": "Capota",
+    "alarmFootBrake": "Frana de serviciu",
+    "alarmFuelLeak": "Pierdere combustibil",
+    "alarmTampering": "Acces neautorizat",
+    "alarmRemoving": "Indepartare",
     "notificationType": "Tip de notificare",
-    "notificationAlways": "All Devices",
-    "notificationNotificators": "Channels",
+    "notificationAlways": "Toate dispozitivele",
+    "notificationNotificators": "Canale",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobil",
     "reportRoute": "Ruta",
     "reportEvents": "Evenimente",
     "reportTrips": "Tronsoane",
@@ -371,14 +375,15 @@
     "reportChartType": "Tip grafic",
     "reportShowMarkers": "Arata punctele",
     "reportExport": "Exporta",
-    "reportPeriod": "Period",
-    "reportCustom": "Custom",
-    "reportToday": "Today",
-    "reportYesterday": "Yesterday",
-    "reportThisWeek": "This Week",
-    "reportPreviousWeek": "Previous Week",
-    "reportThisMonth": "This Month",
-    "reportPreviousMonth": "Previous Month",
+    "reportEmail": "Raport Email",
+    "reportPeriod": "Perioada",
+    "reportCustom": "Personalizat",
+    "reportToday": "Astazi",
+    "reportYesterday": "Ieri",
+    "reportThisWeek": "Saptamana Curenta",
+    "reportPreviousWeek": "Saptamana Anterioara",
+    "reportThisMonth": "Luna Aceasta",
+    "reportPreviousMonth": "Luna Anterioara",
     "reportDeviceName": "Nume dispozitiv",
     "reportAverageSpeed": "Viteză medie",
     "reportMaximumSpeed": "Viteză Maximă",
@@ -389,6 +394,8 @@
     "reportEndTime": "Ora sfarsit",
     "reportEndAddress": "Adresa finala",
     "reportSpentFuel": "Combustibil consumat",
+    "reportStartOdometer": "Inceput Kilometraj",
+    "reportEndOdometer": "Finalizare Kilomteraj",
     "statisticsTitle": "Statistici",
     "statisticsCaptureTime": "Timpul ",
     "statisticsActiveUsers": "Utilizatori activi",
@@ -408,17 +415,18 @@
     "categoryCrane": "Macara",
     "categoryHelicopter": "Elicopter",
     "categoryMotorcycle": "Motocicleta",
-    "categoryOffroad": "Offroad",
+    "categoryOffroad": "Teren Accidentat",
     "categoryPerson": "Persoana",
     "categoryPickup": "Papuc",
     "categoryPlane": "Avion",
     "categoryShip": "Nava",
     "categoryTractor": "Tractor",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Tren",
+    "categoryTram": "Tramvai",
+    "categoryTrolleybus": "Trolebuz",
     "categoryTruck": "Camion",
     "categoryVan": "Duba",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
-    "maintenancePeriod": "Period"
+    "maintenancePeriod": "Perioada"
 }
\ No newline at end of file
diff --git a/web/l10n/ru.json b/web/l10n/ru.json
index 364c7cbf..c6432261 100644
--- a/web/l10n/ru.json
+++ b/web/l10n/ru.json
@@ -20,8 +20,8 @@
     "sharedDays": "дней",
     "sharedHours": "часов",
     "sharedMinutes": "минут",
-    "sharedDecimalDegrees": "Десятичные Градусы",
-    "sharedDegreesDecimalMinutes": "Градусы Десятичные Минуты",
+    "sharedDecimalDegrees": "Десятичные градусы",
+    "sharedDegreesDecimalMinutes": "Градусы Десятичные минуты",
     "sharedDegreesMinutesSeconds": "Градусы Минуты Секунды",
     "sharedName": "Имя",
     "sharedDescription": "Описание",
@@ -45,7 +45,7 @@
     "sharedLiterAbbreviation": "л",
     "sharedGallonAbbreviation": "галлон",
     "sharedLiter": "Литр",
-    "sharedImpGallon": "Имп. Галлон",
+    "sharedImpGallon": "Имп. галлон",
     "sharedUsGallon": "Галлон США",
     "sharedLiterPerHourAbbreviation": "л/ч",
     "sharedGetMapState": "Получить состояние карты",
@@ -53,13 +53,12 @@
     "sharedComputedAttributes": "Вычисляемые атрибуты",
     "sharedCheckComputedAttribute": "Проверить вычисляемый атрибут",
     "sharedExpression": "Выражение",
-    "sharedDeviceDistance": "Пробег устройства",
     "sharedDevice": "Устройство",
     "sharedTestNotification": "Отправить тестовое уведомление",
     "sharedCalendar": "Календарь",
     "sharedCalendars": "Календари",
     "sharedFile": "Файл",
-    "sharedSelectFile": "Выбрать Файл",
+    "sharedSelectFile": "Выбрать файл",
     "sharedPhone": "Телефон",
     "sharedRequired": "Обязательные",
     "sharedPreferences": "Настройки",
@@ -68,35 +67,36 @@
     "sharedTypeString": "Строка",
     "sharedTypeNumber": "Число",
     "sharedTypeBoolean": "Логическое значение",
-    "sharedTimezone": "Часовой Пояс",
+    "sharedTimezone": "Часовой пояс",
     "sharedInfoTitle": "Инфо",
-    "sharedSavedCommand": "Сохраненная Команда",
-    "sharedSavedCommands": "Сохраненные Команды",
+    "sharedSavedCommand": "Сохраненная команда",
+    "sharedSavedCommands": "Сохраненные команды",
     "sharedNew": "Новый...",
-    "sharedShowAddress": "Показать Адрес",
+    "sharedShowAddress": "Показать адрес",
     "sharedDisabled": "Отключен",
     "sharedMaintenance": "Обслуживание",
-    "sharedMaintenances": "Обслуживания",
+    "sharedDeviceAccumulators": "Аккумуляторы",
+    "sharedAlarms": "Тревоги",
     "attributeSpeedLimit": "Ограничение скорости",
-    "attributePolylineDistance": "Polyline Distance",
+    "attributePolylineDistance": "Расстояние от линии",
     "attributeReportIgnoreOdometer": "Отчет: Игнорировать одометер",
     "attributeWebReportColor": "Веб: Цвет отчета",
-    "attributeDevicePassword": "Пароль Устройтва",
+    "attributeDevicePassword": "Пароль устройтва",
     "attributeProcessingCopyAttributes": "Обработка: Копирование атрибутов",
     "attributeColor": "Цвет",
     "attributeWebLiveRouteLength": "Веб: Длина онлайн маршрута",
     "attributeWebSelectZoom": "Веб: Увеличение при выборе",
     "attributeWebMaxZoom": "Веб: Максимальное увеличение",
-    "attributeMailSmtpHost": "Почта: SMTP Хост",
-    "attributeMailSmtpPort": "Почта: SMTP Порт",
+    "attributeMailSmtpHost": "Почта: SMTP хост",
+    "attributeMailSmtpPort": "Почта: SMTP порт",
     "attributeMailSmtpStarttlsEnable": "Почта: Включить SMTP STARTTLS",
-    "attributeMailSmtpStarttlsRequired": "Почта: SMTP STARTTLS Необходим",
+    "attributeMailSmtpStarttlsRequired": "Почта: Необходим SMTP STARTTLS",
     "attributeMailSmtpSslEnable": "Почта: Включить SMTP SSL",
-    "attributeMailSmtpSslTrust": "Почта: SMTP SSL Доверие",
-    "attributeMailSmtpSslProtocols": "Почта: SMTP SSL Протоколы",
-    "attributeMailSmtpFrom": "Почта: SMTP Отправитель",
+    "attributeMailSmtpSslTrust": "Почта: Доверие SMTP SSL",
+    "attributeMailSmtpSslProtocols": "Почта: Протоколы SMTP SSL",
+    "attributeMailSmtpFrom": "Почта: SMTP отправитель",
     "attributeMailSmtpAuth": "Почта: Включить SMTP аутентификацию",
-    "attributeMailSmtpUsername": "Почта: SMTP Имя пользователя",
+    "attributeMailSmtpUsername": "Почта: SMTP имя пользователя",
     "attributeMailSmtpPassword": "Почта: SMTP пароль",
     "attributeUiDisableReport": "UI: Отключить отчеты",
     "attributeUiDisableEvents": "UI: Отключить события",
@@ -104,13 +104,13 @@
     "attributeUiDisableDrivers": "UI: Отключить водителей",
     "attributeUiDisableComputedAttributes": "UI: Отключить вычисляемые атрибуты",
     "attributeUiDisableCalendars": "UI: Отключить календари",
-    "attributeUiDisableMaintenances": "UI: Отключить обслуживания",
-    "attributeUiHidePositionAttributes": "UI: Скрывать Атрибуты",
+    "attributeUiDisableMaintenance": "UI: Отключить обслуживание",
+    "attributeUiHidePositionAttributes": "UI: Скрывать атрибуты",
     "errorTitle": "Ошибка",
     "errorGeneral": "Неправильные параметры или нарушение ограничений",
     "errorConnection": "Ошибка соединения",
     "errorSocket": "Ошибка web socket соединения",
-    "errorZero": "Не может быть ноль",
+    "errorZero": "Не может быть нулевым",
     "userEmail": "Email",
     "userPassword": "Пароль",
     "userAdmin": "Администратор",
@@ -151,9 +151,9 @@
     "settingsGroups": "Группы",
     "settingsServer": "Сервер",
     "settingsUsers": "Пользователи",
-    "settingsDistanceUnit": "Единица Расстояния",
-    "settingsSpeedUnit": "Единица Скорости",
-    "settingsVolumeUnit": "Единица Объема",
+    "settingsDistanceUnit": "Единица расстояния",
+    "settingsSpeedUnit": "Единица скорости",
+    "settingsVolumeUnit": "Единица объема",
     "settingsTwelveHourFormat": "12-часовой формат",
     "settingsCoordinateFormat": "Формат координат",
     "reportTitle": "Отчеты",
@@ -178,13 +178,13 @@
     "positionFuel": "Топливо",
     "positionPower": "Питание",
     "positionBattery": "Батарея",
-    "positionRaw": "Сырые",
+    "positionRaw": "Сырые данные",
     "positionIndex": "Индекс",
     "positionHdop": "HDOP",
     "positionVdop": "VDOP",
     "positionPdop": "PDOP",
     "positionSat": "Спутники",
-    "positionSatVisible": "Видимые Спутники",
+    "positionSatVisible": "Видимые спутники",
     "positionRssi": "RSSI",
     "positionGps": "GPS",
     "positionRoaming": "Роуминг",
@@ -198,8 +198,8 @@
     "positionSteps": "Шаги",
     "positionInput": "Входы",
     "positionOutput": "Выходы",
-    "positionBatteryLevel": "Уровень батареи",
-    "positionFuelConsumption": "Потребление топлива",
+    "positionBatteryLevel": "Уровень заряда батареи",
+    "positionFuelConsumption": "Расход топлива",
     "positionRfid": "RFID",
     "positionVersionFw": "Версия прошивки",
     "positionVersionHw": "Версия железа",
@@ -219,8 +219,8 @@
     "positionCommand": "Команда",
     "positionBlocked": "Блокировка",
     "positionDtcs": "Ошибки",
-    "positionObdSpeed": "OBD Скорость",
-    "positionObdOdometer": "OBD Одометр",
+    "positionObdSpeed": "OBD скорость",
+    "positionObdOdometer": "OBD одометр",
     "positionDriverUniqueId": "ID водителя",
     "positionImage": "Изображение",
     "positionAudio": "Аудио",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Форсировать настройки",
     "mapTitle": "Карта",
     "mapLayer": "Слой карты",
-    "mapCustom": "Пользовательская карта",
+    "mapCustom": "Пользовательский (XYZ)",
+    "mapCustomArcgis": "Пользовательский (ArcGIS)",
+    "mapCustomLabel": "Пользовательская карта",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Ключ Bing Maps",
@@ -241,7 +243,7 @@
     "mapBaidu": "Baidu",
     "mapYandexMap": "Яндекс Карты",
     "mapYandexSat": "Яндекс Спутник",
-    "mapWikimedia": "Wikimedia",
+    "mapWikimedia": "Викимедиа",
     "mapShapePolygon": "Многоугольник",
     "mapShapeCircle": "Круг",
     "mapShapePolyline": "Линия",
@@ -253,7 +255,7 @@
     "commandTitle": "Команда",
     "commandSend": "Отправить",
     "commandSent": "Команда отправлена",
-    "commandQueued": "Команда поставлена в очередь",
+    "commandQueued": "Команда добавлена в очередь",
     "commandUnit": "Единицы",
     "commandCustom": "Пользовательская команда",
     "commandDeviceIdentification": "Идентификация устройства",
@@ -265,7 +267,8 @@
     "commandAlarmArm": "Активировать сигнализацию",
     "commandAlarmDisarm": "Деактивировать сигнализацию",
     "commandSetTimezone": "Настроить часовой пояс",
-    "commandRequestPhoto": "Запросить Фото",
+    "commandRequestPhoto": "Запросить фото",
+    "commandPowerOff": "Выключить устройство",
     "commandRebootDevice": "Перезагрузить устройство",
     "commandSendSms": "Отправить СМС",
     "commandSendUssd": "Отправить USSD",
@@ -278,22 +281,15 @@
     "commandSetAgps": "Настроить AGPS",
     "commandSetIndicator": "Настроить индикатор",
     "commandConfiguration": "Конфигурация",
-    "commandGetVersion": "Определить версию",
+    "commandGetVersion": "Запросить версию",
     "commandFirmwareUpdate": "Обновить прошивку",
     "commandSetConnection": "Настроить соединение",
     "commandSetOdometer": "Настроить одометр",
-    "commandGetModemStatus": "Определить состояние модема",
-    "commandGetDeviceStatus": "Определить состояние устройства",
+    "commandGetModemStatus": "Запросить состояние модема",
+    "commandGetDeviceStatus": "Запросить состояние устройства",
     "commandModePowerSaving": "Изменить режим энергосбережения",
     "commandModeDeepSleep": "Изменить режим глубокого сна",
-    "commandMovementAlarm": "Movement Alarm",
-    "commandAlarmBattery": "Battery Alarm",
-    "commandAlarmSos": "SOS Alarm",
-    "commandAlarmRemove": "Remove Alarm",
-    "commandAlarmClock": "Clock Alarm",
-    "commandAlarmSpeed": "Превышение скорости",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Тревога Вибрация",
+    "commandMovementAlarm": "Тревога Движение",
     "commandFrequency": "Частота",
     "commandTimezone": "Смещение временной зоны",
     "commandMessage": "Сообщение",
@@ -305,61 +301,69 @@
     "commandServer": "Сервер",
     "commandPort": "Порт",
     "eventAll": "Все события",
-    "eventDeviceOnline": "Устройство в сети",
-    "eventDeviceUnknown": "Статус устройства неизвестен",
-    "eventDeviceOffline": "Устройство не в сети",
-    "eventDeviceMoving": "Устройство движется",
+    "eventDeviceOnline": "Статус онлайн",
+    "eventDeviceUnknown": "Статус неизвестен",
+    "eventDeviceOffline": "Статус оффлайн",
+    "eventDeviceMoving": "Устройство двигается",
     "eventDeviceStopped": "Устройство остановилось",
-    "eventDeviceOverspeed": "Устройство превышает скорость",
-    "eventDeviceFuelDrop": "Событие слива топлива",
+    "eventDeviceOverspeed": "Превышено ограничение скорости",
+    "eventDeviceFuelDrop": "Слив топлива",
     "eventCommandResult": "Результат команды",
-    "eventGeofenceEnter": "Устройство вошло в геозону",
-    "eventGeofenceExit": "Устройство покинуло геозону",
-    "eventAlarm": "Тревоги",
-    "eventIgnitionOn": "Зажигание ВКЛ",
-    "eventIgnitionOff": "Зажигание ВЫКЛ",
+    "eventGeofenceEnter": "Вход в геозону",
+    "eventGeofenceExit": "Выход из геозоны",
+    "eventAlarm": "Тревога",
+    "eventIgnitionOn": "Зажигание включено",
+    "eventIgnitionOff": "Зажигание выключено",
     "eventMaintenance": "Требуется обслуживание",
     "eventTextMessage": "Текстовое сообщение получено",
-    "eventDriverChanged": "Водитель сменился",
+    "eventDriverChanged": "Водитель изменен",
     "eventsScrollToLast": "Прокрутка до конца",
-    "alarmSos": "Тревога SOS",
-    "alarmVibration": "Тревога вибрации",
-    "alarmMovement": "Тревога сигнализации",
-    "alarmOverspeed": "Тревога превышения скорости",
-    "alarmFallDown": "Тревога падения",
-    "alarmLowBattery": "Тревога Батарея разряжена",
-    "alarmLowPower": "Тревога Низкое Напряжение",
-    "alarmFault": "Тревога Неисправность",
-    "alarmPowerOff": "Тревога Выключение",
-    "alarmPowerOn": "Тревога Включение",
-    "alarmDoor": "Тревога Дверь",
-    "alarmGeofence": "Тревога Геозона",
-    "alarmGeofenceEnter": "Тревога Вход в Геозону",
-    "alarmGeofenceExit": "Тревога Выход из Геозоны",
-    "alarmGpsAntennaCut": "Тревога Отключение GPS-антенны",
-    "alarmAccident": "Тревога Авария",
-    "alarmTow": "Тревога Буксировка",
-    "alarmIdle": "Тревога Простой",
-    "alarmHardAcceleration": "Тревога Резкое Ускорение",
-    "alarmHardBraking": "Тревога Резкое Торможение",
-    "alarmFatigueDriving": "Тревога Усталость Водителя",
-    "alarmPowerCut": "Тревога Отключение Питания",
-    "alarmPowerRestored": "Тревога Питание Восстановлено",
-    "alarmJamming": "Тревога Глушение",
-    "alarmTemperature": "Тревога Температура",
-    "alarmParking": "Тревога Парковка",
-    "alarmShock": "Тревога Шок",
-    "alarmBonnet": "Тревога Капот",
-    "alarmFootBrake": "Тревога Ножной Тормоз",
-    "alarmFuelLeak": "Тревога Утечка Топлива",
-    "alarmTampering": "Тревога Вмешательство",
-    "alarmRemoving": "Тревога Извлечение",
+    "alarmGeneral": "Общее",
+    "alarmSos": "SOS",
+    "alarmVibration": "Вибрация",
+    "alarmMovement": "Движение",
+    "alarmLowspeed": "Низкая скорость",
+    "alarmOverspeed": "Превышение скорости",
+    "alarmFallDown": "Падение",
+    "alarmLowPower": "Низкий уровень питания",
+    "alarmLowBattery": "Батарея разряжена",
+    "alarmFault": "Неисправность",
+    "alarmPowerOff": "Выключение",
+    "alarmPowerOn": "Включение",
+    "alarmDoor": "Дверь",
+    "alarmLock": "Закрыто",
+    "alarmUnlock": "Открыто",
+    "alarmGeofence": "Геозона",
+    "alarmGeofenceEnter": "Вход в геозону",
+    "alarmGeofenceExit": "Выход из геозоны",
+    "alarmGpsAntennaCut": "Отключение GPS-антенны",
+    "alarmAccident": "Авария",
+    "alarmTow": "Буксировка",
+    "alarmIdle": "Простой",
+    "alarmHighRpm": "Высокие обороты",
+    "alarmHardAcceleration": "Резкое ускорение",
+    "alarmHardBraking": "Резкое торможение",
+    "alarmHardCornering": "Резкий поворот",
+    "alarmLaneChange": "Смена полосы",
+    "alarmFatigueDriving": "Усталость водителя",
+    "alarmPowerCut": "Отключение питания",
+    "alarmPowerRestored": "Питание восстановлено",
+    "alarmJamming": "Заглушено",
+    "alarmTemperature": "Температура",
+    "alarmParking": "Парковка",
+    "alarmShock": "Шок",
+    "alarmBonnet": "Капот",
+    "alarmFootBrake": "Ножной тормоз",
+    "alarmFuelLeak": "Утечка топлива",
+    "alarmTampering": "Вмешательство",
+    "alarmRemoving": "Извлечение",
     "notificationType": "Тип уведомления",
-    "notificationAlways": "Все Устройства",
-    "notificationNotificators": "Channels",
-    "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
-    "notificatorSms": "SMS",
+    "notificationAlways": "Все устройства",
+    "notificationNotificators": "Каналы",
+    "notificatorWeb": "Веб",
+    "notificatorMail": "Почта",
+    "notificatorSms": "СМС",
+    "notificatorFirebase": "Мобильный",
     "reportRoute": "Маршрут",
     "reportEvents": "События",
     "reportTrips": "Поездки",
@@ -371,14 +375,15 @@
     "reportChartType": "Тип диаграммы",
     "reportShowMarkers": "Показать маркеры",
     "reportExport": "Экспорт",
+    "reportEmail": "Отчет по почте",
     "reportPeriod": "Период",
     "reportCustom": "Пользовательский",
     "reportToday": "Сегодня",
     "reportYesterday": "Вчера",
-    "reportThisWeek": "Текущая Неделя",
-    "reportPreviousWeek": "Предыдущая Неделя",
-    "reportThisMonth": "Текущий Месяц",
-    "reportPreviousMonth": "Предыдущий Месяц",
+    "reportThisWeek": "Текущая неделя",
+    "reportPreviousWeek": "Предыдущая неделя",
+    "reportThisMonth": "Текущий месяц",
+    "reportPreviousMonth": "Предыдущий месяц",
     "reportDeviceName": "Имя устройства",
     "reportAverageSpeed": "Средняя скорость",
     "reportMaximumSpeed": "Максимальная скорость",
@@ -389,6 +394,8 @@
     "reportEndTime": "Конечное время",
     "reportEndAddress": "Конечный адрес",
     "reportSpentFuel": "Использовано топлива",
+    "reportStartOdometer": "Одометр, начало",
+    "reportEndOdometer": "Одометр, окончание",
     "statisticsTitle": "Статистика",
     "statisticsCaptureTime": "Время сбора",
     "statisticsActiveUsers": "Активные пользователи",
@@ -414,11 +421,12 @@
     "categoryPlane": "Самолёт",
     "categoryShip": "Корабль",
     "categoryTractor": "Трактор",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Поезд",
+    "categoryTram": "Трамвай",
+    "categoryTrolleybus": "Троллейбус",
     "categoryTruck": "Грузовой автомобиль",
     "categoryVan": "Фургон",
+    "categoryScooter": "Скутер",
     "maintenanceStart": "Начало",
     "maintenancePeriod": "Период"
 }
\ No newline at end of file
diff --git a/web/l10n/si.json b/web/l10n/si.json
index 72206179..a58b4e1c 100644
--- a/web/l10n/si.json
+++ b/web/l10n/si.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "ගණනය කළ ගුණාංග",
     "sharedCheckComputedAttribute": "ගණනය කළ ගුණාංගය පරීක්ෂා කරන්න",
     "sharedExpression": "ප්‍රකාශනය",
-    "sharedDeviceDistance": "උපාංග දුර ප්‍රමාණය",
     "sharedDevice": "උපාංගය",
     "sharedTestNotification": "ටෙස්ට් දැනුම්දීම් යවන්න",
     "sharedCalendar": "දින දසුන",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "ලිපිනය පෙන්වන්න",
     "sharedDisabled": "අබාධිතයි",
     "sharedMaintenance": "නඩත්තුව",
-    "sharedMaintenances": "නඩත්තු",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "වේග සීමාව",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "වාර්තාව: නොසලකා හරිනවා ප්රතිමාවේ",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: ධාවකය අක්‍රිය කරන්න",
     "attributeUiDisableComputedAttributes": "UI: පරිගණකගත ගුණාංග අක්‍රිය කරන්න",
     "attributeUiDisableCalendars": "UI: දින දර්ශන අක්‍රිය කරන්න",
-    "attributeUiDisableMaintenances": "UI: නඩත්තු අක්‍රිය කරන්න",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "errorTitle": "දෝෂයක් ",
     "errorGeneral": "අවලංගු පරාමිති හෝ බාධක උල්ලංඝනය කිරීම",
@@ -231,7 +231,9 @@
     "serverForceSettings": "බලය සැකසීම්",
     "mapTitle": "සිතියම",
     "mapLayer": "සිතියම් ස්තරය",
-    "mapCustom": "අභිරුචි සිතියම",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "විවෘත වීදියේ සිතියම",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "අගය",
     "commandTitle": "විධානය",
     "commandSend": "යවන්න",
-    "commandSent": "විධානය යවා ඇත",
-    "commandQueued": "අණ දීම් පෝලිමේ සිටියි",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "ඒකකය",
     "commandCustom": "UI: පරිගණකගත ගුණාංග අක්‍රිය කරන්න",
     "commandDeviceIdentification": "උපාංග හඳුනා ගැනීම",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Disarm Alarm",
     "commandSetTimezone": "කලාපය සකසන්න",
     "commandRequestPhoto": "ඡායාරූප ඉල්ලීම",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "උපකරණය නැවත ආරම්භ කරන්න",
     "commandSendSms": "කෙටි පණිවිඩ යවන්න",
     "commandSendUssd": "USSD යවන්න",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "බල සුරැකීම වෙනස් කරන්න",
     "commandModeDeepSleep": "ගැඹුරු නින්ද වෙනස් කරන්න",
     "commandMovementAlarm": "චලනය නිවේදන",
-    "commandAlarmBattery": "බැටරි නිවේදන",
-    "commandAlarmSos": "SOS නිවේදන",
-    "commandAlarmRemove": "ඉවත් කරන නිවේදන",
-    "commandAlarmClock": "ඔරලෝසු  නිවේදන",
-    "commandAlarmSpeed": "වැඩි වේගය නිවේදන",
-    "commandAlarmFall": "අසමත් නිවේදන",
-    "commandAlarmVibration": "කම්පන  නිවේදන",
     "commandFrequency": "සංඛ්යාතය",
     "commandTimezone": "වේලා කලාපය",
     "commandMessage": "පණිවිඩය",
@@ -305,61 +301,69 @@
     "commandServer": "සේවාදායකය පරිගණකය ",
     "commandPort": "Port",
     "eventAll": "සියලු සිදුවීම්",
-    "eventDeviceOnline": "උපාංගය මාර්ගගතව ඇත",
-    "eventDeviceUnknown": "උපාංගයේ තත්වය නොදන්නා",
-    "eventDeviceOffline": "උපාංගය අසම්බන්ධය",
-    "eventDeviceMoving": "උපාංගය ගමන් කරයි",
-    "eventDeviceStopped": "උපාංගය නතර කර ඇත",
-    "eventDeviceOverspeed": "උපකරණය වේගයෙන් වැඩි වේ",
-    "eventDeviceFuelDrop": "ඉන්ධන පහළට",
+    "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": "තාපනය ක්‍රියාත්මක වේ ",
-    "eventIgnitionOff": "තාපනය ක්‍රියාත්මක නොවේ ",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "නඩත්තු කිරීම අවශයි ",
     "eventTextMessage": "කෙටි පණිවිඩය ලැබී ඇත",
-    "eventDriverChanged": "රියදුරු වෙනස් වී ඇත",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "අන්තිමට චලනය කරන්න",
-    "alarmSos": "SOS නිවේදනය ",
-    "alarmVibration": "කම්පන නිවේදනය ",
-    "alarmMovement": "වෙනස්වීම් නිවේදනය ",
-    "alarmOverspeed": "වැඩි වේග නිවේදනය ",
-    "alarmFallDown": "වැටෙන්න නිවේදනය ",
-    "alarmLowBattery": "අඩු බැටරි නිවේදනය ",
-    "alarmLowPower": "අඩු බලය නිවේදනය ",
-    "alarmFault": "දෝෂයකි",
-    "alarmPowerOff": "විදුලිය විසන්ධි නිවේදනය ",
-    "alarmPowerOn": "විදුලිය ක්‍රියාත්මක නිවේදනය",
-    "alarmDoor": "දොර නිවේදනය",
-    "alarmGeofence": "භූ වැටිය නිවේදනය",
-    "alarmGeofenceEnter": "භූ වැට ඇතුල් කරන ශබ්දය",
-    "alarmGeofenceExit": "භූ වැටිය පිටවීමේ ශබ්දය",
-    "alarmGpsAntennaCut": "GPS ඇන්ටනා කපන නිවේදනය",
-    "alarmAccident": "හදිසි අනතුරු ඇඟවීමේ නිවේදනය",
-    "alarmTow": "වැල්ලේ ශබ්දය",
-    "alarmIdle": "ldle නිවේදනය",
-    "alarmHardAcceleration": "දෘඩ ත්වරණය නිවේදනය",
-    "alarmHardBraking": "දෘඩ තිරිංග නිවේදනය",
-    "alarmFatigueDriving": "ව්යායාම රිය පැදවීමේ අනතුරු ඇගවීම",
-    "alarmPowerCut": "විදුලි කප්පාදු කිරීමේ නිවේදනය",
-    "alarmPowerRestored": "විදුලිබලය පුනස්ථාපනය කරන ලද නිවේදනය",
-    "alarmJamming": "කම්පන ඇම්පියර් නිවේදනය",
-    "alarmTemperature": "උෂ්ණත්ව සංඥාව",
-    "alarmParking": "නැවැත්වීම නිවේදනය",
-    "alarmShock": "කම්පන නිවේදනය",
-    "alarmBonnet": "Bonnet නිවේදනය",
-    "alarmFootBrake": "පා තිරිංග නිවේදනය ",
-    "alarmFuelLeak": "ඉන්ධන කාන්දුවීමේ නිවේදනය",
-    "alarmTampering": "වැරදීමේ නිවේදනය",
-    "alarmRemoving": "ඉවත් කිරීමේ නිවේදනය",
+    "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": "සියලු උපකරණ",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "ගමන් මඟ",
     "reportEvents": "සිදුවීම්",
     "reportTrips": "ගමන්",
@@ -371,6 +375,7 @@
     "reportChartType": "සටහන් වර්ග ",
     "reportShowMarkers": "ලකුණු පෙන්නවන්න ",
     "reportExport": "අපනයන",
+    "reportEmail": "Email Report",
     "reportPeriod": "කාලය",
     "reportCustom": "වෙනස්කම් ",
     "reportToday": "අද",
@@ -389,6 +394,8 @@
     "reportEndTime": "අවසානය",
     "reportEndAddress": "අවසාන ලිපිනය",
     "reportSpentFuel": "වැයවූ ඉන්ධන ",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "සංඛ්යාලේඛන",
     "statisticsCaptureTime": "ග්‍රහණය කර ගන්නා අවස්ථාව ",
     "statisticsActiveUsers": "ක්‍රියාකාරී  පරිශීලකයින්",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "ට්‍රක් රථය",
     "categoryVan": "වැන් රථය ",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "ආරම්භය",
     "maintenancePeriod": "කාලය"
 }
\ No newline at end of file
diff --git a/web/l10n/sk.json b/web/l10n/sk.json
index 6286112f..674a4760 100644
--- a/web/l10n/sk.json
+++ b/web/l10n/sk.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Computed Attributes",
     "sharedCheckComputedAttribute": "Check Computed Attribute",
     "sharedExpression": "Výraz",
-    "sharedDeviceDistance": "Vzdialenosť zariadenia",
     "sharedDevice": "Zariadenie",
     "sharedTestNotification": "Pošli skúšobnú notifikáciu",
     "sharedCalendar": "Kalendár",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Zobraziť adresu",
     "sharedDisabled": "Vypnuté",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Upozornenia",
     "attributeSpeedLimit": "Limit rýchlosti",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Report: Ignoruj kilometrovník",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Zakázať vodičov",
     "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
     "attributeUiDisableCalendars": "UI: Zakázať kalendáre",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "errorTitle": "Chyba",
     "errorGeneral": "Invalid parameters or constraints violation",
@@ -204,7 +204,7 @@
     "positionVersionFw": "Verzia firmvéru",
     "positionVersionHw": "Verzia hardvéru",
     "positionIgnition": "Zapaľovanie",
-    "positionFlags": "Flags",
+    "positionFlags": "Značky",
     "positionCharge": "Charge",
     "positionIp": "IP",
     "positionArchive": "Archív",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Nastavenie sily",
     "mapTitle": "Mapa",
     "mapLayer": "Mapové vrstvy",
-    "mapCustom": "Vlastná mapa",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Klúč Bing Maps",
@@ -247,13 +249,13 @@
     "mapShapePolyline": "Lomená čiara",
     "mapLiveRoutes": "Live Routes",
     "mapPoiLayer": "POI Layer",
-    "stateTitle": "Štát",
+    "stateTitle": "Parametre",
     "stateName": "Parameter",
     "stateValue": "Hodnota",
     "commandTitle": "Príkaz",
     "commandSend": "Odoslať",
-    "commandSent": "Príkaz bol odoslaný",
-    "commandQueued": "Príkaz zaradený do fronty",
+    "commandSent": "Príkaz odoslaný",
+    "commandQueued": "Command queued",
     "commandUnit": "Jednotka",
     "commandCustom": "Vlastný príkaz",
     "commandDeviceIdentification": "Identifikácia zariadenia",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Zrušiť upozornenie",
     "commandSetTimezone": "Nastaviť časovú zónu",
     "commandRequestPhoto": "Poslať fotku",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Rebootovať zariadenie",
     "commandSendSms": "Postať SMS",
     "commandSendUssd": "Postať USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Upraviť šetrenie spotreby",
     "commandModeDeepSleep": "Upraviť hlboký spánok",
     "commandMovementAlarm": "Pohybový alarm",
-    "commandAlarmBattery": "Alarm batérie",
-    "commandAlarmSos": "SOS alarm",
-    "commandAlarmRemove": "Odstrániť alarm",
-    "commandAlarmClock": "Časový alarm",
-    "commandAlarmSpeed": "Upozornenie na prekročenie rýchlosti",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibračný alarm",
     "commandFrequency": "Frekvencia",
     "commandTimezone": "Časová zóna Offset",
     "commandMessage": "Správa",
@@ -305,65 +301,73 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Všetky akcie",
-    "eventDeviceOnline": "Zariadenie je online",
-    "eventDeviceUnknown": "Stav zariadenie je neznámy",
-    "eventDeviceOffline": "Zariadenie je offline",
-    "eventDeviceMoving": "Zariadenie je v pohybe",
-    "eventDeviceStopped": "Zariadenie sa zastavilo",
-    "eventDeviceOverspeed": "Zariadenie prekročilo rýchlosť",
-    "eventDeviceFuelDrop": "Udalosť poklesu paliva",
+    "eventDeviceOnline": "Stav online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Stav offline",
+    "eventDeviceMoving": "Zariadenie sa hýbe",
+    "eventDeviceStopped": "Zariadenie zastavilo",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Výsledok príkazu",
-    "eventGeofenceEnter": "Zariadenie vstúpilo geofence zóny",
-    "eventGeofenceExit": "Zariadenie opustilo geofence zónu",
-    "eventAlarm": "Upozornenia",
-    "eventIgnitionOn": "Zapaľovanie je ZAPNUTÉ",
-    "eventIgnitionOff": "Zapaľovanie je VYPNUTÉ",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Upozornenie",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Vyžaduje sa údržba",
     "eventTextMessage": "Prijatá textová správa",
-    "eventDriverChanged": "Zmenil sa vodič",
+    "eventDriverChanged": "Zmena vodiča",
     "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "SOS upozornenie",
-    "alarmVibration": "Vibračné upozornenie",
-    "alarmMovement": "Upozornenie pohnutia",
-    "alarmOverspeed": "Upozornenie prekročenia rýchlosti ",
-    "alarmFallDown": "Upozornenie FallDown ",
-    "alarmLowBattery": "Upozornenie LowBattery",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Upozorneie poruchy",
-    "alarmPowerOff": "Alarm vypnutia",
-    "alarmPowerOn": "Alarm zapnutia",
-    "alarmDoor": "Dverový alarm",
-    "alarmGeofence": "Geofence Alarm",
-    "alarmGeofenceEnter": "Geofence Enter Alarm",
-    "alarmGeofenceExit": "Geofence Exit Alarm",
-    "alarmGpsAntennaCut": "GPS Antenna Cut Alarm",
-    "alarmAccident": "Alarm nehody",
-    "alarmTow": "Alarm odtiahnutia",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Alarm prudkej akcelerácie",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Fatigue Driving Alarm",
-    "alarmPowerCut": "Power Cut Alarm",
-    "alarmPowerRestored": "Alarm obnovenia napájania",
-    "alarmJamming": "Jamming Alarm",
-    "alarmTemperature": "Teplotný alarm",
-    "alarmParking": "Parkovací alarm",
-    "alarmShock": "Shock Alarm",
-    "alarmBonnet": "Bonnet Alarm",
-    "alarmFootBrake": "Foot Brake Alarm",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Tampering Alarm",
-    "alarmRemoving": "Removing Alarm",
+    "alarmGeneral": "Všeobecné",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibrácia",
+    "alarmMovement": "Pobyb",
+    "alarmLowspeed": "Low Speed",
+    "alarmOverspeed": "Prekročenie rýchlosti",
+    "alarmFallDown": "Fall Down",
+    "alarmLowPower": "Slabý prúd",
+    "alarmLowBattery": "Slabá batéria",
+    "alarmFault": "Chyba",
+    "alarmPowerOff": "Power Off",
+    "alarmPowerOn": "Power On",
+    "alarmDoor": "Door",
+    "alarmLock": "Zamknúť",
+    "alarmUnlock": "Odomknúť",
+    "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": "Napájanie obnovené",
+    "alarmJamming": "Jamming",
+    "alarmTemperature": "Teplota",
+    "alarmParking": "Parkovanie",
+    "alarmShock": "Shock",
+    "alarmBonnet": "Bonnet",
+    "alarmFootBrake": "Foot Brake",
+    "alarmFuelLeak": "Fuel Leak",
+    "alarmTampering": "Tampering",
+    "alarmRemoving": "Removing",
     "notificationType": "Typ notifikácie",
     "notificationAlways": "Všetky zariadenia",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Cesta",
     "reportEvents": "Udalosti",
     "reportTrips": "Cesty",
-    "reportStops": "Stops",
+    "reportStops": "Zastávky",
     "reportSummary": "Zhrnutie",
     "reportChart": "Graf",
     "reportConfigure": "Konfigurácia",
@@ -371,6 +375,7 @@
     "reportChartType": "Typ grafu",
     "reportShowMarkers": "Zobraziť značky",
     "reportExport": "Export",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Vlastné",
     "reportToday": "Dnes",
@@ -389,6 +394,8 @@
     "reportEndTime": "Čas ukončenia",
     "reportEndAddress": "Koncová adresa",
     "reportSpentFuel": "Spotrebované palivo",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Štatistika",
     "statisticsCaptureTime": "Zachyť čas",
     "statisticsActiveUsers": "Aktívny používatelia",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Nákladné auto",
     "categoryVan": "Dodávka",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/sl.json b/web/l10n/sl.json
index 7799f0c1..66a90f7b 100644
--- a/web/l10n/sl.json
+++ b/web/l10n/sl.json
@@ -20,22 +20,22 @@
     "sharedDays": "dni",
     "sharedHours": "ur",
     "sharedMinutes": "minut",
-    "sharedDecimalDegrees": "Decimal Degrees",
-    "sharedDegreesDecimalMinutes": "Degrees Decimal Minutes",
-    "sharedDegreesMinutesSeconds": "Degrees Minutes Seconds",
+    "sharedDecimalDegrees": "Decimalne stopinje",
+    "sharedDegreesDecimalMinutes": "Stopinje Decimalne Minute",
+    "sharedDegreesMinutesSeconds": "Stopinje Minute Sekunde",
     "sharedName": "Ime",
     "sharedDescription": "Opis",
     "sharedSearch": "Iskanje",
     "sharedGeofence": "Omejeno območje",
     "sharedGeofences": "Omejena območja",
     "sharedNotifications": "Obvestila",
-    "sharedNotification": "Notification",
+    "sharedNotification": "Obvestilo",
     "sharedAttributes": "Atributi",
     "sharedAttribute": "Atribut",
     "sharedDrivers": "Vozniki",
     "sharedDriver": "Voznik",
     "sharedArea": "Območje",
-    "sharedSound": "Notification Sound",
+    "sharedSound": "Zvok obvestila",
     "sharedType": "Tip",
     "sharedDistance": "Razdalja",
     "sharedHourAbbreviation": "h",
@@ -48,14 +48,13 @@
     "sharedImpGallon": "Imp. Gallon",
     "sharedUsGallon": "U.S. Gallon",
     "sharedLiterPerHourAbbreviation": "l/h",
-    "sharedGetMapState": "Get Map State",
-    "sharedComputedAttribute": "Computed Attribute",
-    "sharedComputedAttributes": "Computed Attributes",
+    "sharedGetMapState": "Pridobi stanje zemljevida",
+    "sharedComputedAttribute": "Izračunan atribut",
+    "sharedComputedAttributes": "Izračunani atributi",
     "sharedCheckComputedAttribute": "Check Computed Attribute",
-    "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Razdalja naprave",
+    "sharedExpression": "Izraz",
     "sharedDevice": "Naprava",
-    "sharedTestNotification": "Send Test Notification",
+    "sharedTestNotification": "Pošlji testno obvestilo",
     "sharedCalendar": "Koledar",
     "sharedCalendars": "Koledarji",
     "sharedFile": "Datoteka",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Pokaži naslov",
     "sharedDisabled": "Onemogočen",
     "sharedMaintenance": "Vzdrževanje",
-    "sharedMaintenances": "Vzdrževanja",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarmi",
     "attributeSpeedLimit": "Omejitev hitrosti",
     "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": "Napaka",
     "errorGeneral": "Invalid parameters or constraints violation",
@@ -120,7 +120,7 @@
     "userUserLimit": "Omejitev uporabnikov",
     "userDeviceReadonly": "Naprava samo za branje",
     "userLimitCommands": "Omeji ukaze",
-    "userToken": "Token",
+    "userToken": "Žeton",
     "loginTitle": "Prijava",
     "loginLanguage": "Jezik",
     "loginRegister": "Registracija",
@@ -128,7 +128,7 @@
     "loginFailed": "Nepravilna e-pošta ali geslo",
     "loginCreated": "Nov uporabnik je registriran",
     "loginLogout": "Odjava",
-    "loginLogo": "Logo",
+    "loginLogo": "Logotip",
     "devicesAndState": "Naprava in stanje",
     "deviceTitle": "Naprave",
     "deviceIdentifier": "Identifikacija",
@@ -140,8 +140,8 @@
     "deviceFollow": "Sledi",
     "deviceTotalDistance": "Skupna razdalja",
     "deviceStatus": "Stanje",
-    "deviceStatusOnline": "Online",
-    "deviceStatusOffline": "Offline",
+    "deviceStatusOnline": "Povezan",
+    "deviceStatusOffline": "Nepovezan",
     "deviceStatusUnknown": "Neznano",
     "groupDialog": "Skupina",
     "groupParent": "Skupina",
@@ -151,9 +151,9 @@
     "settingsGroups": "Skupine",
     "settingsServer": "Strežnik",
     "settingsUsers": "Uporabniki",
-    "settingsDistanceUnit": "Distance Unit",
-    "settingsSpeedUnit": "Speed Unit",
-    "settingsVolumeUnit": "Volume Unit",
+    "settingsDistanceUnit": "Enota razdalje",
+    "settingsSpeedUnit": "Enota za hitrost",
+    "settingsVolumeUnit": "Enota za volumen",
     "settingsTwelveHourFormat": "12-urni format",
     "settingsCoordinateFormat": "Format koordinat",
     "reportTitle": "Poročila",
@@ -174,9 +174,9 @@
     "positionAddress": "Naslov",
     "positionProtocol": "Protokol",
     "positionDistance": "Razdalja",
-    "positionRpm": "RPM",
+    "positionRpm": "Obrati",
     "positionFuel": "Gorivo",
-    "positionPower": "Power",
+    "positionPower": "Napajanje",
     "positionBattery": "Baterija",
     "positionRaw": "Raw",
     "positionIndex": "Index",
@@ -191,36 +191,36 @@
     "positionEvent": "Dogodek",
     "positionAlarm": "Alarm",
     "positionStatus": "Stanje",
-    "positionOdometer": "Odometer",
+    "positionOdometer": "Stanje števca",
     "positionServiceOdometer": "Service Odometer",
     "positionTripOdometer": "Trip Odometer",
     "positionHours": "Ur",
     "positionSteps": "Steps",
     "positionInput": "Input",
-    "positionOutput": "Output",
+    "positionOutput": "Izhod",
     "positionBatteryLevel": "Nivo baterije",
-    "positionFuelConsumption": "Fuel Consumption",
+    "positionFuelConsumption": "Poraba goriva",
     "positionRfid": "RFID",
     "positionVersionFw": "Firmware Version",
     "positionVersionHw": "Hardware Version",
     "positionIgnition": "Kontakt",
-    "positionFlags": "Flags",
+    "positionFlags": "Zastavice",
     "positionCharge": "Charge",
     "positionIp": "IP",
     "positionArchive": "Arhiv",
     "positionVin": "VIN",
-    "positionApproximate": "Approximate",
+    "positionApproximate": "Približno",
     "positionThrottle": "Throttle",
     "positionMotion": "Gibanje",
     "positionArmed": "Armed",
-    "positionAcceleration": "Acceleration",
-    "positionDeviceTemp": "Device Temperature",
+    "positionAcceleration": "Pospeševanje",
+    "positionDeviceTemp": "Temperatura naprave",
     "positionOperator": "Operator",
     "positionCommand": "Ukaz",
-    "positionBlocked": "Blocked",
+    "positionBlocked": "Blokirano",
     "positionDtcs": "DTCs",
-    "positionObdSpeed": "OBD Speed",
-    "positionObdOdometer": "OBD Odometer",
+    "positionObdSpeed": "OBD hitrost",
+    "positionObdOdometer": "OBD Stanje števca",
     "positionDriverUniqueId": "Driver Unique Id",
     "positionImage": "Slika",
     "positionAudio": "Zvok",
@@ -231,16 +231,18 @@
     "serverForceSettings": "Vsili nastavitve",
     "mapTitle": "Karta",
     "mapLayer": "Zemljevidi",
-    "mapCustom": "Poljubna karta",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Karta",
     "mapBingKey": "Bing Mapk Ključ",
     "mapBingRoad": "Bing Maps Ceste",
     "mapBingAerial": "Bing Maps Satelit",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Bing zemljevid hibrid",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Yandex zemljevid",
+    "mapYandexSat": "Yandex satelit",
     "mapWikimedia": "Wikimedia",
     "mapShapePolygon": "Poligon",
     "mapShapeCircle": "Krog",
@@ -253,20 +255,21 @@
     "commandTitle": "Ukaz",
     "commandSend": "Pošlji",
     "commandSent": "Ukaz poslan",
-    "commandQueued": "Command has been queued",
+    "commandQueued": "Ukaz v čakalni vrsti",
     "commandUnit": "Naprava",
-    "commandCustom": "Custom command",
-    "commandDeviceIdentification": "Device Identification",
+    "commandCustom": "Ukaz po meri",
+    "commandDeviceIdentification": "Identifikacija naprave",
     "commandPositionSingle": "Single Reporting",
     "commandPositionPeriodic": "Periodično poročanje",
     "commandPositionStop": "Ustavi poročanje",
     "commandEngineStop": "Ugasni motor",
     "commandEngineResume": "Prižgi motor",
-    "commandAlarmArm": "Arm Alarm",
-    "commandAlarmDisarm": "Disarm Alarm",
-    "commandSetTimezone": "Set Timezone",
-    "commandRequestPhoto": "Request Photo",
-    "commandRebootDevice": "Reboot Device",
+    "commandAlarmArm": "Vklopi alarm",
+    "commandAlarmDisarm": "Izklopi alarm",
+    "commandSetTimezone": "Nastavi časovni pas",
+    "commandRequestPhoto": "Zahtevaj sliko",
+    "commandPowerOff": "Power Off Device",
+    "commandRebootDevice": "Ponovno zaženi napravo",
     "commandSendSms": "Pošlji SMS",
     "commandSendUssd": "Pošlji USSD",
     "commandSosNumber": "Nastavi SOS številko",
@@ -275,25 +278,18 @@
     "commandVoiceMessage": "Glasovno sporočilo",
     "commandOutputControl": "Output Control",
     "commandVoiceMonitoring": "Voice Monitoring",
-    "commandSetAgps": "Set AGPS",
+    "commandSetAgps": "Nastavi AGPS",
     "commandSetIndicator": "Set Indicator",
     "commandConfiguration": "Nastavitve",
     "commandGetVersion": "Get Version",
     "commandFirmwareUpdate": "Update Firmware",
     "commandSetConnection": "Set Connection",
-    "commandSetOdometer": "Set Odometer",
+    "commandSetOdometer": "Nastavi stanje števca",
     "commandGetModemStatus": "Get Modem Status",
     "commandGetDeviceStatus": "Get Device Status",
     "commandModePowerSaving": "Modify Power Saving",
     "commandModeDeepSleep": "Modify Deep Sleep",
-    "commandMovementAlarm": "Movement Alarm",
-    "commandAlarmBattery": "Battery Alarm",
-    "commandAlarmSos": "SOS Alarm",
-    "commandAlarmRemove": "Remove Alarm",
-    "commandAlarmClock": "Clock Alarm",
-    "commandAlarmSpeed": "Overspeed Alarm",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
+    "commandMovementAlarm": "Alarm: Premikanje",
     "commandFrequency": "Frekvenca",
     "commandTimezone": "Timezone Offset",
     "commandMessage": "Sporočilo",
@@ -305,61 +301,69 @@
     "commandServer": "Strežnik",
     "commandPort": "Vrata",
     "eventAll": "Vsi dogodki",
-    "eventDeviceOnline": "Naprava je povezana",
-    "eventDeviceUnknown": "Stanje naprave ni znano",
-    "eventDeviceOffline": "Naprava ni povezana",
+    "eventDeviceOnline": "Stanje: povezan",
+    "eventDeviceUnknown": "Neznano stanje",
+    "eventDeviceOffline": "Stanje: nepovezan",
     "eventDeviceMoving": "Naprava se premika",
     "eventDeviceStopped": "Naprava se je ustavila",
-    "eventDeviceOverspeed": "Naprava je prekoračila omejitev hitrosti",
-    "eventDeviceFuelDrop": "Fuel drop event",
+    "eventDeviceOverspeed": "Omejitev hitrosti prekoračena",
+    "eventDeviceFuelDrop": "Padec goriva",
     "eventCommandResult": "Rezultat ukaza",
-    "eventGeofenceEnter": "Device has entered geofence",
-    "eventGeofenceExit": "Device has exited geofence",
-    "eventAlarm": "Alarmi",
-    "eventIgnitionOn": "Kontakt",
-    "eventIgnitionOff": "Odvzem kontakta",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Vžig",
+    "eventIgnitionOff": "Vžig izključen",
     "eventMaintenance": "Potrebno vzdrževanje",
     "eventTextMessage": "Sporočilo sprejeto",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "SOS Alarm",
-    "alarmVibration": "Vibration Alarm",
-    "alarmMovement": "Movement Alarm",
-    "alarmOverspeed": "Overspeed Alarm",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "LowBattery Alarm",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Fault Alarm",
-    "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": "Splošno",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibracije",
+    "alarmMovement": "Premikanje",
+    "alarmLowspeed": "Nizka hitrost",
+    "alarmOverspeed": "Prekoračitev hitrosti",
+    "alarmFallDown": "Fall Down",
+    "alarmLowPower": "Low Power",
+    "alarmLowBattery": "Low Battery",
+    "alarmFault": "Napaka",
+    "alarmPowerOff": "Izklop",
+    "alarmPowerOn": "Vklop",
+    "alarmDoor": "Vrata",
+    "alarmLock": "Zakleni",
+    "alarmUnlock": "Odkleni",
+    "alarmGeofence": "Geofence",
+    "alarmGeofenceEnter": "Geofence Enter",
+    "alarmGeofenceExit": "Geofence Exit",
+    "alarmGpsAntennaCut": "GPS Antenna Cut",
+    "alarmAccident": "Nesreča",
+    "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": "Napajanje obnovljeno",
+    "alarmJamming": "Motnja",
+    "alarmTemperature": "Temperatura",
+    "alarmParking": "Parking",
+    "alarmShock": "Shock",
+    "alarmBonnet": "Bonnet",
+    "alarmFootBrake": "Foot Brake",
+    "alarmFuelLeak": "Fuel Leak",
+    "alarmTampering": "Tampering",
+    "alarmRemoving": "Odstranjujem",
     "notificationType": "Tip obvestil",
     "notificationAlways": "Vse naprave",
-    "notificationNotificators": "Channels",
-    "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
+    "notificationNotificators": "Kanali",
+    "notificatorWeb": "Splet",
+    "notificatorMail": "Elektronska pošta",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobilno",
     "reportRoute": "Pot",
     "reportEvents": "Dogodki",
     "reportTrips": "Poti",
@@ -367,12 +371,13 @@
     "reportSummary": "Povzetek",
     "reportChart": "Graf",
     "reportConfigure": "Nastavi",
-    "reportEventTypes": "Event Types",
+    "reportEventTypes": "Tipi dogodkov",
     "reportChartType": "Tip grafa",
     "reportShowMarkers": "Prikaži oznake",
     "reportExport": "Izvozi",
+    "reportEmail": "Email Report",
     "reportPeriod": "Obdobje",
-    "reportCustom": "Custom",
+    "reportCustom": "Poljubno",
     "reportToday": "Danes",
     "reportYesterday": "Včeraj",
     "reportThisWeek": "Ta teden",
@@ -389,6 +394,8 @@
     "reportEndTime": "Končni čas",
     "reportEndAddress": "Končni naslov",
     "reportSpentFuel": "Porabljeno gorivo",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistika",
     "statisticsCaptureTime": "Začetni čas",
     "statisticsActiveUsers": "Aktivni uporabniki",
@@ -414,11 +421,12 @@
     "categoryPlane": "Letalo",
     "categoryShip": "Ladja",
     "categoryTractor": "Traktor",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Vlak",
+    "categoryTram": "Tramvaj",
+    "categoryTrolleybus": "Trolejbus",
     "categoryTruck": "Tovornjak",
     "categoryVan": "Kombi",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Obdobje"
 }
\ No newline at end of file
diff --git a/web/l10n/sq.json b/web/l10n/sq.json
index 28aa3f42..51eb480f 100644
--- a/web/l10n/sq.json
+++ b/web/l10n/sq.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": "Gabim",
     "errorGeneral": "Invalid parameters or constraints violation",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Force Settings",
     "mapTitle": "Harta",
     "mapLayer": "Zgjedhje harte",
-    "mapCustom": "Hartë e përshtatur",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Vlera",
     "commandTitle": "Komandë",
     "commandSend": "Dërgo",
-    "commandSent": "Komanda u dërgua",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Njësi",
     "commandCustom": "Custom command",
     "commandDeviceIdentification": "Device Identification",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Disarm Alarm",
     "commandSetTimezone": "Set Timezone",
     "commandRequestPhoto": "Request Photo",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Reboot Device",
     "commandSendSms": "Send 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": "Overspeed Alarm",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "Frekuenca",
     "commandTimezone": "Timezone Offset",
     "commandMessage": "Message",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "All Events",
-    "eventDeviceOnline": "Device is online",
-    "eventDeviceUnknown": "Device status is unknown",
-    "eventDeviceOffline": "Device is offline",
-    "eventDeviceMoving": "Device is moving",
-    "eventDeviceStopped": "Device has stopped",
-    "eventDeviceOverspeed": "Device exceeds the speed",
-    "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": "Command result",
-    "eventGeofenceEnter": "Device has entered geofence",
-    "eventGeofenceExit": "Device has exited geofence",
-    "eventAlarm": "Alarms",
-    "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 Alarm",
-    "alarmVibration": "Vibration Alarm",
-    "alarmMovement": "Movement Alarm",
-    "alarmOverspeed": "Overspeed Alarm",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "LowBattery Alarm",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Fault Alarm",
-    "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": "Type of Notification",
     "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
diff --git a/web/l10n/sr.json b/web/l10n/sr.json
index e5fd9ec1..c538a171 100644
--- a/web/l10n/sr.json
+++ b/web/l10n/sr.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Kompjuterizovani atributi",
     "sharedCheckComputedAttribute": "Proveri kompjuterski atribut",
     "sharedExpression": "Izraz",
-    "sharedDeviceDistance": "Ukupno prešao",
     "sharedDevice": "Uređaj",
     "sharedTestNotification": "Pošalji Test Poruku",
     "sharedCalendar": "Kalendar",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Prikaži adresu",
     "sharedDisabled": "Onemogućeno",
     "sharedMaintenance": "Održavanje",
-    "sharedMaintenances": "Održavanja",
+    "sharedDeviceAccumulators": "Akumulatori",
+    "sharedAlarms": "Alarmi",
     "attributeSpeedLimit": "Ograničenje brzine",
     "attributePolylineDistance": "Višelinijska udaljenost",
     "attributeReportIgnoreOdometer": "Izveštaj: Ignoriši odometar",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Onemogući Vozače",
     "attributeUiDisableComputedAttributes": "UI: Onemogući kompjuterizovane atribute",
     "attributeUiDisableCalendars": "UI: Onemogući Kalendare",
-    "attributeUiDisableMaintenances": "KI: Onemogući održavanja",
+    "attributeUiDisableMaintenance": "Korisnički interfejs: Onemogući Održavanje",
     "attributeUiHidePositionAttributes": "KI:Sakrij poziciju atributa ",
     "errorTitle": "Greška",
     "errorGeneral": "Nevažeći parametri ili kršenje ograničenja",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Obavezna podešavanja",
     "mapTitle": "Mapa",
     "mapLayer": "Vrsta Mape",
-    "mapCustom": "Prilagođena mapa",
+    "mapCustom": "Prilagođeno (XYZ)",
+    "mapCustomArcgis": "Prilagođeno (ArcGIS)",
+    "mapCustomLabel": "Prilagođena mapa",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Vrednost",
     "commandTitle": "Komanda",
     "commandSend": "Pošalji",
-    "commandSent": "Komanda je poslata",
-    "commandQueued": "Komanda je stavljena na red",
+    "commandSent": "Komanda poslata",
+    "commandQueued": "Komanda na čekanju",
     "commandUnit": "Jedinica",
     "commandCustom": "Prilagođena komanda",
     "commandDeviceIdentification": "Identifikacija uređaja",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Onemogući alarm",
     "commandSetTimezone": "Podesi vremensku zonu",
     "commandRequestPhoto": "Zahtevaj fotografiju",
+    "commandPowerOff": "Isključi uređjaj",
     "commandRebootDevice": "Ponovo pokreni uređaj",
     "commandSendSms": "Pošalji SMS",
     "commandSendUssd": "Pošalji USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Podesi potrošnju napajanja",
     "commandModeDeepSleep": "Podesi funkciju mirovanja",
     "commandMovementAlarm": "Alarm kretanja",
-    "commandAlarmBattery": "Prazna baterija alarm",
-    "commandAlarmSos": "SOS Alarm",
-    "commandAlarmRemove": "Ukloni alarm",
-    "commandAlarmClock": "Alarm sata",
-    "commandAlarmSpeed": "Alarm prekoračenja brzine",
-    "commandAlarmFall": "Neuspeli alarm",
-    "commandAlarmVibration": "Vibrirajući alarm",
     "commandFrequency": "Frekvencija",
     "commandTimezone": "Vremenska zona ",
     "commandMessage": "Poruka",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Svi događaji",
-    "eventDeviceOnline": "Uređaj je na mreži",
-    "eventDeviceUnknown": "Status uređaja je nepoznat",
-    "eventDeviceOffline": "Uređaj je van mreže",
-    "eventDeviceMoving": "Uređaj se kreće",
-    "eventDeviceStopped": "Uređaj se zaustavio",
-    "eventDeviceOverspeed": "Uređaj prelazi brzinu",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status nepoznat",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Uređaj u pokretu",
+    "eventDeviceStopped": "Uređaj zaustavljen",
+    "eventDeviceOverspeed": "Granica brzine je prekoračena",
     "eventDeviceFuelDrop": "Pad nivoa goriva",
     "eventCommandResult": "Stanje komande",
-    "eventGeofenceEnter": "Uređaj je ušao u geoogradu",
-    "eventGeofenceExit": "Uređaj je izašao iz geoograde",
-    "eventAlarm": "Alarmi",
-    "eventIgnitionOn": "Kontakt uklj.",
-    "eventIgnitionOff": "Kontakt isklj.",
+    "eventGeofenceEnter": "Ulazak u geoogradu",
+    "eventGeofenceExit": "Izlazak iz geoograde",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Kontakt uključen",
+    "eventIgnitionOff": "Kontakt isključen",
     "eventMaintenance": "Potrebno održavanje",
     "eventTextMessage": "Tekstualma poruka primljena",
-    "eventDriverChanged": "Vozač je promenjen",
+    "eventDriverChanged": "Vozač promenjen",
     "eventsScrollToLast": "Skroluj do zadnjeg",
-    "alarmSos": "SOS alarm",
-    "alarmVibration": "Alarm vibracija",
-    "alarmMovement": "Alarm Kretanja",
-    "alarmOverspeed": "Prekoračenje brzine alarm",
-    "alarmFallDown": "Padanje Alarm",
-    "alarmLowBattery": "Slaba baterija alarm",
-    "alarmLowPower": "Alarm slaba baterija",
-    "alarmFault": "Alarm greške",
-    "alarmPowerOff": "Isključen Alarm",
-    "alarmPowerOn": "Uključen Alarm",
-    "alarmDoor": "Alarm Vrata",
-    "alarmGeofence": "Alarm Geoograde",
-    "alarmGeofenceEnter": "Ulazak u Geoogradu Alarm",
-    "alarmGeofenceExit": "Izlazak iz Geoograde Alarm",
-    "alarmGpsAntennaCut": "Alarm GPS antena presečena",
-    "alarmAccident": "Alarm Sobraćajne nesreće",
-    "alarmTow": "Alarm Prikolice",
-    "alarmIdle": "Alarm na čekanju",
-    "alarmHardAcceleration": "Alarm Naglo Ubrzanje",
-    "alarmHardBraking": "Alarm naglog kočenja",
-    "alarmFatigueDriving": "Alarm Vožnje Velikog Umora",
-    "alarmPowerCut": "Alarm Presečeno Napajanje",
-    "alarmPowerRestored": "Alarm Napon uspostavljen",
-    "alarmJamming": "Alarm Ometanja Signala",
-    "alarmTemperature": "Alarm Temperature",
-    "alarmParking": "Parking.Alarm",
-    "alarmShock": "Šok Alarm",
-    "alarmBonnet": "Alarm Haube",
-    "alarmFootBrake": "Alarm Nožne Kočnice",
-    "alarmFuelLeak": "Alarm curenja goriva",
-    "alarmTampering": "Alarm Kvara",
-    "alarmRemoving": "Uklanjanje Alarma",
+    "alarmGeneral": "Opšte",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibracija",
+    "alarmMovement": "Kretanje",
+    "alarmLowspeed": "Mala brzina",
+    "alarmOverspeed": "Prekoračenje brzine",
+    "alarmFallDown": "Pad",
+    "alarmLowPower": "Nizak napon",
+    "alarmLowBattery": "Slaba baterija",
+    "alarmFault": "Greška",
+    "alarmPowerOff": "Alarm isključen",
+    "alarmPowerOn": "Alarm uključen",
+    "alarmDoor": "Vrata",
+    "alarmLock": "Zaključan",
+    "alarmUnlock": "Otključan",
+    "alarmGeofence": "Geoograda",
+    "alarmGeofenceEnter": "Ulazak u geeogradu",
+    "alarmGeofenceExit": "Izlaz iz geoograde",
+    "alarmGpsAntennaCut": "GPS antena u prekidu",
+    "alarmAccident": "Nesreća",
+    "alarmTow": "Odvlačenje",
+    "alarmIdle": "Na čekanju",
+    "alarmHighRpm": "Visoki obrtaji",
+    "alarmHardAcceleration": "Naglo ubrzanje",
+    "alarmHardBraking": "Naglo kočenje",
+    "alarmHardCornering": "Naglo skretanje",
+    "alarmLaneChange": "Promena trake",
+    "alarmFatigueDriving": "Fatigue Driving",
+    "alarmPowerCut": "Nema napajanja",
+    "alarmPowerRestored": "Napajanje obnovljeno",
+    "alarmJamming": "Ometanje signala",
+    "alarmTemperature": "Temperatura",
+    "alarmParking": "Parking",
+    "alarmShock": "Shock",
+    "alarmBonnet": "Hauba",
+    "alarmFootBrake": "Nožna kočnica",
+    "alarmFuelLeak": "Curenje goriva",
+    "alarmTampering": "Tampering",
+    "alarmRemoving": "Uklanjanje",
     "notificationType": "Tip obaveštenja",
     "notificationAlways": "Svi uređaji",
     "notificationNotificators": "Kanali",
     "notificatorWeb": "Internet",
     "notificatorMail": "Pošta",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobilni",
     "reportRoute": "Ruta",
     "reportEvents": "Događaji",
     "reportTrips": "Vožnje",
@@ -371,6 +375,7 @@
     "reportChartType": "Tip grafikona",
     "reportShowMarkers": "Pokaži markere",
     "reportExport": "Izvezi",
+    "reportEmail": "Email Izveštaj",
     "reportPeriod": "Period",
     "reportCustom": "Prilagodjeno",
     "reportToday": "Danas",
@@ -389,6 +394,8 @@
     "reportEndTime": "Završno vreme",
     "reportEndAddress": "Krajnja adresa",
     "reportSpentFuel": "Potrošeno goriva",
+    "reportStartOdometer": "Odometar početak",
+    "reportEndOdometer": "Odometar kraj",
     "statisticsTitle": "Statistika",
     "statisticsCaptureTime": "Vreme slikanja",
     "statisticsActiveUsers": "Aktivni korisnici",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolejbus",
     "categoryTruck": "Kamion",
     "categoryVan": "Kombi",
+    "categoryScooter": "Skuter",
     "maintenanceStart": "Početak",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
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
diff --git a/web/l10n/ta.json b/web/l10n/ta.json
index bdd55c49..a3f0e6d8 100644
--- a/web/l10n/ta.json
+++ b/web/l10n/ta.json
@@ -17,9 +17,9 @@
     "sharedHour": "மணி நேரம்",
     "sharedMinute": "நிமிடம்",
     "sharedSecond": "விநாடி",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "நாட்கள் ",
+    "sharedHours": "மணி நேரம் ",
+    "sharedMinutes": "நிமிடங்கள்",
     "sharedDecimalDegrees": "தசம டிகிரி",
     "sharedDegreesDecimalMinutes": "தசம டிகிரி நிமிடங்கள்",
     "sharedDegreesMinutesSeconds": "தசம டிகிரி நொடிகள்",
@@ -29,98 +29,98 @@
     "sharedGeofence": "பூகோள வேலி",
     "sharedGeofences": "பூகோள வேலிகள்",
     "sharedNotifications": "அறிவிப்புகள்",
-    "sharedNotification": "Notification",
+    "sharedNotification": "அறிவிப்பு",
     "sharedAttributes": "பண்புகள்",
     "sharedAttribute": "பண்பு",
-    "sharedDrivers": "Drivers",
-    "sharedDriver": "Driver",
+    "sharedDrivers": "வாகன ஓட்டிகள் ",
+    "sharedDriver": "ஓட்டுநர்கள்",
     "sharedArea": "பகுதி",
-    "sharedSound": "Notification Sound",
+    "sharedSound": "அறிவிப்பு ஒலி",
     "sharedType": "வகை",
     "sharedDistance": "தொலைவு",
     "sharedHourAbbreviation": "ம",
     "sharedMinuteAbbreviation": "நி",
-    "sharedSecondAbbreviation": "s",
-    "sharedVoltAbbreviation": "V",
-    "sharedLiterAbbreviation": "l",
-    "sharedGallonAbbreviation": "gal",
-    "sharedLiter": "Liter",
-    "sharedImpGallon": "Imp. Gallon",
-    "sharedUsGallon": "U.S. Gallon",
-    "sharedLiterPerHourAbbreviation": "l/h",
+    "sharedSecondAbbreviation": "எஸ் ",
+    "sharedVoltAbbreviation": "வி ",
+    "sharedLiterAbbreviation": "எல் ",
+    "sharedGallonAbbreviation": "கேலன்கள்",
+    "sharedLiter": "லிட்டர்",
+    "sharedImpGallon": "கேலன்கள்",
+    "sharedUsGallon": "அமெரிக்கா கேலன்கள்",
+    "sharedLiterPerHourAbbreviation": "லிட்டர்/மணி ",
     "sharedGetMapState": "வரைபட நிலையை பெறு",
-    "sharedComputedAttribute": "Computed Attribute",
-    "sharedComputedAttributes": "Computed Attributes",
-    "sharedCheckComputedAttribute": "Check Computed Attribute",
-    "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Device Distance",
-    "sharedDevice": "Device",
-    "sharedTestNotification": "Send Test Notification",
-    "sharedCalendar": "Calendar",
-    "sharedCalendars": "Calendars",
-    "sharedFile": "File",
-    "sharedSelectFile": "Select File",
-    "sharedPhone": "Phone",
-    "sharedRequired": "Required",
-    "sharedPreferences": "Preferences",
-    "sharedPermissions": "Permissions",
-    "sharedExtra": "Extra",
-    "sharedTypeString": "String",
-    "sharedTypeNumber": "Number",
-    "sharedTypeBoolean": "Boolean",
-    "sharedTimezone": "Timezone",
-    "sharedInfoTitle": "Info",
-    "sharedSavedCommand": "Saved Command",
-    "sharedSavedCommands": "Saved Commands",
-    "sharedNew": "New…",
-    "sharedShowAddress": "Show Address",
-    "sharedDisabled": "Disabled",
-    "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
-    "attributeSpeedLimit": "Speed Limit",
-    "attributePolylineDistance": "Polyline Distance",
-    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
-    "attributeWebReportColor": "Web: Report Color",
-    "attributeDevicePassword": "Device Password",
-    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
-    "attributeColor": "Color",
-    "attributeWebLiveRouteLength": "Web: Live Route Length",
-    "attributeWebSelectZoom": "Web: Zoom On Select",
-    "attributeWebMaxZoom": "Web: Maximum Zoom",
-    "attributeMailSmtpHost": "Mail: SMTP Host",
-    "attributeMailSmtpPort": "Mail: SMTP Port",
-    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable",
-    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS Required",
-    "attributeMailSmtpSslEnable": "Mail: SMTP SSL Enable",
-    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Trust",
-    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL Protocols",
-    "attributeMailSmtpFrom": "Mail: SMTP From",
-    "attributeMailSmtpAuth": "Mail: SMTP Auth Enable",
-    "attributeMailSmtpUsername": "Mail: SMTP Username",
-    "attributeMailSmtpPassword": "Mail: SMTP Password",
-    "attributeUiDisableReport": "UI: Disable Report",
-    "attributeUiDisableEvents": "UI: Disable Events",
-    "attributeUiDisableVehicleFetures": "UI: Disable Vehicle Fetures",
-    "attributeUiDisableDrivers": "UI: Disable Drivers",
-    "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
-    "attributeUiDisableCalendars": "UI: Disable Calendars",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
-    "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
+    "sharedComputedAttribute": "கணக்கிடப்பட்ட பண்புக்கூறு",
+    "sharedComputedAttributes": "கணக்கிடப்பட்ட பண்புக்கூறுகள்",
+    "sharedCheckComputedAttribute": "கணக்கிடப்பட்ட பண்புகளை சரிபார்க்கவும்",
+    "sharedExpression": "வெளிப்பாடு",
+    "sharedDevice": "கருவி ",
+    "sharedTestNotification": "சோதனை அறிவிப்பை அனுப்பவும்",
+    "sharedCalendar": "நாட்காட்டி",
+    "sharedCalendars": "நாட்காட்டிகள் ",
+    "sharedFile": "கோப்பு",
+    "sharedSelectFile": "கோப்பைத் தேர்ந்தெடு",
+    "sharedPhone": "பேசி ",
+    "sharedRequired": "தேவையான",
+    "sharedPreferences": "விரும்பிய தேவைகள் ",
+    "sharedPermissions": "அனுமதிகள்",
+    "sharedExtra": "கூடுதல்",
+    "sharedTypeString": "சரம்",
+    "sharedTypeNumber": "எண் ",
+    "sharedTypeBoolean": "பூலியன்",
+    "sharedTimezone": "நேர மண்டலம்",
+    "sharedInfoTitle": "தகவல் ",
+    "sharedSavedCommand": "சேமித்த கட்டளை",
+    "sharedSavedCommands": "சேமித்த கட்டளைகள்",
+    "sharedNew": "புதிய",
+    "sharedShowAddress": "முகவரி காட்டு",
+    "sharedDisabled": "முடக்கப்பட்ட ",
+    "sharedMaintenance": "பராமரிப்பு",
+    "sharedDeviceAccumulators": "திரட்டி",
+    "sharedAlarms": "முக்கிய அறிவிப்பு ",
+    "attributeSpeedLimit": "வேக வரம்பு",
+    "attributePolylineDistance": "பாலிலைன் தொலைவு",
+    "attributeReportIgnoreOdometer": "அறிக்கை: புறக்கணிக்க வாகன பயண தூர எண்ணி ",
+    "attributeWebReportColor": "வலை: அறிக்கை வண்ணம்",
+    "attributeDevicePassword": "சாதன கடவுச்சொல்",
+    "attributeProcessingCopyAttributes": "செயல்முறை: நகல் காரணிகள்",
+    "attributeColor": "நிறம்",
+    "attributeWebLiveRouteLength": "வலை : வாகன துரித பயண விபரம் ",
+    "attributeWebSelectZoom": "வலை: பெரிதாக்கு தேர்வு",
+    "attributeWebMaxZoom": "வலை: அதிகபட்ச பெரிதாக்கு",
+    "attributeMailSmtpHost": "அஞ்சல்: SMTP புரவலன்",
+    "attributeMailSmtpPort": "அஞ்சல்: SMTP போர்ட்",
+    "attributeMailSmtpStarttlsEnable": "அஞ்சல்: SMTP STARTTLS இயக்கு",
+    "attributeMailSmtpStarttlsRequired": "அஞ்சல்: SMTP STARTTLS தேவை",
+    "attributeMailSmtpSslEnable": "அஞ்சல்: SMTP SSL இயக்கு",
+    "attributeMailSmtpSslTrust": "அஞ்சல்: SMTP SSL அறக்கட்டளை",
+    "attributeMailSmtpSslProtocols": "அஞ்சல்: SMTP SSL வழிமுறைகள் ",
+    "attributeMailSmtpFrom": "அஞ்சல்: SMTP துவக்கம் ",
+    "attributeMailSmtpAuth": "அஞ்சல்: SMTP Auth இயக்கு",
+    "attributeMailSmtpUsername": "அஞ்சல்: SMTP பயனர்பெயர்",
+    "attributeMailSmtpPassword": "அஞ்சல்: SMTP கடவுச்சொல்",
+    "attributeUiDisableReport": "UI: புகாரை முடக்கு",
+    "attributeUiDisableEvents": "UI: முடக்கு நிகழ்வுகள்",
+    "attributeUiDisableVehicleFetures": "UI: வாகன அம்சங்களை முடக்கு",
+    "attributeUiDisableDrivers": "UI: முடக்கு இயக்கிகள்",
+    "attributeUiDisableComputedAttributes": "UI: கணக்கிடப்பட்ட பண்புக்கூறுகளை முடக்கு",
+    "attributeUiDisableCalendars": "UI: நாட்காட்டியை முடக்கு ",
+    "attributeUiDisableMaintenance": "UI: பராமரிப்பு முடக்கவும்",
+    "attributeUiHidePositionAttributes": "UI: நிலை காரணிகள் மறை",
     "errorTitle": "பிழை",
-    "errorGeneral": "Invalid parameters or constraints violation",
+    "errorGeneral": "தவறான அளவுருக்கள் அல்லது தடைகள் மீறல்",
     "errorConnection": "இணைப்புப் பிழை",
-    "errorSocket": "Web socket connection error",
-    "errorZero": "Can't be zero",
+    "errorSocket": "வலை இணைப்பு பிழை",
+    "errorZero": "பூஜ்யமாக இருக்க முடியாது",
     "userEmail": "மின்னஞ்சல்",
     "userPassword": "கடவுச்சொல்",
     "userAdmin": "நிர்வாகி",
     "userRemember": "நினைவில் கொள்",
-    "userExpirationTime": "Expiration",
-    "userDeviceLimit": "Device Limit",
-    "userUserLimit": "User Limit",
-    "userDeviceReadonly": "Device Readonly",
-    "userLimitCommands": "Limit Commands",
-    "userToken": "Token",
+    "userExpirationTime": "காலாவதி",
+    "userDeviceLimit": "சாதன வரம்பு",
+    "userUserLimit": "பயனர் வரம்பு",
+    "userDeviceReadonly": "சாதன வாசிப்பு",
+    "userLimitCommands": "வரம்பு கட்டளைகள்",
+    "userToken": "டோக்கன் ",
     "loginTitle": "உள் நுழை",
     "loginLanguage": "மொழி",
     "loginRegister": "பதிவு செய்ய",
@@ -128,21 +128,21 @@
     "loginFailed": "தவறான மின்னஞ்சல் முகவரி அல்லது கடவுச்சொல்",
     "loginCreated": "புதிய பயனர் பதிவு செய்யப்பட்டுள்ளது",
     "loginLogout": "வெளியேறு",
-    "loginLogo": "Logo",
+    "loginLogo": "இலட்சினை ",
     "devicesAndState": "கருவிகள் மற்றும் அதன் நிலை",
     "deviceTitle": "சாதனம்",
     "deviceIdentifier": "அடையாளங்காட்டி",
-    "deviceModel": "Model",
-    "deviceContact": "Contact",
-    "deviceCategory": "Category",
+    "deviceModel": "மாதிரி",
+    "deviceContact": "தொடர்பு",
+    "deviceCategory": "வகை",
     "deviceLastUpdate": "கடைசியாக புதுப்பிக்கப்பட்டது",
     "deviceCommand": "கட்டளை",
     "deviceFollow": "பின்தொடர்",
-    "deviceTotalDistance": "Total Distance",
-    "deviceStatus": "Status",
-    "deviceStatusOnline": "Online",
-    "deviceStatusOffline": "Offline",
-    "deviceStatusUnknown": "Unknown",
+    "deviceTotalDistance": "மொத்த தூரம்",
+    "deviceStatus": "நிலைமை",
+    "deviceStatusOnline": "வலை தொடர்பில் ",
+    "deviceStatusOffline": "வலை தொடர்பில்லாமை ",
+    "deviceStatusUnknown": "தெரியாத",
     "groupDialog": "குழு",
     "groupParent": "குழு",
     "groupNoGroup": "குழு இல்லை",
@@ -151,21 +151,21 @@
     "settingsGroups": "குழுக்கள்",
     "settingsServer": "சர்வர்",
     "settingsUsers": "உறுப்பினர்கள்",
-    "settingsDistanceUnit": "Distance Unit",
-    "settingsSpeedUnit": "Speed Unit",
-    "settingsVolumeUnit": "Volume Unit",
+    "settingsDistanceUnit": "தூரம் அலகு",
+    "settingsSpeedUnit": "வேக அலகு",
+    "settingsVolumeUnit": "தொகுதி அலகு",
     "settingsTwelveHourFormat": "12 மணி நேர வடிவம்",
-    "settingsCoordinateFormat": "Coordinates Format",
+    "settingsCoordinateFormat": "வடிவமைப்பை ஒருங்கிணைக்கிறது",
     "reportTitle": "அறிக்கை",
     "reportDevice": "சாதனம்",
-    "reportGroup": "Group",
+    "reportGroup": "குழு",
     "reportFrom": "இருந்து",
     "reportTo": "வரை",
     "reportShow": "காண்பி",
     "reportClear": "அழி",
     "positionFixTime": "நேரம்",
     "positionValid": "செல்லுபடியான",
-    "positionAccuracy": "Accuracy",
+    "positionAccuracy": "துல்லியம்",
     "positionLatitude": "அட்சரேகை",
     "positionLongitude": "தீர்க்கரேகை",
     "positionAltitude": "உயரம்",
@@ -173,87 +173,89 @@
     "positionCourse": "பாடநெறி",
     "positionAddress": "முகவரி",
     "positionProtocol": "புரோட்டோகால்",
-    "positionDistance": "Distance",
-    "positionRpm": "RPM",
-    "positionFuel": "Fuel",
-    "positionPower": "Power",
-    "positionBattery": "Battery",
-    "positionRaw": "Raw",
-    "positionIndex": "Index",
-    "positionHdop": "HDOP",
-    "positionVdop": "VDOP",
-    "positionPdop": "PDOP",
-    "positionSat": "Satellites",
-    "positionSatVisible": "Visible Satellites",
-    "positionRssi": "RSSI",
-    "positionGps": "GPS",
-    "positionRoaming": "Roaming",
-    "positionEvent": "Event",
-    "positionAlarm": "Alarm",
-    "positionStatus": "Status",
-    "positionOdometer": "Odometer",
-    "positionServiceOdometer": "Service Odometer",
-    "positionTripOdometer": "Trip Odometer",
-    "positionHours": "Hours",
-    "positionSteps": "Steps",
-    "positionInput": "Input",
-    "positionOutput": "Output",
-    "positionBatteryLevel": "Battery Level",
-    "positionFuelConsumption": "Fuel Consumption",
-    "positionRfid": "RFID",
-    "positionVersionFw": "Firmware Version",
-    "positionVersionHw": "Hardware Version",
-    "positionIgnition": "Ignition",
-    "positionFlags": "Flags",
-    "positionCharge": "Charge",
-    "positionIp": "IP",
-    "positionArchive": "Archive",
-    "positionVin": "VIN",
-    "positionApproximate": "Approximate",
-    "positionThrottle": "Throttle",
-    "positionMotion": "Motion",
-    "positionArmed": "Armed",
-    "positionAcceleration": "Acceleration",
-    "positionDeviceTemp": "Device Temperature",
-    "positionOperator": "Operator",
-    "positionCommand": "Command",
-    "positionBlocked": "Blocked",
+    "positionDistance": "தூரம்",
+    "positionRpm": "ஆர்பிஎம்",
+    "positionFuel": "எரிபொருள்",
+    "positionPower": "சக்தி",
+    "positionBattery": "மின்கலன் ",
+    "positionRaw": "மூல",
+    "positionIndex": "குறியீட்டு",
+    "positionHdop": "துல்லியமான கிடைமட்ட நீக்கம்",
+    "positionVdop": "துல்லியத்தின் செங்குத்து நீக்கம்",
+    "positionPdop": "துல்லியத்தின் நிலை நீக்கம்",
+    "positionSat": "செயற்கைக்கோள்கள்",
+    "positionSatVisible": "தெரியும் செயற்கைக்கோள்கள்",
+    "positionRssi": "சிக்னல் வலிமை காட்டி",
+    "positionGps": "உலகளாவிய நிலைப்படுத்தல் அமைப்பு",
+    "positionRoaming": "சுற்றி கொண்டு",
+    "positionEvent": "நிகழ்வு",
+    "positionAlarm": "அலாரம்",
+    "positionStatus": "நிலைமை ",
+    "positionOdometer": "பயண தூர விபரக்காட்டி ",
+    "positionServiceOdometer": "வாகன பயண தூர விபரக்காட்டி சேவைகள் ",
+    "positionTripOdometer": "வாகன பயண தூர விபரக்காட்டி ",
+    "positionHours": "மணி நேரம் ",
+    "positionSteps": "படிகள்",
+    "positionInput": "உள்ளீடு",
+    "positionOutput": "வெளியீடு",
+    "positionBatteryLevel": "மின்கலன் நிலை",
+    "positionFuelConsumption": "எரிபொருள் பயன்பாடு",
+    "positionRfid": "ரேடியோ அதிர்வெண் அடையாளம்",
+    "positionVersionFw": "நிலையான மென்பொருள் பதிப்பு",
+    "positionVersionHw": "வன்பொருள் பதிப்பு",
+    "positionIgnition": "வாகன துவக்கி ",
+    "positionFlags": "கொடிகள்",
+    "positionCharge": "மின் ஆற்றல் சேமிக்க",
+    "positionIp": "இணைய நெறிமுறை",
+    "positionArchive": "காப்பகத்தை",
+    "positionVin": "வாகனம் அடையாள எண் ",
+    "positionApproximate": "தோராயமான",
+    "positionThrottle": "கழுத்துப்பகுதி",
+    "positionMotion": "இயக்கம்",
+    "positionArmed": "ஆயுத",
+    "positionAcceleration": "முடுக்கம்",
+    "positionDeviceTemp": "சாதன வெப்பநிலை",
+    "positionOperator": "இயக்குனர் ",
+    "positionCommand": "கட்டளை",
+    "positionBlocked": "தடுக்கப்பட்டது",
     "positionDtcs": "DTCs",
-    "positionObdSpeed": "OBD Speed",
-    "positionObdOdometer": "OBD Odometer",
-    "positionDriverUniqueId": "Driver Unique Id",
-    "positionImage": "Image",
-    "positionAudio": "Audio",
+    "positionObdSpeed": "ஓ பி டியின் வேகம் ",
+    "positionObdOdometer": "ஓ பி டி ஓடோமீட்டர் ",
+    "positionDriverUniqueId": "இயக்கி தனிப்பட்ட ஐடி",
+    "positionImage": "படம் ",
+    "positionAudio": "ஒலி ",
     "serverTitle": "சர்வர் அமைப்பு",
     "serverZoom": "பெரிதாக்கு",
     "serverRegistration": "பதிவுசெய்ய",
     "serverReadonly": "படிக்கமட்டும்",
-    "serverForceSettings": "Force Settings",
+    "serverForceSettings": "சக்தி அமைப்புகள்",
     "mapTitle": "வரைபடம்",
     "mapLayer": "வரைபடம் அடுக்கு",
-    "mapCustom": "விருப்ப வரைபடம்",
-    "mapCarto": "Carto Basemaps",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
+    "mapCarto": "கார்ட்டோ வரைபடங்கள்",
     "mapOsm": "திறமூல தெரு வரைபடம்",
     "mapBingKey": "பிங் வரைபட கீ",
     "mapBingRoad": "பிங் சாலை வரைபடம்",
     "mapBingAerial": "பிங் வான்வழி வரைபடம்",
-    "mapBingHybrid": "Bing Maps Hybrid",
-    "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
-    "mapWikimedia": "Wikimedia",
+    "mapBingHybrid": "பிங் வரைபடங்கள்",
+    "mapBaidu": "பைடு வரைபடங்கள்",
+    "mapYandexMap": "யான் டெக்ஸ் வரைபடங்கள்",
+    "mapYandexSat": "யான் டெக்ஸ் செயற்கைக்கோள்",
+    "mapWikimedia": "விக்கிப்பீடியா",
     "mapShapePolygon": "பலகோணம்",
     "mapShapeCircle": "வட்டம்",
-    "mapShapePolyline": "Polyline",
-    "mapLiveRoutes": "Live Routes",
-    "mapPoiLayer": "POI Layer",
+    "mapShapePolyline": "பாலிலைன்",
+    "mapLiveRoutes": "நேரடி வழிகள்",
+    "mapPoiLayer": "POI லேயர்",
     "stateTitle": "நிலை",
     "stateName": "சாட்டு",
     "stateValue": "மதிப்பு",
     "commandTitle": "கட்டளை",
     "commandSend": "அனுப்பு",
     "commandSent": "கட்டளை அனுப்பப்பட்டது",
-    "commandQueued": "Command has been queued",
+    "commandQueued": "கட்டளை வரிசைப்படுத்தப்பட்டது",
     "commandUnit": "அலகு",
     "commandCustom": "விருப்பமான கட்டளை",
     "commandDeviceIdentification": "\nசாதன அடையாளம்",
@@ -266,159 +268,165 @@
     "commandAlarmDisarm": "அலறிமணி நிறுத்தம்",
     "commandSetTimezone": "நேர மண்டலம்",
     "commandRequestPhoto": "புகைப்படம் வேண்டு",
+    "commandPowerOff": "சாதனத்தை முடக்கு ",
     "commandRebootDevice": "சாதன மறுதுவக்கம்",
     "commandSendSms": "குருஞ்செய்தி அனுப்பு",
-    "commandSendUssd": "Send USSD",
+    "commandSendUssd": "ussd ஐ அனுப்பவும்",
     "commandSosNumber": "அவசர அழைப்பு எண்(SOS)",
     "commandSilenceTime": "அமைதி நேரம் அமைக்க",
     "commandSetPhonebook": "தொலைபேசிப்புத்தகம் அமை",
     "commandVoiceMessage": "குரல் செய்தி",
     "commandOutputControl": "வெளியீட்டு கட்டுப்பாடு",
-    "commandVoiceMonitoring": "Voice Monitoring",
-    "commandSetAgps": "Set AGPS",
-    "commandSetIndicator": "Set Indicator",
-    "commandConfiguration": "Configuration",
-    "commandGetVersion": "Get Version",
-    "commandFirmwareUpdate": "Update Firmware",
-    "commandSetConnection": "Set Connection",
-    "commandSetOdometer": "Set Odometer",
-    "commandGetModemStatus": "Get Modem Status",
-    "commandGetDeviceStatus": "Get Device Status",
-    "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",
+    "commandVoiceMonitoring": "குரல் கண்காணிப்பு",
+    "commandSetAgps": "அடுக்களை அமைக்கவும்",
+    "commandSetIndicator": "காட்டி அமைக்க",
+    "commandConfiguration": "கட்டமைப்பு",
+    "commandGetVersion": "பதிப்பை பெரு",
+    "commandFirmwareUpdate": "பிர்மவாறு அமைத்தல் ",
+    "commandSetConnection": "இணைப்பு அமைக்க",
+    "commandSetOdometer": "ஓடோமீட்டர் அமைக்க ",
+    "commandGetModemStatus": "மோடம் நிலையைப் பெறுக",
+    "commandGetDeviceStatus": "சாதன விவரங்கள் பெறுக ",
+    "commandModePowerSaving": "ஆற்றல் சேமிப்பு மாற்ற",
+    "commandModeDeepSleep": "ஆழமான தூக்கத்தை மாற்றியமைக்கவும்",
+    "commandMovementAlarm": "இயக்க எச்சரிக்கை",
     "commandFrequency": "காலஇடைவெளி",
-    "commandTimezone": "Timezone Offset",
+    "commandTimezone": "நேர மண்டலத்தை முடக்கு",
     "commandMessage": "குறுஞ்செய்தி",
-    "commandRadius": "Radius",
-    "commandEnable": "Enable",
+    "commandRadius": "ஆரம்",
+    "commandEnable": "செயல்படுத்த",
     "commandData": "தரவு",
-    "commandIndex": "Index",
+    "commandIndex": "குறியீட்டு",
     "commandPhone": "தொலைபேசி எண்",
-    "commandServer": "Server",
-    "commandPort": "Port",
-    "eventAll": "All Events",
-    "eventDeviceOnline": "சாதனம் இணைப்பில் உள்ளது",
-    "eventDeviceUnknown": "Device status is unknown",
-    "eventDeviceOffline": "சாதன இணைப்பு துண்டிக்கபட்டது",
-    "eventDeviceMoving": "சாதனம் நகருகிறது",
-    "eventDeviceStopped": "Device has stopped",
-    "eventDeviceOverspeed": "சாதனம் நிர்ணயித்த வேகத் திற்கு மேல்",
-    "eventDeviceFuelDrop": "Fuel drop event",
+    "commandServer": "சர்வர்",
+    "commandPort": "தகவல் வழி ",
+    "eventAll": "அனைத்து நிகழ்வுகள்",
+    "eventDeviceOnline": "நிலை ஆன்லைன்",
+    "eventDeviceUnknown": "தெரியாத நிலை",
+    "eventDeviceOffline": "நிலை ஆஃப்லைன்",
+    "eventDeviceMoving": "சாதனம் நகரும்",
+    "eventDeviceStopped": "சாதனம் நிறுத்தப்பட்டது",
+    "eventDeviceOverspeed": "வேகம் வரம்பை மீறிவிட்டது",
+    "eventDeviceFuelDrop": "எரிபொருள் குறைதல் ",
     "eventCommandResult": "கட்டளை விளைவு",
-    "eventGeofenceEnter": "சாதனம் பூகோள வேலியினுள் நுழைந்துள்ளது",
-    "eventGeofenceExit": "சாதனம் பூகோள வேலியை விட்டு வெளியேறியது",
-    "eventAlarm": "Alarms",
-    "eventIgnitionOn": "Ignition is ON",
-    "eventIgnitionOff": "Ignition is OFF",
-    "eventMaintenance": "Maintenance required",
-    "eventTextMessage": "Text message received",
-    "eventDriverChanged": "Driver has changed",
-    "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "SOS Alarm",
-    "alarmVibration": "Vibration Alarm",
-    "alarmMovement": "Movement Alarm",
-    "alarmOverspeed": "Overspeed Alarm",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "LowBattery Alarm",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Fault Alarm",
-    "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",
+    "eventGeofenceEnter": "புவி வேலிக்குள் நுழைந்தது",
+    "eventGeofenceExit": "புவி வேலி வெளியேறின",
+    "eventAlarm": "அலாரம்",
+    "eventIgnitionOn": "பற்றவைப்பு",
+    "eventIgnitionOff": "பற்றவைத்தல்",
+    "eventMaintenance": "பராமரிப்பு தேவை",
+    "eventTextMessage": "உரை செய்தி பெற்றது",
+    "eventDriverChanged": "இயக்குணர் மாற்றப்பட்டது",
+    "eventsScrollToLast": "நீடிக்கும்",
+    "alarmGeneral": "பொது",
+    "alarmSos": "அவசர உதவி ",
+    "alarmVibration": "அதிர்வு",
+    "alarmMovement": "இயக்கம்",
+    "alarmLowspeed": "குறைவான வேகம்",
+    "alarmOverspeed": "அதி வேகம் ",
+    "alarmFallDown": "கீழே விழுதல்",
+    "alarmLowPower": "குறைந்த சக்தி",
+    "alarmLowBattery": "குறைவான மின்கலம் ",
+    "alarmFault": "குற்றம்",
+    "alarmPowerOff": "சக்தி அணை",
+    "alarmPowerOn": "துவக்கு ",
+    "alarmDoor": "கதவு ",
+    "alarmLock": "பூட்டு ",
+    "alarmUnlock": "திறக்க",
+    "alarmGeofence": "புவி வேலி",
+    "alarmGeofenceEnter": "புவி வேலி நுழைவு ",
+    "alarmGeofenceExit": "குறைந்த சக்தி",
+    "alarmGpsAntennaCut": "gps ஆண்டெனா",
+    "alarmAccident": "விபத்து",
+    "alarmTow": "கயிறு",
+    "alarmIdle": "சும்மா",
+    "alarmHighRpm": "உயர் rpm",
+    "alarmHardAcceleration": "கடின முடுக்கம்",
+    "alarmHardBraking": "கடின முறிப்பு",
+    "alarmHardCornering": "கடின முனை",
+    "alarmLaneChange": "பாதை மாற்றம் ",
+    "alarmFatigueDriving": "சோர்வு ஓட்டுநர்",
+    "alarmPowerCut": "மின் வெட்டு",
+    "alarmPowerRestored": "சக்தி மீட்டெடுப்பு ",
+    "alarmJamming": "நெருக்குதல்",
+    "alarmTemperature": "வெப்ப நிலை",
+    "alarmParking": "பார்க்கிங்",
+    "alarmShock": "அதிர்ச்சி",
+    "alarmBonnet": "கார் குட்நெட்",
+    "alarmFootBrake": "கால் பிரேக்",
+    "alarmFuelLeak": "எரிபொருள் கசிவு",
+    "alarmTampering": "சேதப்படுத்திய",
+    "alarmRemoving": "நீக்கி",
     "notificationType": "type of notification",
-    "notificationAlways": "All Devices",
-    "notificationNotificators": "Channels",
-    "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
-    "notificatorSms": "SMS",
-    "reportRoute": "Route",
-    "reportEvents": "Events",
-    "reportTrips": "Trips",
-    "reportStops": "Stops",
-    "reportSummary": "Summary",
-    "reportChart": "Chart",
-    "reportConfigure": "Configure",
-    "reportEventTypes": "Event Types",
-    "reportChartType": "Chart Type",
-    "reportShowMarkers": "Show Markers",
-    "reportExport": "Export",
-    "reportPeriod": "Period",
-    "reportCustom": "Custom",
-    "reportToday": "Today",
-    "reportYesterday": "Yesterday",
-    "reportThisWeek": "This Week",
-    "reportPreviousWeek": "Previous Week",
-    "reportThisMonth": "This Month",
-    "reportPreviousMonth": "Previous Month",
-    "reportDeviceName": "Device Name",
-    "reportAverageSpeed": "Average Speed",
-    "reportMaximumSpeed": "Maximum Speed",
-    "reportEngineHours": "Engine Hours",
-    "reportDuration": "Duration",
-    "reportStartTime": "Start Time",
-    "reportStartAddress": "Start Address",
-    "reportEndTime": "End Time",
-    "reportEndAddress": "End Address",
-    "reportSpentFuel": "Spent Fuel",
-    "statisticsTitle": "Statistics",
-    "statisticsCaptureTime": "Capture Time",
-    "statisticsActiveUsers": "Active Users",
-    "statisticsActiveDevices": "Active Devices",
-    "statisticsRequests": "Requests",
-    "statisticsMessagesReceived": "Messages Received",
-    "statisticsMessagesStored": "Messages Stored",
-    "statisticsGeocoder": "Geocoder Requests",
-    "statisticsGeolocation": "Geolocation Requests",
-    "categoryArrow": "Arrow",
-    "categoryDefault": "Default",
-    "categoryAnimal": "Animal",
-    "categoryBicycle": "Bicycle",
-    "categoryBoat": "Boat",
-    "categoryBus": "Bus",
-    "categoryCar": "Car",
-    "categoryCrane": "Crane",
-    "categoryHelicopter": "Helicopter",
-    "categoryMotorcycle": "Motorcycle",
-    "categoryOffroad": "Offroad",
-    "categoryPerson": "Person",
-    "categoryPickup": "Pickup",
-    "categoryPlane": "Plane",
-    "categoryShip": "Ship",
-    "categoryTractor": "Tractor",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
-    "categoryTruck": "Truck",
-    "categoryVan": "Van",
-    "maintenanceStart": "Start",
-    "maintenancePeriod": "Period"
+    "notificationAlways": "எல்லா சாதனங்களும்",
+    "notificationNotificators": "சேனல்கள்",
+    "notificatorWeb": "வலைத்தளம் ",
+    "notificatorMail": "மின்னஞ்சல்",
+    "notificatorSms": "குறுஞ்சய்தி ",
+    "notificatorFirebase": "கைபேசி",
+    "reportRoute": "பாதை",
+    "reportEvents": "நிகழ்வுகள்",
+    "reportTrips": "பயணங்கள்",
+    "reportStops": "நிறுத்தங்கள்",
+    "reportSummary": "சுருக்கம்",
+    "reportChart": "விளக்கப்படம்",
+    "reportConfigure": "கட்டமைக்கவும்",
+    "reportEventTypes": "நிகழ்வு வகைகள்",
+    "reportChartType": "விளக்கப்படம் வகை",
+    "reportShowMarkers": "குறிப்பான்கள் காட்டு",
+    "reportExport": "ஏற்றுமதி",
+    "reportEmail": "மின்னஞ்சல் அறிக்கை",
+    "reportPeriod": "காலம்",
+    "reportCustom": "விருப்ப",
+    "reportToday": "இன்று",
+    "reportYesterday": "நேற்று",
+    "reportThisWeek": "இந்த வாரம்",
+    "reportPreviousWeek": "முந்தைய வாரம்",
+    "reportThisMonth": "இந்த மாதம்",
+    "reportPreviousMonth": "சென்ற மாதம்",
+    "reportDeviceName": "சாதன பெயர்",
+    "reportAverageSpeed": "சராசரி வேகம்",
+    "reportMaximumSpeed": "அதிகபட்ச வேகம்",
+    "reportEngineHours": "இயந்திர மணி",
+    "reportDuration": "கால அளவு ",
+    "reportStartTime": "துவக்க நேரம் ",
+    "reportStartAddress": "தொடக்க முகவரி ",
+    "reportEndTime": "முடிவு நேரம்",
+    "reportEndAddress": "இறுதி முகவரி",
+    "reportSpentFuel": "எரிபொருள் செலவு",
+    "reportStartOdometer": "ஓடோமீட்டர் தொடக்கம்",
+    "reportEndOdometer": "ஓடோமீட்டர் முடிவு  ",
+    "statisticsTitle": "புள்ளியியல்",
+    "statisticsCaptureTime": "நேரம் பிடி",
+    "statisticsActiveUsers": "செயலில் பயனர்கள்",
+    "statisticsActiveDevices": "செயல்படும் சாதனங்கள் ",
+    "statisticsRequests": "கோரிக்கைகள் ",
+    "statisticsMessagesReceived": "செய்திகள் பெறப்பட்டன",
+    "statisticsMessagesStored": "சேமித்த செய்திகள்",
+    "statisticsGeocoder": "பூகோள கோரிக்கை",
+    "statisticsGeolocation": "பூகோள கோரிக்கைகள் ",
+    "categoryArrow": "அம்பு",
+    "categoryDefault": "இயல்புநிலை",
+    "categoryAnimal": "கால்நடை",
+    "categoryBicycle": "மிதிவண்டி",
+    "categoryBoat": "படகு",
+    "categoryBus": "பேருந்து",
+    "categoryCar": "கார்",
+    "categoryCrane": "கிரேன்",
+    "categoryHelicopter": "ஹெலிகாப்டர்",
+    "categoryMotorcycle": "மோட்டார் சைக்கிள்",
+    "categoryOffroad": "இனிய சாலை",
+    "categoryPerson": "நபர்",
+    "categoryPickup": "இடும்",
+    "categoryPlane": "விமானம்",
+    "categoryShip": "கப்பல்",
+    "categoryTractor": "டிராக்டர்",
+    "categoryTrain": "ரயில்",
+    "categoryTram": "டிராம்",
+    "categoryTrolleybus": "தள்ளுவண்டி",
+    "categoryTruck": "கண ரக வாகனம்",
+    "categoryVan": "வேன் வாகனம் ",
+    "categoryScooter": "Scooter",
+    "maintenanceStart": "துவக்கு ",
+    "maintenancePeriod": "காலம்"
 }
\ No newline at end of file
diff --git a/web/l10n/th.json b/web/l10n/th.json
index 2fe9f35d..03cf4215 100644
--- a/web/l10n/th.json
+++ b/web/l10n/th.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "คำนวณแอตทริบิวต์",
     "sharedCheckComputedAttribute": "ตรวจสอบคอมพิวเตอร์แอตทริบิวต์",
     "sharedExpression": "การแสดงออก",
-    "sharedDeviceDistance": "ระยะทาง อุปกรณ์",
     "sharedDevice": "อุปกรณ์",
     "sharedTestNotification": "ส่งการแจ้งเตือนการทดสอบ",
     "sharedCalendar": "ปฏิทิน",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "แสดงที่อยู่",
     "sharedDisabled": "ปิดการใช้งาน",
     "sharedMaintenance": "ซ่อมบำรุง",
-    "sharedMaintenances": "ซ่อมบำรุง",
+    "sharedDeviceAccumulators": "รวม",
+    "sharedAlarms": "เตือน",
     "attributeSpeedLimit": "จำกัดความเร็ว",
     "attributePolylineDistance": "เส้นระยะทาง",
     "attributeReportIgnoreOdometer": "รายงาน: ละเว้นวัดระยะ",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: ปิดการใช้งานไดร์เวอร์",
     "attributeUiDisableComputedAttributes": "UI: ปิดใช้งานแอ็ตทริบิวต์ที่คำนวณ",
     "attributeUiDisableCalendars": "UI: ปิดปฏิทิน",
-    "attributeUiDisableMaintenances": "UI: ปิดการซ่อมบำรุง",
+    "attributeUiDisableMaintenance": "UI: ปิด-ซ่อมบำรุง",
     "attributeUiHidePositionAttributes": "UI: ซ่อนตำแหน่งลักษณะ",
     "errorTitle": "ผิดพลาด",
     "errorGeneral": "ไม่ถูกต้องพารามิเตอร์หรือ จำกัด การละเมิด",
@@ -231,7 +231,9 @@
     "serverForceSettings": "บังคับ การตั้งค่า",
     "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": "กำลังรอคิวคำสั่ง..",
+    "commandSent": "คำสั่ง-ส่งแล้ว",
+    "commandQueued": "คำสั่ง-คิว",
     "commandUnit": "หน่วย",
     "commandCustom": "คำสั่งกำหนดเอง",
     "commandDeviceIdentification": "หมายเลขอุปกรณ์",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "แจ้งเตือนยกเลิกติดต่อสาขา",
     "commandSetTimezone": "ตั้งค่าเขตเวลา",
     "commandRequestPhoto": "สั่งถ่ายภาพ",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "รีบูต",
     "commandSendSms": "ส่ง SMS",
     "commandSendUssd": "ส่ง USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "แก้ไขการประหยัดพลังงาน",
     "commandModeDeepSleep": "ปรับเปลี่ยนการนอนหลับลึก",
     "commandMovementAlarm": "สัญญาณเตือนการเคลื่อนไหว",
-    "commandAlarmBattery": "สัญญาณเตือนแบตเตอรี่",
-    "commandAlarmSos": "สัญญาณเตือน SOS",
-    "commandAlarmRemove": "ลบการแจ้งเตือน",
-    "commandAlarmClock": "นาฬิกาปลุก",
-    "commandAlarmSpeed": "แจ้งเตือนความเร็วเกินกำหนด",
-    "commandAlarmFall": "สัญญานเตือนความผิดผลาด",
-    "commandAlarmVibration": "สัญญาณเตือนการสั่นสะเทือน",
     "commandFrequency": "ความถี่",
     "commandTimezone": "เขตเวลา ตรงข้าม",
     "commandMessage": "ข้อความ",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "เหตุการณ์ทั้งหมด",
-    "eventDeviceOnline": "อุปกรณ์เชื่อมต่อแล้ว",
-    "eventDeviceUnknown": "สถานะของอุปกรณ์ไม่เป็นที่รู้จัก",
-    "eventDeviceOffline": "อุปกรณ์ไม่ได้เชื่อมต่อ",
-    "eventDeviceMoving": "อุปกรณ์กำลังเคลื่อนที่",
-    "eventDeviceStopped": "อุปกรณ์กำลังหยุด",
-    "eventDeviceOverspeed": "อุปกรณ์เกินกำหนดความเร็ว",
-    "eventDeviceFuelDrop": "เหตุการณ์ลดน้ำมันเชื้อเพลิง",
+    "eventDeviceOnline": "ออนไลน์",
+    "eventDeviceUnknown": "ไม่ระบุ",
+    "eventDeviceOffline": "ออฟไลน์",
+    "eventDeviceMoving": "เคลื่อนที่",
+    "eventDeviceStopped": "หยุด/จอด",
+    "eventDeviceOverspeed": "ความเร็วเกิน",
+    "eventDeviceFuelDrop": "เชื้อเพลิงลด",
     "eventCommandResult": "ผลลัพธ์จากคำสั่ง",
-    "eventGeofenceEnter": "อุปกรณ์เข้าในเขตพื้นที่",
-    "eventGeofenceExit": "อุปกรณ์ออกนอกเขตพื้นที่",
-    "eventAlarm": "แจ้งเตือน",
-    "eventIgnitionOn": "สวิทย์กุญแจ เปิด",
-    "eventIgnitionOff": "สวิทย์กุญแจ ปิด",
+    "eventGeofenceEnter": "เข้าเขต",
+    "eventGeofenceExit": "ออกนอกเขต",
+    "eventAlarm": "เตือน",
+    "eventIgnitionOn": "เครื่องยนต์ติด",
+    "eventIgnitionOff": "เครื่องยนต์ดับ",
     "eventMaintenance": "จำเป็นต้อง บำรุงรักษา",
     "eventTextMessage": "ข้อความที่ได้รับ",
-    "eventDriverChanged": "มีการเปลี่ยนแปลงไดร์เวอร์แล้ว",
+    "eventDriverChanged": "เปลี่ยนคนขับ",
     "eventsScrollToLast": "เลื่อนไปที่ล่าสุด",
-    "alarmSos": "แจ้งเตือนฉุกเฉิน SOS",
-    "alarmVibration": "แจ้งเตือนการสั่นสะเทือน",
-    "alarmMovement": "แจ้งเตือนการเคลื่อนไหว",
-    "alarmOverspeed": "แจ้งเตือนความเร็วเกินกำหนด",
-    "alarmFallDown": "แจ้งเตือนการล้ม",
-    "alarmLowBattery": "แจ้งเตือนแบตเตอรี่เหลือน้อย",
-    "alarmLowPower": "แจ้งเตือนพลังงานต่ำ",
-    "alarmFault": "แจ้งเตือนข้อผิดพลาด",
-    "alarmPowerOff": "ปิดการแจ้งเตือน",
-    "alarmPowerOn": "เปิดการแจ้งเตือน",
-    "alarmDoor": "แจ้งเตือน ประตู",
-    "alarmGeofence": "แจ้งเดือน เขตพื้นที่",
-    "alarmGeofenceEnter": "แจ้งเตือน เข้าในเขตพื้นที่",
-    "alarmGeofenceExit": "แจ้งเตือน ออกนอกเขตพื้นที่",
-    "alarmGpsAntennaCut": "แจ้งเตือน เสาอากาศ GPS ตัด",
-    "alarmAccident": "แจ้งเตือน อุบัติเหตุ",
-    "alarmTow": "แจ้งเตือน พ่วง",
-    "alarmIdle": "สัญญาณเตือน ยังไม่ได้ใช้งาน",
-    "alarmHardAcceleration": "แจ้งเตือน อัตราการเร่ง",
-    "alarmHardBraking": "สัญญาณเตือนการเบรค",
-    "alarmFatigueDriving": "Fatigue Driving Alarm",
-    "alarmPowerCut": "แจ้งเตือน ตัดพลังงาน",
-    "alarmPowerRestored": "ปลุกการเรียกคืนพลัง",
-    "alarmJamming": "Jamming Alarm",
-    "alarmTemperature": "แจ้งเตือน อุณหภูมิ",
-    "alarmParking": "แจ้งเตือนที่จอดรถ",
-    "alarmShock": "แจ้งเตือน การสั่นสเทือน",
-    "alarmBonnet": "Bonnet Alarm",
-    "alarmFootBrake": "แจ้งเตือน เบรกเท้า",
-    "alarmFuelLeak": "แจ้งเตือนเชื้อเพลิงลด",
-    "alarmTampering": "แจ้งเตือนแทรกแซงสัญญาณ",
-    "alarmRemoving": "แจ้งเตือนกำลังลบออก",
+    "alarmGeneral": "ทั่วไป",
+    "alarmSos": "SOS",
+    "alarmVibration": "สั่นสะเทือน",
+    "alarmMovement": "เคลื่อนที่",
+    "alarmLowspeed": "เคลื่อนช้าๆ",
+    "alarmOverspeed": "ความเร็วเกิน",
+    "alarmFallDown": "ร่วงหล่น",
+    "alarmLowPower": "กำลัง-อ่อน",
+    "alarmLowBattery": "แบต-อ่อน",
+    "alarmFault": "ผิดพลาด",
+    "alarmPowerOff": "ปิดเครื่อง",
+    "alarmPowerOn": "เปิดเครื่อง",
+    "alarmDoor": "ประตู",
+    "alarmLock": "ล็อค",
+    "alarmUnlock": "ปลดล็อค",
+    "alarmGeofence": "ขอบเขต",
+    "alarmGeofenceEnter": "เข้าขอบเขต",
+    "alarmGeofenceExit": "ออกขอบเขต",
+    "alarmGpsAntennaCut": "เสา GPS ตัด",
+    "alarmAccident": "อุบัติเหตุ",
+    "alarmTow": "ลาก",
+    "alarmIdle": "นิ่ง",
+    "alarmHighRpm": "รอบเครื่องสูง",
+    "alarmHardAcceleration": "ออกตัวแรง",
+    "alarmHardBraking": "เบรคแรง",
+    "alarmHardCornering": "เลี้ยวกระทันหัน",
+    "alarmLaneChange": "เปลี่ยนเลน",
+    "alarmFatigueDriving": "ขับรถ-ล้า",
+    "alarmPowerCut": "ตัดสตาร์ท",
+    "alarmPowerRestored": "ไฟฟ้า-ต่อ",
+    "alarmJamming": "สัญญาณรบกวน",
+    "alarmTemperature": "อุณหภูมิ",
+    "alarmParking": "จอด",
+    "alarmShock": "สะเทือน",
+    "alarmBonnet": "ฝาสูบ",
+    "alarmFootBrake": "เบรคเท้า",
+    "alarmFuelLeak": "เชื้อเพลิงรั่ว",
+    "alarmTampering": "บุกรุกเครื่อง",
+    "alarmRemoving": "ถอดออก",
     "notificationType": "ชนิดการแจ้งเตือน",
     "notificationAlways": "อุปกรณ์ทั้งหมด",
     "notificationNotificators": "ช่อง",
     "notificatorWeb": "เว็ป",
     "notificatorMail": "เมลล์",
     "notificatorSms": "ส่งข้อความ",
+    "notificatorFirebase": "โทรฯเคลื่อนที่",
     "reportRoute": "เส้นทาง",
     "reportEvents": "เหตุการณ์",
     "reportTrips": "การเดินทาง",
@@ -371,6 +375,7 @@
     "reportChartType": "ชนิดของแผนภูมิ",
     "reportShowMarkers": "แสดงเครื่องหมาย",
     "reportExport": "ส่งออก",
+    "reportEmail": "รายงาน-Email",
     "reportPeriod": "ช่วงเวลา",
     "reportCustom": "กำหนดเอง",
     "reportToday": "วันนี้",
@@ -389,6 +394,8 @@
     "reportEndTime": "เวลาสิ้นสุด",
     "reportEndAddress": "จุดสิ้นสุด",
     "reportSpentFuel": "เชื้อเพลิงที่ใช้",
+    "reportStartOdometer": "เดินทาง-เริ่ม",
+    "reportEndOdometer": "เดินทาง-สิ้นสุด",
     "statisticsTitle": "ข้อมูลสถิติ",
     "statisticsCaptureTime": "จับเวลา",
     "statisticsActiveUsers": "ผู้ใช้ที่ใช้งานอยู่",
@@ -414,11 +421,12 @@
     "categoryPlane": "เครื่องบิน",
     "categoryShip": "เรือ",
     "categoryTractor": "รถแทรกเตอร์",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "รถไฟ",
+    "categoryTram": "รถราง",
+    "categoryTrolleybus": "รถยก",
     "categoryTruck": "รถบรรทุก",
     "categoryVan": "รถตู้",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "เริ่มต้น",
     "maintenancePeriod": "ระยะเวลา"
 }
\ No newline at end of file
diff --git a/web/l10n/tr.json b/web/l10n/tr.json
index 942f4265..d3636643 100644
--- a/web/l10n/tr.json
+++ b/web/l10n/tr.json
@@ -11,7 +11,7 @@
     "sharedKm": "km",
     "sharedMi": "mil",
     "sharedNmi": "nmi",
-    "sharedKn": "Knot",
+    "sharedKn": "knot",
     "sharedKmh": "km/s",
     "sharedMph": "mil/s",
     "sharedHour": "Saat",
@@ -43,17 +43,16 @@
     "sharedSecondAbbreviation": "s",
     "sharedVoltAbbreviation": "V",
     "sharedLiterAbbreviation": "l",
-    "sharedGallonAbbreviation": "Galon",
+    "sharedGallonAbbreviation": "galon",
     "sharedLiter": "Litre",
     "sharedImpGallon": "İngiliz Galonu",
     "sharedUsGallon": "Amerikan Galonu",
     "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Harita Durumunu Getir",
-    "sharedComputedAttribute": "Computed Attribute",
-    "sharedComputedAttributes": "Computed Attributes",
-    "sharedCheckComputedAttribute": "Check Computed Attribute",
-    "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Cihaz Mesafesi",
+    "sharedComputedAttribute": "Hesaplanmış Nitelik",
+    "sharedComputedAttributes": "Hesaplanmış Nitelikler",
+    "sharedCheckComputedAttribute": "Hesaplanmış Nitelikleri Kontrol Et",
+    "sharedExpression": "İfade",
     "sharedDevice": "Cihaz",
     "sharedTestNotification": "Deneme bildirimi gönder",
     "sharedCalendar": "Takvim",
@@ -65,9 +64,9 @@
     "sharedPreferences": "Özellikler",
     "sharedPermissions": "Yetkiler",
     "sharedExtra": "Ekstra",
-    "sharedTypeString": "String",
+    "sharedTypeString": "Akış",
     "sharedTypeNumber": "Sayı",
-    "sharedTypeBoolean": "Boolean",
+    "sharedTypeBoolean": "Evet - Hayır",
     "sharedTimezone": "Saat dilimi",
     "sharedInfoTitle": "Info",
     "sharedSavedCommand": "Komut Kaydet",
@@ -76,38 +75,39 @@
     "sharedShowAddress": "Adresi Göster",
     "sharedDisabled": "Devre Dışı",
     "sharedMaintenance": "Bakım",
-    "sharedMaintenances": "Bakımlar",
+    "sharedDeviceAccumulators": "Akümülatörler",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Hız Limiti",
     "attributePolylineDistance": "Çizgi uzaklığı",
     "attributeReportIgnoreOdometer": "Rapor: Odometerı yoksay",
     "attributeWebReportColor": "Web: Rapor Rengi",
     "attributeDevicePassword": "Araç şifresi",
     "attributeProcessingCopyAttributes": "İşleniyor: Nitelikler Kopyalanıyor",
-    "attributeColor": "Color",
+    "attributeColor": "Renk",
     "attributeWebLiveRouteLength": "Web: Rota Uzunluğu",
     "attributeWebSelectZoom": "Web: Seçiliye Yaklaş",
     "attributeWebMaxZoom": "Web: Maksimum Yakınlaştırma",
-    "attributeMailSmtpHost": "Mail: SMTP Host",
-    "attributeMailSmtpPort": "Mail: SMTP Port",
-    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable",
-    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS Required",
-    "attributeMailSmtpSslEnable": "Mail: SMTP SSL Enable",
-    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Trust",
-    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL Protocols",
-    "attributeMailSmtpFrom": "Mail: SMTP From",
-    "attributeMailSmtpAuth": "Mail: SMTP Auth Enable",
-    "attributeMailSmtpUsername": "Mail: SMTP Username",
-    "attributeMailSmtpPassword": "Mail: SMTP Password",
+    "attributeMailSmtpHost": "Eposta: SMTP Sunucu",
+    "attributeMailSmtpPort": "Eposta: SMTP Port",
+    "attributeMailSmtpStarttlsEnable": "Eposta: SMTP STARTTLS Kullan",
+    "attributeMailSmtpStarttlsRequired": "Eposta: SMTP STARTTLS Gerekli",
+    "attributeMailSmtpSslEnable": "Eposta: SMTP SSL Kullan",
+    "attributeMailSmtpSslTrust": "Eposta: SMTP SSL Güvenli",
+    "attributeMailSmtpSslProtocols": "Eposta: SMTP SSL Protokol",
+    "attributeMailSmtpFrom": "Eposta: SMTP Kimden",
+    "attributeMailSmtpAuth": "Eposta: SMTP Parola Etkin",
+    "attributeMailSmtpUsername": "Eposta: SMTP Kullanıcı Adı",
+    "attributeMailSmtpPassword": "Eposta: SMTP Şifre",
     "attributeUiDisableReport": "UI: Rapor Devredışı",
     "attributeUiDisableEvents": "Etkinlikler Devredışı",
-    "attributeUiDisableVehicleFetures": "UI: Araç Özellikleri Devredışı",
-    "attributeUiDisableDrivers": "UI: Sürücüler Devredışı",
-    "attributeUiDisableComputedAttributes": "UI: Hesaplanmış Öznitelikler Devredışı",
-    "attributeUiDisableCalendars": "UI: Takvim Devredışı",
-    "attributeUiDisableMaintenances": "Bakımlar Devre Dışı",
+    "attributeUiDisableVehicleFetures": "Görünüm: Araç Özellikleri Devredışı",
+    "attributeUiDisableDrivers": "Görünüm: Sürücüler Devredışı",
+    "attributeUiDisableComputedAttributes": "Görünüm: Hesaplanmış Öznitelikler Devredışı",
+    "attributeUiDisableCalendars": "Görünüm: Takvim Devredışı",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "Konum Özniteliklerini Gizle",
     "errorTitle": "Hata",
-    "errorGeneral": "Invalid parameters or constraints violation",
+    "errorGeneral": "Geçersiz parametre veya kısıtlama ihlali",
     "errorConnection": "Bağlantı Hatası",
     "errorSocket": "Web Soketine bağlanırken hata",
     "errorZero": "Sıfır olamaz",
@@ -175,11 +175,11 @@
     "positionProtocol": "Protokol",
     "positionDistance": "Mesafe",
     "positionRpm": "RPM",
-    "positionFuel": "Fuel",
-    "positionPower": "Power",
-    "positionBattery": "Battery",
-    "positionRaw": "Raw",
-    "positionIndex": "Index",
+    "positionFuel": "Yakıt",
+    "positionPower": "Güç",
+    "positionBattery": "Batarya",
+    "positionRaw": "Ham",
+    "positionIndex": "Indeks",
     "positionHdop": "HDOP",
     "positionVdop": "VDOP",
     "positionPdop": "PDOP",
@@ -188,50 +188,52 @@
     "positionRssi": "RSSI",
     "positionGps": "GPS",
     "positionRoaming": "Dolaşım",
-    "positionEvent": "Event",
+    "positionEvent": "Etkinlik",
     "positionAlarm": "Alarm",
     "positionStatus": "Durum",
-    "positionOdometer": "Odometer",
-    "positionServiceOdometer": "Service Odometer",
-    "positionTripOdometer": "Trip Odometer",
-    "positionHours": "Hours",
+    "positionOdometer": "Kilometre Sayacı",
+    "positionServiceOdometer": "Kilometre Sayacı Hizmeti",
+    "positionTripOdometer": "Kilometre Sayacı Turu",
+    "positionHours": "Saat",
     "positionSteps": "Adım",
-    "positionInput": "Input",
-    "positionOutput": "Output",
+    "positionInput": "Giren",
+    "positionOutput": "Çıkan",
     "positionBatteryLevel": "Pil Seviyesi",
     "positionFuelConsumption": "Yakıt Tüketimi",
     "positionRfid": "RFID",
-    "positionVersionFw": "Firmware Version",
-    "positionVersionHw": "Hardware Version",
-    "positionIgnition": "Ignition",
-    "positionFlags": "Flags",
-    "positionCharge": "Charge",
+    "positionVersionFw": "Firmware Versiyonu",
+    "positionVersionHw": "Hardware Versiyonu",
+    "positionIgnition": "Kontak",
+    "positionFlags": "Etiketler",
+    "positionCharge": "Şarz",
     "positionIp": "IP",
     "positionArchive": "Arşiv",
     "positionVin": "VIN",
     "positionApproximate": "Yaklaşık",
-    "positionThrottle": "Throttle",
-    "positionMotion": "Motion",
-    "positionArmed": "Armed",
-    "positionAcceleration": "Acceleration",
-    "positionDeviceTemp": "Device Temperature",
-    "positionOperator": "Operator",
+    "positionThrottle": "Kısıtlama",
+    "positionMotion": "Hareket",
+    "positionArmed": "Hazır",
+    "positionAcceleration": "Hızlanma",
+    "positionDeviceTemp": "Cihaz Sıcaklığı",
+    "positionOperator": "Operatör",
     "positionCommand": "Komut",
-    "positionBlocked": "Blocked",
+    "positionBlocked": "Bloke Edildi",
     "positionDtcs": "DTCs",
-    "positionObdSpeed": "OBD Speed",
-    "positionObdOdometer": "OBD Odometer",
+    "positionObdSpeed": "OBD Hız",
+    "positionObdOdometer": "OBD Kilometre Sayacı",
     "positionDriverUniqueId": "Benzersiz Sürücü Kimliği",
     "positionImage": "Görüntü",
     "positionAudio": "Ses",
     "serverTitle": "Sunucu Ayarları",
     "serverZoom": "Yakınlaştırma",
     "serverRegistration": "Kayıt",
-    "serverReadonly": "Saltokunur",
-    "serverForceSettings": "Mecbur Bırakılan Ayarlar",
+    "serverReadonly": "Sadece Okunur",
+    "serverForceSettings": "Zorunlu Ayarlar",
     "mapTitle": "Harita",
     "mapLayer": "Harita Katmanı",
-    "mapCustom": "Özelleştirilmiş Harita",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -253,7 +255,7 @@
     "commandTitle": "Komut",
     "commandSend": "Gönder",
     "commandSent": "Komut gönderildi",
-    "commandQueued": "Komut kuyruğa alındı",
+    "commandQueued": "Komut sıraya alındı",
     "commandUnit": "Ünite",
     "commandCustom": "Özel komut",
     "commandDeviceIdentification": "Cihaz Tanımı",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Alarmı Kapat",
     "commandSetTimezone": "Zaman Dilimini Belirle",
     "commandRequestPhoto": "Fotoğraf İste",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Aygıtı Yeniden Başlat",
     "commandSendSms": "SMS Gönder",
     "commandSendUssd": "USSD Gönder",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Güç Tasarrufunu Güncelle",
     "commandModeDeepSleep": "Derin Uykuyu Güncelle",
     "commandMovementAlarm": "Hareket Alarmı",
-    "commandAlarmBattery": "Batarya Alarmı",
-    "commandAlarmSos": "Acil Durum Alarmı",
-    "commandAlarmRemove": "Alarmı Kaldır",
-    "commandAlarmClock": "Saat Alarmı",
-    "commandAlarmSpeed": "Hız Alarmı",
-    "commandAlarmFall": "Arıza Alarmı",
-    "commandAlarmVibration": "Titreşim Alarmı",
     "commandFrequency": "Frekans",
     "commandTimezone": "Saat Dilimi Dışında",
     "commandMessage": "Mesaj",
@@ -305,61 +301,69 @@
     "commandServer": "Sunucu",
     "commandPort": "Port",
     "eventAll": "Tüm Olaylar",
-    "eventDeviceOnline": "Cihaz çevrimiçi",
-    "eventDeviceUnknown": "Cihaz Durumu Bilinmiyor",
-    "eventDeviceOffline": "Cihaz çevrimdışı",
+    "eventDeviceOnline": "Durumu çevrimiçi",
+    "eventDeviceUnknown": "Durumu bilinmiyor",
+    "eventDeviceOffline": "Durum çevrimdışı",
     "eventDeviceMoving": "Cihaz hareket halinde",
-    "eventDeviceStopped": "Cihaz çalışmıyor",
-    "eventDeviceOverspeed": "Cihaz hızı aştı",
-    "eventDeviceFuelDrop": "Fuel drop event",
+    "eventDeviceStopped": "Cihaz hareket etmiyor",
+    "eventDeviceOverspeed": "Hız limiti aşıldı",
+    "eventDeviceFuelDrop": "Yakıt düştü",
     "eventCommandResult": "Komut sonucu",
-    "eventGeofenceEnter": "Cihaz güvenli bölgede",
-    "eventGeofenceExit": "Cihaz güvenli bölgeden çıktı",
-    "eventAlarm": "Alarmlar",
-    "eventIgnitionOn": "Kontak Açık",
-    "eventIgnitionOff": "Kontak Kapalı",
+    "eventGeofenceEnter": "Coğrafik çite girildi",
+    "eventGeofenceExit": "Coğrafik çitden çıkıldı",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Kontak açık",
+    "eventIgnitionOff": "Kontak kapalı",
     "eventMaintenance": "Bakım Gerekli",
     "eventTextMessage": "Kısa mesaj alındı",
     "eventDriverChanged": "Sürücü değişti",
-    "eventsScrollToLast": "Scroll To Last",
-    "alarmSos": "İmdat Alarmı",
-    "alarmVibration": "Darbe Alarmı",
-    "alarmMovement": "Hareket Alarmı",
-    "alarmOverspeed": "Hız Alarmı",
-    "alarmFallDown": "Düşme Alarmı",
-    "alarmLowBattery": "Batarya Düşük Alarmı",
-    "alarmLowPower": "LowPower Alarm",
-    "alarmFault": "Arıza Alarmı",
-    "alarmPowerOff": "Güç alarmı devredışı",
-    "alarmPowerOn": "Güç alarmı devrede",
-    "alarmDoor": "Kapı alarmı",
-    "alarmGeofence": "Belirli alan alarmı",
-    "alarmGeofenceEnter": "Belirli bölgeye girildi",
-    "alarmGeofenceExit": "Belirli bölgeden çıkıldı",
-    "alarmGpsAntennaCut": "GPS Anteni çıkarıldı",
-    "alarmAccident": "Kaza alarmı",
-    "alarmTow": "Çekici Alarmı",
-    "alarmIdle": "Rölanti Alarmı",
-    "alarmHardAcceleration": "Kuvvetli ivmelenme alarmı",
-    "alarmHardBraking": "Ani fren alarmı",
-    "alarmFatigueDriving": "Yavaş hareket alarmı",
-    "alarmPowerCut": "Güç kesildi",
-    "alarmPowerRestored": "Power Restored Alarm",
-    "alarmJamming": "Sinyal zayıf",
-    "alarmTemperature": "Yüksek sıcaklık",
-    "alarmParking": "Park alarmı",
-    "alarmShock": "Şok alarm",
-    "alarmBonnet": "Kaput açık",
-    "alarmFootBrake": "Fren alarmı",
-    "alarmFuelLeak": "Yakıt Sızıntısı Alarmı",
-    "alarmTampering": "Sıcaklık alarmı",
-    "alarmRemoving": "Removing Alarm",
+    "eventsScrollToLast": "Sona Git",
+    "alarmGeneral": "General",
+    "alarmSos": "Acil Yardım",
+    "alarmVibration": "Sarsıntı",
+    "alarmMovement": "Hareket",
+    "alarmLowspeed": "Low Speed",
+    "alarmOverspeed": "Aşırı Hız",
+    "alarmFallDown": "Fall Down",
+    "alarmLowPower": "Low Power",
+    "alarmLowBattery": "Low Battery",
+    "alarmFault": "Arıza",
+    "alarmPowerOff": "Kapalı",
+    "alarmPowerOn": "Çalışıyor",
+    "alarmDoor": "Kapı",
+    "alarmLock": "Lock",
+    "alarmUnlock": "Unlock",
+    "alarmGeofence": "Coğrafik çit",
+    "alarmGeofenceEnter": "Coğrafik çite girildi",
+    "alarmGeofenceExit": "Coğrafik çitden çıkıldı",
+    "alarmGpsAntennaCut": "GPS Anteni Kes",
+    "alarmAccident": "Kaza",
+    "alarmTow": "Çekme",
+    "alarmIdle": "Çalışmıyor",
+    "alarmHighRpm": "High RPM",
+    "alarmHardAcceleration": "Ani Hızlanma",
+    "alarmHardBraking": "Ani Yavaşlama",
+    "alarmHardCornering": "Hard Cornering",
+    "alarmLaneChange": "Lane Change",
+    "alarmFatigueDriving": "Yorgun Sürücü",
+    "alarmPowerCut": "Enerji kesildi",
+    "alarmPowerRestored": "Enerji geldi",
+    "alarmJamming": "Sıkışıklık",
+    "alarmTemperature": "Hararet",
+    "alarmParking": "Park halinde",
+    "alarmShock": "Şok",
+    "alarmBonnet": "Kaput",
+    "alarmFootBrake": "Ayak freni",
+    "alarmFuelLeak": "Yakıt sızıntısı",
+    "alarmTampering": "Kurcalama",
+    "alarmRemoving": "Çıkarma",
     "notificationType": "Bildirim tipi",
     "notificationAlways": "Tüm Cihazlar",
-    "notificationNotificators": "Channels",
+    "notificationNotificators": "Kanallar",
     "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
-    "notificatorSms": "SMS",
+    "notificatorMail": "Eposta",
+    "notificatorSms": "SMS Mesajı",
+    "notificatorFirebase": "Mobil",
     "reportRoute": "Rota",
     "reportEvents": "Olaylar",
     "reportTrips": "Turlar",
@@ -371,6 +375,7 @@
     "reportChartType": "Grafik Tipi",
     "reportShowMarkers": "İşaretleri Göster",
     "reportExport": "Çıktı Al",
+    "reportEmail": "Eposta Rapor",
     "reportPeriod": "Dönem",
     "reportCustom": "Özel",
     "reportToday": "Bugün",
@@ -389,6 +394,8 @@
     "reportEndTime": "Bittiği Zaman",
     "reportEndAddress": "Bittiği Adres",
     "reportSpentFuel": "Tüketilen Yakıt",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistics",
     "statisticsCaptureTime": "Yakalama Zamanı",
     "statisticsActiveUsers": "Aktif Kullanıcılar",
@@ -398,7 +405,7 @@
     "statisticsMessagesStored": "Mesajlar Kaydedildi",
     "statisticsGeocoder": "Geocoder Requests",
     "statisticsGeolocation": "Geolocation Requests",
-    "categoryArrow": "Ok",
+    "categoryArrow": "Yön",
     "categoryDefault": "Varsayılan",
     "categoryAnimal": "Hayvan",
     "categoryBicycle": "Bisiklet",
@@ -414,11 +421,12 @@
     "categoryPlane": "Uçak",
     "categoryShip": "Gemi",
     "categoryTractor": "Tractor",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Tren",
+    "categoryTram": "Tramvay",
+    "categoryTrolleybus": "Troleybüs",
     "categoryTruck": "Kamyon",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Başlat",
     "maintenancePeriod": "Dönem"
 }
\ No newline at end of file
diff --git a/web/l10n/uk.json b/web/l10n/uk.json
index 5d2836c2..723655fa 100644
--- a/web/l10n/uk.json
+++ b/web/l10n/uk.json
@@ -2,7 +2,7 @@
     "sharedLoading": "Завантаження... ",
     "sharedHide": "Приховувати",
     "sharedSave": "Зберегти",
-    "sharedSet": "Set",
+    "sharedSet": "Встановити",
     "sharedCancel": "Відміна",
     "sharedAdd": "Додати",
     "sharedEdit": "Редагувати",
@@ -17,9 +17,9 @@
     "sharedHour": "Години",
     "sharedMinute": "Хвилини",
     "sharedSecond": "Секунди",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "днів",
+    "sharedHours": "годин",
+    "sharedMinutes": "хвилин",
     "sharedDecimalDegrees": "Градуси°",
     "sharedDegreesDecimalMinutes": "Градуси° хвилини′",
     "sharedDegreesMinutesSeconds": "Градуси° хвилини′ секунди″",
@@ -29,98 +29,98 @@
     "sharedGeofence": "Геозон",
     "sharedGeofences": "Геозони",
     "sharedNotifications": "Повідомлення",
-    "sharedNotification": "Notification",
+    "sharedNotification": "Повідомлення",
     "sharedAttributes": "Атрибути",
     "sharedAttribute": "Атрибут",
-    "sharedDrivers": "Drivers",
-    "sharedDriver": "Driver",
+    "sharedDrivers": "Водії",
+    "sharedDriver": "Водій",
     "sharedArea": "Площа",
-    "sharedSound": "Notification Sound",
+    "sharedSound": "Звукове повідомлення",
     "sharedType": "Тип",
     "sharedDistance": "Відстань",
     "sharedHourAbbreviation": "г",
     "sharedMinuteAbbreviation": "хв",
-    "sharedSecondAbbreviation": "s",
+    "sharedSecondAbbreviation": "c",
     "sharedVoltAbbreviation": "V",
     "sharedLiterAbbreviation": "l",
     "sharedGallonAbbreviation": "gal",
-    "sharedLiter": "Liter",
-    "sharedImpGallon": "Imp. Gallon",
-    "sharedUsGallon": "U.S. Gallon",
-    "sharedLiterPerHourAbbreviation": "l/h",
+    "sharedLiter": "Літр",
+    "sharedImpGallon": "Імп. галон",
+    "sharedUsGallon": "Галон США",
+    "sharedLiterPerHourAbbreviation": "л/ч",
     "sharedGetMapState": "Отримати стан карти",
-    "sharedComputedAttribute": "Computed Attribute",
-    "sharedComputedAttributes": "Computed Attributes",
-    "sharedCheckComputedAttribute": "Check Computed Attribute",
-    "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Відстань пристроїв",
+    "sharedComputedAttribute": "Обчислюваний атрибут",
+    "sharedComputedAttributes": "Обчислювані атрибути",
+    "sharedCheckComputedAttribute": "Перевірити обчислюваний атрибут",
+    "sharedExpression": "Вираз",
     "sharedDevice": "Пристрій",
-    "sharedTestNotification": "Send Test Notification",
-    "sharedCalendar": "Calendar",
-    "sharedCalendars": "Calendars",
-    "sharedFile": "File",
-    "sharedSelectFile": "Select File",
-    "sharedPhone": "Phone",
-    "sharedRequired": "Required",
-    "sharedPreferences": "Preferences",
-    "sharedPermissions": "Permissions",
-    "sharedExtra": "Extra",
-    "sharedTypeString": "String",
-    "sharedTypeNumber": "Number",
-    "sharedTypeBoolean": "Boolean",
-    "sharedTimezone": "Timezone",
-    "sharedInfoTitle": "Info",
-    "sharedSavedCommand": "Saved Command",
-    "sharedSavedCommands": "Saved Commands",
-    "sharedNew": "New…",
-    "sharedShowAddress": "Show Address",
-    "sharedDisabled": "Disabled",
-    "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
-    "attributeSpeedLimit": "Speed Limit",
-    "attributePolylineDistance": "Polyline Distance",
-    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
-    "attributeWebReportColor": "Web: Report Color",
-    "attributeDevicePassword": "Device Password",
-    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
-    "attributeColor": "Color",
-    "attributeWebLiveRouteLength": "Web: Live Route Length",
-    "attributeWebSelectZoom": "Web: Zoom On Select",
-    "attributeWebMaxZoom": "Web: Maximum Zoom",
-    "attributeMailSmtpHost": "Mail: SMTP Host",
-    "attributeMailSmtpPort": "Mail: SMTP Port",
-    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable",
-    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS Required",
-    "attributeMailSmtpSslEnable": "Mail: SMTP SSL Enable",
-    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Trust",
-    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL Protocols",
-    "attributeMailSmtpFrom": "Mail: SMTP From",
-    "attributeMailSmtpAuth": "Mail: SMTP Auth Enable",
-    "attributeMailSmtpUsername": "Mail: SMTP Username",
-    "attributeMailSmtpPassword": "Mail: SMTP Password",
-    "attributeUiDisableReport": "UI: Disable Report",
-    "attributeUiDisableEvents": "UI: Disable Events",
-    "attributeUiDisableVehicleFetures": "UI: Disable Vehicle Fetures",
-    "attributeUiDisableDrivers": "UI: Disable Drivers",
-    "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
-    "attributeUiDisableCalendars": "UI: Disable Calendars",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
-    "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
+    "sharedTestNotification": "Відправити тестове повідомлення",
+    "sharedCalendar": "Календар",
+    "sharedCalendars": "Календарi",
+    "sharedFile": "Файл",
+    "sharedSelectFile": "Вибрати файл",
+    "sharedPhone": "Телефон",
+    "sharedRequired": "Обов'язкові",
+    "sharedPreferences": "Налаштування",
+    "sharedPermissions": "Дозволи",
+    "sharedExtra": "Екстра",
+    "sharedTypeString": "Строка",
+    "sharedTypeNumber": "Число",
+    "sharedTypeBoolean": "Логічне значення",
+    "sharedTimezone": "Часовий пояс",
+    "sharedInfoTitle": "Інфо",
+    "sharedSavedCommand": "Збережена команда",
+    "sharedSavedCommands": "Збережені команди",
+    "sharedNew": "Новий…",
+    "sharedShowAddress": "Показати адрес",
+    "sharedDisabled": "Вимкнутий",
+    "sharedMaintenance": "Обслуговування",
+    "sharedDeviceAccumulators": "Акумулятори",
+    "sharedAlarms": "Тривоги",
+    "attributeSpeedLimit": "Обмеження швидкості",
+    "attributePolylineDistance": "Відстань від лінії",
+    "attributeReportIgnoreOdometer": "Звіт: Ігнорувати одометер",
+    "attributeWebReportColor": "Веб: Колір звіту",
+    "attributeDevicePassword": "Пароль пристрою",
+    "attributeProcessingCopyAttributes": "Обробка: Копіювання атрибутів",
+    "attributeColor": "Колір",
+    "attributeWebLiveRouteLength": "Веб: Довжина онлайн маршруту",
+    "attributeWebSelectZoom": "Веб: Збільшення при виборі",
+    "attributeWebMaxZoom": "Веб: Максимальне збільшення",
+    "attributeMailSmtpHost": "Пошта: SMTP хост",
+    "attributeMailSmtpPort": "Пошта: SMTP порт",
+    "attributeMailSmtpStarttlsEnable": "Пошта: увімкнути SMTP STARTTLS",
+    "attributeMailSmtpStarttlsRequired": "Пошта: потрібен SMTP STARTTLS",
+    "attributeMailSmtpSslEnable": "Пошта: увімкнути SMTP SSL",
+    "attributeMailSmtpSslTrust": "Пошта: довіра SMTP SSL",
+    "attributeMailSmtpSslProtocols": "Пошта: Протоколи SMTP SSL",
+    "attributeMailSmtpFrom": "Пошта: SMTP відправник",
+    "attributeMailSmtpAuth": "Пошта: Увімкнути SMTP Auth",
+    "attributeMailSmtpUsername": "Пошта: SMTP ім'я користувача",
+    "attributeMailSmtpPassword": "Пошта: SMTP пароль",
+    "attributeUiDisableReport": "UI: Вимкнути звіти",
+    "attributeUiDisableEvents": "UI: Вимкнути події",
+    "attributeUiDisableVehicleFetures": "UI: Вимкнути автомобільні функції",
+    "attributeUiDisableDrivers": "UI: Вимкнути водіїв",
+    "attributeUiDisableComputedAttributes": "UI: Вимкнути обчислювані атрибути",
+    "attributeUiDisableCalendars": "UI: Вимкнути календарі",
+    "attributeUiDisableMaintenance": "UI: Вимкнути обслуговування",
+    "attributeUiHidePositionAttributes": "UI: Приховувати атрибути",
     "errorTitle": "Помилка",
-    "errorGeneral": "Invalid parameters or constraints violation",
+    "errorGeneral": "Неправильні параметри або порушення обмежень",
     "errorConnection": "Помилка з'єднання",
-    "errorSocket": "Web socket connection error",
-    "errorZero": "Can't be zero",
+    "errorSocket": "Помилка web socket з'єднання",
+    "errorZero": "Не може бути нульовим",
     "userEmail": "E-mail",
     "userPassword": "Пароль",
     "userAdmin": "Адмiнiстратор",
     "userRemember": "Запам'ятати",
-    "userExpirationTime": "Expiration",
-    "userDeviceLimit": "Device Limit",
-    "userUserLimit": "User Limit",
-    "userDeviceReadonly": "Device Readonly",
-    "userLimitCommands": "Limit Commands",
-    "userToken": "Token",
+    "userExpirationTime": "Термін дії",
+    "userDeviceLimit": "Обмеження пристроїв",
+    "userUserLimit": "Обмеження користувачів",
+    "userDeviceReadonly": "Тільки перегляд пристроїв",
+    "userLimitCommands": "Обмеження команд",
+    "userToken": "Ключ",
     "loginTitle": "Логiн",
     "loginLanguage": "Мова",
     "loginRegister": "Реєстрація",
@@ -128,21 +128,21 @@
     "loginFailed": "Неправильне адреса електронної пошти або пароль",
     "loginCreated": "Новий користувач був зареєстрований",
     "loginLogout": "Вийти",
-    "loginLogo": "Logo",
+    "loginLogo": "Логотип",
     "devicesAndState": "Пристрої та стан",
     "deviceTitle": " Прилади",
     "deviceIdentifier": "Iдентифікатор",
     "deviceModel": "Модель",
     "deviceContact": "Контакт",
-    "deviceCategory": "Category",
+    "deviceCategory": "Категорія",
     "deviceLastUpdate": "Останнє оновлення",
     "deviceCommand": "Команда",
     "deviceFollow": "Слідувати",
     "deviceTotalDistance": "Загальна відстань",
-    "deviceStatus": "Status",
-    "deviceStatusOnline": "Online",
-    "deviceStatusOffline": "Offline",
-    "deviceStatusUnknown": "Unknown",
+    "deviceStatus": "Статус",
+    "deviceStatusOnline": "Онлайн",
+    "deviceStatusOffline": "Офлайн",
+    "deviceStatusUnknown": "Невідомий",
     "groupDialog": "Група",
     "groupParent": "Група",
     "groupNoGroup": "Група відсутня",
@@ -151,9 +151,9 @@
     "settingsGroups": "Групи",
     "settingsServer": "Сервер",
     "settingsUsers": "Користувачі",
-    "settingsDistanceUnit": "Distance Unit",
-    "settingsSpeedUnit": "Speed Unit",
-    "settingsVolumeUnit": "Volume Unit",
+    "settingsDistanceUnit": "Одиниця відстані",
+    "settingsSpeedUnit": "Одиниця швидкості",
+    "settingsVolumeUnit": "Одиниця об'єму",
     "settingsTwelveHourFormat": "12-годинний формат",
     "settingsCoordinateFormat": "Формат координат",
     "reportTitle": "Звіти",
@@ -165,7 +165,7 @@
     "reportClear": "Очистити",
     "positionFixTime": "Час ",
     "positionValid": "Дійсний",
-    "positionAccuracy": "Accuracy",
+    "positionAccuracy": "Точність",
     "positionLatitude": "Широта",
     "positionLongitude": "Довгота ",
     "positionAltitude": "Висота",
@@ -173,57 +173,57 @@
     "positionCourse": "Напрямок",
     "positionAddress": "Адреса",
     "positionProtocol": "Протокол",
-    "positionDistance": "Distance",
-    "positionRpm": "RPM",
-    "positionFuel": "Fuel",
-    "positionPower": "Power",
-    "positionBattery": "Battery",
-    "positionRaw": "Raw",
-    "positionIndex": "Index",
+    "positionDistance": "Відстань",
+    "positionRpm": "Обороти",
+    "positionFuel": "Паливо",
+    "positionPower": "Живлення",
+    "positionBattery": "Батарея",
+    "positionRaw": "Cирі дані",
+    "positionIndex": "Індекс",
     "positionHdop": "HDOP",
     "positionVdop": "VDOP",
     "positionPdop": "PDOP",
-    "positionSat": "Satellites",
-    "positionSatVisible": "Visible Satellites",
+    "positionSat": "Супутники",
+    "positionSatVisible": "Видимі супутники",
     "positionRssi": "RSSI",
     "positionGps": "GPS",
-    "positionRoaming": "Roaming",
-    "positionEvent": "Event",
-    "positionAlarm": "Alarm",
-    "positionStatus": "Status",
-    "positionOdometer": "Odometer",
-    "positionServiceOdometer": "Service Odometer",
-    "positionTripOdometer": "Trip Odometer",
-    "positionHours": "Hours",
-    "positionSteps": "Steps",
-    "positionInput": "Input",
-    "positionOutput": "Output",
-    "positionBatteryLevel": "Battery Level",
-    "positionFuelConsumption": "Fuel Consumption",
+    "positionRoaming": "Роумінг",
+    "positionEvent": "Подія",
+    "positionAlarm": "Тривога",
+    "positionStatus": "Статус",
+    "positionOdometer": "Одометр",
+    "positionServiceOdometer": "Одометр обслуговування",
+    "positionTripOdometer": "Одометр поїздки",
+    "positionHours": "Години",
+    "positionSteps": "Кроки",
+    "positionInput": "Входи",
+    "positionOutput": "Виходи",
+    "positionBatteryLevel": "Рівень заряду батареї",
+    "positionFuelConsumption": "Витрати палива",
     "positionRfid": "RFID",
-    "positionVersionFw": "Firmware Version",
-    "positionVersionHw": "Hardware Version",
-    "positionIgnition": "Ignition",
-    "positionFlags": "Flags",
-    "positionCharge": "Charge",
+    "positionVersionFw": "Версія прошивки",
+    "positionVersionHw": "Версія пристрою",
+    "positionIgnition": "Запалення",
+    "positionFlags": "Флаги",
+    "positionCharge": "Заряд",
     "positionIp": "IP",
-    "positionArchive": "Archive",
+    "positionArchive": "Архів",
     "positionVin": "VIN",
-    "positionApproximate": "Approximate",
-    "positionThrottle": "Throttle",
-    "positionMotion": "Motion",
-    "positionArmed": "Armed",
-    "positionAcceleration": "Acceleration",
-    "positionDeviceTemp": "Device Temperature",
-    "positionOperator": "Operator",
-    "positionCommand": "Command",
-    "positionBlocked": "Blocked",
-    "positionDtcs": "DTCs",
-    "positionObdSpeed": "OBD Speed",
-    "positionObdOdometer": "OBD Odometer",
-    "positionDriverUniqueId": "Driver Unique Id",
-    "positionImage": "Image",
-    "positionAudio": "Audio",
+    "positionApproximate": "Приблизний",
+    "positionThrottle": "Дросель",
+    "positionMotion": "Рух",
+    "positionArmed": "Охорона",
+    "positionAcceleration": "Прискорення",
+    "positionDeviceTemp": "Температура пристрою",
+    "positionOperator": "Оператор",
+    "positionCommand": "Команда",
+    "positionBlocked": "Блокування",
+    "positionDtcs": "Помилки",
+    "positionObdSpeed": "OBD швидкість",
+    "positionObdOdometer": "OBD одометр",
+    "positionDriverUniqueId": "ID водія",
+    "positionImage": "Зображення",
+    "positionAudio": "Аудіо",
     "serverTitle": "Налаштування сервера",
     "serverZoom": "Наближення",
     "serverRegistration": "Реєстрація",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Налаштування Force",
     "mapTitle": "Карта",
     "mapLayer": "Використання мап",
-    "mapCustom": "Користувацька мапа",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Ключ Bing Maps ",
@@ -244,16 +246,16 @@
     "mapWikimedia": "Wikimedia",
     "mapShapePolygon": "Багатокутник",
     "mapShapeCircle": "Коло",
-    "mapShapePolyline": "Polyline",
+    "mapShapePolyline": "Лінія",
     "mapLiveRoutes": "Поточні маршрути",
-    "mapPoiLayer": "POI Layer",
+    "mapPoiLayer": "Шар POI",
     "stateTitle": "Стан",
     "stateName": "Атрибут",
     "stateValue": "Значення ",
     "commandTitle": "Команда ",
     "commandSend": "Послати. ",
-    "commandSent": "Команда була відправлена",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Команда відправлена",
+    "commandQueued": "Команда додана в чергу",
     "commandUnit": "Одиниці",
     "commandCustom": "Користувацька команда",
     "commandDeviceIdentification": "Ідентифікація пристрою",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Вимкнути сигналізацію",
     "commandSetTimezone": "Часовий пояс",
     "commandRequestPhoto": "Запит фото",
+    "commandPowerOff": "Вимкнути пристрій",
     "commandRebootDevice": "Перезавантаження пристрою",
     "commandSendSms": "Надсилання SMS",
     "commandSendUssd": "Надсилання USSD",
@@ -274,111 +277,113 @@
     "commandSetPhonebook": "Телефонна книга",
     "commandVoiceMessage": "Голосове повідомлення",
     "commandOutputControl": "Контроль виходу",
-    "commandVoiceMonitoring": "Voice Monitoring",
-    "commandSetAgps": "Set AGPS",
-    "commandSetIndicator": "Set Indicator",
-    "commandConfiguration": "Configuration",
-    "commandGetVersion": "Get Version",
-    "commandFirmwareUpdate": "Update Firmware",
-    "commandSetConnection": "Set Connection",
-    "commandSetOdometer": "Set Odometer",
-    "commandGetModemStatus": "Get Modem Status",
-    "commandGetDeviceStatus": "Get Device Status",
-    "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",
+    "commandVoiceMonitoring": "Голосове повідомлення",
+    "commandSetAgps": "Налаштувати AGPS",
+    "commandSetIndicator": "Налаштувати ітдикатор",
+    "commandConfiguration": "Конфігурація",
+    "commandGetVersion": "Отримати версію",
+    "commandFirmwareUpdate": "Оновити прошивку",
+    "commandSetConnection": "Налаштувати з'єднання",
+    "commandSetOdometer": "Налаштувати одометр",
+    "commandGetModemStatus": "Отримати стан модема",
+    "commandGetDeviceStatus": "Отримати статус пристрою",
+    "commandModePowerSaving": "Змінити режим енергозбереження",
+    "commandModeDeepSleep": "Змінити режим глибокого сну",
+    "commandMovementAlarm": "Тривога Рух",
     "commandFrequency": "Частота",
-    "commandTimezone": "Timezone Offset",
+    "commandTimezone": "Зсув часової зони",
     "commandMessage": "Повідомлення",
-    "commandRadius": "Radius",
-    "commandEnable": "Enable",
+    "commandRadius": "Радіус",
+    "commandEnable": "Увімкнути",
     "commandData": "Дані",
     "commandIndex": "Індекс",
     "commandPhone": "Номер телефону",
-    "commandServer": "Server",
-    "commandPort": "Port",
+    "commandServer": "Сервер",
+    "commandPort": "Порт",
     "eventAll": "Всі події",
-    "eventDeviceOnline": "Пристрій з'єднався",
-    "eventDeviceUnknown": "Device status is unknown",
-    "eventDeviceOffline": "Пристрій від'єднався",
-    "eventDeviceMoving": "Пристрій в русі",
+    "eventDeviceOnline": "Статус онлайн",
+    "eventDeviceUnknown": "Статус невідомий",
+    "eventDeviceOffline": "Статус офлайн",
+    "eventDeviceMoving": "Пристрій рухається",
     "eventDeviceStopped": "Пристрій зупинився",
-    "eventDeviceOverspeed": "Пристрій перевищує швидкість",
-    "eventDeviceFuelDrop": "Fuel drop event",
+    "eventDeviceOverspeed": "Перевищено обмеження швидкості",
+    "eventDeviceFuelDrop": "Злив палива",
     "eventCommandResult": "Результат команди",
-    "eventGeofenceEnter": "Пристрій в геозоні",
-    "eventGeofenceExit": "Пристрій залишив геозону",
-    "eventAlarm": "Тревоги",
-    "eventIgnitionOn": "Запалення УВІМК",
-    "eventIgnitionOff": "Запалення ВИМК",
-    "eventMaintenance": "Maintenance required",
-    "eventTextMessage": "Text message received",
-    "eventDriverChanged": "Driver has 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",
+    "eventGeofenceEnter": "Вхід в геозон",
+    "eventGeofenceExit": "Вихід з геозон",
+    "eventAlarm": "Тривога",
+    "eventIgnitionOn": "Запалення увімкнено",
+    "eventIgnitionOff": "Запалення вимкнено",
+    "eventMaintenance": "Потрібне обслуговування",
+    "eventTextMessage": "Текстове повідомлення отримано",
+    "eventDriverChanged": "Водій змінений",
+    "eventsScrollToLast": "Прокрутка до кінця",
+    "alarmGeneral": "Загальне",
+    "alarmSos": "SOS",
+    "alarmVibration": "Вібрація",
+    "alarmMovement": "Рух",
+    "alarmLowspeed": "Низька швидкість",
+    "alarmOverspeed": "Перевищення швидкості",
+    "alarmFallDown": "Падіння",
+    "alarmLowPower": "Низький рівень живлення",
+    "alarmLowBattery": "Батарея розряджена",
+    "alarmFault": "Несправність",
+    "alarmPowerOff": "Power Off",
+    "alarmPowerOn": "Power On",
+    "alarmDoor": "Двері",
+    "alarmLock": "Блокування",
+    "alarmUnlock": "Разблокування",
+    "alarmGeofence": "Геозон",
+    "alarmGeofenceEnter": "Вхід в геозон",
+    "alarmGeofenceExit": "Вихід з геозон",
+    "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",
+    "notificationAlways": "Всi пристрої",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Маршрут",
     "reportEvents": "Події",
     "reportTrips": "Подорожі",
-    "reportStops": "Stops",
+    "reportStops": "Зупинки",
     "reportSummary": "Звіт",
-    "reportChart": "Chart",
+    "reportChart": "Діаграма",
     "reportConfigure": "Конфігурувати",
     "reportEventTypes": "Тип події",
-    "reportChartType": "Chart Type",
-    "reportShowMarkers": "Show Markers",
+    "reportChartType": "Тип діаграми",
+    "reportShowMarkers": "Показати маркери",
     "reportExport": "Експорт",
-    "reportPeriod": "Period",
-    "reportCustom": "Custom",
-    "reportToday": "Today",
-    "reportYesterday": "Yesterday",
-    "reportThisWeek": "This Week",
-    "reportPreviousWeek": "Previous Week",
-    "reportThisMonth": "This Month",
-    "reportPreviousMonth": "Previous Month",
+    "reportEmail": "Звіт по пошті",
+    "reportPeriod": "Період",
+    "reportCustom": "Користувальницький",
+    "reportToday": "Сьогодні",
+    "reportYesterday": "Вчора",
+    "reportThisWeek": "Поточний тиждень",
+    "reportPreviousWeek": "Попередній тиждень",
+    "reportThisMonth": "Поточний місяць",
+    "reportPreviousMonth": "Попередній місяць",
     "reportDeviceName": "Ім'я пристрою",
     "reportAverageSpeed": "Середня швидкість",
     "reportMaximumSpeed": "Максимальна швидкість",
@@ -389,6 +394,8 @@
     "reportEndTime": "Кінцевий час",
     "reportEndAddress": "Кінцева адреса",
     "reportSpentFuel": "Використано палива",
+    "reportStartOdometer": "Одометр, початок",
+    "reportEndOdometer": "Одометр, закінчення",
     "statisticsTitle": "Статистика",
     "statisticsCaptureTime": "Час збору",
     "statisticsActiveUsers": "Активні користувачі",
@@ -396,29 +403,30 @@
     "statisticsRequests": "Запити",
     "statisticsMessagesReceived": "Отримано повідомлень",
     "statisticsMessagesStored": "Збережено повідомлень",
-    "statisticsGeocoder": "Geocoder Requests",
-    "statisticsGeolocation": "Geolocation Requests",
-    "categoryArrow": "Arrow",
-    "categoryDefault": "Default",
-    "categoryAnimal": "Animal",
-    "categoryBicycle": "Bicycle",
-    "categoryBoat": "Boat",
-    "categoryBus": "Bus",
-    "categoryCar": "Car",
-    "categoryCrane": "Crane",
-    "categoryHelicopter": "Helicopter",
-    "categoryMotorcycle": "Motorcycle",
-    "categoryOffroad": "Offroad",
-    "categoryPerson": "Person",
-    "categoryPickup": "Pickup",
-    "categoryPlane": "Plane",
-    "categoryShip": "Ship",
-    "categoryTractor": "Tractor",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
-    "categoryTruck": "Truck",
-    "categoryVan": "Van",
-    "maintenanceStart": "Start",
-    "maintenancePeriod": "Period"
+    "statisticsGeocoder": "Запити геокодера",
+    "statisticsGeolocation": "Запити геолокації",
+    "categoryArrow": "Стрілка",
+    "categoryDefault": "За замовчуванням",
+    "categoryAnimal": "Тварина",
+    "categoryBicycle": "Велосипед",
+    "categoryBoat": "Човен",
+    "categoryBus": "Автобус",
+    "categoryCar": "Автомобіль",
+    "categoryCrane": "Кран",
+    "categoryHelicopter": "Гвинтокрил",
+    "categoryMotorcycle": "Мотоцикл",
+    "categoryOffroad": "Позашляховик",
+    "categoryPerson": "Людина",
+    "categoryPickup": "Пікап",
+    "categoryPlane": "Літак",
+    "categoryShip": "Корабель",
+    "categoryTractor": "Трактор",
+    "categoryTrain": "Поїзд",
+    "categoryTram": "Трамвай",
+    "categoryTrolleybus": "Тролейбус",
+    "categoryTruck": "Вантажний автомобіль",
+    "categoryVan": "Фургон",
+    "categoryScooter": "Скутер",
+    "maintenanceStart": "Початок",
+    "maintenancePeriod": "Період"
 }
\ No newline at end of file
diff --git a/web/l10n/uz.json b/web/l10n/uz.json
index f2be868e..48a51865 100644
--- a/web/l10n/uz.json
+++ b/web/l10n/uz.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Computed Attributes",
     "sharedCheckComputedAttribute": "Check Computed Attribute",
     "sharedExpression": "Expression",
-    "sharedDeviceDistance": "Қурилма ишлаган кўрсатгич",
     "sharedDevice": "Қурилма",
     "sharedTestNotification": "Send Test Notification",
     "sharedCalendar": "Тақвим",
@@ -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": "Созламаларни кучайтириш",
     "mapTitle": "Харита",
     "mapLayer": "Харита қавати",
-    "mapCustom": "Фойдаланувчи харитаси",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Ma",
     "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": "СМС жўнатиш",
     "commandSendUssd": "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": "Соат қутбининг силжиши",
     "commandMessage": "Хабар",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Барча воқеалар",
-    "eventDeviceOnline": "Қурилма тармоқда",
-    "eventDeviceUnknown": "Қурилма мақоми номаълум",
-    "eventDeviceOffline": "Қурилма тармоқда эмас",
-    "eventDeviceMoving": "Қурилма ҳаракатланмоқда",
-    "eventDeviceStopped": "Қурилма тўхтади",
-    "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": "Ўт олдириш ЁҚЛ",
-    "eventIgnitionOff": "Ўт олдириш ЎЧР",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Хизмат кўрсатиш талаб этилади",
     "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": "Маршрут",
     "reportEvents": "Ҳодисалар",
     "reportTrips": "Сафарлар",
@@ -371,6 +375,7 @@
     "reportChartType": "График тури",
     "reportShowMarkers": "Маркетларни кўрсатиш",
     "reportExport": "Экспорт",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "Тугаш вақти",
     "reportEndAddress": "Сўнгги манзил",
     "reportSpentFuel": "Ёқилғи сарфи",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Статистика",
     "statisticsCaptureTime": "Йиғилиш вақти",
     "statisticsActiveUsers": "Актив фойдаланувчилар",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Юк автомобили",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/vi.json b/web/l10n/vi.json
index c4f4fcff..01a9007d 100644
--- a/web/l10n/vi.json
+++ b/web/l10n/vi.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Tính toán thuộc tính",
     "sharedCheckComputedAttribute": "Kiểm tra tính toán thuộc tính",
     "sharedExpression": "Truyền",
-    "sharedDeviceDistance": "Khoảng cách thiết bị",
     "sharedDevice": "Thiết bị",
     "sharedTestNotification": "Gửi thông báo thử",
     "sharedCalendar": "Lịch",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Giới hạn tốc độ",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Báo cáo: Bỏ qua đồng hồ đo",
@@ -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": "Lỗi",
     "errorGeneral": "Tham số không hợp lệ hoặc hạn chế vi phạm",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Buộc thiết lập",
     "mapTitle": "Bản đồ",
     "mapLayer": "Lớp bản đồ",
-    "mapCustom": "Bản đồ tùy chỉnh",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
     "mapBingKey": "Bing Maps Key",
@@ -252,8 +254,8 @@
     "stateValue": "Giá trị",
     "commandTitle": "Lệnh",
     "commandSend": "Gửi",
-    "commandSent": "Lệnh đã được gửi",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Đơn vị",
     "commandCustom": "Lệnh tùy chỉnh",
     "commandDeviceIdentification": "Định danh thiết bị",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Báo động không cho phép",
     "commandSetTimezone": "Thiết lập múi giờ",
     "commandRequestPhoto": "Yêu cầu ảnh",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Khởi động lại thiết bị",
     "commandSendSms": "Gửi tin nhắn",
     "commandSendUssd": "Gửi mã 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": "Báo động quá tốc độ",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "Tần suất",
     "commandTimezone": "Múi giờ",
     "commandMessage": "Thông báo",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Tất cả sự kiện",
-    "eventDeviceOnline": "Thiết bị trực tuyến",
-    "eventDeviceUnknown": "Không xác định tình trạng thiết bị",
-    "eventDeviceOffline": "Thiết bị ngoại tuyến",
-    "eventDeviceMoving": "Thiết bị đang di chuyển",
-    "eventDeviceStopped": "Thiết bị đã dừng",
-    "eventDeviceOverspeed": "Thiết bị vượt quá tốc độ",
-    "eventDeviceFuelDrop": "Sự kiện nhiên liệu thất thoát",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Kết quả lệnh",
-    "eventGeofenceEnter": "Thiết bị đã đi vào giới hạn địa lý",
-    "eventGeofenceExit": "Thiết bị đã thoát khỏi giới hạn địa lý",
-    "eventAlarm": "Báo động",
-    "eventIgnitionOn": "Mở khóa",
-    "eventIgnitionOff": "Ngắt khóa",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Yêu cầu bảo dưỡng",
     "eventTextMessage": "Đã nhận tin nhắn",
-    "eventDriverChanged": "Driver has changed",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Kéo xuống cuối",
-    "alarmSos": "Báo động khẩn",
-    "alarmVibration": "Báo động rung",
-    "alarmMovement": "Báo động di chuyển",
-    "alarmOverspeed": "Cảnh báo quá tốc độ",
-    "alarmFallDown": "Cảnh báo FallDown",
-    "alarmLowBattery": "Cảnh báo nguồn yếu",
-    "alarmLowPower": "Cảnh báo nguồn yếu",
-    "alarmFault": "Cảnh báo lỗi",
-    "alarmPowerOff": "Cảnh báo tắt máy",
-    "alarmPowerOn": "Cảnh báo bật máy",
-    "alarmDoor": "Cảnh báo mở cửa",
-    "alarmGeofence": "Cảnh báo hàng rào địa lý",
-    "alarmGeofenceEnter": "Cảnh báo vào hàng rào",
-    "alarmGeofenceExit": "Cảnh báo ra khỏi hàng rào",
-    "alarmGpsAntennaCut": "Cảnh báo ăng ten GPS bị cắt",
-    "alarmAccident": "Cảnh báo tai nạn",
-    "alarmTow": "Cảnh báo cẩu xe",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Cảnh báo tăng ga đột ngột",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Cảnh báo mệt mỏi",
-    "alarmPowerCut": "Cảnh báo cắt nguồn",
-    "alarmPowerRestored": "Cảnh báo cấp lại nguồn",
-    "alarmJamming": "Cảnh báo tắc đường",
-    "alarmTemperature": "Cảnh báo nhiệt độ",
-    "alarmParking": "Cảnh báo đỗ xe",
-    "alarmShock": "Cảnh báo va chạm",
-    "alarmBonnet": "Cảnh báo mở nắp capo",
-    "alarmFootBrake": "Cảnh báo phanh chân",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Cảnh báo đập phá",
-    "alarmRemoving": "Loại bỏ cảnh báo",
+    "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": "Loại thông báo",
     "notificationAlways": "All Devices",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Lộ trình",
     "reportEvents": "Sự kiện",
     "reportTrips": "Hành trình",
@@ -371,6 +375,7 @@
     "reportChartType": "Kiểu biều đồ",
     "reportShowMarkers": "Hiển thị dấu",
     "reportExport": "Xuất",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "Thời gian kết thúc",
     "reportEndAddress": "Địa chỉ kết thúc",
     "reportSpentFuel": "Tiêu thụ nguyên liệu",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Thống kê",
     "statisticsCaptureTime": "Thời gian",
     "statisticsActiveUsers": "Người dùng được kích hoạt",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Xe tải",
     "categoryVan": "Xe thùng",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/l10n/zh.json b/web/l10n/zh.json
index edce2181..a4e8ada7 100644
--- a/web/l10n/zh.json
+++ b/web/l10n/zh.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "计算属性",
     "sharedCheckComputedAttribute": "确认计算属性",
     "sharedExpression": "表达",
-    "sharedDeviceDistance": "设备里程",
     "sharedDevice": "设备",
     "sharedTestNotification": "发送测试通知",
     "sharedCalendar": "日历",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "显示地址",
     "sharedDisabled": "关闭",
     "sharedMaintenance": "维护",
-    "sharedMaintenances": "维护",
+    "sharedDeviceAccumulators": "蓄电池",
+    "sharedAlarms": "报警",
     "attributeSpeedLimit": "速度限制",
     "attributePolylineDistance": "折线距离",
     "attributeReportIgnoreOdometer": "报告：忽略里程表",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "关闭驾驶员",
     "attributeUiDisableComputedAttributes": "关闭计算属性",
     "attributeUiDisableCalendars": "关闭日历",
-    "attributeUiDisableMaintenances": "关闭维护保养",
+    "attributeUiDisableMaintenance": "禁止维护",
     "attributeUiHidePositionAttributes": "隐藏位置属性",
     "errorTitle": "错误",
     "errorGeneral": "无效参数",
@@ -231,7 +231,9 @@
     "serverForceSettings": "强制设置",
     "mapTitle": "地图",
     "mapLayer": "地图图层",
-    "mapCustom": "自定义地图",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap 地图",
     "mapBingKey": "必应重点地图",
@@ -252,7 +254,7 @@
     "stateValue": "值",
     "commandTitle": "下发指令",
     "commandSend": "发送",
-    "commandSent": "命令已发送",
+    "commandSent": "指令已发送",
     "commandQueued": "指令已排队",
     "commandUnit": "单位",
     "commandCustom": "自定义指令",
@@ -262,10 +264,11 @@
     "commandPositionStop": "位置停止",
     "commandEngineStop": "引擎熄火",
     "commandEngineResume": "引擎启动",
-    "commandAlarmArm": "Arm Alarm",
+    "commandAlarmArm": "部署报警",
     "commandAlarmDisarm": "解除报警",
     "commandSetTimezone": "设置时区",
     "commandRequestPhoto": "请求图片",
+    "commandPowerOff": "设备关机",
     "commandRebootDevice": "重启设备",
     "commandSendSms": "发送短信",
     "commandSendUssd": "发送USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "修改电源节省",
     "commandModeDeepSleep": "修改深度睡眠",
     "commandMovementAlarm": "移动报警",
-    "commandAlarmBattery": "电池报警",
-    "commandAlarmSos": "SOS报警",
-    "commandAlarmRemove": "移除报警",
-    "commandAlarmClock": "时钟报警",
-    "commandAlarmSpeed": "超速报警",
-    "commandAlarmFall": "失败报警",
-    "commandAlarmVibration": "振动报警",
     "commandFrequency": "频率",
     "commandTimezone": "时区偏移",
     "commandMessage": "消息",
@@ -305,61 +301,69 @@
     "commandServer": "服务器",
     "commandPort": "端口",
     "eventAll": "所有事件",
-    "eventDeviceOnline": "设备在线",
-    "eventDeviceUnknown": "设备状态未知",
-    "eventDeviceOffline": "设备离线",
+    "eventDeviceOnline": "在线状态",
+    "eventDeviceUnknown": "未知状态",
+    "eventDeviceOffline": "离线状态",
     "eventDeviceMoving": "设备移动中",
     "eventDeviceStopped": "设备已停止",
-    "eventDeviceOverspeed": "设备超速",
-    "eventDeviceFuelDrop": "燃料泄漏事件",
+    "eventDeviceOverspeed": "超速限制",
+    "eventDeviceFuelDrop": "燃料液滴",
     "eventCommandResult": "指令结果",
-    "eventGeofenceEnter": "设备已进入区域",
-    "eventGeofenceExit": "设备已离开区域",
+    "eventGeofenceEnter": "进入围栏",
+    "eventGeofenceExit": "离开围栏",
     "eventAlarm": "报警",
-    "eventIgnitionOn": "点火开启",
-    "eventIgnitionOff": "点火关闭",
+    "eventIgnitionOn": "点火",
+    "eventIgnitionOff": "熄火",
     "eventMaintenance": "需要维护",
     "eventTextMessage": "已接收文本信息",
     "eventDriverChanged": "驾驶员已改变",
     "eventsScrollToLast": "移至最后",
-    "alarmSos": "SOS报警",
-    "alarmVibration": "振动报警",
-    "alarmMovement": "移动报警",
-    "alarmOverspeed": "超速报警",
-    "alarmFallDown": "坠落报警",
-    "alarmLowBattery": "低电报警",
-    "alarmLowPower": "低电报警",
-    "alarmFault": "故障报警",
-    "alarmPowerOff": "关机报警",
-    "alarmPowerOn": "开机报警",
-    "alarmDoor": "开门报警",
-    "alarmGeofence": "围栏报警",
-    "alarmGeofenceEnter": "进入围栏报警",
-    "alarmGeofenceExit": "离开围栏报警",
-    "alarmGpsAntennaCut": "GPS天线报警",
-    "alarmAccident": "事故报警",
-    "alarmTow": "牵引报警",
-    "alarmIdle": "怠速报警",
-    "alarmHardAcceleration": "急加速报警",
-    "alarmHardBraking": "隐藏刹车报警",
-    "alarmFatigueDriving": "疲劳驾驶报警",
-    "alarmPowerCut": "断电报警",
-    "alarmPowerRestored": "电源恢复报警",
-    "alarmJamming": "干扰报警",
-    "alarmTemperature": "温度报警",
-    "alarmParking": "停车报警",
-    "alarmShock": "震动报警",
-    "alarmBonnet": "阀盖报警",
-    "alarmFootBrake": "制动报警",
-    "alarmFuelLeak": "燃料泄漏报警",
-    "alarmTampering": "篡改报警",
-    "alarmRemoving": "移除报警",
+    "alarmGeneral": "通常",
+    "alarmSos": "求救",
+    "alarmVibration": "振动",
+    "alarmMovement": "移动",
+    "alarmLowspeed": "低速",
+    "alarmOverspeed": "超速",
+    "alarmFallDown": "跌落",
+    "alarmLowPower": "低电源",
+    "alarmLowBattery": "低电量",
+    "alarmFault": "故障",
+    "alarmPowerOff": "关闭电源",
+    "alarmPowerOn": "开启电源",
+    "alarmDoor": "门",
+    "alarmLock": "锁定",
+    "alarmUnlock": "解锁",
+    "alarmGeofence": "围栏",
+    "alarmGeofenceEnter": "进入围栏",
+    "alarmGeofenceExit": "离开围栏",
+    "alarmGpsAntennaCut": "GPS天线切割",
+    "alarmAccident": "事故",
+    "alarmTow": "拖",
+    "alarmIdle": "空转",
+    "alarmHighRpm": "高转速",
+    "alarmHardAcceleration": "急加速",
+    "alarmHardBraking": "急刹车",
+    "alarmHardCornering": "急转弯",
+    "alarmLaneChange": "紧急变线",
+    "alarmFatigueDriving": "疲劳驾驶",
+    "alarmPowerCut": "断电",
+    "alarmPowerRestored": "电源恢复",
+    "alarmJamming": "干扰",
+    "alarmTemperature": "温度",
+    "alarmParking": "停车中",
+    "alarmShock": "震动",
+    "alarmBonnet": "阀盖",
+    "alarmFootBrake": "脚踏制动器",
+    "alarmFuelLeak": "燃料泄漏",
+    "alarmTampering": "篡改",
+    "alarmRemoving": "移除中",
     "notificationType": "通知类型",
     "notificationAlways": "所有设备",
     "notificationNotificators": "通道",
     "notificatorWeb": "网页",
     "notificatorMail": "邮件",
     "notificatorSms": "短信",
+    "notificatorFirebase": "移动",
     "reportRoute": "轨迹",
     "reportEvents": "事件",
     "reportTrips": "行程",
@@ -371,6 +375,7 @@
     "reportChartType": "图表类型",
     "reportShowMarkers": "显示图标",
     "reportExport": "导出",
+    "reportEmail": "邮件报告",
     "reportPeriod": "时期",
     "reportCustom": "自定义",
     "reportToday": "今天",
@@ -389,6 +394,8 @@
     "reportEndTime": "结束时间",
     "reportEndAddress": "结束地址",
     "reportSpentFuel": "燃料消耗",
+    "reportStartOdometer": "里程开始",
+    "reportEndOdometer": "里程结束",
     "statisticsTitle": "统计",
     "statisticsCaptureTime": "时间",
     "statisticsActiveUsers": "活动用户",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "无轨电车",
     "categoryTruck": "卡车",
     "categoryVan": "厢式货车",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "开始",
     "maintenancePeriod": "时期"
 }
\ No newline at end of file
diff --git a/web/l10n/zh_TW.json b/web/l10n/zh_TW.json
index a11e3e30..5c8dc1d4 100644
--- a/web/l10n/zh_TW.json
+++ b/web/l10n/zh_TW.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "計算屬性",
     "sharedCheckComputedAttribute": "檢查計算屬性",
     "sharedExpression": "表示式",
-    "sharedDeviceDistance": "設備距離",
     "sharedDevice": "設備",
     "sharedTestNotification": "傳送測試通知",
     "sharedCalendar": "日曆",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "速限",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "報告：忽略里程表",
@@ -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": "非法的參數或違反限制",
@@ -231,7 +231,9 @@
     "serverForceSettings": "強制覆寫設定",
     "mapTitle": "地圖",
     "mapLayer": "地圖圖層",
-    "mapCustom": "自訂地圖",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "CARTO 地圖",
     "mapOsm": "OpenStreetMap",
     "mapBingKey": "Bing 地圖金鑰",
@@ -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": "傳送簡訊",
     "commandSendUssd": "傳送 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": "時區",
     "commandMessage": "訊息",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "所有事件",
-    "eventDeviceOnline": "設備上線",
-    "eventDeviceUnknown": "設備狀態未知",
-    "eventDeviceOffline": "設備下線",
-    "eventDeviceMoving": "設備正在移動",
-    "eventDeviceStopped": "設備已停止",
-    "eventDeviceOverspeed": "設備超速",
-    "eventDeviceFuelDrop": "加油",
+    "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": "點火開",
-    "eventIgnitionOff": "點火關",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "需要保養",
     "eventTextMessage": "已接收文字訊息",
-    "eventDriverChanged": "已更換駕駛",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "卷軸已拉到底",
-    "alarmSos": "求救警報",
-    "alarmVibration": "振動警報",
-    "alarmMovement": "移動警報",
-    "alarmOverspeed": "超速警報",
-    "alarmFallDown": "墜落警報",
-    "alarmLowBattery": "電池耗盡警報",
-    "alarmLowPower": "電力耗盡警報",
-    "alarmFault": "故障錯誤",
-    "alarmPowerOff": "關機警報",
-    "alarmPowerOn": "開機警報",
-    "alarmDoor": "開門警報",
-    "alarmGeofence": "地圖圍籬警報",
-    "alarmGeofenceEnter": "進入地圖圍籬警報",
-    "alarmGeofenceExit": "離開地圖圍籬警報",
-    "alarmGpsAntennaCut": "GPS 天線脫落警報",
-    "alarmAccident": "事故警報",
-    "alarmTow": "拖吊警報",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "緊急加速警報",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "疲勞駕駛",
-    "alarmPowerCut": "失去電力警報",
-    "alarmPowerRestored": "電力恢復警報",
-    "alarmJamming": "塞車警報",
-    "alarmTemperature": "溫度異常警報",
-    "alarmParking": "停車警報",
-    "alarmShock": "震動警報",
-    "alarmBonnet": "引擎蓋警報",
-    "alarmFootBrake": "腳煞車警報",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "舞弊警報",
-    "alarmRemoving": "移除警報",
+    "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": "路線",
     "reportEvents": "事件",
     "reportTrips": "旅程",
@@ -371,6 +375,7 @@
     "reportChartType": "圖表類型",
     "reportShowMarkers": "顯示地標",
     "reportExport": "匯出",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "結束時間",
     "reportEndAddress": "結束地點",
     "reportSpentFuel": "燃油消耗",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "統計",
     "statisticsCaptureTime": "截取時間",
     "statisticsActiveUsers": "活躍用戶量",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "貨車",
     "categoryVan": "箱型車",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file
diff --git a/web/load.js b/web/load.js
index 0418a131..f22f0adc 100644
--- a/web/load.js
+++ b/web/load.js
@@ -1,5 +1,5 @@
 (function () {
-    var debugMode, touchMode, locale, localeParameter, extjsVersion, proj4jsVersion, fontAwesomeVersion, olVersion, i, language, languages, languageDefault;
+    var debugMode, touchMode, locale, localeParameter, extjsVersion, proj4jsVersion, olVersion, i, language, languages, languageDefault;
 
     function addStyleFile(file) {
         var link = document.createElement('link');
@@ -28,6 +28,10 @@
     debugMode = document.getElementById('loadScript').getAttribute('mode') === 'debug';
     touchMode = 'ontouchstart' in window || navigator.maxTouchPoints;
 
+    window.updateNotificationToken = function (token) {
+        Traccar.app.updateNotificationToken(token);
+    };
+
     locale = {};
     window.Locale = locale;
 
@@ -144,39 +148,34 @@
     }
 
     extjsVersion = '6.2.0';
-    fontAwesomeVersion = '5.2.0';
-    olVersion = '4.6.5';
-    proj4jsVersion = '2.4.4';
+    olVersion = '6.2.1';
+    proj4jsVersion = '2.6.0';
 
     if (debugMode) {
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/ext-all-debug.js');
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/packages/charts/classic/charts-debug.js');
+        addScriptFile('https://cdn.traccar.com/js/extjs/' + extjsVersion + '/ext-all-debug.js');
+        addScriptFile('https://cdn.traccar.com/js/extjs/' + extjsVersion + '/packages/charts/classic/charts-debug.js');
     } else {
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/ext-all.js');
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/packages/charts/classic/charts.js');
+        addScriptFile('https://cdn.traccar.com/js/extjs/' + extjsVersion + '/ext-all.js');
+        addScriptFile('https://cdn.traccar.com/js/extjs/' + extjsVersion + '/packages/charts/classic/charts.js');
     }
-    addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/locale/locale-' + locale.languages[locale.language].code + '.js');
+    addScriptFile('https://cdn.traccar.com/js/extjs/' + extjsVersion + '/classic/locale/locale-' + locale.languages[locale.language].code + '.js');
 
-    addStyleFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/theme-triton/resources/theme-triton-all.css');
-    addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/theme-triton/theme-triton.js');
+    addStyleFile('https://cdn.traccar.com/js/extjs/' + extjsVersion + '/classic/theme-triton/resources/theme-triton-all.css');
+    addScriptFile('https://cdn.traccar.com/js/extjs/' + extjsVersion + '/classic/theme-triton/theme-triton.js');
 
-    addStyleFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/packages/charts/classic/triton/resources/charts-all.css');
+    addStyleFile('https://cdn.traccar.com/js/extjs/' + extjsVersion + '/packages/charts/classic/triton/resources/charts-all.css');
 
-    addStyleFile('//cdnjs.cloudflare.com/ajax/libs/ol3/' + olVersion + '/ol.css');
-    if (debugMode) {
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/ol3/' + olVersion + '/ol-debug.js');
-    } else {
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/ol3/' + olVersion + '/ol.js');
-    }
+    addStyleFile('https://cdn.traccar.com/js/ol/' + olVersion + '/ol.css');
+    addScriptFile('https://cdn.traccar.com/js/ol/' + olVersion + '/ol.js');
 
     if (debugMode) {
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/proj4js/' + proj4jsVersion + '/proj4-src.js');
+        addScriptFile('https://cdn.traccar.com/js/proj4js/' + proj4jsVersion + '/proj4-src.js');
     } else {
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/proj4js/' + proj4jsVersion + '/proj4.js');
+        addScriptFile('https://cdn.traccar.com/js/proj4js/' + proj4jsVersion + '/proj4.js');
     }
 
     window.Images = ['arrow', 'default', 'animal', 'bicycle', 'boat', 'bus', 'car', 'crane', 'helicopter', 'motorcycle',
-        'offroad', 'person', 'pickup', 'plane', 'ship', 'tractor', 'train', 'tram', 'trolleybus', 'truck', 'van'];
+        'offroad', 'person', 'pickup', 'plane', 'ship', 'tractor', 'train', 'tram', 'trolleybus', 'truck', 'van', 'scooter'];
 
     for (i = 0; i < window.Images.length; i++) {
         addSvgFile('images/' + window.Images[i] + '.svg', window.Images[i] + 'Svg');