Update translations and add languages

49 files changed, 6307 insertions, 1054 deletions

diff --git a/web/l10n/ar.json b/web/l10n/ar.json
index d30eac0a..147e7e5a 100644
--- a/web/l10n/ar.json
+++ b/web/l10n/ar.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Distance",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "خطأ",
-    "errorUnknown": "خطأ غير معروف",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "خطأ في الاتصال",
     "errorSocket": "Web socket connection error",
     "userEmail": "بريد إلكتروني",
@@ -119,6 +151,51 @@
     "positionAddress": "العنوان",
     "positionProtocol": "بروتوكول",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "اعدادت الخادم",
     "serverZoom": "تقريب",
     "serverRegistration": "تسجيل",
@@ -174,6 +251,8 @@
     "commandPhone": "Phone Number",
     "commandMessage": "Message",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "الجهاز متصل",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "الجهاز يتحرك",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "الجهاز متعدٍّ للسرعة",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "نتيجة الأمر",
     "eventGeofenceEnter": "الجهاز قد دخل السياج الجغرافي",
     "eventGeofenceExit": "الجهاز قد خرج من السياج الجغرافي",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "نوع الملاحظة",
     "notificationWeb": "أرسل عن طريق صفحة الويب",
     "notificationMail": "أرسل عن طريق البريد الإلكتروني",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/bg.json b/web/l10n/bg.json
index 33403c13..4a1b0f74 100644
--- a/web/l10n/bg.json
+++ b/web/l10n/bg.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Разстояние",
     "sharedHourAbbreviation": "ч.",
     "sharedMinuteAbbreviation": "мин.",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Състояние на картата",
     "sharedAttributeAlias": "Сензор/Име",
     "sharedAttributeAliases": "Сензор/Име",
     "sharedAlias": "Име",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Пробег на устройството",
     "sharedDevice": "Устройство",
     "sharedTestNotification": "Изпрати пробно известие",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Предпочитания",
     "sharedPermissions": "Разрешения",
     "sharedExtra": "Допълнително",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Номер",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Часова зона",
+    "sharedInfoTitle": "Инфо",
+    "attributeSpeedLimit": "Ограничение на скоростта",
+    "attributeReportIgnoreOdometer": "Отчет: Игнорирай километража",
+    "attributeMaintenanceStart": "Поддръжка: Старт",
+    "attributeMaintenanceInterval": "Поддръжка: Интервал",
+    "attributeWebReportColor": "Цвят на доклада",
+    "attributeDevicePassword": "Парола на устройството",
+    "attributeProcessingCopyAttributes": "Обработка: копиране на сензори",
+    "attributeColor": "Цвят",
+    "attributeWebLiveRouteLength": "Дължина на дирята",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "attributeMailSmtpHost": "Поща: SMTP хост",
+    "attributeMailSmtpPort": "Поща: SMTP порт",
+    "attributeMailSmtpStarttlsEnable": "Поща: SMTP STARTTLS активирай",
+    "attributeMailSmtpStarttlsRequired": "Поща: SMTP STARTTLS задължително",
+    "attributeMailSmtpSslEnable": "Поща: SMTP SSL активирай",
+    "attributeMailSmtpSslTrust": "Поща: SMTP SSL Trust",
+    "attributeMailSmtpSslProtocols": "Поща: SMTP SSL протокол",
+    "attributeMailSmtpFrom": "Поща: SMTP от",
+    "attributeMailSmtpAuth": "Поща: SMTP Auth активирай",
+    "attributeMailSmtpUsername": "Поща: SMTP потребител",
+    "attributeMailSmtpPassword": "Поща: SMTP парола",
     "errorTitle": "Грешка",
-    "errorUnknown": "Неизвестна грешка",
+    "errorGeneral": "Невалидни параметри",
     "errorConnection": "Грешка във връзката",
     "errorSocket": "Грешка в WebSocket връзката",
     "userEmail": "Пощенска кутия",
@@ -77,7 +109,7 @@
     "loginLogout": "Изход",
     "loginLogo": "Лого",
     "devicesAndState": "Устройства и състояние",
-    "deviceTitle": "Устройства",
+    "deviceTitle": "Обекти",
     "deviceIdentifier": "Идентификатор",
     "deviceModel": "Модел",
     "deviceContact": "Контакт",
@@ -108,7 +140,7 @@
     "reportTo": "До",
     "reportShow": "Покажи",
     "reportClear": "Изчисти",
-    "positionFixTime": "Време",
+    "positionFixTime": "Дата",
     "positionValid": "Валидност",
     "positionAccuracy": "Точност",
     "positionLatitude": "Географска Ширина",
@@ -119,6 +151,51 @@
     "positionAddress": "Адрес",
     "positionProtocol": "Протокол",
     "positionDistance": "Разстояние",
+    "positionRpm": "Обороти",
+    "positionFuel": "Гориво",
+    "positionPower": "Захранване",
+    "positionBattery": "Батерия",
+    "positionRaw": "Raw",
+    "positionIndex": "Индекс",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Сателити",
+    "positionSatVisible": "Видими сателити",
+    "positionRssi": "RSSI",
+    "positionGps": "ДжиПиЕс",
+    "positionEvent": "Събитие",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Статус",
+    "positionOdometer": "Километраж",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Часове",
+    "positionInput": "Input",
+    "positionOutput": "Output",
+    "positionBatteryLevel": "Батерия %",
+    "positionFuelConsumption": "Разход на гориво",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Firmware Version",
+    "positionVersionHw": "Hardware Version",
+    "positionIgnition": "На контакт",
+    "positionFlags": "Flags",
+    "positionCharge": "Зареждане",
+    "positionIp": "АйПи",
+    "positionArchive": "Архив",
+    "positionVin": "VIN",
+    "positionApproximate": "Приблизително",
+    "positionThrottle": "Throttle",
+    "positionMotion": "Движение",
+    "positionArmed": "Armed",
+    "positionAcceleration": "Acceleration",
+    "positionDeviceTemp": "Температура на устройството",
+    "positionOperator": "Оператор",
+    "positionCommand": "Command",
+    "positionBlocked": "Блокиран",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Настройки на сървъра",
     "serverZoom": "Приближение",
     "serverRegistration": "Регистрация",
@@ -132,10 +209,10 @@
     "mapBingKey": "Ключ за Bing Maps",
     "mapBingRoad": "Bing Maps Road",
     "mapBingAerial": "Bing Maps Aerial",
-    "mapBingHybrid": "Bing Maps Hybrid",
-    "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapBingHybrid": "Bing карта хибрид",
+    "mapBaidu": "Байду",
+    "mapYandexMap": "Yandex карта",
+    "mapYandexSat": "Yandex сателитна карта ",
     "mapShapePolygon": "Многоъгълник",
     "mapShapeCircle": "Кръг",
     "mapShapePolyline": "Линия",
@@ -151,7 +228,7 @@
     "commandEngineStop": "Спри двигателя",
     "commandEngineResume": "Стартирай двигателя",
     "commandFrequency": "Честота",
-    "commandUnit": "Обект",
+    "commandUnit": "Мерна ед.",
     "commandCustom": "Персонализирана команда",
     "commandPositionSingle": "Единичен доклад",
     "commandAlarmArm": "Активирай Аларма",
@@ -174,6 +251,8 @@
     "commandPhone": "Телефонен номер",
     "commandMessage": "Съобщение",
     "commandTimezone": "Компенсация на часовата зона",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "Всички събития",
     "eventDeviceOnline": "Устройството е на линия",
     "eventDeviceUnknown": "Незвестно състояние на устройството",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Обектът е в движение",
     "eventDeviceStopped": "Обектът спря",
     "eventDeviceOverspeed": "Обектът превишава скоростта",
+    "eventDeviceFuelDrop": "Спад на горивото",
     "eventCommandResult": "Резултат от командата",
     "eventGeofenceEnter": "Обектът влезе в зоната",
     "eventGeofenceExit": "Обектът излезе от зоната",
@@ -189,35 +269,38 @@
     "eventIgnitionOff": "Запалването е изключено",
     "eventMaintenance": "Необходимо е обслужване",
     "eventTextMessage": "Получен SMS",
-    "alarm": "Аларма",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "SOS Аларма",
-    "alarmVibration": "Аларма \"Вибрация\"",
-    "alarmMovement": "Аларма \"Движение\"",
-    "alarmOverspeed": "Аларма \"Превишена Скорост\"",
-    "alarmFallDown": "Аларма \"Падане\"",
-    "alarmLowBattery": "Аларма \"Слаба батерия\"",
-    "alarmFault": "Аларма \"Повреда\"",
-    "alarmPowerOff": "Аларма \"Изключено захранване\"",
-    "alarmPowerOn": "Аларма \"На контакг\"",
-    "alarmDoor": "Аларма \"Отворена врата\"",
-    "alarmGeofence": "Аларма \"Зона\"",
-    "alarmGeofenceEnter": "Аларма \"Влизане в зона\"",
-    "alarmGeofenceExit": "Аларма \"Излизане от зона\"",
-    "alarmGpsAntennaCut": "Аларма \"GPS антената откачена\"",
-    "alarmAccident": "Аларма \"Инцидент\"",
-    "alarmTow": "Аларма \"Теглене\"",
-    "alarmHardAcceleration": "Аларма \"Рязко ускорение\"",
-    "alarmHardBreaking": "Аларма \"Рязко спиране\"",
-    "alarmFatigueDriving": "Аларма \"Уморен водач\"",
-    "alarmPowerCut": "Аларма \"Захранването прекъснато\"",
-    "alarmJamming": "Аларма \"Заглушаване\"",
-    "alarmTemperature": "Аларма \"Температура\"",
-    "alarmParking": "Аларма \"Паркиране\"",
-    "alarmShock": "Аларма \"Удар\"",
-    "alarmBonnet": "Аларма \"Отворен капак\"",
-    "alarmFootBrake": "Аларма \"Спирачен педал\"",
-    "alarmOilLeak": "Аларма \"Теч на масло\"",
-    "alarmTampering": "Аларма \"Намеса по тракера\"",
+    "alarmVibration": "Аларма: Вибрация",
+    "alarmMovement": "Аларма: Движение",
+    "alarmOverspeed": "Аларма: Превишена Скорост",
+    "alarmFallDown": "Аларма: Падане",
+    "alarmLowBattery": "Аларма: Слаба батерия",
+    "alarmLowPower": "Аларма: Ниско напрежение",
+    "alarmFault": "Аларма: Повреда",
+    "alarmPowerOff": "Аларма: Изключено захранване",
+    "alarmPowerOn": "Аларма: На контакг",
+    "alarmDoor": "Аларма: Отворена врата",
+    "alarmGeofence": "Аларма: Зона",
+    "alarmGeofenceEnter": "Аларма: Влизане в зона",
+    "alarmGeofenceExit": "Аларма: Излизане от зона",
+    "alarmGpsAntennaCut": "Аларма: GPS антената откачена",
+    "alarmAccident": "Аларма: Инцидент",
+    "alarmTow": "Аларма: Теглене",
+    "alarmHardAcceleration": "Аларма: Рязко ускорение",
+    "alarmHardBreaking": "Аларма: Рязко спиране",
+    "alarmFatigueDriving": "Аларма: Уморен водач",
+    "alarmPowerCut": "Аларма: Захранването прекъснато",
+    "alarmPowerRestored": "Аларма Захранването възстановено",
+    "alarmJamming": "Аларма: Заглушаване",
+    "alarmTemperature": "Аларма: Температура",
+    "alarmParking": "Аларма: Паркиране",
+    "alarmShock": "Аларма: Удар",
+    "alarmBonnet": "Аларма: Отворен капак",
+    "alarmFootBrake": "Аларма: Спирачен педал",
+    "alarmOilLeak": "Аларма: Теч на масло",
+    "alarmTampering": "Аларма: Намеса по тракера",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Тип на известието",
     "notificationWeb": "Изпрати чрез интернет",
     "notificationMail": "Изпрати чрез имейл",
@@ -225,6 +308,7 @@
     "reportRoute": "Маршрут",
     "reportEvents": "Събития",
     "reportTrips": "Пътувания",
+    "reportStops": "Stops",
     "reportSummary": "Общо",
     "reportChart": "Графика",
     "reportConfigure": "Конфигуриране",
@@ -242,22 +326,31 @@
     "reportEndTime": "Краен час",
     "reportEndAddress": "Краен адрес",
     "reportSpentFuel": "Изразходвано гориво",
-    "statisticsTitle": "Статистика",
-    "statisticsCaptureTime": "Час на снимката",
+    "statisticsTitle": "Статистики",
+    "statisticsCaptureTime": "Дата",
     "statisticsActiveUsers": "Активни потребители",
     "statisticsActiveDevices": "Активни устройства",
     "statisticsRequests": "Повиквания",
     "statisticsMessagesReceived": "Приети съобщения",
     "statisticsMessagesStored": "Запазени съобщения",
+    "statisticsGeocoder": "Запитвания за адрес",
+    "statisticsGeolocation": "Запитвания за позиция",
     "categoryArrow": "Стрелка",
     "categoryDefault": "По подразбиране",
-    "categoryCar": "Кола",
+    "categoryAnimal": "Животно",
+    "categoryBicycle": "Колело",
+    "categoryBoat": "Лодка",
     "categoryBus": "Автобус",
-    "categoryTruck": "Камион",
-    "categoryShip": "Кораб",
-    "categoryPlane": "Самолет",
+    "categoryCar": "Кола",
+    "categoryCrane": "Кран",
+    "categoryHelicopter": "Въртолет",
     "categoryMotorcycle": "Мотор",
-    "categoryBicycle": "Колело",
+    "categoryOffroad": "Джип",
     "categoryPerson": "Човек",
-    "categoryAnimal": "Животно"
+    "categoryPickup": "Пикап",
+    "categoryPlane": "Самолет",
+    "categoryShip": "Кораб",
+    "categoryTractor": "Трактор",
+    "categoryTruck": "Камион",
+    "categoryVan": "Ван"
 }
\ No newline at end of file
diff --git a/web/l10n/cs.json b/web/l10n/cs.json
index dd0ad0a0..a2a5ab43 100644
--- a/web/l10n/cs.json
+++ b/web/l10n/cs.json
@@ -17,9 +17,9 @@
     "sharedHour": "Hodina",
     "sharedMinute": "Minuta",
     "sharedSecond": "Sekunda",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "dny",
+    "sharedHours": "hodiny",
+    "sharedMinutes": "minuty",
     "sharedDecimalDegrees": "Desetinné stupně",
     "sharedDegreesDecimalMinutes": "Desetinné minuty",
     "sharedDegreesMinutesSeconds": "Desetinné sekundy",
@@ -37,10 +37,17 @@
     "sharedDistance": "Vzdálenost",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Získat stav mapy",
     "sharedAttributeAlias": "Přezdívka atributu",
     "sharedAttributeAliases": "Přezdívky atributů",
     "sharedAlias": "Přezdívka",
+    "sharedComputedAttribute": "Vypočítaná vlastnost",
+    "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í",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preference",
     "sharedPermissions": "Oprávnění",
     "sharedExtra": "Extra",
+    "sharedTypeString": "Řetězec",
+    "sharedTypeNumber": "Číslo",
+    "sharedTypeBoolean": "Booleovo",
     "sharedTimezone": "Časová zóna",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Limit rychlosti",
+    "attributeReportIgnoreOdometer": "Report: Počítadlo kilometrů",
+    "attributeMaintenanceStart": "Údržba: Start",
+    "attributeMaintenanceInterval": "Údržba: Interval",
+    "attributeWebReportColor": "Web: Reportovat barvu",
+    "attributeDevicePassword": "Heslo zařízení",
+    "attributeProcessingCopyAttributes": "Procesuji: Kopírování vlastností",
+    "attributeColor": "Barva",
+    "attributeWebLiveRouteLength": "Web: Aktuální délka trasy",
+    "attributeWebSelectZoom": "Web: Přiblížit při výběru",
+    "attributeMailSmtpHost": "Mail: SMTP server",
+    "attributeMailSmtpPort": "Mail: SMTP port",
+    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS povolit",
+    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS vyžadováno",
+    "attributeMailSmtpSslEnable": "Mail: SMTP SSL povolit",
+    "attributeMailSmtpSslTrust": "Mail: SMTP SSL důvěřovat",
+    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL protokoly",
+    "attributeMailSmtpFrom": "Mail: SMTP od",
+    "attributeMailSmtpAuth": "Mail: SMTP povolení ověřování",
+    "attributeMailSmtpUsername": "Mail: SMTP uživatelské jméno",
+    "attributeMailSmtpPassword": "Mail: SMTP heslo",
     "errorTitle": "Chyba",
-    "errorUnknown": "Neznámá chyba",
+    "errorGeneral": "Nesprávné parametry nebo překročení omezení",
     "errorConnection": "Chyba spojení",
     "errorSocket": "Chyba připojení webového socketu",
     "userEmail": "Email",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresa",
     "positionProtocol": "Protokol",
     "positionDistance": "Vzdálenost",
+    "positionRpm": "RPM",
+    "positionFuel": "Palivo",
+    "positionPower": "Energie",
+    "positionBattery": "Baterie",
+    "positionRaw": "Čisté",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satelity",
+    "positionSatVisible": "Viditelné satelity",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Událost",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Počítadlo kilometrů",
+    "positionServiceOdometer": "Servisní počítadlo kilometrů",
+    "positionTripOdometer": "Počítadlo kilometrů úseku",
+    "positionHours": "Hodiny",
+    "positionInput": "Vstup",
+    "positionOutput": "Výstup",
+    "positionBatteryLevel": "Úroveň baterie",
+    "positionFuelConsumption": "Spotřeba paliva",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Verze firmwaru",
+    "positionVersionHw": "Verze hardwaru",
+    "positionIgnition": "Zapalování",
+    "positionFlags": "Vlajky",
+    "positionCharge": "Nabití",
+    "positionIp": "IP",
+    "positionArchive": "Archiv",
+    "positionVin": "VIN",
+    "positionApproximate": "Přibližný",
+    "positionThrottle": "Škrtící klapka",
+    "positionMotion": "Pohyb",
+    "positionArmed": "Odjištěno",
+    "positionAcceleration": "Akcelerace",
+    "positionDeviceTemp": "Teplota zařízení",
+    "positionOperator": "Operátor",
+    "positionCommand": "Command",
+    "positionBlocked": "Blokované",
+    "positionDtcs": "DTC",
+    "positionObdSpeed": "OBD rychlost",
+    "positionObdOdometer": "OBD počítadlo kilometrů",
     "serverTitle": "Nastavení serveru",
     "serverZoom": "Přiblížení",
     "serverRegistration": "Registrace",
@@ -132,10 +209,10 @@
     "mapBingKey": "Bing Maps klíč",
     "mapBingRoad": "Bing Maps cesta",
     "mapBingAerial": "Bing Maps anténa",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Hybridní Bing mapy",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Yandex mapa",
+    "mapYandexSat": "Yandex satelit",
     "mapShapePolygon": "Mnohoúhelník",
     "mapShapeCircle": "Kruh",
     "mapShapePolyline": "Křivka",
@@ -174,6 +251,8 @@
     "commandPhone": "Číslo telefonu",
     "commandMessage": "Zpráva",
     "commandTimezone": "Ofset časové zóny",
+    "commandgetModemStatus": "Status modemu",
+    "commandgetDeviceStatus": "Status zařízení",
     "eventAll": "Všechny události",
     "eventDeviceOnline": "Zařízení je online",
     "eventDeviceUnknown": "Status zařízení je neznámý",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Zařízení s pohybuje",
     "eventDeviceStopped": "Zařízení se zastavilo",
     "eventDeviceOverspeed": "Zařízení překračuje rychlost",
+    "eventDeviceFuelDrop": "Událost ztráty paliva",
     "eventCommandResult": "Výsledek příkazu",
     "eventGeofenceEnter": "Zařízení vstoupilo do geografické hranice",
     "eventGeofenceExit": "Zařízení opustilo geografickou hranici",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Zažehnutí je VYPNUTO",
     "eventMaintenance": "Vyžadována údržba",
     "eventTextMessage": "Obdržena textová zpráva",
-    "alarm": "Alarm",
+    "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í",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Alarm tvrdého brždění",
     "alarmFatigueDriving": "Alarm unaveného řízení",
     "alarmPowerCut": "Alarm výpadku proudu",
+    "alarmPowerRestored": "Alarm obnovení napájení",
     "alarmJamming": "Alarm zácpy",
     "alarmTemperature": "Alarm teploty",
     "alarmParking": "Alarm parkování",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Alarm nožní brzdy",
     "alarmOilLeak": "Alarm úniku oleje",
     "alarmTampering": "Alarm poškození",
+    "alarmRemoving": "Odstraňuji alarm",
     "notificationType": "Typ oznámení",
     "notificationWeb": "Odeslat přes web",
     "notificationMail": "Odeslat přes mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Trasa",
     "reportEvents": "Události",
     "reportTrips": "Výlety",
+    "reportStops": "Zastávky",
     "reportSummary": "Souhrn",
     "reportChart": "Schéma",
     "reportConfigure": "Nastavit",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Požadavky",
     "statisticsMessagesReceived": "Obdržené zprávy",
     "statisticsMessagesStored": "Uložené zprávy",
+    "statisticsGeocoder": "Požadavky Geocodera",
+    "statisticsGeolocation": "Požadavky Geolokace",
     "categoryArrow": "Šipka",
     "categoryDefault": "Defaultní",
-    "categoryCar": "Auto",
+    "categoryAnimal": "Zvíře",
+    "categoryBicycle": "Kolo",
+    "categoryBoat": "Loď",
     "categoryBus": "Autobus",
-    "categoryTruck": "Nákladní auto",
-    "categoryShip": "Loď",
-    "categoryPlane": "Letadlo",
+    "categoryCar": "Auto",
+    "categoryCrane": "Jeřáb",
+    "categoryHelicopter": "Helikoptéra",
     "categoryMotorcycle": "Motorka",
-    "categoryBicycle": "Kolo",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Osoba",
-    "categoryAnimal": "Zvíře"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Letadlo",
+    "categoryShip": "Loď",
+    "categoryTractor": "Traktor",
+    "categoryTruck": "Nákladní auto",
+    "categoryVan": "Dodávka"
 }
\ No newline at end of file
diff --git a/web/l10n/da.json b/web/l10n/da.json
index dcb41d5e..bde93c15 100644
--- a/web/l10n/da.json
+++ b/web/l10n/da.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Distance",
     "sharedHourAbbreviation": "t",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Kort status",
     "sharedAttributeAlias": "Egenskab alias",
     "sharedAttributeAliases": "Egenskab aliaser",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Enhed distance",
     "sharedDevice": "Enhed",
     "sharedTestNotification": "Send Test notifikation",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Foretrukne",
     "sharedPermissions": "Tilladelser",
     "sharedExtra": "Ekstra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Tidszone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "Fejl",
-    "errorUnknown": "Ukendt Fejl",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Tilslutning fejl",
     "errorSocket": "Web tilslutnings fejl",
     "userEmail": "Email",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresse",
     "positionProtocol": "Protokol",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Server indstillinger",
     "serverZoom": "Zoom",
     "serverRegistration": "Registrering",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefon nummer",
     "commandMessage": "Meddelelse",
     "commandTimezone": "Tidszone forskel",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "Alle begivenheder",
     "eventDeviceOnline": "Enhed online",
     "eventDeviceUnknown": "Enheds status er ukendt",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Enhed i bevægelse",
     "eventDeviceStopped": "Enhed stoppet",
     "eventDeviceOverspeed": "Enhed overskrider hastighed",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Resultat af kommando",
     "eventGeofenceEnter": "Enhed kom indenfor geofence",
     "eventGeofenceExit": "Enhed kom udenfor geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Tænding slået fra",
     "eventMaintenance": "Vedligeholdelse krævet",
     "eventTextMessage": "Tekst besked modtaget",
-    "alarm": "Alarm",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "SOS alarm",
     "alarmVibration": "Vibrations alarm",
     "alarmMovement": "Bevægelses alarm",
     "alarmOverspeed": "Hastigheds alarm",
     "alarmFallDown": "Fald alarm",
     "alarmLowBattery": "Lavt batteri alarm",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "Fejl alarm",
     "alarmPowerOff": "Strøm frakoblet - ALARM",
     "alarmPowerOn": "Strøm tilsluttet - ALARM",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hård opbremsning - ALARM",
     "alarmFatigueDriving": "Kørsel - ALARM",
     "alarmPowerCut": "Strøm frakoblet - ALARM",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Enhed jammet - ALARM",
     "alarmTemperature": "Temperatur - ALARM",
     "alarmParking": "Parkering - ALARM",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Fodbremse - ALARM",
     "alarmOilLeak": "Oilespild - ALARM",
     "alarmTampering": "Enhed åbnet - ALARM",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Type af notifikation",
     "notificationWeb": "Send via Web",
     "notificationMail": "Send via mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Rute",
     "reportEvents": "Begivenheder",
     "reportTrips": "Ture",
+    "reportStops": "Stops",
     "reportSummary": "Resume",
     "reportChart": "Graf",
     "reportConfigure": "Konfigurer",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Anmodninger",
     "statisticsMessagesReceived": "Meddelelser modtaget",
     "statisticsMessagesStored": "Meddelelser gemt",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Pil",
     "categoryDefault": "Standard",
-    "categoryCar": "Bil",
+    "categoryAnimal": "Dyr",
+    "categoryBicycle": "Cykel",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Lastbil",
-    "categoryShip": "Skib",
-    "categoryPlane": "Fly",
+    "categoryCar": "Bil",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcykel",
-    "categoryBicycle": "Cykel",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Dyr"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Fly",
+    "categoryShip": "Skib",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Lastbil",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/de.json b/web/l10n/de.json
index 312c214a..3dcd37e2 100644
--- a/web/l10n/de.json
+++ b/web/l10n/de.json
@@ -17,9 +17,9 @@
     "sharedHour": "Stunde",
     "sharedMinute": "Minute",
     "sharedSecond": "Sekunde",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "Tage",
+    "sharedHours": "Stunden",
+    "sharedMinutes": "Minuten",
     "sharedDecimalDegrees": "Dezimalgrad",
     "sharedDegreesDecimalMinutes": "Dezimalgrad Minuten",
     "sharedDegreesMinutesSeconds": "Grad Minuten Sekunden",
@@ -34,13 +34,20 @@
     "sharedArea": "Gebiet",
     "sharedSound": "Benarichtigungston",
     "sharedType": "Typ",
-    "sharedDistance": "Abstand",
+    "sharedDistance": "Entfernung",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
-    "sharedGetMapState": "Kartenstatus auslesen",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
+    "sharedGetMapState": "Aktuelle Position übernehmen",
     "sharedAttributeAlias": "Eigenschaft Alias",
     "sharedAttributeAliases": "Eigenschaften Alias",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Verarbeitetes Attribut",
+    "sharedComputedAttributes": "Verarbeitete Attribute",
+    "sharedCheckComputedAttribute": "Verarbeitetes Attribut prüfen",
+    "sharedExpression": "Ausdruck",
     "sharedDeviceDistance": "Gerätedistanz",
     "sharedDevice": "Gerät",
     "sharedTestNotification": "Testbenachrichtigung senden",
@@ -53,11 +60,36 @@
     "sharedPreferences": "Einstellungen",
     "sharedPermissions": "Berechtigungen",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Nummer",
+    "sharedTypeBoolean": "Boolesche Variable",
     "sharedTimezone": "Zeitzone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Höchstgeschwindigkeit",
+    "attributeReportIgnoreOdometer": "Bericht: Kilometerzähler ignorieren",
+    "attributeMaintenanceStart": "Wartung: Start",
+    "attributeMaintenanceInterval": "Wartung: Intervall",
+    "attributeWebReportColor": "Web: Berichtsfarbe",
+    "attributeDevicePassword": "Gerätepasswort",
+    "attributeProcessingCopyAttributes": "Bearbeiten: Attribute kopieren",
+    "attributeColor": "Farbe",
+    "attributeWebLiveRouteLength": "Web: Länge der Liveroute",
+    "attributeWebSelectZoom": "Web: Mit Auswahl vergrößern",
+    "attributeMailSmtpHost": "Mail: SMTP Host",
+    "attributeMailSmtpPort": "Mail: SMTP Port",
+    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS aktivieren",
+    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS erforderlich",
+    "attributeMailSmtpSslEnable": "Mail: SMTP SSL aktivieren",
+    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Vertrauensstufe",
+    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL Protokolle",
+    "attributeMailSmtpFrom": "Mail: SMTP Absender",
+    "attributeMailSmtpAuth": "Mail: SMTP Authentifizierung aktivieren",
+    "attributeMailSmtpUsername": "Mail: SMTP Benutzername",
+    "attributeMailSmtpPassword": "Mail: SMTP Passwort",
     "errorTitle": "Fehler",
-    "errorUnknown": "Unbekannter Fehler",
+    "errorGeneral": "Ungültige Eingabe oder keine Berechtigung",
     "errorConnection": "Verbindungsfehler",
-    "errorSocket": "Web Socket Verbidungsfehler",
+    "errorSocket": "Web Socket Verbindungsfehler",
     "userEmail": "Email",
     "userPassword": "Passwort",
     "userAdmin": "Admin",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresse",
     "positionProtocol": "Protokoll",
     "positionDistance": "Distanz",
+    "positionRpm": "Drehzahl",
+    "positionFuel": "Treibstoff",
+    "positionPower": "Strom",
+    "positionBattery": "Batterie",
+    "positionRaw": "Roh",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satelliten",
+    "positionSatVisible": "Sichtbare Satelliten",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Ereignis",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Kilometerzähler",
+    "positionServiceOdometer": "Kilometerzähler - Service",
+    "positionTripOdometer": "Kilometerzähler - Trip",
+    "positionHours": "Stunden",
+    "positionInput": "Input",
+    "positionOutput": "Output",
+    "positionBatteryLevel": "Batteriestand",
+    "positionFuelConsumption": "Kraftstoffverbrauch",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Firmware Version",
+    "positionVersionHw": "Hardware Version",
+    "positionIgnition": "Zündung",
+    "positionFlags": "Flags",
+    "positionCharge": "Laden",
+    "positionIp": "IP",
+    "positionArchive": "Archiv",
+    "positionVin": "VIN",
+    "positionApproximate": "Geschätzt",
+    "positionThrottle": "Gasstellung",
+    "positionMotion": "Bewegung",
+    "positionArmed": "Gesichert",
+    "positionAcceleration": "Beschleunigung",
+    "positionDeviceTemp": "Gerätetemperatur",
+    "positionOperator": "Bediener",
+    "positionCommand": "Befehl",
+    "positionBlocked": "Blockiert",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Geschwindigkeit",
+    "positionObdOdometer": "OBD Kilometerzähler",
     "serverTitle": "Server Einstellungen",
     "serverZoom": "Zoomen",
     "serverRegistration": "Registrierung zulassen",
@@ -148,8 +225,8 @@
     "commandSent": "Befehl wurde gesendet",
     "commandPositionPeriodic": "Periodische Berichte",
     "commandPositionStop": "Bericht stoppen",
-    "commandEngineStop": "Motor Stop",
-    "commandEngineResume": "Motor Start",
+    "commandEngineStop": "Motor gestoppt",
+    "commandEngineResume": "Motor gestartet",
     "commandFrequency": "Frequenz",
     "commandUnit": "Einheit",
     "commandCustom": "Benutzerdefinierter Befehl",
@@ -174,6 +251,8 @@
     "commandPhone": "Rufnummer",
     "commandMessage": "Nachricht",
     "commandTimezone": "Zeitzonendifferenz",
+    "commandgetModemStatus": "Modemstatus",
+    "commandgetDeviceStatus": "Gerätestatus",
     "eventAll": "Alle Ereignisse",
     "eventDeviceOnline": "Gerät ist online",
     "eventDeviceUnknown": "Gerätestatus ist unbekannt",
@@ -181,35 +260,38 @@
     "eventDeviceMoving": "Gerät ist in Bewegung",
     "eventDeviceStopped": "Gerät hat angehalten",
     "eventDeviceOverspeed": "Gerät überschreitet Tempolimit",
+    "eventDeviceFuelDrop": "Treibstoffleck Ereignis",
     "eventCommandResult": "Ergebnis des Befehls",
     "eventGeofenceEnter": "Gerät hat Geo-Zaun betreten",
     "eventGeofenceExit": "Gerät hat Geo-Zaun verlassen",
     "eventAlarm": "Alarme",
-    "eventIgnitionOn": "Zünding an",
+    "eventIgnitionOn": "Zündung an",
     "eventIgnitionOff": "Zündung aus",
     "eventMaintenance": "Wartung erdorderlich",
     "eventTextMessage": "Textnachricht empfangen",
-    "alarm": "Alarm",
+    "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",
+    "alarmGeofenceEnter": "Geozaun betreten Alarm",
+    "alarmGeofenceExit": "Geozaun verlassen Alarm",
+    "alarmGpsAntennaCut": "GPS-Antenne beschädigt Alarm",
     "alarmAccident": "Unfall Alarm",
     "alarmTow": "Abschlepp Alarm",
     "alarmHardAcceleration": "Starke Beschleunigung Alarm",
     "alarmHardBreaking": "Vollbremsung Alarm",
-    "alarmFatigueDriving": "Ermüdng Alarm",
+    "alarmFatigueDriving": "Ermüdung Alarm",
     "alarmPowerCut": "Spannungsverlust Alarm",
+    "alarmPowerRestored": "Spannungsrückkehr Alarm",
     "alarmJamming": "Störung Alarm",
     "alarmTemperature": "Temperatur Alarm",
     "alarmParking": "Parken Alarm",
@@ -218,13 +300,15 @@
     "alarmFootBrake": "Fußbremse Alarm",
     "alarmOilLeak": "Ölleck Alarm",
     "alarmTampering": "Manipulation Alarm",
+    "alarmRemoving": "Entfernen Alarm",
     "notificationType": "Art der Benachrichtigung ",
     "notificationWeb": "Per Web senden",
     "notificationMail": "Per E-Mail senden",
-    "notificationSms": "per SMS senden",
+    "notificationSms": "Per SMS senden",
     "reportRoute": "Route",
     "reportEvents": "Ereignis",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Zusammenfassung",
     "reportChart": "Diagramm",
     "reportConfigure": "Konfigurieren",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Anfragen",
     "statisticsMessagesReceived": "Empfangene Nachrichten",
     "statisticsMessagesStored": "Gespeicherte Nachrichten",
+    "statisticsGeocoder": "Geocoder Anfragen",
+    "statisticsGeolocation": "Geolocation Anfragen",
     "categoryArrow": "Pfeil",
     "categoryDefault": "Standard",
-    "categoryCar": "Auto",
+    "categoryAnimal": "Tier",
+    "categoryBicycle": "Fahrrad",
+    "categoryBoat": "Boot",
     "categoryBus": "Bus",
-    "categoryTruck": "LKW",
-    "categoryShip": "Schiff",
-    "categoryPlane": "Flugzeug",
+    "categoryCar": "Auto",
+    "categoryCrane": "Kran",
+    "categoryHelicopter": "Helikopter",
     "categoryMotorcycle": "Motorrad",
-    "categoryBicycle": "Fahrrad",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Tier"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Flugzeug",
+    "categoryShip": "Schiff",
+    "categoryTractor": "Traktor",
+    "categoryTruck": "LKW",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/el.json b/web/l10n/el.json
index 9e41b507..873c9a10 100644
--- a/web/l10n/el.json
+++ b/web/l10n/el.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Απόσταση",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Κατάσταση χάρτη",
     "sharedAttributeAlias": "Παράμετρος ψευδώνυμου",
     "sharedAttributeAliases": "Παράμετρος ψευδωνύμων",
     "sharedAlias": "Ψευδώνυμο",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Απόσταση Συσκευής",
     "sharedDevice": "Συσκευή",
     "sharedTestNotification": "Αποστολή δοκιμαστικής ειδοποίησης",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Προτιμήσεις",
     "sharedPermissions": "Άδειες",
     "sharedExtra": "Επιπλέον",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Ζώνη ώρας",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "Σφάλμα",
-    "errorUnknown": "Άγνωστο σφάλμα",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Σφάλμα σύνδεσης",
     "errorSocket": "Web socket connection error",
     "userEmail": "Ηλ. διεύθυνση",
@@ -119,6 +151,51 @@
     "positionAddress": "Διεύθυνση",
     "positionProtocol": "Πρωτόκολλο",
     "positionDistance": "Απόσταση",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Ρυθμίσεις εξυπηρετητή",
     "serverZoom": "Εστίαση",
     "serverRegistration": "Εγγραφή",
@@ -174,6 +251,8 @@
     "commandPhone": "Τηλεφωνικός αριθμός",
     "commandMessage": "Μήνυμα",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "Όλα τα γεγονότα",
     "eventDeviceOnline": "Η συσκευή είναι συνδεδεμένη",
     "eventDeviceUnknown": "Άγνωστη κατάσταση συσκευής",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Η συσκευή βρίσκεται σε κίνηση",
     "eventDeviceStopped": "Η συσκευή είναι σταματημένη",
     "eventDeviceOverspeed": "Η συσκευή υπερέβει την ταχύτητα",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Αποτέλεσμα εντολής",
     "eventGeofenceEnter": "Η συσσκευή εισήλθε του γεωφράχτη",
     "eventGeofenceExit": "Η συσκευή εξήλθε του γεωφράχτη",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Απαιτείται συντήρηση",
     "eventTextMessage": "Ελήφθη γραπτό μήνυμα",
-    "alarm": "Προειδοποίηση",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "Προειδοποίηση SOS",
     "alarmVibration": "Προειδοποίηση δόνησης",
     "alarmMovement": "Προειδοποίηση κίνησης",
     "alarmOverspeed": "Προειδοποίηση υπέρβασης ορίου ταχύτητας",
     "alarmFallDown": "Προειδοποίηση πτώσης",
     "alarmLowBattery": "Προειδοποίηση χαμηλής μπαταρίας",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "Προειδοποίηση σφάλματος",
     "alarmPowerOff": "Απενεργοποίηση συναγερμού",
     "alarmPowerOn": "Ενεργοποίηση συναγερμού",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Τύπος ειδοποίησης",
     "notificationWeb": "Αποστολή μέσω διαδικτύου",
     "notificationMail": "Αποστολή μέσω ηλ. ταχυδρομείου",
@@ -225,6 +308,7 @@
     "reportRoute": "Διαδρομή",
     "reportEvents": "Γεγονότα",
     "reportTrips": "Ταξίδια",
+    "reportStops": "Stops",
     "reportSummary": "Περίληψη",
     "reportChart": "Διάγραμμα",
     "reportConfigure": "Διαμόρφωση",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Αιτήματα",
     "statisticsMessagesReceived": "Εισερχόμενα Μυνήματα",
     "statisticsMessagesStored": "Αποθηκευμένα Μυνήματα",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Βέλος",
     "categoryDefault": "Default",
-    "categoryCar": "Αυτοκίνητο",
+    "categoryAnimal": "Ζώο",
+    "categoryBicycle": "Ποδήλατο",
+    "categoryBoat": "Boat",
     "categoryBus": "Λεωφορείο",
-    "categoryTruck": "Φορτηγό",
-    "categoryShip": "Πλοίο",
-    "categoryPlane": "Αεροπλάνο",
+    "categoryCar": "Αυτοκίνητο",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Μοτοσικλέτα",
-    "categoryBicycle": "Ποδήλατο",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Άτομο",
-    "categoryAnimal": "Ζώο"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Αεροπλάνο",
+    "categoryShip": "Πλοίο",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Φορτηγό",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 61cf1a75..655b801f 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -276,7 +276,7 @@
     "alarmOverspeed": "Overspeed Alarm",
     "alarmFallDown": "FallDown Alarm",
     "alarmLowBattery": "LowBattery Alarm",
-    "alarmLowPower": "LowPower Alarm",	
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "Fault Alarm",
     "alarmPowerOff": "Power Off Alarm",
     "alarmPowerOn": "Power On Alarm",
@@ -291,7 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
-    "alarmPowerRestored": "Power Restored Alarm",	
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -353,4 +353,4 @@
     "categoryTractor": "Tractor",
     "categoryTruck": "Truck",
     "categoryVan": "Van"
-}
+}
\ No newline at end of file
diff --git a/web/l10n/es.json b/web/l10n/es.json
index d7428f70..6414bd41 100644
--- a/web/l10n/es.json
+++ b/web/l10n/es.json
@@ -1,13 +1,13 @@
 {
     "sharedLoading": "Cargando...",
-    "sharedHide": "Esconder",
+    "sharedHide": "Ocultar",
     "sharedSave": "Guardar",
     "sharedSet": "Establecer",
     "sharedCancel": "Cancelar",
     "sharedAdd": "Agregar",
     "sharedEdit": "Editar",
-    "sharedRemove": "Borrar",
-    "sharedRemoveConfirm": "Borrar Elemento?",
+    "sharedRemove": "Eliminar",
+    "sharedRemoveConfirm": "¿Eliminar elemento?",
     "sharedKm": "KM",
     "sharedMi": "MI",
     "sharedNmi": "nmi",
@@ -17,9 +17,9 @@
     "sharedHour": "Hora",
     "sharedMinute": "Minuto",
     "sharedSecond": "Segundo",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "días",
+    "sharedHours": "horas",
+    "sharedMinutes": "minutos",
     "sharedDecimalDegrees": "Grados",
     "sharedDegreesDecimalMinutes": "Minutos",
     "sharedDegreesMinutesSeconds": "Segundos",
@@ -37,25 +37,57 @@
     "sharedDistance": "Distancia",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "I",
+    "sharedLiterPerHourAbbreviation": "I/h",
     "sharedGetMapState": "Obtener Estado del Mapa",
     "sharedAttributeAlias": "Alias de atributo",
     "sharedAttributeAliases": "Alias de atributos",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Atributo calculado",
+    "sharedComputedAttributes": "Atributos calculados",
+    "sharedCheckComputedAttribute": "Revisar atributo calculado",
+    "sharedExpression": "Expresión",
     "sharedDeviceDistance": "Distancia del dispositivo",
     "sharedDevice": "Dispositivo",
-    "sharedTestNotification": "Enviar prueba de notificaciones",
+    "sharedTestNotification": "Enviar notificación de prueba",
     "sharedCalendar": "Calendario",
     "sharedCalendars": "Calendarios",
     "sharedFile": "Archivo",
     "sharedSelectFile": "Seleccione archivo",
     "sharedPhone": "Teléfono",
-    "sharedRequired": "Requerido",
+    "sharedRequired": "Obligatorio",
     "sharedPreferences": "Preferencias",
     "sharedPermissions": "Permisos",
     "sharedExtra": "Extra",
+    "sharedTypeString": "Cadena",
+    "sharedTypeNumber": "Número",
+    "sharedTypeBoolean": "Booleano",
     "sharedTimezone": "Zona horaria",
+    "sharedInfoTitle": "Información",
+    "attributeSpeedLimit": "Límite de velocidad",
+    "attributeReportIgnoreOdometer": "Reporte: Ignorar el odómetro",
+    "attributeMaintenanceStart": "Mantenimiento: Inicio",
+    "attributeMaintenanceInterval": "Mantenimiento: Intervalo",
+    "attributeWebReportColor": "Web: Color de reporte",
+    "attributeDevicePassword": "Contraseña de dispositivo",
+    "attributeProcessingCopyAttributes": "Procesando: Copia de atributos",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Longitud de la ruta en vivo",
+    "attributeWebSelectZoom": "Web: hacer zoom en seleccionar",
+    "attributeMailSmtpHost": "Correo: Servidor SMTP",
+    "attributeMailSmtpPort": "Correo: Puerto SMTP",
+    "attributeMailSmtpStarttlsEnable": "Correo: Habilitar SMTP STARTTLS",
+    "attributeMailSmtpStarttlsRequired": "Correo: SMTP STARTTLS requerido",
+    "attributeMailSmtpSslEnable": "Correo: Habilitar SMTP SSL",
+    "attributeMailSmtpSslTrust": "Correo: SMTP SSL de confianza",
+    "attributeMailSmtpSslProtocols": "Correo: SMTP SSL protocolos",
+    "attributeMailSmtpFrom": "Correo: SMTP desde",
+    "attributeMailSmtpAuth": "Correo: Habilitación de autenticación SMTP",
+    "attributeMailSmtpUsername": "Correo: Nombre de usuario SMTP",
+    "attributeMailSmtpPassword": "Correo: Contraseña SMTP",
     "errorTitle": "Error",
-    "errorUnknown": "Error Desconocido",
+    "errorGeneral": "Parámetros inválidos o violación de restricción",
     "errorConnection": "Error de Conexión",
     "errorSocket": "Error en toma de conexión web",
     "userEmail": "Email",
@@ -72,8 +104,8 @@
     "loginLanguage": "Idioma",
     "loginRegister": "Registrar",
     "loginLogin": "Ingresar",
-    "loginFailed": "Dirección de Correo o Contraseña o contraseña Incorrecta",
-    "loginCreated": "Nuevo Usuario ha sido registrado",
+    "loginFailed": "Dirección de correo o contraseña incorrecta",
+    "loginCreated": "Se ha registrado un nuevo usuario",
     "loginLogout": "Salir",
     "loginLogo": "Logotipo",
     "devicesAndState": "Dispositivos y Estado",
@@ -119,10 +151,55 @@
     "positionAddress": "Dirección",
     "positionProtocol": "Protocolo",
     "positionDistance": "Distancia",
-    "serverTitle": "Preferencias Servidor",
+    "positionRpm": "RPM",
+    "positionFuel": "Combustible",
+    "positionPower": "Corriente",
+    "positionBattery": "Batería",
+    "positionRaw": "Crudo",
+    "positionIndex": "Indice",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satélites",
+    "positionSatVisible": "Satélites visibles",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Evento",
+    "positionAlarm": "Alarma",
+    "positionStatus": "Estado",
+    "positionOdometer": "Odómetro",
+    "positionServiceOdometer": "Odómetro de mantenimiento",
+    "positionTripOdometer": "Odómetro de viaje",
+    "positionHours": "Horas",
+    "positionInput": "Entrada",
+    "positionOutput": "Salida",
+    "positionBatteryLevel": "Nivel de batería",
+    "positionFuelConsumption": "Consumo de gasolina",
+    "positionRfid": "RFDI",
+    "positionVersionFw": "Versión de firmware",
+    "positionVersionHw": "Versión de hardware",
+    "positionIgnition": "Encendido",
+    "positionFlags": "Banderas",
+    "positionCharge": "Carga",
+    "positionIp": "IP",
+    "positionArchive": "Archivo",
+    "positionVin": "VIN",
+    "positionApproximate": "Aproximado",
+    "positionThrottle": "Acelerador",
+    "positionMotion": "Movimiento",
+    "positionArmed": "Armado",
+    "positionAcceleration": "Aceleración",
+    "positionDeviceTemp": "Temperatura del dispositivo",
+    "positionOperator": "Operador",
+    "positionCommand": "Command",
+    "positionBlocked": "Bloqueado",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "Velocidad OBD",
+    "positionObdOdometer": "Odómetro OBD",
+    "serverTitle": "Ajustes del servidor",
     "serverZoom": "Zoom",
-    "serverRegistration": "Registrar",
-    "serverReadonly": "Sólo Lectura",
+    "serverRegistration": "Registro",
+    "serverReadonly": "Sólo lectura",
     "serverForceSettings": "Forzar Valores",
     "mapTitle": "Mapa",
     "mapLayer": "Capa de Mapa",
@@ -132,10 +209,10 @@
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps - Carretera",
     "mapBingAerial": "Bing Maps - Aéreo",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Bing Maps híbrido",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Mapa Yandex",
+    "mapYandexSat": "Yandex Satélite",
     "mapShapePolygon": "Polígono",
     "mapShapeCircle": "Círculo",
     "mapShapePolyline": "Polilínea",
@@ -146,14 +223,14 @@
     "commandTitle": "Comando",
     "commandSend": "Enviar",
     "commandSent": "El Comando ha sido enviado",
-    "commandPositionPeriodic": "Frecuencia de Posiciones",
-    "commandPositionStop": "Detener Reporte de Posiciones",
+    "commandPositionPeriodic": "Reporte Periódico",
+    "commandPositionStop": "Detener Reporte",
     "commandEngineStop": "Apagar motor",
     "commandEngineResume": "Desbloquear Encendido de Motor",
     "commandFrequency": "Frequencia",
     "commandUnit": "Unidad",
     "commandCustom": "Comando personalizado",
-    "commandPositionSingle": "Un report",
+    "commandPositionSingle": "Reporte único",
     "commandAlarmArm": "Armar Alarma",
     "commandAlarmDisarm": "Desarmar Alarma",
     "commandSetTimezone": "Establecer zona horaria",
@@ -174,6 +251,8 @@
     "commandPhone": "Número de Teléfono",
     "commandMessage": "Mensaje",
     "commandTimezone": "Compensación horaria",
+    "commandgetModemStatus": "Estado del Módem",
+    "commandgetDeviceStatus": "Estado del Dispositivo",
     "eventAll": "Todos los Eventos",
     "eventDeviceOnline": "El dispositivo está en linea",
     "eventDeviceUnknown": "El estado del dispositivo es desconocido",
@@ -181,6 +260,7 @@
     "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",
     "eventCommandResult": "Resultado de comando",
     "eventGeofenceEnter": "El dispositivo ha ingresado a la geocerca",
     "eventGeofenceExit": "El dispositivo ha salido de la geocerca",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Encendido OFF",
     "eventMaintenance": "Requiere mantenimiento",
     "eventTextMessage": "Mensaje de texto recibido",
-    "alarm": "Alarma",
+    "eventsScrollToLast": "Desplazarse hasta el último",
     "alarmSos": "Alarma de SOS",
     "alarmVibration": "Alarma de vibración",
     "alarmMovement": "Alarma de movimiento",
     "alarmOverspeed": "Alarma de exceso de velocidad",
     "alarmFallDown": "Alarma de caida",
     "alarmLowBattery": "Alarma de bateria baja",
+    "alarmLowPower": "Alarma por pérdida de corriente",
     "alarmFault": "Alarma de fallo",
     "alarmPowerOff": "Alarma por apagado",
     "alarmPowerOn": "Alarma por encendido",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Alarma por frenado brusco",
     "alarmFatigueDriving": "Alarma por fatiga de conducciòn",
     "alarmPowerCut": "Alarma por corte de corriente",
+    "alarmPowerRestored": "Alarma de corriente restaurada",
     "alarmJamming": "Alarma de interferencia",
     "alarmTemperature": "Alarma de temperatura",
     "alarmParking": "Alarma de estacionamiento",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Alarma freno de pie",
     "alarmOilLeak": "Alarma pérdida de aceite",
     "alarmTampering": "Alarma por manipulación",
+    "alarmRemoving": "Eliminar la alarma",
     "notificationType": "Tipo de Notificación",
     "notificationWeb": "Envíar vía Web",
     "notificationMail": "Envíar vía Email",
@@ -225,10 +308,11 @@
     "reportRoute": "Ruta",
     "reportEvents": "Eventos",
     "reportTrips": "Viajes",
-    "reportSummary": "Sumario",
+    "reportStops": "Paradas",
+    "reportSummary": "Resumen",
     "reportChart": "Gráfica",
     "reportConfigure": "Configurar",
-    "reportEventTypes": "Tipos de Evento",
+    "reportEventTypes": "Tipos de evento",
     "reportChartType": "Tipo de gráfica",
     "reportShowMarkers": "Mostrar marcadores",
     "reportExport": "Exportar",
@@ -247,17 +331,26 @@
     "statisticsActiveUsers": "Usuarios Activos",
     "statisticsActiveDevices": "Dispositivos Activos",
     "statisticsRequests": "Peticiones",
-    "statisticsMessagesReceived": "Mensajes Recibidos",
-    "statisticsMessagesStored": "Mensajes Guardados",
+    "statisticsMessagesReceived": "Mensajes recibidos",
+    "statisticsMessagesStored": "Mensajes almacenados",
+    "statisticsGeocoder": "Solicitudes del codificador geográfico",
+    "statisticsGeolocation": "Solicitudes de geolocalización",
     "categoryArrow": "Flecha",
     "categoryDefault": "Prederminado",
-    "categoryCar": "Automóvil",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicicleta",
+    "categoryBoat": "Bote",
     "categoryBus": "Autobús",
-    "categoryTruck": "Camión",
-    "categoryShip": "Barco",
-    "categoryPlane": "Avión",
+    "categoryCar": "Automóvil",
+    "categoryCrane": "Grúa",
+    "categoryHelicopter": "Helicóptero",
     "categoryMotorcycle": "Motocicleta",
-    "categoryBicycle": "Bicicleta",
+    "categoryOffroad": "Todoterreno",
     "categoryPerson": "Persona",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Avión",
+    "categoryShip": "Barco",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Camión",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/fa.json b/web/l10n/fa.json
index e68ca656..226bfee5 100644
--- a/web/l10n/fa.json
+++ b/web/l10n/fa.json
@@ -17,9 +17,9 @@
     "sharedHour": "ساعت",
     "sharedMinute": "دقيقه",
     "sharedSecond": "ثانيه",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "روز",
+    "sharedHours": "ساعت",
+    "sharedMinutes": "دقیقه",
     "sharedDecimalDegrees": "درجه اعشار",
     "sharedDegreesDecimalMinutes": "درجه اعشار دقیقه",
     "sharedDegreesMinutesSeconds": "درجه اعشار ثانیه",
@@ -32,30 +32,62 @@
     "sharedAttributes": "ویژگی ها",
     "sharedAttribute": "ویژگی",
     "sharedArea": "محدوده",
-    "sharedSound": "Notification Sound",
+    "sharedSound": "صدای هشدار",
     "sharedType": "نوع خط",
     "sharedDistance": "طول مسیر",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "دریافت نقشه وضعیت",
     "sharedAttributeAlias": "نامگذاری ویژگیها",
     "sharedAttributeAliases": "نامگذاری ویژگیها",
     "sharedAlias": "نامها",
+    "sharedComputedAttribute": "ویژگی محاسبه شده",
+    "sharedComputedAttributes": "ویژگیهای محاسبه شده",
+    "sharedCheckComputedAttribute": "بررسی ویژگی محاسبه شده",
+    "sharedExpression": "اصطلاح",
     "sharedDeviceDistance": "مسافت دستگاه",
     "sharedDevice": "دستگاه",
-    "sharedTestNotification": "Send Test Notification",
+    "sharedTestNotification": "ارسال تست اخطار",
     "sharedCalendar": "تقویم",
     "sharedCalendars": "تقویمها",
     "sharedFile": "فایل",
     "sharedSelectFile": "انتخاب فایل",
-    "sharedPhone": "Phone",
-    "sharedRequired": "Required",
-    "sharedPreferences": "Preferences",
-    "sharedPermissions": "Permissions",
-    "sharedExtra": "Extra",
-    "sharedTimezone": "Timezone",
+    "sharedPhone": "تلفن",
+    "sharedRequired": "ضروری",
+    "sharedPreferences": "تنظیمات",
+    "sharedPermissions": "دسترسیها",
+    "sharedExtra": "عالی",
+    "sharedTypeString": "رشته",
+    "sharedTypeNumber": "شماره",
+    "sharedTypeBoolean": "بولی",
+    "sharedTimezone": "منطقه زمانی",
+    "sharedInfoTitle": "اطلاعات",
+    "attributeSpeedLimit": "محدودیت سرعت",
+    "attributeReportIgnoreOdometer": "گزارش : بدون کیلومتر شمار",
+    "attributeMaintenanceStart": "تعمیرات : شروع",
+    "attributeMaintenanceInterval": "تعمیرات : فواصل",
+    "attributeWebReportColor": "وب : گزارش رنگ",
+    "attributeDevicePassword": "رمز عبور ردیاب",
+    "attributeProcessingCopyAttributes": "در حال پردازش : کپی ویژگیها",
+    "attributeColor": "رنگ",
+    "attributeWebLiveRouteLength": "وب : طول جاده آنلاین",
+    "attributeWebSelectZoom": "وب : زوم با انتخاب",
+    "attributeMailSmtpHost": "ایمیل : هاست SMTP",
+    "attributeMailSmtpPort": "ایمیل : پورت SMTP",
+    "attributeMailSmtpStarttlsEnable": "ایمیل : SMTP STARTTLS فعال",
+    "attributeMailSmtpStarttlsRequired": "ایمیل : SMTP STARTTLS ضروری است",
+    "attributeMailSmtpSslEnable": "ایمیل :  SMTP SSL فعال",
+    "attributeMailSmtpSslTrust": "ایمیل : SMTP SSL معتبر",
+    "attributeMailSmtpSslProtocols": "ایمیل :  پروتکلهای SMTP SSL",
+    "attributeMailSmtpFrom": "ایمیل : SMTP ازطرف",
+    "attributeMailSmtpAuth": "ایمیل : معتبر سازی SMTP فعال",
+    "attributeMailSmtpUsername": "ایمیل : نام کاربری SMTP",
+    "attributeMailSmtpPassword": "ایمیل : رمز عبور SMTP",
     "errorTitle": "خطا",
-    "errorUnknown": "خطا ناشناخته",
+    "errorGeneral": "پارامترهای نامعتبر یا نقص محدودیت",
     "errorConnection": "خطا در اتصال",
     "errorSocket": "ایراد اتصال سوکت وب",
     "userEmail": "ایمیل",
@@ -86,10 +118,10 @@
     "deviceCommand": "فرمان",
     "deviceFollow": "تعقیب",
     "deviceTotalDistance": "کل مسافت",
-    "deviceStatus": "Status",
-    "deviceStatusOnline": "Online",
-    "deviceStatusOffline": "Offline",
-    "deviceStatusUnknown": "Unknown",
+    "deviceStatus": "وضعیت",
+    "deviceStatusOnline": "آنلاین",
+    "deviceStatusOffline": "آفلاین",
+    "deviceStatusUnknown": "ناشناخته",
     "groupDialog": "گروه",
     "groupParent": "گروه",
     "groupNoGroup": "بدون گروه",
@@ -119,6 +151,51 @@
     "positionAddress": "آدرس",
     "positionProtocol": "پروتوکل",
     "positionDistance": "مسافت",
+    "positionRpm": "دور / دقیقه",
+    "positionFuel": "سوخت",
+    "positionPower": "روشن بودن",
+    "positionBattery": "باطری",
+    "positionRaw": "خالص",
+    "positionIndex": "شاخص",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "ماهواره ها",
+    "positionSatVisible": "ماهواره های آنلاین",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "رویداد",
+    "positionAlarm": "هشدار",
+    "positionStatus": "وضعیت",
+    "positionOdometer": "کیلومتر شمار",
+    "positionServiceOdometer": "سرویس کیلومتر شمار",
+    "positionTripOdometer": "کیلومتر شمار مسافت",
+    "positionHours": "ساعت",
+    "positionInput": "ورود",
+    "positionOutput": "خروج",
+    "positionBatteryLevel": "وضعیت باطری",
+    "positionFuelConsumption": "مصرف سوخت",
+    "positionRfid": "RFID",
+    "positionVersionFw": "ورژن فلش",
+    "positionVersionHw": "ورژن سخت افزار",
+    "positionIgnition": "روشن بودن",
+    "positionFlags": "نشانها",
+    "positionCharge": "شارژ",
+    "positionIp": "آی پی",
+    "positionArchive": "آرشیو",
+    "positionVin": "VIN",
+    "positionApproximate": "تقریبی",
+    "positionThrottle": "دریچه گاز",
+    "positionMotion": "حرکت",
+    "positionArmed": "مسلح",
+    "positionAcceleration": "شتاب",
+    "positionDeviceTemp": "دمای دستگاه",
+    "positionOperator": "اوپراتور",
+    "positionCommand": "Command",
+    "positionBlocked": "بلوکه",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "سرعت OBD",
+    "positionObdOdometer": "کیلومتر شمار ODB",
     "serverTitle": "تنظیمات سرور",
     "serverZoom": "بزرگنمایی",
     "serverRegistration": "ثبت نام",
@@ -132,10 +209,10 @@
     "mapBingKey": "کلید نقشه Bing",
     "mapBingRoad": "نقشه جاده Bing",
     "mapBingAerial": "نقشه هوایی Bing",
-    "mapBingHybrid": "Bing Maps Hybrid",
-    "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapBingHybrid": "نقشه هیبریدی Bing",
+    "mapBaidu": "بایدو",
+    "mapYandexMap": "نقشه یاندکس",
+    "mapYandexSat": "ماهواره یاندکس",
     "mapShapePolygon": "چند ضلعی",
     "mapShapeCircle": "دایره ",
     "mapShapePolyline": "چند خطی",
@@ -174,6 +251,8 @@
     "commandPhone": "شماره تلفن",
     "commandMessage": "پیام",
     "commandTimezone": "فاصله زمانی مبدا",
+    "commandgetModemStatus": "وضعیت مودم",
+    "commandgetDeviceStatus": "وضعیت دستگاه",
     "eventAll": "همه رویدادها",
     "eventDeviceOnline": "ردیاب آنلاین است ",
     "eventDeviceUnknown": "وضعیت ردیاب نامعلوم",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "ردیاب در حال حرکت است",
     "eventDeviceStopped": "ردیاب متوقف است",
     "eventDeviceOverspeed": "دستگاه از سرعت تعیین شده تجاوز کرده است ",
+    "eventDeviceFuelDrop": "رویداد خالی کردن باک",
     "eventCommandResult": "نتیجه ارسال دستور",
     "eventGeofenceEnter": "خودرو وارد حصار جغرافیایی شد ",
     "eventGeofenceExit": "خودرو از حصار جغرافیایی خارج شد",
@@ -188,43 +268,47 @@
     "eventIgnitionOn": "خودرو روشن هست  ",
     "eventIgnitionOff": "خودرو خاموش است ",
     "eventMaintenance": "نیاز به تعمیر",
-    "eventTextMessage": "Text message received",
-    "alarm": "هشدار",
+    "eventTextMessage": "پیامک دریافت شد",
+    "eventsScrollToLast": "اسکرول تا آخر",
     "alarmSos": "هشدار کمک اضطراری",
     "alarmVibration": "هشدار ضربه",
     "alarmMovement": "هشدار حرکت",
     "alarmOverspeed": "هشدار سرعت غیر مجاز",
     "alarmFallDown": "هشدار سقوط خودرو",
     "alarmLowBattery": "هشدار کم شدن باتری",
+    "alarmLowPower": "هشدار کم شدن نیرو",
     "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",
-    "alarmHardAcceleration": "Hard Acceleration Alarm",
-    "alarmHardBreaking": "Hard Breaking Alarm",
-    "alarmFatigueDriving": "Fatigue Driving Alarm",
-    "alarmPowerCut": "Power Cut Alarm",
-    "alarmJamming": "Jamming Alarm",
-    "alarmTemperature": "Temperature Alarm",
-    "alarmParking": "Parking Alarm",
-    "alarmShock": "Shock Alarm",
-    "alarmBonnet": "Bonnet Alarm",
-    "alarmFootBrake": "Foot Brake Alarm",
-    "alarmOilLeak": "Oil Leak Alarm",
-    "alarmTampering": "Tampering Alarm",
+    "alarmPowerOff": "هشدار خاموش شدن",
+    "alarmPowerOn": "هشدار روشن شدن",
+    "alarmDoor": "هشدار درب",
+    "alarmGeofence": "هشدار محدوده",
+    "alarmGeofenceEnter": "هشدار ورود به محدوده",
+    "alarmGeofenceExit": "هشدار خروج از محدوده",
+    "alarmGpsAntennaCut": "هشدار قطع آنتن GPS",
+    "alarmAccident": "هشدار تصادف",
+    "alarmTow": "هشدار دوم",
+    "alarmHardAcceleration": "هشدار شتاب زیاد",
+    "alarmHardBreaking": "هشدار ترمز شدید",
+    "alarmFatigueDriving": "هشدار رانندگی خواب آلود",
+    "alarmPowerCut": "هشدار قطع منبع تغذیه",
+    "alarmPowerRestored": "هشدار وصل منبع تغذیه",
+    "alarmJamming": "هشدار مسدود کردن",
+    "alarmTemperature": "هشدار دما",
+    "alarmParking": "هشدار پارک",
+    "alarmShock": "هشدار ضربه",
+    "alarmBonnet": "هشدار صندوق عقب",
+    "alarmFootBrake": "هشدار ترمز پا",
+    "alarmOilLeak": "هشدار نشت سوخت",
+    "alarmTampering": "هشدار دما",
+    "alarmRemoving": "حذف هشدار",
     "notificationType": "تعیین نوع رویداد ",
     "notificationWeb": "ارسال از طریق وب",
     "notificationMail": "ارسال با ایمیل",
-    "notificationSms": "Send via SMS",
+    "notificationSms": "ارسال با پیامک",
     "reportRoute": "مسیر های پیموده شده ",
     "reportEvents": "رویداد ها",
     "reportTrips": "مسافرتها",
+    "reportStops": "توقفها",
     "reportSummary": "خلاصه وضعیت ",
     "reportChart": "نمودار",
     "reportConfigure": "تنظیمات",
@@ -249,15 +333,24 @@
     "statisticsRequests": "درخواستها",
     "statisticsMessagesReceived": "پیامهای دریافتی",
     "statisticsMessagesStored": "پیامها ذخیره",
+    "statisticsGeocoder": "درخواست محدوده",
+    "statisticsGeolocation": "درخواستهای محدوده",
     "categoryArrow": "فلش",
     "categoryDefault": "پیش فرض",
-    "categoryCar": "خودرو",
+    "categoryAnimal": "حیوان",
+    "categoryBicycle": "دوچرخه",
+    "categoryBoat": "قایق",
     "categoryBus": "اتوبوس",
-    "categoryTruck": "تریلی",
-    "categoryShip": "کشتی",
-    "categoryPlane": "هواپیما",
+    "categoryCar": "خودرو",
+    "categoryCrane": "جرثقیل",
+    "categoryHelicopter": "هلی کوپتر",
     "categoryMotorcycle": "موتورسیکلت",
-    "categoryBicycle": "دوچرخه",
+    "categoryOffroad": "جاده بند",
     "categoryPerson": "شخص",
-    "categoryAnimal": "حیوان"
+    "categoryPickup": "نفربر",
+    "categoryPlane": "هواپیما",
+    "categoryShip": "کشتی",
+    "categoryTractor": "تراکتور",
+    "categoryTruck": "تریلی",
+    "categoryVan": "ون"
 }
\ No newline at end of file
diff --git a/web/l10n/fi.json b/web/l10n/fi.json
index bf8ad0b6..e0d81301 100644
--- a/web/l10n/fi.json
+++ b/web/l10n/fi.json
@@ -17,12 +17,12 @@
     "sharedHour": "Tunti",
     "sharedMinute": "Minuutti",
     "sharedSecond": "Sekunti",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
-    "sharedDecimalDegrees": "Desimaalit Asteet",
-    "sharedDegreesDecimalMinutes": "Asteet Desimaalit Minuutit",
-    "sharedDegreesMinutesSeconds": "Asteet Minuutit Sekunnit",
+    "sharedDays": "päivää",
+    "sharedHours": "tuntia",
+    "sharedMinutes": "sekuntia",
+    "sharedDecimalDegrees": "Desimaaliasteet",
+    "sharedDegreesDecimalMinutes": "Asteet ja desimaaliminuutit",
+    "sharedDegreesMinutesSeconds": "Asteet, minuutit ja sekunnit",
     "sharedName": "Nimi",
     "sharedDescription": "Kuvaus",
     "sharedSearch": "Haku",
@@ -32,41 +32,73 @@
     "sharedAttributes": "Ominaisuudet",
     "sharedAttribute": "Ominaisuus",
     "sharedArea": "Alue",
-    "sharedSound": "Notification Sound",
+    "sharedSound": "Ilmoitusääni",
     "sharedType": "Tyyppi",
     "sharedDistance": "Matka",
-    "sharedHourAbbreviation": "t",
+    "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Hae kartan tila",
-    "sharedAttributeAlias": "Ominaisuuden Alias",
-    "sharedAttributeAliases": "Ominaisuuden Aliakset",
+    "sharedAttributeAlias": "Ominaisuuden alias",
+    "sharedAttributeAliases": "Ominaisuuksien aliakset",
     "sharedAlias": "Alias",
-    "sharedDeviceDistance": "Laitteen Matka",
+    "sharedComputedAttribute": "Laskettu ominaisuus",
+    "sharedComputedAttributes": "Lasketut ominaisuudet",
+    "sharedCheckComputedAttribute": "Tarkista laskettu ominaisuus",
+    "sharedExpression": "Lauseke",
+    "sharedDeviceDistance": "Laitteen matka",
     "sharedDevice": "Laite",
-    "sharedTestNotification": "Send Test Notification",
+    "sharedTestNotification": "Lähetä testi-ilmoitus",
     "sharedCalendar": "Kalenteri",
     "sharedCalendars": "Kalenterit",
     "sharedFile": "Tiedosto",
     "sharedSelectFile": "Valitse tiedosto",
-    "sharedPhone": "Phone",
-    "sharedRequired": "Required",
-    "sharedPreferences": "Preferences",
-    "sharedPermissions": "Permissions",
-    "sharedExtra": "Extra",
-    "sharedTimezone": "Timezone",
+    "sharedPhone": "Puhelin",
+    "sharedRequired": "Vaatimukset",
+    "sharedPreferences": "Asetukset",
+    "sharedPermissions": "Käyttöoikeudet",
+    "sharedExtra": "Ekstra",
+    "sharedTypeString": "Merkkijono",
+    "sharedTypeNumber": "Numero",
+    "sharedTypeBoolean": "Totuusarvo",
+    "sharedTimezone": "Aikavyöhyke",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Nopeusrajoitus",
+    "attributeReportIgnoreOdometer": "Raportti: Jätä matkamittari huomiotta",
+    "attributeMaintenanceStart": "Huolto: Alku",
+    "attributeMaintenanceInterval": "Huolto: Väliaika",
+    "attributeWebReportColor": "Web: Raportin väri",
+    "attributeDevicePassword": "Laitteen salasana",
+    "attributeProcessingCopyAttributes": "Laskenta: Kopioi ominaisuudet",
+    "attributeColor": "Väri",
+    "attributeWebLiveRouteLength": "Web: Live-reitin pituus",
+    "attributeWebSelectZoom": "Web: Lähennä valittaessa",
+    "attributeMailSmtpHost": "Email: SMTP-isäntäpalvelin",
+    "attributeMailSmtpPort": "Email: SMTP-portti",
+    "attributeMailSmtpStarttlsEnable": "Email: SMTP STARTTLS:n aktivointi",
+    "attributeMailSmtpStarttlsRequired": "Email: SMTP STARTTLS vaaditaan",
+    "attributeMailSmtpSslEnable": "Email: SMTP SSL:n aktivointi",
+    "attributeMailSmtpSslTrust": "Email: SMTP SSL Trust",
+    "attributeMailSmtpSslProtocols": "Email: SMTP SSL -protokollat",
+    "attributeMailSmtpFrom": "Email: SMTP-lähettäjä",
+    "attributeMailSmtpAuth": "Email: SMTP-tunnistautumisen aktivointi",
+    "attributeMailSmtpUsername": "Email: SMTP-käyttäjätunnus",
+    "attributeMailSmtpPassword": "Email: SMTP-salasana",
     "errorTitle": "Virhe",
-    "errorUnknown": "Tuntematon virhe",
+    "errorGeneral": "Epäkelvot parametrit tai rajoitteiden rikkomus",
     "errorConnection": "Yhteysvirhe",
-    "errorSocket": "Web socket yhteysvirhe",
-    "userEmail": "Email",
+    "errorSocket": "WebSocket-yhteysvirhe",
+    "userEmail": "Sähköposti",
     "userPassword": "Salasana",
     "userAdmin": "Ylläpito",
     "userRemember": "Muista",
     "userDisabled": "Poistettu käytöstä",
     "userExpirationTime": "Vanheneminen",
     "userDeviceLimit": "Laiteraja",
-    "userUserLimit": "User Limit",
-    "userDeviceReadonly": "Device Readonly",
+    "userUserLimit": "Käyttäjäraja",
+    "userDeviceReadonly": "Laitteet vain luettavissa",
     "userToken": "Token",
     "loginTitle": "Kirjaudu",
     "loginLanguage": "Kieli",
@@ -86,10 +118,10 @@
     "deviceCommand": "Komento",
     "deviceFollow": "Seuraa",
     "deviceTotalDistance": "Kokonaismatka",
-    "deviceStatus": "Status",
+    "deviceStatus": "Tila",
     "deviceStatusOnline": "Online",
     "deviceStatusOffline": "Offline",
-    "deviceStatusUnknown": "Unknown",
+    "deviceStatusUnknown": "Tuntematon",
     "groupDialog": "Ryhmä",
     "groupParent": "Ryhmä",
     "groupNoGroup": "Ei ryhmää",
@@ -119,27 +151,72 @@
     "positionAddress": "Osoite",
     "positionProtocol": "Protokolla",
     "positionDistance": "Matka",
+    "positionRpm": "RPM",
+    "positionFuel": "Polttoaine",
+    "positionPower": "Teho",
+    "positionBattery": "Akku",
+    "positionRaw": "Raaka",
+    "positionIndex": "Indeksi",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satelliitit",
+    "positionSatVisible": "Näkyvät satelliitit",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Tapahtuma",
+    "positionAlarm": "Hälytys",
+    "positionStatus": "Tila",
+    "positionOdometer": "Matkamittari",
+    "positionServiceOdometer": "Palvelumatkamittari",
+    "positionTripOdometer": "Trippimittari",
+    "positionHours": "Tuntia",
+    "positionInput": "Sisääntulo",
+    "positionOutput": "Ulostulo",
+    "positionBatteryLevel": "Akun varaus",
+    "positionFuelConsumption": "Polttoaineen kulutus",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Laiteohjelmiston versio",
+    "positionVersionHw": "Laitteiston versio",
+    "positionIgnition": "Virta (sytytys)",
+    "positionFlags": "Liput",
+    "positionCharge": "Lataus",
+    "positionIp": "IP",
+    "positionArchive": "Arkisto",
+    "positionVin": "VIN",
+    "positionApproximate": "Likimääräinen",
+    "positionThrottle": "Kaasu",
+    "positionMotion": "Liike",
+    "positionArmed": "Hälytys kytketty",
+    "positionAcceleration": "Kiihtyvyys",
+    "positionDeviceTemp": "Laitteen lämpötila",
+    "positionOperator": "Operaattori",
+    "positionCommand": "Komento",
+    "positionBlocked": "Estetty",
+    "positionDtcs": "DTC:t",
+    "positionObdSpeed": "OBD-nopeus",
+    "positionObdOdometer": "OBD-matkamittari",
     "serverTitle": "Palvelinasetukset",
-    "serverZoom": "Lähennä",
+    "serverZoom": "Lähennys",
     "serverRegistration": "Rekisteröinti",
     "serverReadonly": "Vain luku",
     "serverForceSettings": "Pakota asetukset",
     "mapTitle": "Kartta",
     "mapLayer": "Karttataso",
     "mapCustom": "Oma kartta",
-    "mapCarto": "Carto Basemaps",
+    "mapCarto": "Carto-pohjakartat",
     "mapOsm": "Open Street Map",
-    "mapBingKey": "Bing Maps avain",
-    "mapBingRoad": "Bign Maps tiet",
-    "mapBingAerial": "Bing Maps ilmakuva",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingKey": "Bing Maps -avain",
+    "mapBingRoad": "Bing Maps -tiet",
+    "mapBingAerial": "Bing Maps -ilmakuva",
+    "mapBingHybrid": "Bing Maps -hybridi",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Yandex-kartta",
+    "mapYandexSat": "Yandex-satelliittikuva",
     "mapShapePolygon": "Polygoni",
     "mapShapeCircle": "Ympyrä",
     "mapShapePolyline": "Polylinja",
-    "mapLiveRoutes": "Live reitit",
+    "mapLiveRoutes": "Live-reitit",
     "stateTitle": "Tila",
     "stateName": "Ominaisuus",
     "stateValue": "Arvo",
@@ -154,14 +231,14 @@
     "commandUnit": "Yksikkö",
     "commandCustom": "Oma komento",
     "commandPositionSingle": "Yksittäinen raportointi",
-    "commandAlarmArm": "Arm Alarm",
-    "commandAlarmDisarm": "Disarm Alarm",
+    "commandAlarmArm": "Hälytys päälle",
+    "commandAlarmDisarm": "Hälytys pois",
     "commandSetTimezone": "Aseta aikavyöhyke",
-    "commandRequestPhoto": "Request Photo",
+    "commandRequestPhoto": "Pyydä kuva",
     "commandRebootDevice": "Käynnistä laite uudelleen",
     "commandSendSms": "Lähetä tekstiviesti",
     "commandSendUssd": "Lähetä USSD",
-    "commandSosNumber": "Aseta SOS numero",
+    "commandSosNumber": "Aseta SOS-numero",
     "commandSilenceTime": "Aseta hiljainen aika",
     "commandSetPhonebook": "Aseta osoitekirja",
     "commandSetIndicator": "Aseta indikaattori",
@@ -169,11 +246,13 @@
     "commandOutputControl": "Ulostulon ohjaus",
     "commandAlarmSpeed": "Ylinopeushälytys",
     "commandDeviceIdentification": "Laitteen tunnistus",
-    "commandIndex": "Index",
+    "commandIndex": "Indeksi",
     "commandData": "Tieto",
     "commandPhone": "Puhelinnumero",
     "commandMessage": "Viesti",
     "commandTimezone": "Aikavyöhykkeen poikkeama",
+    "commandgetModemStatus": "Modeemin tila",
+    "commandgetDeviceStatus": "Laitteen tila",
     "eventAll": "Kaikki tapahtumat",
     "eventDeviceOnline": "Laite on online-tilassa",
     "eventDeviceUnknown": "Laitteen tila on tuntematon",
@@ -181,83 +260,97 @@
     "eventDeviceMoving": "Laite liikkuu",
     "eventDeviceStopped": "Laite on pysähtynyt",
     "eventDeviceOverspeed": "Laite liikuu ylinopeutta",
+    "eventDeviceFuelDrop": "Äkillinen polttoainevähenemä",
     "eventCommandResult": "Komennon tulos",
     "eventGeofenceEnter": "Laite on saapunut geoaitaan",
     "eventGeofenceExit": "Laite on poistunut geoaidasta",
     "eventAlarm": "Hälytykset",
-    "eventIgnitionOn": "Ignition is ON",
-    "eventIgnitionOff": "Ignition is OFF",
-    "eventMaintenance": "Maintenance required",
-    "eventTextMessage": "Text message received",
-    "alarm": "Hälytys",
-    "alarmSos": "SOS Alarm",
+    "eventIgnitionOn": "Virta (sytytys) on PÄÄLLÄ",
+    "eventIgnitionOff": "Virta (sytytys) on POIS PÄÄLTÄ",
+    "eventMaintenance": "Huoltoa vaaditaan",
+    "eventTextMessage": "Tekstiviesti vastaanotettu",
+    "eventsScrollToLast": "Vieritä viimeiseen",
+    "alarmSos": "SOS-hälytys",
     "alarmVibration": "Tärinähälytys",
     "alarmMovement": "Liikehälytys",
     "alarmOverspeed": "Ylinopeushälytys",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "Akku vähissä hälytys",
-    "alarmFault": "Vika hälytys",
-    "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",
-    "alarmHardAcceleration": "Hard Acceleration Alarm",
-    "alarmHardBreaking": "Hard Breaking Alarm",
-    "alarmFatigueDriving": "Fatigue Driving Alarm",
-    "alarmPowerCut": "Power Cut Alarm",
-    "alarmJamming": "Jamming Alarm",
-    "alarmTemperature": "Temperature Alarm",
-    "alarmParking": "Parking Alarm",
-    "alarmShock": "Shock Alarm",
-    "alarmBonnet": "Bonnet Alarm",
-    "alarmFootBrake": "Foot Brake Alarm",
-    "alarmOilLeak": "Oil Leak Alarm",
-    "alarmTampering": "Tampering Alarm",
+    "alarmFallDown": "Kaatumishälytys",
+    "alarmLowBattery": "Akku vähissä -hälytys",
+    "alarmLowPower": "LowPower Alarm",
+    "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",
+    "alarmHardAcceleration": "Rajun kiihdytyksen hälytys",
+    "alarmHardBreaking": "Rajun jarrutuksen 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",
+    "alarmOilLeak": "Öljyvuotohälytys",
+    "alarmTampering": "Peukalointihälytys",
+    "alarmRemoving": "Poistetaan hälytystä",
     "notificationType": "Ilmoituksen tyyppi",
-    "notificationWeb": "Send via Web",
+    "notificationWeb": "Lähetä webissä",
     "notificationMail": "Lähetä sähköpostilla",
-    "notificationSms": "Send via SMS",
+    "notificationSms": "Lähetä tekstiviestillä",
     "reportRoute": "Reitti",
     "reportEvents": "Tapahtumat",
     "reportTrips": "Matkat",
+    "reportStops": "Pysähdykset",
     "reportSummary": "Yhteenveto",
-    "reportChart": "Chart",
+    "reportChart": "Kuvaaja",
     "reportConfigure": "Konfiguroi",
-    "reportEventTypes": "Event Types",
-    "reportChartType": "Chart Type",
-    "reportShowMarkers": "Show Markers",
+    "reportEventTypes": "Tapahtumatyypit",
+    "reportChartType": "Kuvaajatyypit",
+    "reportShowMarkers": "Näytä merkit",
     "reportExport": "Vie",
     "reportDeviceName": "Laitteen nimi",
     "reportAverageSpeed": "Keskinopeus",
     "reportMaximumSpeed": "Suurin nopeus",
-    "reportEngineHours": "Engine Hours",
+    "reportEngineHours": "Käyttötunnit",
     "reportDuration": "Kesto",
     "reportStartTime": "Aloitusaika",
     "reportStartAddress": "Aloitusosoite",
     "reportEndTime": "Lopetusaika",
     "reportEndAddress": "Lopetusosoite",
     "reportSpentFuel": "Käytetty polttoaine",
-    "statisticsTitle": "Statistiikat",
-    "statisticsCaptureTime": "Capture Time",
-    "statisticsActiveUsers": "Aktiiviset käyttäjät",
-    "statisticsActiveDevices": "Aktiiviset laitteet",
-    "statisticsRequests": "Requests",
+    "statisticsTitle": "Tilastot",
+    "statisticsCaptureTime": "Tarkasteluaika",
+    "statisticsActiveUsers": "Aktiivisia käyttäjiä",
+    "statisticsActiveDevices": "Aktiivisia laitteita",
+    "statisticsRequests": "Pyyntöjä",
     "statisticsMessagesReceived": "Viestejä vastaanotettu",
     "statisticsMessagesStored": "Viestejä tallennettu",
+    "statisticsGeocoder": "Geokoodauspyyntöjä",
+    "statisticsGeolocation": "Sijaintipyyntöjä",
     "categoryArrow": "Nuoli",
     "categoryDefault": "Oletus",
-    "categoryCar": "Auto",
+    "categoryAnimal": "Eläin",
+    "categoryBicycle": "Polkupyörä",
+    "categoryBoat": "Vene",
     "categoryBus": "Bussi",
-    "categoryTruck": "Kuorma-auto",
-    "categoryShip": "Laiva",
-    "categoryPlane": "Lentokone",
+    "categoryCar": "Auto",
+    "categoryCrane": "Nosturi",
+    "categoryHelicopter": "Helikopteri",
     "categoryMotorcycle": "Moottoripyörä",
-    "categoryBicycle": "Polkupyörä",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Henkilö",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Lentokone",
+    "categoryShip": "Laiva",
+    "categoryTractor": "Traktori",
+    "categoryTruck": "Kuorma-auto",
+    "categoryVan": "Pakettiauto"
 }
\ No newline at end of file
diff --git a/web/l10n/fr.json b/web/l10n/fr.json
index a46547bc..063aee18 100644
--- a/web/l10n/fr.json
+++ b/web/l10n/fr.json
@@ -17,8 +17,8 @@
     "sharedHour": "Heure",
     "sharedMinute": "Minute",
     "sharedSecond": "Seconde",
-    "sharedDays": "days",
-    "sharedHours": "hours",
+    "sharedDays": "jours",
+    "sharedHours": "heures",
     "sharedMinutes": "minutes",
     "sharedDecimalDegrees": "Degrés Décimaux",
     "sharedDegreesDecimalMinutes": "Dégrés Décimaux Minutes",
@@ -37,11 +37,18 @@
     "sharedDistance": "Distance",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
-    "sharedGetMapState": "Etat de la carte",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
+    "sharedGetMapState": "État de la carte",
     "sharedAttributeAlias": "Alias d'attribut",
     "sharedAttributeAliases": "Alias d'attribut",
     "sharedAlias": "Alias",
-    "sharedDeviceDistance": "Distance appareil",
+    "sharedComputedAttribute": "Attribut calculé",
+    "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",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Préférences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "Chaîne de caractères",
+    "sharedTypeNumber": "Nombre",
+    "sharedTypeBoolean": "Booléen",
     "sharedTimezone": "Fuseau horaire",
+    "sharedInfoTitle": "Information",
+    "attributeSpeedLimit": "Limite de vitesse",
+    "attributeReportIgnoreOdometer": "Rapport: Ignorer l'odomètre",
+    "attributeMaintenanceStart": "Entretien: début",
+    "attributeMaintenanceInterval": "Entretien: intervalle",
+    "attributeWebReportColor": "Web: couleur du rapport",
+    "attributeDevicePassword": "Mot de passe de l'appareil",
+    "attributeProcessingCopyAttributes": "En cours: Copie des attributs",
+    "attributeColor": "Couleur",
+    "attributeWebLiveRouteLength": "Web: Longueur de route en temps réel",
+    "attributeWebSelectZoom": "Web: Zoomer à la sélection",
+    "attributeMailSmtpHost": "Mail: Hôte SMTP",
+    "attributeMailSmtpPort": "Mail: Port SMTP",
+    "attributeMailSmtpStarttlsEnable": "Mail: Activer SMTP STARTTLS",
+    "attributeMailSmtpStarttlsRequired": "Mail: Requérir SMTP STARTTLS",
+    "attributeMailSmtpSslEnable": "Mail: Activer SMTP SSL",
+    "attributeMailSmtpSslTrust": "Mail: Trust SMTP SSL",
+    "attributeMailSmtpSslProtocols": "Mail: Protocoles SMTP SSL",
+    "attributeMailSmtpFrom": "Mail: SMTP From",
+    "attributeMailSmtpAuth": "Mail: Activer l'authentification",
+    "attributeMailSmtpUsername": "Mail: Nom d'utilisateur",
+    "attributeMailSmtpPassword": "Mail: Mot de passe",
     "errorTitle": "Erreur",
-    "errorUnknown": "Erreur inconnue",
+    "errorGeneral": "Paramètres invalides ou violation de contrainte",
     "errorConnection": "Erreur de connexion",
     "errorSocket": "Erreur de connexion au socket web",
     "userEmail": "Email",
@@ -64,9 +96,9 @@
     "userRemember": "Rappel",
     "userDisabled": "Désactivé",
     "userExpirationTime": "Expiration",
-    "userDeviceLimit": "Limite de dispositifs",
+    "userDeviceLimit": "Limite de l'appareil",
     "userUserLimit": "Limite d'utilisateurs",
-    "userDeviceReadonly": "Lecture seule",
+    "userDeviceReadonly": "Appareil - Lecture seule",
     "userToken": "Jeton",
     "loginTitle": "Identification",
     "loginLanguage": "Langue",
@@ -76,8 +108,8 @@
     "loginCreated": "Nouvel utilisateur enregistré",
     "loginLogout": "Déconnexion",
     "loginLogo": "Logo",
-    "devicesAndState": "Dispositifs et Etat",
-    "deviceTitle": "Dispositifs",
+    "devicesAndState": "Appareils et État",
+    "deviceTitle": "Appareils",
     "deviceIdentifier": "Identifiant",
     "deviceModel": "Modèle",
     "deviceContact": "Contact",
@@ -102,10 +134,10 @@
     "settingsTwelveHourFormat": "Format d'heure - 12 heures",
     "settingsCoordinateFormat": "Format des coordonées",
     "reportTitle": "Rapports",
-    "reportDevice": "Dispositif",
+    "reportDevice": "Appareil",
     "reportGroup": "Groupe",
     "reportFrom": "De",
-    "reportTo": "A",
+    "reportTo": "À",
     "reportShow": "Afficher",
     "reportClear": "Effacer",
     "positionFixTime": "Heure",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresse",
     "positionProtocol": "Protocole",
     "positionDistance": "Distance",
+    "positionRpm": "t/m",
+    "positionFuel": "Carburant",
+    "positionPower": "Courant",
+    "positionBattery": "Batterie",
+    "positionRaw": "Brut",
+    "positionIndex": "Index",
+    "positionHdop": "Dilution de précision horizontale",
+    "positionVdop": "Dilution de précision horizontale",
+    "positionPdop": "Dilution de précision de position",
+    "positionSat": "Satellites",
+    "positionSatVisible": "Satellites visibles",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Évènement",
+    "positionAlarm": "Alarme",
+    "positionStatus": "Statut",
+    "positionOdometer": "Odomètre",
+    "positionServiceOdometer": "Odomètre d'entretien",
+    "positionTripOdometer": "Odomètre de voyage",
+    "positionHours": "Heures",
+    "positionInput": "Entrée de données",
+    "positionOutput": "Sortie de données",
+    "positionBatteryLevel": "Niveau de batterie",
+    "positionFuelConsumption": "Consommation de carburant",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Version du micrologiciel",
+    "positionVersionHw": "Version du matériel",
+    "positionIgnition": "Allumage",
+    "positionFlags": "Drapeau",
+    "positionCharge": "Charge",
+    "positionIp": "IP",
+    "positionArchive": "Archive",
+    "positionVin": "Numéro de chassis",
+    "positionApproximate": "Approximatif",
+    "positionThrottle": "Accélérateur",
+    "positionMotion": "Mouvement",
+    "positionArmed": "Armé",
+    "positionAcceleration": "Accélération",
+    "positionDeviceTemp": "Température de l'appareil",
+    "positionOperator": "Opérateur",
+    "positionCommand": "Commande",
+    "positionBlocked": "Bloqué",
+    "positionDtcs": "Code erreur",
+    "positionObdSpeed": "Vitesse OBD",
+    "positionObdOdometer": "Odomètre OBD",
     "serverTitle": "Paramètres de serveur",
     "serverZoom": "Zoom",
     "serverRegistration": "Inscription",
@@ -132,15 +209,15 @@
     "mapBingKey": "Clé Bing Maps",
     "mapBingRoad": "Bing Maps Road",
     "mapBingAerial": "Bing Maps Aerial",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Bing Maps Hybride",
     "mapBaidu": "Baidu",
     "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexSat": "Yandex Satelitte",
     "mapShapePolygon": "Polygone",
     "mapShapeCircle": "Cercle",
     "mapShapePolyline": "Polyligne",
     "mapLiveRoutes": "Routes en direct",
-    "stateTitle": "Etat",
+    "stateTitle": "État",
     "stateName": "Paramètre",
     "stateValue": "Valeur",
     "commandTitle": "Commande",
@@ -174,13 +251,16 @@
     "commandPhone": "Numéro de téléphone",
     "commandMessage": "Message",
     "commandTimezone": "Décalage horaire",
+    "commandgetModemStatus": "Statut du modem",
+    "commandgetDeviceStatus": "Statut de l'appareil",
     "eventAll": "Tous les événements",
     "eventDeviceOnline": "L'appareil est en ligne",
-    "eventDeviceUnknown": "Le statut du dispositif est inconnu",
+    "eventDeviceUnknown": "Le statut de l'appareil est inconnu",
     "eventDeviceOffline": "L'appareil est hors-ligne",
     "eventDeviceMoving": "L'appareil est en mouvement",
-    "eventDeviceStopped": "Le dispositif s'est arrêté",
+    "eventDeviceStopped": "L'appareil s'est arrêté",
     "eventDeviceOverspeed": "L'appareil dépasse la vitesse",
+    "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",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Contact coupé",
     "eventMaintenance": "Entretien requis",
     "eventTextMessage": "Message textuel reçu",
-    "alarm": "Alarme",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "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",
@@ -218,21 +300,23 @@
     "alarmFootBrake": "Alarme de frein à pied",
     "alarmOilLeak": "Alarme de fuite d'huile",
     "alarmTampering": "Alarme d'altération",
+    "alarmRemoving": "Retrait de l'alarme",
     "notificationType": "Type de notification",
     "notificationWeb": "Envoyer par internet",
     "notificationMail": "Envoyer par E-mail",
     "notificationSms": "Envoyer par SMS",
     "reportRoute": "Route",
-    "reportEvents": "Evénements",
+    "reportEvents": "Évènements",
     "reportTrips": "Trajets",
+    "reportStops": "Arrêts",
     "reportSummary": "Résumé",
     "reportChart": "Graphique",
     "reportConfigure": "Configurer",
-    "reportEventTypes": "Types d'événements",
+    "reportEventTypes": "Types d'évènements",
     "reportChartType": "Type de graphique",
     "reportShowMarkers": "Montrer les marqueurs",
     "reportExport": "Exporter",
-    "reportDeviceName": "Nom du dispositif",
+    "reportDeviceName": "Nom de l'appareil",
     "reportAverageSpeed": "Vitesse moyenne",
     "reportMaximumSpeed": "Vitesse maximum",
     "reportEngineHours": "Heures du moteur",
@@ -245,19 +329,28 @@
     "statisticsTitle": "Statistiques",
     "statisticsCaptureTime": "Heure de capture",
     "statisticsActiveUsers": "Utilisateurs actifs",
-    "statisticsActiveDevices": "Dispositifs actifs",
+    "statisticsActiveDevices": "Appareils actifs",
     "statisticsRequests": "Requêtes",
     "statisticsMessagesReceived": "Messages reçus",
     "statisticsMessagesStored": "Messages stockés",
+    "statisticsGeocoder": "Requêtes de géocodage",
+    "statisticsGeolocation": "Requêtes de géolocalisation",
     "categoryArrow": "Flêche",
     "categoryDefault": "Par défaut",
-    "categoryCar": "Voiture",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Vélo",
+    "categoryBoat": "Bateau",
     "categoryBus": "Bus",
-    "categoryTruck": "Camion",
-    "categoryShip": "Bateau",
-    "categoryPlane": "Avion",
+    "categoryCar": "Voiture",
+    "categoryCrane": "Grue",
+    "categoryHelicopter": "Hélicoptère",
     "categoryMotorcycle": "Moto",
-    "categoryBicycle": "Vélo",
+    "categoryOffroad": "Véhicule tout terrains",
     "categoryPerson": "Personne",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Avion",
+    "categoryShip": "Bateau",
+    "categoryTractor": "Tracteur",
+    "categoryTruck": "Camion",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/he.json b/web/l10n/he.json
index fff6016d..418dd1b2 100644
--- a/web/l10n/he.json
+++ b/web/l10n/he.json
@@ -37,10 +37,17 @@
     "sharedDistance": "מרחק",
     "sharedHourAbbreviation": "ש'",
     "sharedMinuteAbbreviation": "דק'",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "הגדר מהמפה",
     "sharedAttributeAlias": "מאפייני כינוי",
     "sharedAttributeAliases": "מאפייני כינויים",
     "sharedAlias": "כינוי",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "קילומטרז'",
     "sharedDevice": "רכב",
     "sharedTestNotification": "שלח הודעת בדיקה",
@@ -53,9 +60,34 @@
     "sharedPreferences": "עדיפויות",
     "sharedPermissions": "הרשאות",
     "sharedExtra": "תוספת",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "אזור זמן",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "צבע",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "שגיאה",
-    "errorUnknown": "שגיאה לא ידועה",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "בעייה בחיבור",
     "errorSocket": "בעיית רשת",
     "userEmail": "אימייל",
@@ -119,6 +151,51 @@
     "positionAddress": "כתובת",
     "positionProtocol": "פרוטוקול",
     "positionDistance": "מרחק",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "סוללה",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "לוויינים",
+    "positionSatVisible": "לוויינים גלויים",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "אירוע",
+    "positionAlarm": "התראה",
+    "positionStatus": "סטטוס",
+    "positionOdometer": "מד מרחק",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "שעות",
+    "positionInput": "כניסה",
+    "positionOutput": "יציאה",
+    "positionBatteryLevel": "רמת הסוללה",
+    "positionFuelConsumption": "צריכת דלק",
+    "positionRfid": "RFID",
+    "positionVersionFw": "גרסת קושחה",
+    "positionVersionHw": "גרסת חומרה",
+    "positionIgnition": "הצתה",
+    "positionFlags": "Flags",
+    "positionCharge": "טעינה",
+    "positionIp": "IP",
+    "positionArchive": "ארכיון",
+    "positionVin": "VIN",
+    "positionApproximate": "Approximate",
+    "positionThrottle": "Throttle",
+    "positionMotion": "תנועה",
+    "positionArmed": "Armed",
+    "positionAcceleration": "תאוצה",
+    "positionDeviceTemp": "טמפרטורת המכשיר",
+    "positionOperator": "Operator",
+    "positionCommand": "Command",
+    "positionBlocked": "חסום",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "הגדרות שרת",
     "serverZoom": "זום",
     "serverRegistration": "הרשמה",
@@ -174,6 +251,8 @@
     "commandPhone": "טלפון",
     "commandMessage": "הודעה",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "כל ההתראות",
     "eventDeviceOnline": "המכשיר און לין",
     "eventDeviceUnknown": "מצב המכשיר אינו ידועה",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "המכשיר בתזוזה",
     "eventDeviceStopped": "המכשיר עצר",
     "eventDeviceOverspeed": "המכשיר עבר את המהירות המותרת",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "תוצאות הפקודה",
     "eventGeofenceEnter": "המכשיר נכנס לתחום המוגדר",
     "eventGeofenceExit": "המכשיר יצא מהתחום המוגדר",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "כיבוי מנוע",
     "eventMaintenance": "תחזוקה נדרשת",
     "eventTextMessage": "התקבלה הודעת טקסט",
-    "alarm": "אזעקה",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "אתרעת SOS",
     "alarmVibration": "אזעקת רטט",
     "alarmMovement": "אזעקת תנועה",
     "alarmOverspeed": "אזעקת מהירות יתר",
     "alarmFallDown": "אזעקת נפילה",
     "alarmLowBattery": "אזעקת סוללה חלשה",
+    "alarmLowPower": "התראת סוללה חלשה",
     "alarmFault": "אזעקת שווא",
     "alarmPowerOff": "התראת ניתוק עשמל",
     "alarmPowerOn": "התראת חיבור עשמל",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "בלימת חרום",
     "alarmFatigueDriving": "התראת התעייפות",
     "alarmPowerCut": "התראת ניתוק חשמל",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "התראת Jamming",
     "alarmTemperature": "התראת טמפרטורה גבוהה",
     "alarmParking": "התראת חנייה",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "סוג ההתראה",
     "notificationWeb": "שלח דרך ווב",
     "notificationMail": "שלח באימייל",
@@ -225,6 +308,7 @@
     "reportRoute": "מסלול",
     "reportEvents": "אירועים",
     "reportTrips": "נסיעות",
+    "reportStops": "עצירות",
     "reportSummary": "סיכום",
     "reportChart": "תרשים",
     "reportConfigure": "הגדר",
@@ -249,15 +333,24 @@
     "statisticsRequests": "בקשות",
     "statisticsMessagesReceived": "הודעות שהתקבלו",
     "statisticsMessagesStored": "הודעות שנשמרו",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "חץ",
     "categoryDefault": "ברירת מחדל",
-    "categoryCar": "רכב פרטי",
+    "categoryAnimal": "חייה",
+    "categoryBicycle": "אופניים",
+    "categoryBoat": "סירה",
     "categoryBus": "אוטובוס",
-    "categoryTruck": "משאית",
-    "categoryShip": "ספינה",
-    "categoryPlane": "מטוס",
+    "categoryCar": "רכב פרטי",
+    "categoryCrane": "מנוף",
+    "categoryHelicopter": "מסוק",
     "categoryMotorcycle": "אופנוע",
-    "categoryBicycle": "אופניים",
+    "categoryOffroad": "רכב שטח",
     "categoryPerson": "אדם",
-    "categoryAnimal": "חייה"
+    "categoryPickup": "משאית קלה",
+    "categoryPlane": "מטוס",
+    "categoryShip": "ספינה",
+    "categoryTractor": "טרקטור",
+    "categoryTruck": "משאית",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/hi.json b/web/l10n/hi.json
index 34e1e13e..748a0e47 100644
--- a/web/l10n/hi.json
+++ b/web/l10n/hi.json
@@ -37,10 +37,17 @@
     "sharedDistance": "दूरी",
     "sharedHourAbbreviation": "एच",
     "sharedMinuteAbbreviation": "एम",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "मानचित्र की स्तिति प्रदान करें",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "त्रुटि",
-    "errorUnknown": "अज्ञात त्रुटि",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "कनेक्शन त्रुटि",
     "errorSocket": "Web socket connection error",
     "userEmail": "ईमेल",
@@ -119,6 +151,51 @@
     "positionAddress": "पता",
     "positionProtocol": "प्रोटोकॉल",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "सर्वर की सेटिंग्स",
     "serverZoom": "ज़ूम",
     "serverRegistration": "पंजीकरण",
@@ -174,6 +251,8 @@
     "commandPhone": "फोन नंबर",
     "commandMessage": "संदेश / मेसेज",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "सभी घटनाएँ / इवेंट्स",
     "eventDeviceOnline": "उपकरण / डिवाइस ऑनलाइन है",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "उपकरण / डिवाइस गतिमान है",
     "eventDeviceStopped": "उपकरण / डिवाइस रुक गया  है",
     "eventDeviceOverspeed": "उपकरण / डिवाइस ने गति सीमा का उल्लंघन किया है",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "आदेश / क्मांड का परिणाम",
     "eventGeofenceEnter": "उपकरण / डिवाइस ने जियो फेन्स मे प्रवेश किया है",
     "eventGeofenceExit": "उपकरण / डिवाइस जियो फेन्स से बाहर आ गया है",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "इग्निशन ऑफ / बंद है",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "अलार्म",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "एसओएस / एमर्जेन्सी अलार्म",
     "alarmVibration": "कंपन होने का अलार्म",
     "alarmMovement": "गतिमय होने का अलार्म",
     "alarmOverspeed": "गति सीमा से बाहर होने का अलार्म",
     "alarmFallDown": "नीचे गिरने का अलार्म",
     "alarmLowBattery": "बैटरी कम होने का अलार्म",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "खराबी आने का अलार्म",
     "alarmPowerOff": "Power Off Alarm",
     "alarmPowerOn": "Power On Alarm",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "सूचना का प्रकार",
     "notificationWeb": "वेब / इंटरनेट के माध्यम से भेजें",
     "notificationMail": " ईमेल के माध्यम से भेजें",
@@ -225,6 +308,7 @@
     "reportRoute": "मार्ग",
     "reportEvents": "घटनाएँ / इवेंट्स",
     "reportTrips": "यात्राएँ / ट्रिप्स",
+    "reportStops": "Stops",
     "reportSummary": "सारांश",
     "reportChart": "Chart",
     "reportConfigure": "समनुरूप / कन्फिगर करें",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/hr.json b/web/l10n/hr.json
new file mode 100644
index 00000000..c2b8f555
--- /dev/null
+++ b/web/l10n/hr.json
@@ -0,0 +1,356 @@
+{
+    "sharedLoading": "Učitavanje...",
+    "sharedHide": "Sakrij",
+    "sharedSave": "Spremi",
+    "sharedSet": "Postavi",
+    "sharedCancel": "Poništi",
+    "sharedAdd": "Dodaj",
+    "sharedEdit": "Uredi",
+    "sharedRemove": "Ukloni",
+    "sharedRemoveConfirm": "Ukloniti stavku?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedNmi": "nmi",
+    "sharedKn": "čv",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Sat",
+    "sharedMinute": "Minuta",
+    "sharedSecond": "Sekunda",
+    "sharedDays": "dani",
+    "sharedHours": "sati",
+    "sharedMinutes": "minuta",
+    "sharedDecimalDegrees": "Decimalni stupnjevi",
+    "sharedDegreesDecimalMinutes": "Stupnjevi u decimalnim minutama",
+    "sharedDegreesMinutesSeconds": "Stupnjevi u minutama i sekundama",
+    "sharedName": "Ime",
+    "sharedDescription": "Opis",
+    "sharedSearch": "Pretraži",
+    "sharedGeofence": "Geo-ograda",
+    "sharedGeofences": "Geo-ograde",
+    "sharedNotifications": "Obavijesti",
+    "sharedAttributes": "Atributi",
+    "sharedAttribute": "Atribut",
+    "sharedArea": "Područje",
+    "sharedSound": "Zvuk obavijesti",
+    "sharedType": "Tip",
+    "sharedDistance": "Udaljenost",
+    "sharedHourAbbreviation": "h",
+    "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
+    "sharedGetMapState": "Dohvati stanje karte",
+    "sharedAttributeAlias": "Alias atributa",
+    "sharedAttributeAliases": "Aliasi Atributa",
+    "sharedAlias": "Alias",
+    "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",
+    "sharedCalendars": "Kalendari",
+    "sharedFile": "Datoteka",
+    "sharedSelectFile": "Odaberi datoteku",
+    "sharedPhone": "Telefon",
+    "sharedRequired": "Potrebno",
+    "sharedPreferences": "Postavke",
+    "sharedPermissions": "Dozvole",
+    "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Broj",
+    "sharedTypeBoolean": "Boolean",
+    "sharedTimezone": "Vremenska zona",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Ograničenje brzine",
+    "attributeReportIgnoreOdometer": "Izvještaj: ignoriraj kilometražu",
+    "attributeMaintenanceStart": "Održavanje: Start",
+    "attributeMaintenanceInterval": "Održavanje: Interval",
+    "attributeWebReportColor": "Web: Boja izvještaja",
+    "attributeDevicePassword": "Lozinka uređaja",
+    "attributeProcessingCopyAttributes": "Obrada: Kopiraj atribute",
+    "attributeColor": "Boja",
+    "attributeWebLiveRouteLength": "Web: Udaljenost rute uživo",
+    "attributeWebSelectZoom": "Web: Približi kod odabira",
+    "attributeMailSmtpHost": "Mail: SMTP poslužitelj",
+    "attributeMailSmtpPort": "Mail: SMTP port",
+    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS uključen",
+    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS potreban",
+    "attributeMailSmtpSslEnable": "Mail: SMTP SSL uključen",
+    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Trust",
+    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL protokoli",
+    "attributeMailSmtpFrom": "Mail: SMTP pošiljatelj",
+    "attributeMailSmtpAuth": "Mail: SMTP uključi autentikaciju",
+    "attributeMailSmtpUsername": "Mail: SMTP korisničko ime",
+    "attributeMailSmtpPassword": "Mail: SMTP lozinka",
+    "errorTitle": "Greška",
+    "errorGeneral": "Nevažeći parametri ili kršenje ograničenja",
+    "errorConnection": "Greška konekcije",
+    "errorSocket": "WebSocket konekcijska greška",
+    "userEmail": "E-mail",
+    "userPassword": "Lozinka",
+    "userAdmin": "Administrator",
+    "userRemember": "Zapamti",
+    "userDisabled": "Isključeno",
+    "userExpirationTime": "Vrijeme isteka",
+    "userDeviceLimit": "Maksimalni broj uređaja",
+    "userUserLimit": "Maksimalni broj korisnika",
+    "userDeviceReadonly": "Onemogući dodavanje uređaja",
+    "userToken": "Token",
+    "loginTitle": "Prijava",
+    "loginLanguage": "Jezik",
+    "loginRegister": "Registracija",
+    "loginLogin": "Prijava",
+    "loginFailed": "Netočna e-mail adresa ili password",
+    "loginCreated": "Registiran je novi korisnik",
+    "loginLogout": "Odjava",
+    "loginLogo": "Logo",
+    "devicesAndState": "Uređaji i stanje",
+    "deviceTitle": "Uređaji",
+    "deviceIdentifier": "Identifikator",
+    "deviceModel": "Model",
+    "deviceContact": "Kontakt",
+    "deviceCategory": "Kategorija",
+    "deviceLastUpdate": "Zadnje ažuriranje",
+    "deviceCommand": "Naredba",
+    "deviceFollow": "Prati",
+    "deviceTotalDistance": "Ukupna udaljenost",
+    "deviceStatus": "Status",
+    "deviceStatusOnline": "Online",
+    "deviceStatusOffline": "Offline",
+    "deviceStatusUnknown": "Nepoznato",
+    "groupDialog": "Grupa",
+    "groupParent": "Grupa",
+    "groupNoGroup": "Bez grupe",
+    "settingsTitle": "Postavke",
+    "settingsUser": "Račun",
+    "settingsGroups": "Grupe",
+    "settingsServer": "Server",
+    "settingsUsers": "Korisnici",
+    "settingsSpeedUnit": "Brzina",
+    "settingsTwelveHourFormat": "12-satno vrijeme",
+    "settingsCoordinateFormat": "Format koordinata",
+    "reportTitle": "Izvještaji",
+    "reportDevice": "Uređaj",
+    "reportGroup": "Grupa",
+    "reportFrom": "Od",
+    "reportTo": "Za",
+    "reportShow": "Prikaži",
+    "reportClear": "Očisti",
+    "positionFixTime": "Vrijeme",
+    "positionValid": "Važeće",
+    "positionAccuracy": "Preciznost",
+    "positionLatitude": "Širina",
+    "positionLongitude": "Dužina",
+    "positionAltitude": "Visina",
+    "positionSpeed": "Brzina",
+    "positionCourse": "Kurs",
+    "positionAddress": "Adresa",
+    "positionProtocol": "Protokol",
+    "positionDistance": "Udaljenost",
+    "positionRpm": "O/min",
+    "positionFuel": "Gorivo",
+    "positionPower": "Napajanje",
+    "positionBattery": "Baterija",
+    "positionRaw": "Sirovi podaci",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sateliti",
+    "positionSatVisible": "Vidljivi sateliti",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Događaj",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Stanje",
+    "positionOdometer": "Kilometraža",
+    "positionServiceOdometer": "Kilometara do servisa",
+    "positionTripOdometer": "Kilometraža puta",
+    "positionHours": "Sati",
+    "positionInput": "Ulaz",
+    "positionOutput": "Izlaz",
+    "positionBatteryLevel": "Razina baterije",
+    "positionFuelConsumption": "Potrošnja goriva",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Verzija firmwarea",
+    "positionVersionHw": "Verzija hadrvera",
+    "positionIgnition": "Paljenje",
+    "positionFlags": "Zastavice",
+    "positionCharge": "Punjenje",
+    "positionIp": "IP",
+    "positionArchive": "Arhiva",
+    "positionVin": "VIN",
+    "positionApproximate": "Približno",
+    "positionThrottle": "Gas",
+    "positionMotion": "Kretanje",
+    "positionArmed": "Aktivirano",
+    "positionAcceleration": "Ubrzavanje",
+    "positionDeviceTemp": "Temperatura uređaja",
+    "positionOperator": "Operater",
+    "positionCommand": "Command",
+    "positionBlocked": "Blokirano",
+    "positionDtcs": "DTC kodovi",
+    "positionObdSpeed": "OBD brzina",
+    "positionObdOdometer": "OBD kilometraža",
+    "serverTitle": "Postavke poslužitelja",
+    "serverZoom": "Povećanje",
+    "serverRegistration": "Registracija",
+    "serverReadonly": "Samo pregledavanje",
+    "serverForceSettings": "Nametni postavke",
+    "mapTitle": "Karta",
+    "mapLayer": "Sloj karte",
+    "mapCustom": "Prilagođena mapa",
+    "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",
+    "mapShapePolygon": "Mnogokut",
+    "mapShapeCircle": "Krug",
+    "mapShapePolyline": "Razlomljena linija",
+    "mapLiveRoutes": "Rute uživo",
+    "stateTitle": "Stanje",
+    "stateName": "Atribut",
+    "stateValue": "Vrijednost",
+    "commandTitle": "Naredba",
+    "commandSend": "Pošalji",
+    "commandSent": "Naredba poslana",
+    "commandPositionPeriodic": "Periodično izvješćivanje",
+    "commandPositionStop": "Zaustavi izvješćivanje",
+    "commandEngineStop": "Zaustavi motor",
+    "commandEngineResume": "Pokreni motor",
+    "commandFrequency": "Učestalost",
+    "commandUnit": "Jedinica",
+    "commandCustom": "Prilagođena naredba",
+    "commandPositionSingle": "Jedan izvještaj",
+    "commandAlarmArm": "Aktiviraj alarm",
+    "commandAlarmDisarm": "Deaktiviraj alarm",
+    "commandSetTimezone": "Postavi vremensku zonu",
+    "commandRequestPhoto": "Zatraži sliku",
+    "commandRebootDevice": "Ponovno pokretanje uređaja",
+    "commandSendSms": "Pošalji SMS",
+    "commandSendUssd": "Pošalji USSD",
+    "commandSosNumber": "Postavi SOS broj",
+    "commandSilenceTime": "Postavi vrijeme tišine",
+    "commandSetPhonebook": "Postavi imenik",
+    "commandSetIndicator": "Postavi indikator",
+    "commandVoiceMessage": "Glasovna poruka",
+    "commandOutputControl": "Kontrola izlaza",
+    "commandAlarmSpeed": "Alarm prekoračenja brzine",
+    "commandDeviceIdentification": "Identifikacija uređaja",
+    "commandIndex": "Indeks",
+    "commandData": "Podaci",
+    "commandPhone": "Telefonski broj",
+    "commandMessage": "Poruka",
+    "commandTimezone": "Korekcija vremenske zone",
+    "commandgetModemStatus": "Status modema",
+    "commandgetDeviceStatus": "Status uređaja",
+    "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",
+    "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",
+    "eventMaintenance": "Potrebno održavanje",
+    "eventTextMessage": "Primljena tekstualna poruka",
+    "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",
+    "alarmHardAcceleration": "Alarm brzog ubrzavanja",
+    "alarmHardBreaking": "Alarm jakog kočenja",
+    "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",
+    "alarmOilLeak": "Alarm curenja ulja",
+    "alarmTampering": "Alarm neovlaštenog izmjenjivanja",
+    "alarmRemoving": "Alarm otklanjanja",
+    "notificationType": "Tip obavijesti",
+    "notificationWeb": "Pošalji preko weba",
+    "notificationMail": "Pošalji putem e-maila",
+    "notificationSms": "Pošalji putem SMS-a",
+    "reportRoute": "Ruta",
+    "reportEvents": "Događaji",
+    "reportTrips": "Putovanja",
+    "reportStops": "Zaustavljanja",
+    "reportSummary": "Sažetak",
+    "reportChart": "Graf",
+    "reportConfigure": "Konfiguriraj",
+    "reportEventTypes": "Vrste događaja",
+    "reportChartType": "Vrsta grafa",
+    "reportShowMarkers": "Pokaži markere",
+    "reportExport": "Izvoz",
+    "reportDeviceName": "Ime uređaja",
+    "reportAverageSpeed": "Prosječna brzina",
+    "reportMaximumSpeed": "Maksimalna brzina",
+    "reportEngineHours": "Sati rada motora",
+    "reportDuration": "Trajanje",
+    "reportStartTime": "Početno vrijeme",
+    "reportStartAddress": "Početna adresa",
+    "reportEndTime": "Vrijeme završetka",
+    "reportEndAddress": "Završna adresa",
+    "reportSpentFuel": "Potrošeno goriva",
+    "statisticsTitle": "Statistike",
+    "statisticsCaptureTime": "Vrijeme dohvaćanja",
+    "statisticsActiveUsers": "Aktivnih korisnika",
+    "statisticsActiveDevices": "Aktivnih uređaja",
+    "statisticsRequests": "Zahtjeva",
+    "statisticsMessagesReceived": "Poruka primljeno",
+    "statisticsMessagesStored": "Poruka spremljeno",
+    "statisticsGeocoder": "Geocoder zahtjevi",
+    "statisticsGeolocation": "Geolokacijski zahtjevi",
+    "categoryArrow": "Strelica",
+    "categoryDefault": "Zadano",
+    "categoryAnimal": "Životinja",
+    "categoryBicycle": "Bicikl",
+    "categoryBoat": "Brod",
+    "categoryBus": "Autobus",
+    "categoryCar": "Automobil",
+    "categoryCrane": "Dizalica",
+    "categoryHelicopter": "Helikopter",
+    "categoryMotorcycle": "Motocikl",
+    "categoryOffroad": "Offroad",
+    "categoryPerson": "Osoba",
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Avion",
+    "categoryShip": "Brod",
+    "categoryTractor": "Traktor",
+    "categoryTruck": "Kamion",
+    "categoryVan": "Kombi"
+}
\ No newline at end of file
diff --git a/web/l10n/hu.json b/web/l10n/hu.json
index 43c47901..f23ca193 100644
--- a/web/l10n/hu.json
+++ b/web/l10n/hu.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Távolság",
     "sharedHourAbbreviation": "ó",
     "sharedMinuteAbbreviation": "p",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Térkép állapot lekérés",
     "sharedAttributeAlias": "Paraméter alias",
     "sharedAttributeAliases": "Paraméter Alias-ok",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Számított attribútum",
+    "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",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferenciák",
     "sharedPermissions": "Jogosultságok",
     "sharedExtra": "Extra",
+    "sharedTypeString": "Szöveg",
+    "sharedTypeNumber": "Szám",
+    "sharedTypeBoolean": "Logikai",
     "sharedTimezone": "Időzóna",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Sebesség határ",
+    "attributeReportIgnoreOdometer": "Jelentés: Odométer figyelmen kívül hagyása",
+    "attributeMaintenanceStart": "Karbantartás: Kezdet",
+    "attributeMaintenanceInterval": "Karbantartás: Köztes",
+    "attributeWebReportColor": "Web: Jelentés színe",
+    "attributeDevicePassword": "Eszköz jelszó",
+    "attributeProcessingCopyAttributes": "Feldolgozás: Attribútumok másolása",
+    "attributeColor": "Szín",
+    "attributeWebLiveRouteLength": "Web: Élő útvonal hossz",
+    "attributeWebSelectZoom": "Web: közelítés a kiválasztáson",
+    "attributeMailSmtpHost": "SMTP kiszolgáló",
+    "attributeMailSmtpPort": "SMTP port",
+    "attributeMailSmtpStarttlsEnable": "SMTP STARTTLS engedélyezése",
+    "attributeMailSmtpStarttlsRequired": "SMTP STARTTLS szükséges",
+    "attributeMailSmtpSslEnable": "SMTP SSL engedélyezése",
+    "attributeMailSmtpSslTrust": "SMTP SSL Trust",
+    "attributeMailSmtpSslProtocols": "SMTP SSL Protokollok",
+    "attributeMailSmtpFrom": "SMTP Feladó",
+    "attributeMailSmtpAuth": "SMTP autentikáció engedélyezése",
+    "attributeMailSmtpUsername": "SMTP felhasználónév",
+    "attributeMailSmtpPassword": "SMTP jelszó",
     "errorTitle": "Hiba",
-    "errorUnknown": "Ismeretlen hiba",
+    "errorGeneral": "Érvénytelen paraméterek vagy integritási szabályok megsértése",
     "errorConnection": "Kapcsolódási hiba",
     "errorSocket": "Kapcsolódási hiba",
     "userEmail": "Email",
@@ -119,6 +151,51 @@
     "positionAddress": "Cím",
     "positionProtocol": "Protokoll",
     "positionDistance": "Távolság",
+    "positionRpm": "Fordulat",
+    "positionFuel": "Üzemanyag",
+    "positionPower": "Áramforrás",
+    "positionBattery": "Akkumulátor",
+    "positionRaw": "Nyers",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Műholdak",
+    "positionSatVisible": "Látható műholdak",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Esemény",
+    "positionAlarm": "Riasztás",
+    "positionStatus": "Státusz",
+    "positionOdometer": "Megtett út",
+    "positionServiceOdometer": "Szerviz megtett út",
+    "positionTripOdometer": "Utazás megtett út",
+    "positionHours": "Órák",
+    "positionInput": "Bemenet",
+    "positionOutput": "Kimenet",
+    "positionBatteryLevel": "Akkumulátor szint",
+    "positionFuelConsumption": "Fogyasztás",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Firmware verzió",
+    "positionVersionHw": "Hardver verzió",
+    "positionIgnition": "Gyújtás",
+    "positionFlags": "Zászlók",
+    "positionCharge": "Töltés",
+    "positionIp": "IP",
+    "positionArchive": "Arhív",
+    "positionVin": "Alvázszám",
+    "positionApproximate": "Megközelít",
+    "positionThrottle": "Throttle",
+    "positionMotion": "Mozgás",
+    "positionArmed": "Élesített",
+    "positionAcceleration": "Gyorsulás",
+    "positionDeviceTemp": "Eszköz hőmérséklet",
+    "positionOperator": "Operátor",
+    "positionCommand": "Command",
+    "positionBlocked": "Blokkolt",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "ODB sebesség",
+    "positionObdOdometer": "ODB megtett út",
     "serverTitle": "Szerver beállítások",
     "serverZoom": "Nagyítás",
     "serverRegistration": "Regisztráció",
@@ -134,8 +211,8 @@
     "mapBingAerial": "Bing Maps Aerial",
     "mapBingHybrid": "Bing Maps Hybrid",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Yandex térkép",
+    "mapYandexSat": "Yandex Műhold",
     "mapShapePolygon": "Poligon",
     "mapShapeCircle": "Kör",
     "mapShapePolyline": "Vonallánc",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefonszám",
     "commandMessage": "Üzenet",
     "commandTimezone": "Időzóna eltoása",
+    "commandgetModemStatus": "Modem státusz",
+    "commandgetDeviceStatus": "Eszköz státusz",
     "eventAll": "Minden esemény",
     "eventDeviceOnline": "Eszköz online",
     "eventDeviceUnknown": "Eszköz státusza ismeretlen",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Eszköz mozog",
     "eventDeviceStopped": "Eszköz megállt",
     "eventDeviceOverspeed": "Eszköz túllépte a sebességkorlátot",
+    "eventDeviceFuelDrop": "Üzemanyagszint esés",
     "eventCommandResult": "Parancs eredmény",
     "eventGeofenceEnter": "Eszköz belépett a geokerítésbe",
     "eventGeofenceExit": "Eszköz kilépett a geokerítésből",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Gyújtás KI",
     "eventMaintenance": "Karbantartás szükséges",
     "eventTextMessage": "Szöveges üzenet érkezett",
-    "alarm": "Riasztás",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Erős fé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",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Lábfék riasztás",
     "alarmOilLeak": "Olajszivárgás riasztás",
     "alarmTampering": "Illetéktelen riasztás",
+    "alarmRemoving": "Riasztás eltávolítása",
     "notificationType": "Értesítés Típusa",
     "notificationWeb": "Küldés Weben",
     "notificationMail": "Küldés E-mailben",
@@ -225,6 +308,7 @@
     "reportRoute": "Útvonal",
     "reportEvents": "Események",
     "reportTrips": "Utazások",
+    "reportStops": "Megállók",
     "reportSummary": "Összegzés",
     "reportChart": "Diagram",
     "reportConfigure": "Konfiguráció",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Kérések",
     "statisticsMessagesReceived": "Fogadott üzenetek",
     "statisticsMessagesStored": "Tárolt üzenetek",
+    "statisticsGeocoder": "Geocoder kérések",
+    "statisticsGeolocation": "Geopozíció kérések",
     "categoryArrow": "Nyíl",
     "categoryDefault": "Alapértelmezett",
-    "categoryCar": "Autó",
+    "categoryAnimal": "Állat",
+    "categoryBicycle": "Bicikli",
+    "categoryBoat": "Csónak",
     "categoryBus": "Busz",
-    "categoryTruck": "Kamion",
-    "categoryShip": "Hajó",
-    "categoryPlane": "Repülő",
+    "categoryCar": "Autó",
+    "categoryCrane": "Daru",
+    "categoryHelicopter": "Helikopter",
     "categoryMotorcycle": "Motorbicikli",
-    "categoryBicycle": "Bicikli",
+    "categoryOffroad": "Terep",
     "categoryPerson": "Személy",
-    "categoryAnimal": "Állat"
+    "categoryPickup": "Platós",
+    "categoryPlane": "Repülő",
+    "categoryShip": "Hajó",
+    "categoryTractor": "Traktor",
+    "categoryTruck": "Kamion",
+    "categoryVan": "Teherkocsi"
 }
\ No newline at end of file
diff --git a/web/l10n/id.json b/web/l10n/id.json
index 3f0672b1..48b8e8c3 100644
--- a/web/l10n/id.json
+++ b/web/l10n/id.json
@@ -7,7 +7,7 @@
     "sharedAdd": "Tambah",
     "sharedEdit": "Ubah",
     "sharedRemove": "Hapus",
-    "sharedRemoveConfirm": "Hapus item?",
+    "sharedRemoveConfirm": "Hapus Item?",
     "sharedKm": "km",
     "sharedMi": "mi",
     "sharedNmi": "nmi",
@@ -17,9 +17,9 @@
     "sharedHour": "Jam",
     "sharedMinute": "Menit",
     "sharedSecond": "Detik",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "Semua Hari",
+    "sharedHours": "Semua Jam",
+    "sharedMinutes": "Semua Menit",
     "sharedDecimalDegrees": "Derajat Desimal",
     "sharedDegreesDecimalMinutes": "Menit Derajat Desimal",
     "sharedDegreesMinutesSeconds": "Menit Detik Derajat",
@@ -37,10 +37,17 @@
     "sharedDistance": "Jarak",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Dapatkan Status Peta",
     "sharedAttributeAlias": "Atribut Alias",
     "sharedAttributeAliases": "Semua Atribut Alias",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Atribut Terkomputerisasi",
+    "sharedComputedAttributes": "Semua Atribut Terkomputerisasi",
+    "sharedCheckComputedAttribute": "Pilih Atribut Terkomputerisasi",
+    "sharedExpression": "Ekspresi",
     "sharedDeviceDistance": "Jarak Perangkat",
     "sharedDevice": "Perangkat",
     "sharedTestNotification": "Kirim Test Notifikasi",
@@ -53,11 +60,36 @@
     "sharedPreferences": "Preferensi",
     "sharedPermissions": "Kewenangan",
     "sharedExtra": "Ekstra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Nomor",
+    "sharedTypeBoolean": "Pilihan",
     "sharedTimezone": "Zona Waktu",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Batas Kecepatan",
+    "attributeReportIgnoreOdometer": "Laporan: Biarkan Odometer",
+    "attributeMaintenanceStart": "Perawatan: Mulai",
+    "attributeMaintenanceInterval": "Perawatan: Selang Waktu",
+    "attributeWebReportColor": "Web: Warna Laporan",
+    "attributeDevicePassword": "Sandi Perangkat",
+    "attributeProcessingCopyAttributes": "Memproses: Salin Semua Atribut",
+    "attributeColor": "Warna",
+    "attributeWebLiveRouteLength": "Web: Panjang Rute Aktif",
+    "attributeWebSelectZoom": "Web: Perbesar Saat Pilih",
+    "attributeMailSmtpHost": "Mail: SMTP Host",
+    "attributeMailSmtpPort": "Mail: SMTP Port",
+    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Aktif",
+    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS Diperlukan",
+    "attributeMailSmtpSslEnable": "Mail: SMTP SSL Aktif",
+    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Terpercaya",
+    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL Protokol",
+    "attributeMailSmtpFrom": "Mail: SMTP Pengirim",
+    "attributeMailSmtpAuth": "Mail: SMTP Otorisasi Aktif",
+    "attributeMailSmtpUsername": "Mail: SMTP Pengguna",
+    "attributeMailSmtpPassword": "Mail: SMTP Sandi",
     "errorTitle": "Bermasalah",
-    "errorUnknown": "Masalah tidak diketahui",
-    "errorConnection": "Koneksi bermasalah",
-    "errorSocket": "Koneksi web socket bermasalah",
+    "errorGeneral": "Semua Parameter Salah Atau Salah Aturan",
+    "errorConnection": "Koneksi Bermasalah",
+    "errorSocket": "Koneksi Web Socket Bermasalah",
     "userEmail": "Email",
     "userPassword": "Sandi",
     "userAdmin": "Admin",
@@ -72,12 +104,12 @@
     "loginLanguage": "Bahasa",
     "loginRegister": "Daftar",
     "loginLogin": "Masuk",
-    "loginFailed": "Email atau password salah",
-    "loginCreated": "Pengguna baru telah terdaftar",
+    "loginFailed": "Email Atau Password Salah",
+    "loginCreated": "Pengguna Baru Telah Terdaftar",
     "loginLogout": "Keluar",
     "loginLogo": "Lambang",
-    "devicesAndState": "Perangkat dan Status",
-    "deviceTitle": "Perangkat",
+    "devicesAndState": "Perangkat Dan Status",
+    "deviceTitle": "Semua Perangkat",
     "deviceIdentifier": "Pengindetifikasi",
     "deviceModel": "Model",
     "deviceContact": "Kontak",
@@ -100,8 +132,8 @@
     "settingsUsers": "Pengguna",
     "settingsSpeedUnit": "Kecepatan",
     "settingsTwelveHourFormat": "Format 12 Jam",
-    "settingsCoordinateFormat": "Format Koornidat",
-    "reportTitle": "Laporan",
+    "settingsCoordinateFormat": "Format Koordinat",
+    "reportTitle": "Semua Laporan",
     "reportDevice": "Perangkat",
     "reportGroup": "Grup",
     "reportFrom": "Dari",
@@ -119,11 +151,56 @@
     "positionAddress": "Alamat",
     "positionProtocol": "Protokol",
     "positionDistance": "Jarak",
-    "serverTitle": "Pengaturan Server",
+    "positionRpm": "RPM",
+    "positionFuel": "BBM",
+    "positionPower": "Tenaga",
+    "positionBattery": "Battery",
+    "positionRaw": "Mentah",
+    "positionIndex": "Indek",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satelit",
+    "positionSatVisible": "Satelit Terlihat",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Peristiwa",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Odometer Perbaikan",
+    "positionTripOdometer": "Odometer Perjalanan",
+    "positionHours": "Semua Jam",
+    "positionInput": "Masukan",
+    "positionOutput": "Keluaran",
+    "positionBatteryLevel": "Level Battery",
+    "positionFuelConsumption": "Konsumsi BBM",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Versi Firmware",
+    "positionVersionHw": "Versi Hardware",
+    "positionIgnition": "Mesin",
+    "positionFlags": "Semua Bendera",
+    "positionCharge": "Pengisian",
+    "positionIp": "IP",
+    "positionArchive": "Arsip",
+    "positionVin": "VIN",
+    "positionApproximate": "Perkiraan",
+    "positionThrottle": "Throttle",
+    "positionMotion": "Gerakan",
+    "positionArmed": "Aktif",
+    "positionAcceleration": "Akselerasi",
+    "positionDeviceTemp": "Suhu Perangkat",
+    "positionOperator": "Operator",
+    "positionCommand": "Command",
+    "positionBlocked": "Diblok",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "Kecepatan OBD",
+    "positionObdOdometer": "Odometer OBD",
+    "serverTitle": "Semua Pengaturan Server",
     "serverZoom": "Perbesar",
     "serverRegistration": "Pendaftaran",
     "serverReadonly": "Hanya Dilihat",
-    "serverForceSettings": "Setelan Paksa",
+    "serverForceSettings": "Semua Pengaturan Paksa",
     "mapTitle": "Peta",
     "mapLayer": "Layer Peta",
     "mapCustom": "Peta Buatan",
@@ -132,10 +209,10 @@
     "mapBingKey": "Key Peta Bing",
     "mapBingRoad": "Peta Jalan Bing",
     "mapBingAerial": "Peta Udara Bing",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Peta Bing Hybrid",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Peta Yandex",
+    "mapYandexSat": "Satelit Yandex",
     "mapShapePolygon": "Poligon",
     "mapShapeCircle": "Lingkaran",
     "mapShapePolyline": "Garis Poli",
@@ -145,14 +222,14 @@
     "stateValue": "Nilai",
     "commandTitle": "Perintah",
     "commandSend": "Kirim",
-    "commandSent": "Perintah terkirim",
-    "commandPositionPeriodic": "Laporan berkala",
+    "commandSent": "Perintah Terkirim",
+    "commandPositionPeriodic": "Laporan Berkala",
     "commandPositionStop": "Stop Laporan",
     "commandEngineStop": "Matikan Mesin",
     "commandEngineResume": "HIdupkan Mesin",
     "commandFrequency": "Frekuensi",
     "commandUnit": "Unit",
-    "commandCustom": "Perintah buatan",
+    "commandCustom": "Perintah Buatan",
     "commandPositionSingle": "Laporan Tunggal",
     "commandAlarmArm": "Alarm Aktif",
     "commandAlarmDisarm": "Alarm Tidak Aktif",
@@ -174,28 +251,32 @@
     "commandPhone": "Nomor Telepon",
     "commandMessage": "Pesan",
     "commandTimezone": "Zona Waktu Tidak Tepat",
+    "commandgetModemStatus": "Status Modem",
+    "commandgetDeviceStatus": "Status Perangkat",
     "eventAll": "Semua Peristiwa",
-    "eventDeviceOnline": "Perangkat online",
-    "eventDeviceUnknown": "Perangkat tidak diketahui",
-    "eventDeviceOffline": "Perangkat offline",
+    "eventDeviceOnline": "Perangkat Online",
+    "eventDeviceUnknown": "Perangkat Tidak Diketahui",
+    "eventDeviceOffline": "Perangkat Offline",
     "eventDeviceMoving": "Perangkat bergerak",
-    "eventDeviceStopped": "Perangkat berhenti",
-    "eventDeviceOverspeed": "Perangkat melebihi kecepatan",
-    "eventCommandResult": "Hasil perintah",
-    "eventGeofenceEnter": "Perangkat memasuki batas wilayah",
-    "eventGeofenceExit": "Perangkat keluar batas wilayah",
+    "eventDeviceStopped": "Perangkat Berhenti",
+    "eventDeviceOverspeed": "Perangkat Melebihi Kecepatan",
+    "eventDeviceFuelDrop": "Peristiwa BBM Berkurang",
+    "eventCommandResult": "Hasil Perintah",
+    "eventGeofenceEnter": "Perangkat Memasuki Batas Wilayah",
+    "eventGeofenceExit": "Perangkat Keluar Batas Wilayah",
     "eventAlarm": "Semua Alarm",
     "eventIgnitionOn": "Mesin Hidup",
     "eventIgnitionOff": "Mesin Mati",
     "eventMaintenance": "Perlu Perbaikan",
     "eventTextMessage": "Pesan Teks Diterima",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Alarm Rem Mendadak",
     "alarmFatigueDriving": "Alarm Mengemudi Ugal-ugalan",
     "alarmPowerCut": "Alarm Listrik Terputus",
+    "alarmPowerRestored": "Alarm Tenaga Dipulihkan",
     "alarmJamming": "Alarm Pengacau Signal",
     "alarmTemperature": "Alarm Suhu",
     "alarmParking": "Alarm Parkir",
@@ -218,13 +300,15 @@
     "alarmFootBrake": "Alarm Rem",
     "alarmOilLeak": "Alarm Kebocoran BBM",
     "alarmTampering": "Alarm Temper",
+    "alarmRemoving": "Alarm Dihapus",
     "notificationType": "Tipe Notifikasi",
-    "notificationWeb": "Kirim via Web",
-    "notificationMail": "Kirim via Email",
-    "notificationSms": "Kirim via SMS",
+    "notificationWeb": "Kirim Via Web",
+    "notificationMail": "Kirim Via Email",
+    "notificationSms": "Kirim Via SMS",
     "reportRoute": "Rute",
-    "reportEvents": "Peristiwa",
+    "reportEvents": "Semua Peristiwa",
     "reportTrips": "Perjalanan",
+    "reportStops": "Berhenti",
     "reportSummary": "Ringkasan",
     "reportChart": "Grafik",
     "reportConfigure": "Pengaturan",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Permintaan",
     "statisticsMessagesReceived": "Pesan Diterima",
     "statisticsMessagesStored": "Pesan Disimpan",
+    "statisticsGeocoder": "Permintaan Geocoder",
+    "statisticsGeolocation": "Permintaan Geolokasi",
     "categoryArrow": "Panah",
     "categoryDefault": "Pengaturan Awal",
-    "categoryCar": "Mobil",
+    "categoryAnimal": "Hewan",
+    "categoryBicycle": "Sepeda",
+    "categoryBoat": "Perahu",
     "categoryBus": "Bis",
-    "categoryTruck": "Truk",
-    "categoryShip": "Kapal Laut",
-    "categoryPlane": "Pesawat",
+    "categoryCar": "Mobil",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helikopter",
     "categoryMotorcycle": "Sepeda Motor",
-    "categoryBicycle": "Sepeda",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Orang",
-    "categoryAnimal": "Hewan"
+    "categoryPickup": "Jemput",
+    "categoryPlane": "Pesawat",
+    "categoryShip": "Kapal Laut",
+    "categoryTractor": "Traktor",
+    "categoryTruck": "Truk",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/it.json b/web/l10n/it.json
index c31ffd52..6e1abe0c 100644
--- a/web/l10n/it.json
+++ b/web/l10n/it.json
@@ -1,5 +1,5 @@
 {
-    "sharedLoading": "Loading...",
+    "sharedLoading": "Caricamento...",
     "sharedHide": "Nascondi",
     "sharedSave": "Salva",
     "sharedSet": "Imposta",
@@ -37,10 +37,17 @@
     "sharedDistance": "Distanza",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Ottieni Stato Mappa",
     "sharedAttributeAlias": "Alias attributo",
     "sharedAttributeAliases": "Aliases attributo",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Attributo calcolato",
+    "sharedComputedAttributes": "Attributi calcolati",
+    "sharedCheckComputedAttribute": "Controllo attributo calcolato",
+    "sharedExpression": "Espressione",
     "sharedDeviceDistance": "Distanza dispositivo",
     "sharedDevice": "Dispositivo",
     "sharedTestNotification": "Invia Test Notifica",
@@ -53,25 +60,50 @@
     "sharedPreferences": "Preferenze",
     "sharedPermissions": "Permessi",
     "sharedExtra": "Extra",
+    "sharedTypeString": "Stringa",
+    "sharedTypeNumber": "Numero",
+    "sharedTypeBoolean": "Booleano",
     "sharedTimezone": "Fuso Orario",
+    "sharedInfoTitle": "Informazioni",
+    "attributeSpeedLimit": "Limite di velocità",
+    "attributeReportIgnoreOdometer": "Rapporto: ignora odometro",
+    "attributeMaintenanceStart": "Manutenzione: avvia",
+    "attributeMaintenanceInterval": "Manutenzione: intervallo",
+    "attributeWebReportColor": "Web: colore rapporto",
+    "attributeDevicePassword": "Password dispositivo",
+    "attributeProcessingCopyAttributes": "Elaborazione: copia attributi",
+    "attributeColor": "Colore",
+    "attributeWebLiveRouteLength": "Web: lunghezza percorso live",
+    "attributeWebSelectZoom": "Web: zoom su selezione",
+    "attributeMailSmtpHost": "Mail: host SMTP",
+    "attributeMailSmtpPort": "Mail: porta SMTP",
+    "attributeMailSmtpStarttlsEnable": "Mail: attiva STARTTLS SMTP",
+    "attributeMailSmtpStarttlsRequired": "Mail: richiesto STARTTLS SMTP",
+    "attributeMailSmtpSslEnable": "Mail: attiva SSL SMTP",
+    "attributeMailSmtpSslTrust": "Mail: fiducia SSL SMTP",
+    "attributeMailSmtpSslProtocols": "Mail: protocolli SSL SMTP",
+    "attributeMailSmtpFrom": "Mail: SMTP da",
+    "attributeMailSmtpAuth": "Mail: attiva autenticazione SMTP",
+    "attributeMailSmtpUsername": "Mail: nome utente SMTP",
+    "attributeMailSmtpPassword": "Mail: Password SMTP",
     "errorTitle": "Errore",
-    "errorUnknown": "Errore sconosciuto",
+    "errorGeneral": "Parametri non validi o violazione dei vincoli",
     "errorConnection": "Errore di connessione",
     "errorSocket": "Errore connessione web socket",
     "userEmail": "Email",
     "userPassword": "Password",
-    "userAdmin": "Admin",
+    "userAdmin": "Amministratore",
     "userRemember": "Ricorda",
     "userDisabled": "Disabilitato",
     "userExpirationTime": "Scadenza",
     "userDeviceLimit": "Limite dispositivo",
     "userUserLimit": "Limite Utente",
-    "userDeviceReadonly": "Dispositivo Sola Lettura",
+    "userDeviceReadonly": "Dispositivo di sola lettura",
     "userToken": "Token",
-    "loginTitle": "Login",
+    "loginTitle": "Accesso",
     "loginLanguage": "Lingua",
     "loginRegister": "Registrazione",
-    "loginLogin": "Login",
+    "loginLogin": "Accesso",
     "loginFailed": "Indirizzo email  o password errati",
     "loginCreated": "Un nuovo utente si e` registrato",
     "loginLogout": "Logout",
@@ -94,7 +126,7 @@
     "groupParent": "Gruppo",
     "groupNoGroup": "Nessun Gruppo",
     "settingsTitle": "Impostazioni",
-    "settingsUser": "Account",
+    "settingsUser": "Profilo",
     "settingsGroups": "Gruppi",
     "settingsServer": "Server",
     "settingsUsers": "Utenti",
@@ -119,6 +151,51 @@
     "positionAddress": "Indirizzo",
     "positionProtocol": "Protocollo",
     "positionDistance": "Distanza",
+    "positionRpm": "RPM",
+    "positionFuel": "Carburante",
+    "positionPower": "Energia",
+    "positionBattery": "Batteria",
+    "positionRaw": "Raw",
+    "positionIndex": "Indice",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satelliti",
+    "positionSatVisible": "Satelliti visibili",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Evento",
+    "positionAlarm": "Allarme",
+    "positionStatus": "Stato",
+    "positionOdometer": "Odometro",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Ore",
+    "positionInput": "Ingresso",
+    "positionOutput": "Output",
+    "positionBatteryLevel": "Livello batteria",
+    "positionFuelConsumption": "Consumo carburante",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Versione firmware",
+    "positionVersionHw": "Versione hardware",
+    "positionIgnition": "Accensione",
+    "positionFlags": "Flag",
+    "positionCharge": "Charge",
+    "positionIp": "IP",
+    "positionArchive": "Archivio",
+    "positionVin": "VIN",
+    "positionApproximate": "Approximate",
+    "positionThrottle": "Throttle",
+    "positionMotion": "Movimento",
+    "positionArmed": "Armed",
+    "positionAcceleration": "Accelerazione",
+    "positionDeviceTemp": "Temperatura dispositivo",
+    "positionOperator": "Operatore",
+    "positionCommand": "Comando",
+    "positionBlocked": "Bloccato",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "Velocità OBD",
+    "positionObdOdometer": "Odometro OBD",
     "serverTitle": "Impostazioni Server",
     "serverZoom": "Zoom",
     "serverRegistration": "Registrazione",
@@ -132,7 +209,7 @@
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
     "mapBingAerial": "Bing Maps Aerial",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Bing Mappe ibrido",
     "mapBaidu": "Baidu",
     "mapYandexMap": "Yandex Map",
     "mapYandexSat": "Yandex Satellite",
@@ -174,13 +251,16 @@
     "commandPhone": "Numero Telefonico",
     "commandMessage": "Messaggio",
     "commandTimezone": "Differenza Fuso Orario",
+    "commandgetModemStatus": "Stato del modem",
+    "commandgetDeviceStatus": "Stato del dispositivo",
     "eventAll": "Tutti gli Eventi",
     "eventDeviceOnline": "Dispositivo online",
     "eventDeviceUnknown": "Stato del dispositivo sconosciuto",
     "eventDeviceOffline": "Dispositivo offline",
     "eventDeviceMoving": "Dispositivo in movimento",
     "eventDeviceStopped": "Il dispositivo si è feramto",
-    "eventDeviceOverspeed": "Dispostivo troppo veloce",
+    "eventDeviceOverspeed": "Il dispositivo ha superato al velocità limite",
+    "eventDeviceFuelDrop": "Evento perdita carburante",
     "eventCommandResult": "Risultato comando",
     "eventGeofenceEnter": "Il dipositivo e` entrato nel GeoRecinto",
     "eventGeofenceExit": "Il dipositivo e` uscito dal GeoRecinto",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Accensione è disinserita",
     "eventMaintenance": "Richiesta manutenzione",
     "eventTextMessage": "Messaggio di testo ricevuto",
-    "alarm": "Allarme",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Allarme Frenata Brusca",
     "alarmFatigueDriving": "Allarme Affaticamento Guidatore",
     "alarmPowerCut": "Allarme Corrente Scollegata",
+    "alarmPowerRestored": "Allarme Energia Ripristinata",
     "alarmJamming": "Allarme Bloccato",
     "alarmTemperature": "Allarme Temperatura",
     "alarmParking": "Allarme Parcheggio",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Allarme Freno a Pedale",
     "alarmOilLeak": "Allarme Perdita Olio",
     "alarmTampering": "Allarme Manomissione",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Tipo notica",
     "notificationWeb": "Invia tramite Web",
     "notificationMail": "Invia tramite Mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Percorso",
     "reportEvents": "Eventi",
     "reportTrips": "Viaggi",
+    "reportStops": "Fermate",
     "reportSummary": "Sommario",
     "reportChart": "Grafico",
     "reportConfigure": "Configura",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Richieste",
     "statisticsMessagesReceived": "Messaggi ricevuti",
     "statisticsMessagesStored": "Messaggi salvati",
+    "statisticsGeocoder": "Richieste Geocoder",
+    "statisticsGeolocation": "Richieste geolocalizzazione",
     "categoryArrow": "Freccia",
     "categoryDefault": "Predefinita",
-    "categoryCar": "Automobile",
+    "categoryAnimal": "Animale",
+    "categoryBicycle": "Bicicletta",
+    "categoryBoat": "Barca",
     "categoryBus": "Autobus",
-    "categoryTruck": "Camion",
-    "categoryShip": "Nave",
-    "categoryPlane": "Aeroplano",
+    "categoryCar": "Automobile",
+    "categoryCrane": "Gru",
+    "categoryHelicopter": "Elicottero",
     "categoryMotorcycle": "Moto",
-    "categoryBicycle": "Bicicletta",
+    "categoryOffroad": "Fuoristrada",
     "categoryPerson": "Persona",
-    "categoryAnimal": "Animale"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Aeroplano",
+    "categoryShip": "Nave",
+    "categoryTractor": "Trattore",
+    "categoryTruck": "Camion",
+    "categoryVan": "Furgone"
 }
\ No newline at end of file
diff --git a/web/l10n/ja.json b/web/l10n/ja.json
index b3cda02b..d7178ab3 100644
--- a/web/l10n/ja.json
+++ b/web/l10n/ja.json
@@ -20,9 +20,9 @@
     "sharedDays": "日",
     "sharedHours": "時間",
     "sharedMinutes": "分",
-    "sharedDecimalDegrees": "小数の度",
-    "sharedDegreesDecimalMinutes": "度小数分",
-    "sharedDegreesMinutesSeconds": "度分秒",
+    "sharedDecimalDegrees": "DEG形式（度）",
+    "sharedDegreesDecimalMinutes": "DMM形式（度分）",
+    "sharedDegreesMinutesSeconds": "DMS形式（度分秒）",
     "sharedName": "名前",
     "sharedDescription": "説明",
     "sharedSearch": "検索",
@@ -37,10 +37,17 @@
     "sharedDistance": "距離",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "マップ状態を取得",
     "sharedAttributeAlias": "属性別名",
     "sharedAttributeAliases": "属性別名",
     "sharedAlias": "別名",
+    "sharedComputedAttribute": "計算した属性",
+    "sharedComputedAttributes": "計算した属性",
+    "sharedCheckComputedAttribute": "計算された属性を確認",
+    "sharedExpression": "式",
     "sharedDeviceDistance": "デバイスの距離",
     "sharedDevice": "デバイス",
     "sharedTestNotification": "テスト通知を送信",
@@ -49,21 +56,46 @@
     "sharedFile": "ファイル",
     "sharedSelectFile": "ファイルを選択",
     "sharedPhone": "電話",
-    "sharedRequired": "必要です",
-    "sharedPreferences": "プリファレンス",
+    "sharedRequired": "必須項目",
+    "sharedPreferences": "環境設定",
     "sharedPermissions": "アクセス許可",
     "sharedExtra": "拡張",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "数値",
+    "sharedTypeBoolean": "ブール値",
     "sharedTimezone": "タイムゾーン",
+    "sharedInfoTitle": "情報",
+    "attributeSpeedLimit": "速度制限",
+    "attributeReportIgnoreOdometer": "レポート: 走行距離計を無視する",
+    "attributeMaintenanceStart": "メンテナンス: 開始",
+    "attributeMaintenanceInterval": "メンテナンス: 間隔",
+    "attributeWebReportColor": "Web: レポートの色",
+    "attributeDevicePassword": "デバイスパスワード",
+    "attributeProcessingCopyAttributes": "処理中: 属性のコピー",
+    "attributeColor": "色",
+    "attributeWebLiveRouteLength": "Web: リアルタイム経路長",
+    "attributeWebSelectZoom": "Web: 選択時にズーム",
+    "attributeMailSmtpHost": "メール: SMTP ホスト",
+    "attributeMailSmtpPort": "メール: SMTP ポート",
+    "attributeMailSmtpStarttlsEnable": "メール: SMTP STARTTLS 有効",
+    "attributeMailSmtpStarttlsRequired": "メール: SMTP STARTTLS 要求",
+    "attributeMailSmtpSslEnable": "メール: SMTP SSL 有効",
+    "attributeMailSmtpSslTrust": "メール: SMTP SSL 信頼",
+    "attributeMailSmtpSslProtocols": "メール: SMTP SSL プロトコル",
+    "attributeMailSmtpFrom": "メール: SMTP 元",
+    "attributeMailSmtpAuth": "メール: SMTP 認証有効",
+    "attributeMailSmtpUsername": "メール: SMTP ユーザー名",
+    "attributeMailSmtpPassword": "メール: SMTP パスワード",
     "errorTitle": "エラー",
-    "errorUnknown": "不明なエラー",
+    "errorGeneral": "無効なパラメータまたは制約違反",
     "errorConnection": "接続エラー",
     "errorSocket": "Web ソケット接続エラー",
     "userEmail": "メール",
     "userPassword": "パスワード",
     "userAdmin": "管理者",
     "userRemember": "記憶する",
-    "userDisabled": "無効",
-    "userExpirationTime": "期限切れ",
+    "userDisabled": "無効にする",
+    "userExpirationTime": "有効期限",
     "userDeviceLimit": "デバイス制限",
     "userUserLimit": "ユーザー制限",
     "userDeviceReadonly": "デバイス読み取り専用",
@@ -101,163 +133,224 @@
     "settingsSpeedUnit": "速度",
     "settingsTwelveHourFormat": "12 時間形式",
     "settingsCoordinateFormat": "座標形式",
-    "reportTitle": "Reports",
-    "reportDevice": "Device",
-    "reportGroup": "Group",
-    "reportFrom": "From",
-    "reportTo": "To",
-    "reportShow": "Show",
-    "reportClear": "Clear",
-    "positionFixTime": "Time",
-    "positionValid": "Valid",
-    "positionAccuracy": "Accuracy",
-    "positionLatitude": "Latitude",
-    "positionLongitude": "Longitude",
-    "positionAltitude": "Altitude",
-    "positionSpeed": "Speed",
-    "positionCourse": "Course",
-    "positionAddress": "Address",
-    "positionProtocol": "Protocol",
-    "positionDistance": "Distance",
-    "serverTitle": "Server Settings",
-    "serverZoom": "Zoom",
-    "serverRegistration": "Registration",
-    "serverReadonly": "Readonly",
-    "serverForceSettings": "Force Settings",
-    "mapTitle": "Map",
-    "mapLayer": "Map Layer",
-    "mapCustom": "Custom Map",
-    "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",
-    "mapShapePolygon": "Polygon",
-    "mapShapeCircle": "Circle",
-    "mapShapePolyline": "Polyline",
-    "mapLiveRoutes": "Live Routes",
-    "stateTitle": "State",
-    "stateName": "Attribute",
-    "stateValue": "Value",
-    "commandTitle": "Command",
-    "commandSend": "Send",
-    "commandSent": "Command has been sent",
-    "commandPositionPeriodic": "Periodic Reporting",
-    "commandPositionStop": "Stop Reporting",
-    "commandEngineStop": "Engine Stop",
-    "commandEngineResume": "Engine Resume",
-    "commandFrequency": "Frequency",
-    "commandUnit": "Unit",
-    "commandCustom": "Custom command",
-    "commandPositionSingle": "Single Reporting",
-    "commandAlarmArm": "Arm Alarm",
-    "commandAlarmDisarm": "Disarm Alarm",
-    "commandSetTimezone": "Set Timezone",
-    "commandRequestPhoto": "Request Photo",
-    "commandRebootDevice": "Reboot Device",
-    "commandSendSms": "Send SMS",
-    "commandSendUssd": "Send USSD",
-    "commandSosNumber": "Set SOS Number",
-    "commandSilenceTime": "Set Silence Time",
-    "commandSetPhonebook": "Set Phonebook",
-    "commandSetIndicator": "Set Indicator",
-    "commandVoiceMessage": "Voice Message",
-    "commandOutputControl": "Output Control",
-    "commandAlarmSpeed": "Overspeed Alarm",
-    "commandDeviceIdentification": "Device Identification",
-    "commandIndex": "Index",
-    "commandData": "Data",
-    "commandPhone": "Phone Number",
-    "commandMessage": "Message",
-    "commandTimezone": "Timezone Offset",
-    "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",
-    "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",
-    "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
-    "alarmSos": "SOS Alarm",
-    "alarmVibration": "Vibration Alarm",
-    "alarmMovement": "Movement Alarm",
-    "alarmOverspeed": "Overspeed Alarm",
-    "alarmFallDown": "FallDown Alarm",
-    "alarmLowBattery": "LowBattery 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",
-    "alarmHardAcceleration": "Hard Acceleration Alarm",
-    "alarmHardBreaking": "Hard Breaking Alarm",
-    "alarmFatigueDriving": "Fatigue Driving Alarm",
-    "alarmPowerCut": "Power Cut Alarm",
-    "alarmJamming": "Jamming Alarm",
-    "alarmTemperature": "Temperature Alarm",
-    "alarmParking": "Parking Alarm",
-    "alarmShock": "Shock Alarm",
-    "alarmBonnet": "Bonnet Alarm",
-    "alarmFootBrake": "Foot Brake Alarm",
-    "alarmOilLeak": "Oil Leak Alarm",
-    "alarmTampering": "Tampering Alarm",
-    "notificationType": "Type of Notification",
-    "notificationWeb": "Send via Web",
-    "notificationMail": "Send via Mail",
-    "notificationSms": "Send via SMS",
-    "reportRoute": "Route",
-    "reportEvents": "Events",
-    "reportTrips": "Trips",
-    "reportSummary": "Summary",
-    "reportChart": "Chart",
-    "reportConfigure": "Configure",
-    "reportEventTypes": "Event Types",
-    "reportChartType": "Chart Type",
-    "reportShowMarkers": "Show Markers",
-    "reportExport": "Export",
-    "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",
-    "categoryArrow": "Arrow",
-    "categoryDefault": "Default",
-    "categoryCar": "Car",
-    "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
-    "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
-    "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "reportTitle": "レポート",
+    "reportDevice": "機器",
+    "reportGroup": "グループ",
+    "reportFrom": "開始日時",
+    "reportTo": "終了日時",
+    "reportShow": "詳細",
+    "reportClear": "クリア",
+    "positionFixTime": "時間",
+    "positionValid": "測位",
+    "positionAccuracy": "推定距離",
+    "positionLatitude": "緯度",
+    "positionLongitude": "経度",
+    "positionAltitude": "高度",
+    "positionSpeed": "速度",
+    "positionCourse": "方角",
+    "positionAddress": "場所",
+    "positionProtocol": "プロトコル",
+    "positionDistance": "距離",
+    "positionRpm": "RPM",
+    "positionFuel": "燃料",
+    "positionPower": "電源",
+    "positionBattery": "バッテリー",
+    "positionRaw": "Raw",
+    "positionIndex": "インデックス",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "衛星",
+    "positionSatVisible": "可視衛星",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "イベント",
+    "positionAlarm": "警報",
+    "positionStatus": "ステータス",
+    "positionOdometer": "走行距離計",
+    "positionServiceOdometer": "サービス走行距離計",
+    "positionTripOdometer": "トリップ走行距離計",
+    "positionHours": "時間",
+    "positionInput": "入力",
+    "positionOutput": "出力",
+    "positionBatteryLevel": "バッテリーレベル",
+    "positionFuelConsumption": "燃料消費",
+    "positionRfid": "RFID",
+    "positionVersionFw": "ファームウェアバージョン",
+    "positionVersionHw": "ハードウェアバージョン",
+    "positionIgnition": "イグニッション",
+    "positionFlags": "フラグ",
+    "positionCharge": "充電",
+    "positionIp": "IP",
+    "positionArchive": "アーカイブ",
+    "positionVin": "VIN",
+    "positionApproximate": "近似",
+    "positionThrottle": "スロットル",
+    "positionMotion": "運動",
+    "positionArmed": "強化",
+    "positionAcceleration": "加速",
+    "positionDeviceTemp": "デバイス温度",
+    "positionOperator": "運用",
+    "positionCommand": "コマンド",
+    "positionBlocked": "ブロック",
+    "positionDtcs": "DTC",
+    "positionObdSpeed": "OBD 速度",
+    "positionObdOdometer": "OBD 走行距離計",
+    "serverTitle": "サーバー設定",
+    "serverZoom": "拡大縮小",
+    "serverRegistration": "新規ユーザー登録を許可",
+    "serverReadonly": "読み取り専用",
+    "serverForceSettings": "強制的に設定",
+    "mapTitle": "地図",
+    "mapLayer": "使用する地図",
+    "mapCustom": "カスタム地図",
+    "mapCarto": "Cartoベースマップ",
+    "mapOsm": "Open Streetマップ",
+    "mapBingKey": "Bingマップキー",
+    "mapBingRoad": "Bingマップ",
+    "mapBingAerial": "Bing航空写真マップ",
+    "mapBingHybrid": "Bingハイブリッドマップ",
+    "mapBaidu": "百度地図",
+    "mapYandexMap": "Yandexマップ",
+    "mapYandexSat": "Yandex衛星写真マップ",
+    "mapShapePolygon": "多角形",
+    "mapShapeCircle": "円形",
+    "mapShapePolyline": "折れ線形",
+    "mapLiveRoutes": "リアルタイム経路",
+    "stateTitle": "状態",
+    "stateName": "属性",
+    "stateValue": "値",
+    "commandTitle": "コマンド",
+    "commandSend": "送信",
+    "commandSent": "コマンドを送信しました",
+    "commandPositionPeriodic": "定期レポート",
+    "commandPositionStop": "レポートを停止",
+    "commandEngineStop": "エンジン停止",
+    "commandEngineResume": "エンジン再始動",
+    "commandFrequency": "周期",
+    "commandUnit": "単位",
+    "commandCustom": "カスタムコマンド",
+    "commandPositionSingle": "シングルレポート",
+    "commandAlarmArm": "警報開始",
+    "commandAlarmDisarm": "警報解除",
+    "commandSetTimezone": "タイムゾーンを設定",
+    "commandRequestPhoto": "写真をリクエスト",
+    "commandRebootDevice": "デバイスを再起動",
+    "commandSendSms": "SMSを送信",
+    "commandSendUssd": "USSDを送信",
+    "commandSosNumber": "SOS送信先電話番号",
+    "commandSilenceTime": "通知OFF時間帯",
+    "commandSetPhonebook": "電話帳設定",
+    "commandSetIndicator": "通知設定",
+    "commandVoiceMessage": "音声メッセージ",
+    "commandOutputControl": "コマンド出力制御",
+    "commandAlarmSpeed": "速度超過警報",
+    "commandDeviceIdentification": "デバイス ID",
+    "commandIndex": "コマンド一覧",
+    "commandData": "データー",
+    "commandPhone": "電話番号",
+    "commandMessage": "メッセージ",
+    "commandTimezone": "世界標準時との時差",
+    "commandgetModemStatus": "モデムステータス",
+    "commandgetDeviceStatus": "デバイスステータス",
+    "eventAll": "全てのイベント",
+    "eventDeviceOnline": "デバイスはオンラインです。",
+    "eventDeviceUnknown": "デバイスの状態が不明です",
+    "eventDeviceOffline": "デバイスはオフラインです。",
+    "eventDeviceMoving": "デバイスは移動中です。",
+    "eventDeviceStopped": "デバイスは停止中です。",
+    "eventDeviceOverspeed": "デバイスが速度超過しています。",
+    "eventDeviceFuelDrop": "燃料ドロップイベント",
+    "eventCommandResult": "コマンド実行結果",
+    "eventGeofenceEnter": "デバイスがジオフェンスに入りました。",
+    "eventGeofenceExit": "デバイスがジオフェンスから出ました。",
+    "eventAlarm": "警報",
+    "eventIgnitionOn": "イグニッション ON",
+    "eventIgnitionOff": "イグニッション OFF",
+    "eventMaintenance": "メンテナンスが必要です。",
+    "eventTextMessage": "テキストメッセージを受信しました。",
+    "eventsScrollToLast": "最後にスクロール",
+    "alarmSos": "SOS警報",
+    "alarmVibration": "振動警報",
+    "alarmMovement": "移動警報",
+    "alarmOverspeed": "速度超過警報",
+    "alarmFallDown": "転倒警報",
+    "alarmLowBattery": "バッテリー残量低下警報",
+    "alarmLowPower": "バッテリー残量低下警報",
+    "alarmFault": "測位失敗警報",
+    "alarmPowerOff": "電源OFF警報",
+    "alarmPowerOn": "電源ON警報",
+    "alarmDoor": "ドア警報",
+    "alarmGeofence": "ジオフェンス警報",
+    "alarmGeofenceEnter": "ジオフェンス進入警報",
+    "alarmGeofenceExit": "ジオフェンス退出警報",
+    "alarmGpsAntennaCut": "GPSアンテナ切断警報",
+    "alarmAccident": "事故警報",
+    "alarmTow": "レッカー移動警報",
+    "alarmHardAcceleration": "急加速警報",
+    "alarmHardBreaking": "急ブレーキ警報",
+    "alarmFatigueDriving": "過労運転警報",
+    "alarmPowerCut": "電源OFF警報",
+    "alarmPowerRestored": "電源回復警報",
+    "alarmJamming": "電波障害警報",
+    "alarmTemperature": "温度警報",
+    "alarmParking": "駐車警報",
+    "alarmShock": "衝撃検知警報",
+    "alarmBonnet": "ボンネット開閉警報",
+    "alarmFootBrake": "フットブレーキ警報",
+    "alarmOilLeak": "オイル漏れ警報",
+    "alarmTampering": "窃盗警報",
+    "alarmRemoving": "警報の削除中",
+    "notificationType": "通知の種別",
+    "notificationWeb": "Web 経由で送信",
+    "notificationMail": "Eメールで送信",
+    "notificationSms": "SMSで送信",
+    "reportRoute": "移動行程",
+    "reportEvents": "イベント",
+    "reportTrips": "走行距離",
+    "reportStops": "停止",
+    "reportSummary": "概要",
+    "reportChart": "図表",
+    "reportConfigure": "設定",
+    "reportEventTypes": "イベント種別",
+    "reportChartType": "図表種別",
+    "reportShowMarkers": "マーカーを表示",
+    "reportExport": "エクスポート",
+    "reportDeviceName": "デバイス名",
+    "reportAverageSpeed": "平均速度",
+    "reportMaximumSpeed": "最高速度",
+    "reportEngineHours": "エンジン稼働時間",
+    "reportDuration": "期間",
+    "reportStartTime": "開始日時",
+    "reportStartAddress": "出発地",
+    "reportEndTime": "終了日時",
+    "reportEndAddress": "到着地",
+    "reportSpentFuel": "燃料消費量",
+    "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": "トラクター",
+    "categoryTruck": "貨物車",
+    "categoryVan": "バン"
 }
\ No newline at end of file
diff --git a/web/l10n/ka.json b/web/l10n/ka.json
index 72c82cc4..61f9c74b 100644
--- a/web/l10n/ka.json
+++ b/web/l10n/ka.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Distance",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "შეცდომა",
-    "errorUnknown": "უცნობი შეცდომა",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "კავშირის შეცდომა",
     "errorSocket": "Web socket connection error",
     "userEmail": "ელ-ფოსტა",
@@ -119,6 +151,51 @@
     "positionAddress": "მისამართი",
     "positionProtocol": "პროტოკოლი",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "სერვერის პარამეტრები",
     "serverZoom": "ზუმი",
     "serverRegistration": "რეგისტრაცია",
@@ -174,6 +251,8 @@
     "commandPhone": "Phone Number",
     "commandMessage": "Message",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "Device is online",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Device is moving",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "Device exceeds the speed",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Command result",
     "eventGeofenceEnter": "Device has entered geofence",
     "eventGeofenceExit": "Device has exited geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Type of Notification",
     "notificationWeb": "Send via Web",
     "notificationMail": "Send via Mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/kk.json b/web/l10n/kk.json
new file mode 100644
index 00000000..670996c6
--- /dev/null
+++ b/web/l10n/kk.json
@@ -0,0 +1,356 @@
+{
+    "sharedLoading": "Жүктеу...",
+    "sharedHide": "Жасыру",
+    "sharedSave": "Сақтау",
+    "sharedSet": "Орнату",
+    "sharedCancel": "Болдырмау",
+    "sharedAdd": "Енгізу",
+    "sharedEdit": "Түзету",
+    "sharedRemove": "Жою",
+    "sharedRemoveConfirm": "Элементті жою?",
+    "sharedKm": "км",
+    "sharedMi": "мили",
+    "sharedNmi": "теңіз мили",
+    "sharedKn": "тораптар",
+    "sharedKmh": "км/сағ",
+    "sharedMph": "миля/сағ",
+    "sharedHour": "Сағаттар",
+    "sharedMinute": "Минуттар",
+    "sharedSecond": "Секундтар",
+    "sharedDays": "күндер",
+    "sharedHours": "сағат",
+    "sharedMinutes": "минут",
+    "sharedDecimalDegrees": "Ондық Градустар",
+    "sharedDegreesDecimalMinutes": "Градустар Ондық Минуттар",
+    "sharedDegreesMinutesSeconds": "Градустар Минуттар Секундтар",
+    "sharedName": "Атауы",
+    "sharedDescription": "Сипаттамасы",
+    "sharedSearch": "Іздеу",
+    "sharedGeofence": "Геозона",
+    "sharedGeofences": "Геозоналар",
+    "sharedNotifications": "Ескертулер",
+    "sharedAttributes": "Атрибуттар",
+    "sharedAttribute": "Атрибут",
+    "sharedArea": "Аймақ",
+    "sharedSound": "Дыбыстық Ескерту",
+    "sharedType": "Түр",
+    "sharedDistance": "Қашықтық",
+    "sharedHourAbbreviation": "с",
+    "sharedMinuteAbbreviation": "м",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
+    "sharedGetMapState": "Картаның Жағдайын Білу",
+    "sharedAttributeAlias": "Атрибут Лақап Аты",
+    "sharedAttributeAliases": "Атрибуттар Лақап Аттары ",
+    "sharedAlias": "Лақап ат",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
+    "sharedDeviceDistance": "Құрылғы Жылдамдығы",
+    "sharedDevice": "Құрылғы",
+    "sharedTestNotification": "Тестілік Хабарландыру Жіберу",
+    "sharedCalendar": "Күнтізбе",
+    "sharedCalendars": "Күнтізбелер",
+    "sharedFile": "Файл",
+    "sharedSelectFile": "Файлды таңдау",
+    "sharedPhone": "Телефон",
+    "sharedRequired": "Міндетті",
+    "sharedPreferences": "Баптау",
+    "sharedPermissions": "Рұқсат",
+    "sharedExtra": "Экстра",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
+    "sharedTimezone": "Сағаттық белдеу",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Жылдамдықты Шектеу",
+    "attributeReportIgnoreOdometer": "Есеп: одометр елемеу",
+    "attributeMaintenanceStart": "Техникалық қызмет көрсету: Бастау",
+    "attributeMaintenanceInterval": "Техникалық қызмет көрсету: Интервал",
+    "attributeWebReportColor": "Веб: Түсі Есеп",
+    "attributeDevicePassword": "Құрылғы Құпия Сөз",
+    "attributeProcessingCopyAttributes": "Өңдеу: атрибуттары көшіру",
+    "attributeColor": "Түс",
+    "attributeWebLiveRouteLength": "Веб: Белсенді Маршруттың Ұзындығы",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "attributeMailSmtpHost": "Mail: SMTP Host",
+    "attributeMailSmtpPort": "Mail: SMTP Port",
+    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable",
+    "attributeMailSmtpStarttlsRequired": "Пошта: SMTP STARTTLS Required",
+    "attributeMailSmtpSslEnable": "Пошта: SMTP SSL Включить",
+    "attributeMailSmtpSslTrust": "Пошта: SMTP SSL Trust",
+    "attributeMailSmtpSslProtocols": "Пошта: SMTP SSL Протокол ",
+    "attributeMailSmtpFrom": "Пошта: SMTP From",
+    "attributeMailSmtpAuth": "Пошта: SMTP Auth Enable",
+    "attributeMailSmtpUsername": "Пошта: SMTP Пайдаланушы",
+    "attributeMailSmtpPassword": "Пошта: SMTP Құпиясөз",
+    "errorTitle": "Қате",
+    "errorGeneral": "Қолайсыз бұзылуы параметрлері немесе шектеулер",
+    "errorConnection": "Қосылу қатесі",
+    "errorSocket": "Web socket біріктіру қатесі",
+    "userEmail": "Email",
+    "userPassword": "Құпиясөз",
+    "userAdmin": "Әкімші",
+    "userRemember": "Еске сақтау",
+    "userDisabled": "Өшірілген",
+    "userExpirationTime": "Қолданылу мерзімі",
+    "userDeviceLimit": "Құрылғыларды Шектеу",
+    "userUserLimit": "Қолданушылар Лимиті",
+    "userDeviceReadonly": "Құрылғыларды қарау ғана",
+    "userToken": "Кілт",
+    "loginTitle": "Кіру",
+    "loginLanguage": "Тіл",
+    "loginRegister": "Тіркеу",
+    "loginLogin": "Кіру",
+    "loginFailed": "Қате email немесе пароль",
+    "loginCreated": "Жаңа қолданушы тіркелді",
+    "loginLogout": "Шығу",
+    "loginLogo": "Логотип",
+    "devicesAndState": "Құрылғылар және Жай - күйлер",
+    "deviceTitle": "Құрылғылар",
+    "deviceIdentifier": "Идентификатор",
+    "deviceModel": "Моделі",
+    "deviceContact": "Байланыс",
+    "deviceCategory": "Санат",
+    "deviceLastUpdate": "Соңғы жаңарту",
+    "deviceCommand": "Команда",
+    "deviceFollow": "Ілесу",
+    "deviceTotalDistance": "Жалпы Тармақ",
+    "deviceStatus": "Мәртебе",
+    "deviceStatusOnline": "Онлайн",
+    "deviceStatusOffline": "Оффлайн",
+    "deviceStatusUnknown": "Белгісіз",
+    "groupDialog": "Топ",
+    "groupParent": "Топ",
+    "groupNoGroup": "Топсыз",
+    "settingsTitle": "Баптау",
+    "settingsUser": "Аккаунт",
+    "settingsGroups": "Топтар",
+    "settingsServer": "Сервер",
+    "settingsUsers": "Қолданушылар",
+    "settingsSpeedUnit": "Жылдамдық",
+    "settingsTwelveHourFormat": "12 сағаттық пішім",
+    "settingsCoordinateFormat": "Координат пішімі",
+    "reportTitle": "Есептер",
+    "reportDevice": "Құрылғы",
+    "reportGroup": "Топ",
+    "reportFrom": "Бастап",
+    "reportTo": "Дейін",
+    "reportShow": "Көрсету",
+    "reportClear": "Тазарту",
+    "positionFixTime": "Уақыт",
+    "positionValid": "Туралық",
+    "positionAccuracy": "Нақтылық",
+    "positionLatitude": "Ендігі",
+    "positionLongitude": "Ұзақтығы",
+    "positionAltitude": "Биіктігі",
+    "positionSpeed": "Жылдамдық",
+    "positionCourse": "Бағыты",
+    "positionAddress": "Мекен-жай",
+    "positionProtocol": "Хаттама",
+    "positionDistance": "Қашықтық",
+    "positionRpm": "RPM",
+    "positionFuel": "Отын",
+    "positionPower": "Қуат көзі",
+    "positionBattery": "Аккумулятор",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
+    "serverTitle": "Серверді баптау",
+    "serverZoom": "Жақындау",
+    "serverRegistration": "Тіркеу",
+    "serverReadonly": "Тек қарап шығу",
+    "serverForceSettings": "Баптауды жылдамдату",
+    "mapTitle": "Карта",
+    "mapLayer": "Карта қабаты",
+    "mapCustom": "Қолданушы Картасы",
+    "mapCarto": "Carto Basemaps",
+    "mapOsm": "Open Street Map",
+    "mapBingKey": "Bing Maps кілті",
+    "mapBingRoad": "Bing Maps жолдары",
+    "mapBingAerial": "Bing Maps Жер серігі",
+    "mapBingHybrid": "Bing Maps Будан",
+    "mapBaidu": "Baidu",
+    "mapYandexMap": "Яндекс Карталар",
+    "mapYandexSat": "Яндекс Жер серіктері",
+    "mapShapePolygon": "Көпбұрыш",
+    "mapShapeCircle": "Шеңбер",
+    "mapShapePolyline": "Сызық",
+    "mapLiveRoutes": "Нақты бағыттар",
+    "stateTitle": "Жай күйі",
+    "stateName": "Параметрі",
+    "stateValue": "Мағынасы",
+    "commandTitle": "Команда",
+    "commandSend": "Жіберу",
+    "commandSent": "Команда жіберілді",
+    "commandPositionPeriodic": "Қадағалауды бастау",
+    "commandPositionStop": "Қадағалауды болдырмау",
+    "commandEngineStop": "Қозғалтқышты бұғаттау",
+    "commandEngineResume": "Қозғалтқышты бұғаттан шығару",
+    "commandFrequency": "Жиілік",
+    "commandUnit": "Бірліктер",
+    "commandCustom": "Қолданушылар командасы",
+    "commandPositionSingle": "Біржолғы қадағалау",
+    "commandAlarmArm": "Сигнал жабдығын іске қосу",
+    "commandAlarmDisarm": "Сигнал жабдығын істен айыру",
+    "commandSetTimezone": "Сағаттық белдеуді баптау",
+    "commandRequestPhoto": "Фото сұрау",
+    "commandRebootDevice": "Құрылғыны қайта жүктеу",
+    "commandSendSms": "СМС жіберу",
+    "commandSendUssd": "USSD жіберу",
+    "commandSosNumber": "Төтенше нөмірді баптау",
+    "commandSilenceTime": "Тыныштық уақытын баптау",
+    "commandSetPhonebook": "Телефон анықтамасын баптау",
+    "commandSetIndicator": "Индикаторды орнату",
+    "commandVoiceMessage": "Дыбыстық хабарлама",
+    "commandOutputControl": "Шығуды бақылау",
+    "commandAlarmSpeed": "Жылдамдықты көбейту",
+    "commandDeviceIdentification": "Құрылғы идентификациясы",
+    "commandIndex": "Индексі",
+    "commandData": "Мәліметтер",
+    "commandPhone": "Телефон нөмірі",
+    "commandMessage": "Хабарлама",
+    "commandTimezone": "Уақытша аймақты жылжыту",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
+    "eventAll": "Барлық",
+    "eventDeviceOnline": "Құрылғы желіде",
+    "eventDeviceUnknown": "Құрылғы мәртебесі белгісіз",
+    "eventDeviceOffline": "Құрылғы желіде жоқ",
+    "eventDeviceMoving": "Құрылғы қозғалады",
+    "eventDeviceStopped": "Құрылғы тоқтады",
+    "eventDeviceOverspeed": "Құрылғы жылдамдықты арттырады",
+    "eventDeviceFuelDrop": "Отын қысқарту оқиға",
+    "eventCommandResult": "Команда нәтижесі",
+    "eventGeofenceEnter": "Құрылғы геозонаға ауысты",
+    "eventGeofenceExit": "Құрылғы геозонадан айырылды",
+    "eventAlarm": "Қауіптер",
+    "eventIgnitionOn": "ВКЛ жағу",
+    "eventIgnitionOff": "ВЫКЛ жағу",
+    "eventMaintenance": "Қызмет көрсету геозону",
+    "eventTextMessage": "Мәтіндік хабарлама алынды",
+    "eventsScrollToLast": "Scroll To Last",
+    "alarmSos": "SOS дабыл",
+    "alarmVibration": "Вибрация қауіпі",
+    "alarmMovement": "Сигнал беру қауіпі",
+    "alarmOverspeed": "Жылдамдықты арттыру қауіпі",
+    "alarmFallDown": "Төмендеу қауіпі",
+    "alarmLowBattery": "Батареяны тоғынан ажырату қауіпі",
+    "alarmLowPower": "Төмен қуат деңгейі қауіпі",
+    "alarmFault": "Жарамсыздық қауіпі",
+    "alarmPowerOff": "Жарамсыздық қауіпі",
+    "alarmPowerOn": "Іске қосу қауіпі",
+    "alarmDoor": "Есік қауіпі",
+    "alarmGeofence": "Геозона қауіпі",
+    "alarmGeofenceEnter": "Геозонға кіру қауіпі",
+    "alarmGeofenceExit": "Геозонадан щығу қауіпі",
+    "alarmGpsAntennaCut": "GPS-антенналарды айыру қауіпі",
+    "alarmAccident": "Жол апаты қауіпі",
+    "alarmTow": "Тіркеп сүйреу қауіпі",
+    "alarmHardAcceleration": "Оқыс жеделдету қауіпі",
+    "alarmHardBreaking": "Оқыс тежелу қауіпі",
+    "alarmFatigueDriving": "Жүргізушінің шаршау қауіпі",
+    "alarmPowerCut": "Қуат көзі алып тастау қауіпі",
+    "alarmPowerRestored": "Қуат көзі келтірілді қауіпі",
+    "alarmJamming": "Өшіру қауіпі",
+    "alarmTemperature": "Температура қауіпі",
+    "alarmParking": "Көлік қою қауіпі",
+    "alarmShock": "Шок қауіпі",
+    "alarmBonnet": "Кақпақ қауіпі",
+    "alarmFootBrake": "Аяқ тежеуіш қауіпі",
+    "alarmOilLeak": "Отынның азаю қауіпі",
+    "alarmTampering": "Араласу қауіпі",
+    "alarmRemoving": "Removing Alarm",
+    "notificationType": "Ескерту түрі",
+    "notificationWeb": "Web арқылы жіберу",
+    "notificationMail": "Пошта арқылы жіберу",
+    "notificationSms": "СМС арқылы жіберу",
+    "reportRoute": "Бағыт",
+    "reportEvents": "Оқиғалар",
+    "reportTrips": "Сапарлар",
+    "reportStops": "Stops",
+    "reportSummary": "Мәлімет",
+    "reportChart": "Диаграмма",
+    "reportConfigure": "Конфигурациялау",
+    "reportEventTypes": "Оқиға түрі",
+    "reportChartType": "Түр Диаграммалар",
+    "reportShowMarkers": "Маркерлер көрсету",
+    "reportExport": "Экспорт",
+    "reportDeviceName": "Құрылғы атауы",
+    "reportAverageSpeed": "Орташа жылдамдық",
+    "reportMaximumSpeed": "Максималды жылдамдық",
+    "reportEngineHours": "Мотосағат",
+    "reportDuration": "Ұзақтығы",
+    "reportStartTime": "Бастапқы уақыт",
+    "reportStartAddress": "Бастапқы мекен-жай",
+    "reportEndTime": "Ақырғы уақыт",
+    "reportEndAddress": "Ақырғы мекен-жай",
+    "reportSpentFuel": "Отын пайдаланылды",
+    "statisticsTitle": "Статистика",
+    "statisticsCaptureTime": "Жинау уақыты",
+    "statisticsActiveUsers": "Белсенді қолданушылар",
+    "statisticsActiveDevices": "Белсенді құрылғылар",
+    "statisticsRequests": "Сұраныстар",
+    "statisticsMessagesReceived": "Хабарлама алынды",
+    "statisticsMessagesStored": "Хабарлама сақталды",
+    "statisticsGeocoder": "Геокодер Сұраулар",
+    "statisticsGeolocation": "Геолокация Сұраулар",
+    "categoryArrow": "Тетік",
+    "categoryDefault": "Қалып бойынша",
+    "categoryAnimal": "Жануар",
+    "categoryBicycle": "Велосипед",
+    "categoryBoat": "Boat",
+    "categoryBus": "Автобус",
+    "categoryCar": "Автомобиль",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
+    "categoryMotorcycle": "Мотоцикл",
+    "categoryOffroad": "Offroad",
+    "categoryPerson": "Адам",
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Ұшақ",
+    "categoryShip": "Кеме",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Жүк автомобилі",
+    "categoryVan": "Van"
+}
\ No newline at end of file
diff --git a/web/l10n/km.json b/web/l10n/km.json
index bbe8f8d2..53fbe591 100644
--- a/web/l10n/km.json
+++ b/web/l10n/km.json
@@ -37,10 +37,17 @@
     "sharedDistance": "ចម្ងាយ",
     "sharedHourAbbreviation": "ម៉ោង",
     "sharedMinuteAbbreviation": "នាទី",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "ទទួលបានការកំណត់ផែនទី",
     "sharedAttributeAlias": "គុណលក្ខណៈហៅក្រៅ",
     "sharedAttributeAliases": "គុណលក្ខណៈ",
     "sharedAlias": "ឈ្មោះហៅក្រៅ",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "ចម្ងាយឧបករណ៍",
     "sharedDevice": "ឧបករណ៍",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "កំហុស",
-    "errorUnknown": "កំហុសកំណត់មិនបាន",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "កំហុសក្នុងការតភ្ជាប់",
     "errorSocket": "កំហុសក្នុងការតភ្ជាប់ Web socket",
     "userEmail": "អ៊ីម៉ែល",
@@ -119,6 +151,51 @@
     "positionAddress": "អាសយដ្ឋាន",
     "positionProtocol": "ពិធីការ",
     "positionDistance": "ចម្ងាយ",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "ការកំណត់ម៉ាស៊ីនមេ",
     "serverZoom": "ពង្រីក",
     "serverRegistration": "ការចុះឈ្មោះ",
@@ -174,6 +251,8 @@
     "commandPhone": "លេខទូរសព្ទ",
     "commandMessage": "សារ",
     "commandTimezone": "តំបន់ពេលវេលា",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "ព្រឹត្តិការណ៍ទាំងអស់",
     "eventDeviceOnline": "ឧបករណ៍លើបណ្តាញ",
     "eventDeviceUnknown": "ស្ថានភាពឧបករណ៍គឺមិនស្គាល់",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "ឧបករណ៍ធ្វើចលនា",
     "eventDeviceStopped": "ឧបករណ៍បានបញ្ឈប់",
     "eventDeviceOverspeed": "ឧបករណ៍ដើរលើសពីល្បឿនកំណត់",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "លទ្ធផលពាក្យបញ្ជា",
     "eventGeofenceEnter": "ឧបករណ៍បានចូលភូមិសាស្ត្រ​​​​​​​​​កំណត់",
     "eventGeofenceExit": "ឧបករណ៍បានចេញពីភូមិសាស្ត្រ​​​​​​​​​កំណត់",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "ចំណុចបញ្ឆេះត្រូវបានបិទ",
     "eventMaintenance": "ថែទាំត្រូវការជាចាំបាច់",
     "eventTextMessage": "Text message received",
-    "alarm": "សំឡេងរោទិ៍",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "សំឡេងរោទិ៍SOS",
     "alarmVibration": "សំឡេងរោទិ៍រំញ័រ",
     "alarmMovement": "សំឡេងរោទិ៍ពីចលនា",
     "alarmOverspeed": "សំឡេងរោទិ៍ន​​ល្បឿនហួសកំណត់",
     "alarmFallDown": "សំឡេងរោទិ៍ពីការដួល",
     "alarmLowBattery": "សំឡេងរោទិ៍ថ្មទាប",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "សំឡេងរោទិ៍អំពីកំហុស",
     "alarmPowerOff": "Power Off Alarm",
     "alarmPowerOn": "Power On Alarm",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "ប្រភេទការជូនដំណឹង",
     "notificationWeb": "ផ្ញើតាមរយៈបណ្ដាញWeb",
     "notificationMail": "ផ្ញើតាមសំបុត្រ",
@@ -225,6 +308,7 @@
     "reportRoute": "ផ្លូវ",
     "reportEvents": "ព្រឹត្តិការណ៍",
     "reportTrips": "ការ​ធ្វើដំណើរ",
+    "reportStops": "Stops",
     "reportSummary": "សេចក្តីសង្ខេប",
     "reportChart": "គំនូសតាង",
     "reportConfigure": "កំណត់រចនាសម្ព័ន្ធ",
@@ -249,15 +333,24 @@
     "statisticsRequests": "សំណើ",
     "statisticsMessagesReceived": "សារដែលបានទទួល",
     "statisticsMessagesStored": "សារដែលបានរក្សាទុក",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "ព្រួញ",
     "categoryDefault": "លំនាំដើម",
-    "categoryCar": "រថយន្ត",
+    "categoryAnimal": "សត្វ",
+    "categoryBicycle": "កង់",
+    "categoryBoat": "Boat",
     "categoryBus": "រថយន្ដក្រុង",
-    "categoryTruck": "រថយន្តដឹកទំនិញ",
-    "categoryShip": "នាវា",
-    "categoryPlane": "យន្តហោះ",
+    "categoryCar": "រថយន្ត",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "ម៉ូតូ",
-    "categoryBicycle": "កង់",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "មនុស្ស",
-    "categoryAnimal": "សត្វ"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "យន្តហោះ",
+    "categoryShip": "នាវា",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "រថយន្តដឹកទំនិញ",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/ko.json b/web/l10n/ko.json
index f8ceb52a..2ee70348 100644
--- a/web/l10n/ko.json
+++ b/web/l10n/ko.json
@@ -37,10 +37,17 @@
     "sharedDistance": "거리",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "지도 상태 가져 오기",
     "sharedAttributeAlias": "속성 별칭",
     "sharedAttributeAliases": "속성 별칭",
     "sharedAlias": "별칭",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "장치 거리",
     "sharedDevice": "장치",
     "sharedTestNotification": "테스트 알림 보내기",
@@ -53,9 +60,34 @@
     "sharedPreferences": "환경 설정",
     "sharedPermissions": "권한",
     "sharedExtra": "특별한 것",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "시간대",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "오류",
-    "errorUnknown": "모르는 오류",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "연결오류",
     "errorSocket": "웹 소켓 연결 오류",
     "userEmail": "이메일",
@@ -119,6 +151,51 @@
     "positionAddress": "주소",
     "positionProtocol": "프로토콜",
     "positionDistance": "거리",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "서버설정",
     "serverZoom": "줌",
     "serverRegistration": "등록",
@@ -174,6 +251,8 @@
     "commandPhone": "전화번호",
     "commandMessage": "메세지",
     "commandTimezone": "시간대 옵셋",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "모든 이벤트",
     "eventDeviceOnline": "장치는 온라인입니다.",
     "eventDeviceUnknown": "장치상태는 모릅니다.",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "장치는 움직입니다.",
     "eventDeviceStopped": "장치가 멈췄습니다.",
     "eventDeviceOverspeed": "장치는 과속했습니다.",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "명령결과",
     "eventGeofenceEnter": "장치가 지리적울타리에 들어왔습니다.",
     "eventGeofenceExit": "장치가 지리적울타리 밖으로 나갔습니다.",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "점화되지 않았습니다.",
     "eventMaintenance": "유지보수가 필요",
     "eventTextMessage": "텍스트 메세지 받았습니다.",
-    "alarm": "경보",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "긴급경보",
     "alarmVibration": "진동 경보",
     "alarmMovement": "운동 경보",
     "alarmOverspeed": "과속 경보",
     "alarmFallDown": "낙석 경보",
     "alarmLowBattery": "낮은배터리 경보",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "실패 경보",
     "alarmPowerOff": "전원 꺼짐 경보",
     "alarmPowerOn": "전원 켜짐 경보",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "하드 브레이킹 경보",
     "alarmFatigueDriving": "피로 운전 경보",
     "alarmPowerCut": "파워 절단 경보",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "방해 경보",
     "alarmTemperature": "온도 경보",
     "alarmParking": "주차 경보",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "발 브레이크 경보",
     "alarmOilLeak": "기름 누수 경보",
     "alarmTampering": "변조 경보",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "알림 유형",
     "notificationWeb": "웹경유 보내기",
     "notificationMail": "메일경유 보내기",
@@ -225,6 +308,7 @@
     "reportRoute": "노선",
     "reportEvents": "이벤트",
     "reportTrips": "여행",
+    "reportStops": "Stops",
     "reportSummary": "요약",
     "reportChart": "차트",
     "reportConfigure": "구성",
@@ -249,15 +333,24 @@
     "statisticsRequests": "요청",
     "statisticsMessagesReceived": "받은 메시지",
     "statisticsMessagesStored": "저장한 메세지",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "화살",
     "categoryDefault": "디폴트",
-    "categoryCar": "차",
+    "categoryAnimal": "동물",
+    "categoryBicycle": "자전거",
+    "categoryBoat": "Boat",
     "categoryBus": "버스",
-    "categoryTruck": "트럭",
-    "categoryShip": "배",
-    "categoryPlane": "비행기",
+    "categoryCar": "차",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "오토바이",
-    "categoryBicycle": "자전거",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "사람",
-    "categoryAnimal": "동물"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "비행기",
+    "categoryShip": "배",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "트럭",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/lo.json b/web/l10n/lo.json
index ec3f2547..69f82eeb 100644
--- a/web/l10n/lo.json
+++ b/web/l10n/lo.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Distance",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "ຜິດພາດ",
-    "errorUnknown": "ຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ຈັກ",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "ການເຊື່ອມຕໍ່ຜິດພາດ",
     "errorSocket": "Web socket connection error",
     "userEmail": "ອີເມວ",
@@ -119,6 +151,51 @@
     "positionAddress": "ທີ່ຢູ່",
     "positionProtocol": "ໂປຣໂຕຄໍລ໌",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "ການຕັ້ງຄ່າເຊີເວີ້",
     "serverZoom": "ຂະຫຍາຍ +/-",
     "serverRegistration": "ລົງທະບຽນ",
@@ -174,6 +251,8 @@
     "commandPhone": "Phone Number",
     "commandMessage": "Message",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "ອຸປະກອນເຊື່ອມຕໍ່ແລ້ວ",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "ອຸປະກອນກຳລັງເຄື່ອນທີ່",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "ອຸປະກອນເກີນກຳນົດຄວາມໄວ",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "ຜົນຮັບຈາກຄຳສັ່ງ",
     "eventGeofenceEnter": "ອຸປະກອນເຂົ້າໃນເຂດພື້ນທີ່",
     "eventGeofenceExit": "ອຸປະກອນອອກນອກເຂດພື້ນທີ່",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "ແຈ້ງເຕືອນ",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "ແຈ້ງເຕືອນ SOS",
     "alarmVibration": "ແຈ້ງເຕືອນແບບສັ່ນ",
     "alarmMovement": "ແຈ້ງເຕືອນມີການເຄື່ອນທີ່",
     "alarmOverspeed": "ແຈ້ງເຕືອນຄວາມໄວສູງເກີນກຳນົດ",
     "alarmFallDown": "ແຈ້ງເຕືອນການຕົກ",
     "alarmLowBattery": "ແຈ້ງເຕືອນແບັດເຕີລີ້ອ່ອນ",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "ແຈ້ງເຕື່ອນຜິດພາດ",
     "alarmPowerOff": "Power Off Alarm",
     "alarmPowerOn": "Power On Alarm",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "ຊະນິດການແຈ້ງເຕືອນ",
     "notificationWeb": "ສົ່ງທາງເວັບ",
     "notificationMail": "ສົ່ງທາງເມວ",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/lt.json b/web/l10n/lt.json
index 4df07996..66525dac 100644
--- a/web/l10n/lt.json
+++ b/web/l10n/lt.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Distance",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "Klaida",
-    "errorUnknown": "Nenumatyta klaida",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Ryšio klaida",
     "errorSocket": "Web socket connection error",
     "userEmail": "Vartotojo vardas",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresas",
     "positionProtocol": "Protokolas",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Serverio nustatymai",
     "serverZoom": "Priartinimas",
     "serverRegistration": "Registracija",
@@ -174,6 +251,8 @@
     "commandPhone": "Phone Number",
     "commandMessage": "Message",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "Device is online",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Device is moving",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "Device exceeds the speed",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Command result",
     "eventGeofenceEnter": "Device has entered geofence",
     "eventGeofenceExit": "Device has exited geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Type of Notification",
     "notificationWeb": "Send via Web",
     "notificationMail": "Send via Mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/ml.json b/web/l10n/ml.json
index fbfa16d4..4a274728 100644
--- a/web/l10n/ml.json
+++ b/web/l10n/ml.json
@@ -1,68 +1,100 @@
 {
     "sharedLoading": "ലോഡുചെയ്യുന്നു ..",
     "sharedHide": "മറയ്ക്കുക",
-    "sharedSave": "രക്ഷിക്കും",
-    "sharedSet": "ഗണം",
+    "sharedSave": "സേവ്",
+    "sharedSet": "സെറ്റ്",
     "sharedCancel": "റദ്ദാക്കുക",
     "sharedAdd": "ചേര്‍ക്കുക",
     "sharedEdit": "തിരുത്തുക",
     "sharedRemove": "നീക്കം ചെയ്യുക",
-    "sharedRemoveConfirm": "വിഷയം നീക്കം ചെയ്യുക",
-    "sharedKm": "കിലോമീറ്റർ",
-    "sharedMi": "നാഴിക",
-    "sharedNmi": "nmi",
-    "sharedKn": "കുരുക്ക്",
-    "sharedKmh": "കിലോമീറ്റർ / മണിക്കൂർ",
-    "sharedMph": "മണിക്കൂറിൽ മൈൽ",
-    "sharedHour": "മണിക്കൂര്",
+    "sharedRemoveConfirm": "ഐറ്റം നീക്കം ചെയ്യട്ടെ ?",
+    "sharedKm": "കി.മീ.",
+    "sharedMi": "മൈൽ",
+    "sharedNmi": "നൗട്ടിക്കൽ മൈൽ",
+    "sharedKn": "കനോട്സ്",
+    "sharedKmh": "കിലോമീറ്റർ /മണിക്കൂർ",
+    "sharedMph": "മൈൽസ് / മണിക്കൂർ",
+    "sharedHour": "മണിക്കൂർ",
     "sharedMinute": "മിനിറ്റ്",
     "sharedSecond": "സെക്കന്റ്",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "ദിവസങ്ങൾ ",
+    "sharedHours": "മണിക്കൂറുകൾ",
+    "sharedMinutes": "മിനിറ്റ് ",
     "sharedDecimalDegrees": "ദശാംശ ഡിഗ്രി",
-    "sharedDegreesDecimalMinutes": "Degrees Decimal Minutes",
-    "sharedDegreesMinutesSeconds": "Degrees Minutes Seconds",
+    "sharedDegreesDecimalMinutes": "ഡിഗ്രി ദശാംശ മിനിറ്റ് ",
+    "sharedDegreesMinutesSeconds": "ഡിഗ്രി മിനിറ്റ് സെക്കൻഡ് ",
     "sharedName": "പേര്",
     "sharedDescription": "വിവരണം",
-    "sharedSearch": "തിരയൽ",
-    "sharedGeofence": "എർത്ത് വേലി",
-    "sharedGeofences": "ശില്പ്പശാല എർത്ത്",
+    "sharedSearch": "സെർച്ച് ",
+    "sharedGeofence": "ജിയോഫെൻസ് ",
+    "sharedGeofences": "ജിയോഫെൻസെസ് ",
     "sharedNotifications": "അറിയിപ്പുകൾ",
-    "sharedAttributes": "ഗുണവിശേഷങ്ങൾ",
-    "sharedAttribute": "ഗുണവിശേഷങ്ങ",
-    "sharedArea": "പ്രദേശം",
-    "sharedSound": "Notification Sound",
-    "sharedType": "ടൈപ്പ് ചെയ്യുക",
-    "sharedDistance": "അകലം",
-    "sharedHourAbbreviation": "h",
-    "sharedMinuteAbbreviation": "m",
-    "sharedGetMapState": "Get Map State",
-    "sharedAttributeAlias": "Attribute Alias",
-    "sharedAttributeAliases": "Attribute Aliases",
+    "sharedAttributes": "Attributes",
+    "sharedAttribute": "Attribute",
+    "sharedArea": "ഏരിയ",
+    "sharedSound": "അറിയിപ്പ് ശബ്ദം",
+    "sharedType": "ടൈപ്പ്",
+    "sharedDistance": "ദൂരം ",
+    "sharedHourAbbreviation": "മണിക്കൂർ ",
+    "sharedMinuteAbbreviation": "മിനിറ്റ് ",
+    "sharedVoltAbbreviation": "വോൾട്ട് ",
+    "sharedLiterAbbreviation": "ലിറ്റർ ",
+    "sharedLiterPerHourAbbreviation": "ലിറ്റർ / മണിക്കൂർ ",
+    "sharedGetMapState": "മാപ് സ്റ്റേറ്റ് ലഭ്യമാക്കുക ",
+    "sharedAttributeAlias": "അട്രീബൂട്ട് അലിയാസ്",
+    "sharedAttributeAliases": "അട്രീബൂട്ട് അലിയാസസ് ",
     "sharedAlias": "അപരാഭിധാനം",
-    "sharedDeviceDistance": "Device Distance",
-    "sharedDevice": "ഉപകരണം",
-    "sharedTestNotification": "Send Test Notification",
-    "sharedCalendar": "പഞ്ചാംഗം",
-    "sharedCalendars": "Calendars",
-    "sharedFile": "ഫയല്",
+    "sharedComputedAttribute": "കമ്പ്യൂട്ടേഡ്‌ അട്രീബൂട്ട് ",
+    "sharedComputedAttributes": "കമ്പ്യൂട്ടേഡ്‌ അട്രിബൂട്ടുകൾ ",
+    "sharedCheckComputedAttribute": "കമ്പ്യൂട്ടേഡ്‌ അട്രീബൂട്ട് പരിശോധിക്കുക ",
+    "sharedExpression": "എക്സ്പ്രെഷൻ ",
+    "sharedDeviceDistance": "വാഹനം ഓടിയ ദൂരം ",
+    "sharedDevice": "വാഹനം",
+    "sharedTestNotification": "ടെസ്റ്റ് നോട്ടിഫിക്കേഷൻ അയക്കുക ",
+    "sharedCalendar": "കലണ്ടർ ",
+    "sharedCalendars": "കലണ്ടറുകൾ ",
+    "sharedFile": "ഫയൽ ",
     "sharedSelectFile": "ഫയൽ തിരഞ്ഞെടുക്കുക",
-    "sharedPhone": "Phone",
-    "sharedRequired": "Required",
-    "sharedPreferences": "Preferences",
-    "sharedPermissions": "Permissions",
-    "sharedExtra": "Extra",
-    "sharedTimezone": "Timezone",
-    "errorTitle": "പിശക്‌",
-    "errorUnknown": "അജ്ഞാത പിശക്",
-    "errorConnection": "കണക്ഷൻ പിശക്",
-    "errorSocket": "Web socket connection error",
+    "sharedPhone": "ഫോൺ",
+    "sharedRequired": "അനിവാര്യം",
+    "sharedPreferences": "ഇഷ്ടങ്ങൾ ",
+    "sharedPermissions": "പെർമിഷനുകൾ",
+    "sharedExtra": "എക്സ്ട്രാ ",
+    "sharedTypeString": "സ്ട്രിംഗ്",
+    "sharedTypeNumber": "നമ്പർ ",
+    "sharedTypeBoolean": "ബൂളിയാൻ ",
+    "sharedTimezone": "ടൈം സോൺ ",
+    "sharedInfoTitle": "ഇൻഫോ ",
+    "attributeSpeedLimit": "സ്പീഡ് ലിമിറ്റ്‌ ",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
+    "errorTitle": "എറർ !",
+    "errorGeneral": "പാരാമീറ്റർ  എറർ !",
+    "errorConnection": "കണക്ഷൻ എറർ !",
+    "errorSocket": "വെബ് സോക്കറ്റ് കണക്ഷൻ എറർ !",
     "userEmail": "ഇമെയിൽ",
-    "userPassword": "രഹസ്യ കോഡ്‌",
-    "userAdmin": "നിർവാജി ",
-    "userRemember": "Remember",
-    "userDisabled": "അപ്രാപ്തമാക്കി",
+    "userPassword": "പാസ്സ്‌വേർഡ് ",
+    "userAdmin": "അഡ്മിൻ ",
+    "userRemember": "ഓർത്തിരിക്കുക ",
+    "userDisabled": "ഡിസേയ്ബിൾ !",
     "userExpirationTime": "Expiration",
     "userDeviceLimit": "Device Limit",
     "userUserLimit": "User Limit",
@@ -119,6 +151,51 @@
     "positionAddress": "Address",
     "positionProtocol": "Protocol",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Server Settings",
     "serverZoom": "വലുതാക്കിയോ ചെറുതാക്കിയോ കാണിക്കുക",
     "serverRegistration": "രജിസ്ട്രേഷൻ",
@@ -174,6 +251,8 @@
     "commandPhone": "Phone Number",
     "commandMessage": "Message",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "Device is online",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Device is moving",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "Device exceeds the speed",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Command result",
     "eventGeofenceEnter": "Device has entered geofence",
     "eventGeofenceExit": "Device has exited geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Type of Notification",
     "notificationWeb": "Send via Web",
     "notificationMail": "Send via Mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/ms.json b/web/l10n/ms.json
index d1bd2d4f..210075c0 100644
--- a/web/l10n/ms.json
+++ b/web/l10n/ms.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Distance",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "Ralat",
-    "errorUnknown": "Ralat tidak diketahui",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Ralat penyambungan",
     "errorSocket": "Web socket connection error",
     "userEmail": "Emel",
@@ -119,6 +151,51 @@
     "positionAddress": "Alamat",
     "positionProtocol": "Protokol",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Tetapan Server",
     "serverZoom": "Besarkan",
     "serverRegistration": "Pendaftaran",
@@ -174,6 +251,8 @@
     "commandPhone": "Phone Number",
     "commandMessage": "Message",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "Device is online",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Device is moving",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "Device exceeds the speed",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Command result",
     "eventGeofenceEnter": "Device has entered geofence",
     "eventGeofenceExit": "Device has exited geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Type of Notification",
     "notificationWeb": "Send via Web",
     "notificationMail": "Send via Mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/nb.json b/web/l10n/nb.json
index 4b6b5448..6d3d8b8c 100644
--- a/web/l10n/nb.json
+++ b/web/l10n/nb.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Avstand",
     "sharedHourAbbreviation": "t",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Få karttilstand",
     "sharedAttributeAlias": "Attributt alias",
     "sharedAttributeAliases": "Attributt aliaser",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Enhet",
     "sharedTestNotification": "Send Test Notification",
@@ -48,14 +55,39 @@
     "sharedCalendars": "Kalendere",
     "sharedFile": "Fil",
     "sharedSelectFile": "Velg fil",
-    "sharedPhone": "Phone",
+    "sharedPhone": "Telefon",
     "sharedRequired": "Required",
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "Feil",
-    "errorUnknown": "Ukjent feil",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Forbindelse feilet",
     "errorSocket": "Web socket tilkoblingsfeil",
     "userEmail": "E-post",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresse",
     "positionProtocol": "Protokoll",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Serverinnstillinger",
     "serverZoom": "Zoom",
     "serverRegistration": "Registering",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefonnummer",
     "commandMessage": "Melding",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "Alle hendelser",
     "eventDeviceOnline": "Enhet er tilkoblet",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Enheten beveger seg",
     "eventDeviceStopped": "Enheten har stoppet",
     "eventDeviceOverspeed": "Enheten bryter fartsgrensen",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Kommandoresultat",
     "eventGeofenceEnter": "Enheten har kommet inn i geo-gjerde",
     "eventGeofenceExit": "Enheten har forlatt geo-gjerde",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Tenning er AV",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "SOS-alarm",
     "alarmVibration": "Vibrasjonsalarm",
     "alarmMovement": "Bevegelsesalarm",
     "alarmOverspeed": "Fartsgrensealarm",
     "alarmFallDown": "Fallalarm",
     "alarmLowBattery": "Lavt-batteri-alarm",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "Feilalarm",
     "alarmPowerOff": "Power Off Alarm",
     "alarmPowerOn": "Power On Alarm",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Varseltype",
     "notificationWeb": "Send via web",
     "notificationMail": "Send via e-post",
@@ -225,6 +308,7 @@
     "reportRoute": "Rute",
     "reportEvents": "Hendelser",
     "reportTrips": "Turer",
+    "reportStops": "Stops",
     "reportSummary": "Oppsumering",
     "reportChart": "Chart",
     "reportConfigure": "Sett opp",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Forespørsler",
     "statisticsMessagesReceived": "Meldinger mottatt",
     "statisticsMessagesStored": "Meldinger lagret",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/ne.json b/web/l10n/ne.json
index 2d382205..f222b82e 100644
--- a/web/l10n/ne.json
+++ b/web/l10n/ne.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Distance",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "त्रुटी",
-    "errorUnknown": "अज्ञात त्रुटी ",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "जडान मा त्रुटी भयो ",
     "errorSocket": "Web socket connection error",
     "userEmail": "इ मेल ",
@@ -119,6 +151,51 @@
     "positionAddress": "ठेगाना ",
     "positionProtocol": "प्रोटोकल ",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "सर्भर सेटिंग",
     "serverZoom": "ठुलो बनाउने ",
     "serverRegistration": "दर्ता ",
@@ -174,6 +251,8 @@
     "commandPhone": "Phone Number",
     "commandMessage": "Message",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "Device is online",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Device is moving",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "Device exceeds the speed",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Command result",
     "eventGeofenceEnter": "Device has entered geofence",
     "eventGeofenceExit": "Device has exited geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Type of Notification",
     "notificationWeb": "Send via Web",
     "notificationMail": "Send via Mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/nl.json b/web/l10n/nl.json
index 5104254d..ed46e0b3 100644
--- a/web/l10n/nl.json
+++ b/web/l10n/nl.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Afstand",
     "sharedHourAbbreviation": "u",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/u",
     "sharedGetMapState": "Haal kaartstatus op",
     "sharedAttributeAlias": "Attribuut alias",
     "sharedAttributeAliases": "Attribuut aliassen",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Berekend attribuut",
+    "sharedComputedAttributes": "Berekende attributen",
+    "sharedCheckComputedAttribute": "Controleer berekend attribuut",
+    "sharedExpression": "Uitdrukking",
     "sharedDeviceDistance": "Afstand apparaat",
     "sharedDevice": "Apparaat",
     "sharedTestNotification": "Stuur testnotificatie",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Voorkeuren",
     "sharedPermissions": "Rechten",
     "sharedExtra": "Extra",
+    "sharedTypeString": "Tekst",
+    "sharedTypeNumber": "Getal",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Tijdzone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Snelheidslimiet",
+    "attributeReportIgnoreOdometer": "Rapport: negeer odometer",
+    "attributeMaintenanceStart": "Onderhoud: start",
+    "attributeMaintenanceInterval": "Onderhoud: interval",
+    "attributeWebReportColor": "Web: rapportkleur",
+    "attributeDevicePassword": "Apparaatwachtwoord",
+    "attributeProcessingCopyAttributes": "Verwerking: kopieer attributen",
+    "attributeColor": "Kleur",
+    "attributeWebLiveRouteLength": "Web: live routelengte",
+    "attributeWebSelectZoom": "Web: zoomen tijdens selecteren",
+    "attributeMailSmtpHost": "Mail: SMTP host",
+    "attributeMailSmtpPort": "Mail: SMTP poort",
+    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTL ingeschakeld",
+    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTL vereist",
+    "attributeMailSmtpSslEnable": "Mail: SMTP SSL ingeschakeld",
+    "attributeMailSmtpSslTrust": "Mail: SMTP SSL vertrouwd",
+    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL protocollen",
+    "attributeMailSmtpFrom": "Mail: SMTP van",
+    "attributeMailSmtpAuth": "Mail: SMTP authenticatie ingeschakeld",
+    "attributeMailSmtpUsername": "Mail: SMTP gebruikersnaam",
+    "attributeMailSmtpPassword": "Mail: SMTP wachtwoord",
     "errorTitle": "Fout",
-    "errorUnknown": "Onbekende fout",
+    "errorGeneral": "Ongeldige parameters of overschrijding van beperkingen",
     "errorConnection": "Verbindingsfout",
     "errorSocket": "Web socket verbindingsfout",
     "userEmail": "E-mail",
@@ -119,6 +151,51 @@
     "positionAddress": "Adres",
     "positionProtocol": "Protocol",
     "positionDistance": "Afstand",
+    "positionRpm": "RPM",
+    "positionFuel": "Brandstof",
+    "positionPower": "Stroom",
+    "positionBattery": "Accu",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satellieten",
+    "positionSatVisible": "Zichtbare satellieten",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Gebeurtenis",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service odometer",
+    "positionTripOdometer": "Reis odometer",
+    "positionHours": "Uur",
+    "positionInput": "Invoer",
+    "positionOutput": "Uitvoer",
+    "positionBatteryLevel": "Accuniveau",
+    "positionFuelConsumption": "Brandstofverbruik",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Firmware versie",
+    "positionVersionHw": "Hardware versie",
+    "positionIgnition": "Contact",
+    "positionFlags": "Vlaggen",
+    "positionCharge": "Lading",
+    "positionIp": "IP",
+    "positionArchive": "Archief",
+    "positionVin": "VIN",
+    "positionApproximate": "Benadering",
+    "positionThrottle": "Throttle",
+    "positionMotion": "Beweging",
+    "positionArmed": "Armed",
+    "positionAcceleration": "Versnelling",
+    "positionDeviceTemp": "Apparaattemperatuur",
+    "positionOperator": "Operator",
+    "positionCommand": "Commando",
+    "positionBlocked": "Geblokkeerd",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD snelheid",
+    "positionObdOdometer": "OBD odometer",
     "serverTitle": "Serverinstellingen",
     "serverZoom": "Zoom",
     "serverRegistration": "Registratie",
@@ -132,10 +209,10 @@
     "mapBingKey": "Bing Maps sleutel",
     "mapBingRoad": "Bing Maps Wegen",
     "mapBingAerial": "Bing Maps Luchtfoto",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Bing Maps hybride",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Yandex kaart",
+    "mapYandexSat": "Yandex satelliet",
     "mapShapePolygon": "Polygoon",
     "mapShapeCircle": "Cirkel",
     "mapShapePolyline": "Polylijn",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefoonnummer",
     "commandMessage": "Bericht",
     "commandTimezone": "Tijdzoneverschil",
+    "commandgetModemStatus": "Modemstatus",
+    "commandgetDeviceStatus": "Apparaatstatus",
     "eventAll": "Alle gebeurtenissen",
     "eventDeviceOnline": "Apparaat is online",
     "eventDeviceUnknown": "Apparaatstatus is onbekend",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Apparaat beweegt",
     "eventDeviceStopped": "Apparaat is gestopt",
     "eventDeviceOverspeed": "Apparaat overschrijdt snelheid",
+    "eventDeviceFuelDrop": "Brandstofniveau verlaagd gebeurtenis",
     "eventCommandResult": "Commando resultaat",
     "eventGeofenceEnter": "Appraat is binnen geografisch gebied",
     "eventGeofenceExit": "Apparaat verlaat geografisch gebied",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Contact uit",
     "eventMaintenance": "Onderhoud vereist",
     "eventTextMessage": "Tekstbericht ontvangen",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Harde remming alarm",
     "alarmFatigueDriving": "Vermoeidheid tijdens rijden alarm",
     "alarmPowerCut": "Stroom verbroken alarm",
+    "alarmPowerRestored": "Stroom hersteld alarm",
     "alarmJamming": "Verstoringalarm",
     "alarmTemperature": "Temperatuuralarm",
     "alarmParking": "Parkeeralarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Voetremalarm",
     "alarmOilLeak": "Olielekalarm",
     "alarmTampering": "Knoeialarm",
+    "alarmRemoving": "Alarm verwijderen",
     "notificationType": "Notificatietype",
     "notificationWeb": "Stuur via web",
     "notificationMail": "Stuur via mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Gebeurtenissen",
     "reportTrips": "Ritten",
+    "reportStops": "Stops",
     "reportSummary": "Samenvatting",
     "reportChart": "Grafiek",
     "reportConfigure": "Configureer",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Verzoeken",
     "statisticsMessagesReceived": "Ontvangen berichten",
     "statisticsMessagesStored": "Opgeslagen berichten",
+    "statisticsGeocoder": "Geocoderverzoeken",
+    "statisticsGeolocation": "Geolocatieverzoeken",
     "categoryArrow": "Aanwijzer",
     "categoryDefault": "Standaard",
-    "categoryCar": "Auto",
+    "categoryAnimal": "Dier",
+    "categoryBicycle": "Fiets",
+    "categoryBoat": "Boot",
     "categoryBus": "Bus",
-    "categoryTruck": "Vrachtwagen",
-    "categoryShip": "Schip",
-    "categoryPlane": "Vliegtuig",
+    "categoryCar": "Auto",
+    "categoryCrane": "Kraan",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motor",
-    "categoryBicycle": "Fiets",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Persoon",
-    "categoryAnimal": "Dier"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Vliegtuig",
+    "categoryShip": "Schip",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Vrachtwagen",
+    "categoryVan": "Busje"
 }
\ No newline at end of file
diff --git a/web/l10n/nn.json b/web/l10n/nn.json
index ad1e3f71..97071a1f 100644
--- a/web/l10n/nn.json
+++ b/web/l10n/nn.json
@@ -1,8 +1,8 @@
 {
     "sharedLoading": "Lastar...",
-    "sharedHide": "Hide",
+    "sharedHide": "Gøym",
     "sharedSave": "Lagre",
-    "sharedSet": "Set",
+    "sharedSet": "Sett",
     "sharedCancel": "Avbryt",
     "sharedAdd": "Legg til",
     "sharedEdit": "Endre",
@@ -17,9 +17,9 @@
     "sharedHour": "Time",
     "sharedMinute": "Minutt",
     "sharedSecond": "Sekund",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "dagar",
+    "sharedHours": "timar",
+    "sharedMinutes": "minuttar",
     "sharedDecimalDegrees": "Disimalgrader",
     "sharedDegreesDecimalMinutes": "Desimalminutter",
     "sharedDegreesMinutesSeconds": "Grader minuttar sekund",
@@ -32,42 +32,74 @@
     "sharedAttributes": "Eigenskapar",
     "sharedAttribute": "Eigenskap",
     "sharedArea": "Område",
-    "sharedSound": "Notification Sound",
+    "sharedSound": "Varslingslyd",
     "sharedType": "Type",
     "sharedDistance": "Avstand",
     "sharedHourAbbreviation": "t",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/t",
     "sharedGetMapState": "Få karttilstand",
     "sharedAttributeAlias": "Attributt alias",
     "sharedAttributeAliases": "Attributt aliasar",
     "sharedAlias": "Alias",
-    "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",
-    "sharedTimezone": "Timezone",
+    "sharedComputedAttribute": "Berekna eigenskap",
+    "sharedComputedAttributes": "Berekna eigenskapar",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Uttrykk",
+    "sharedDeviceDistance": "Einingsavstand",
+    "sharedDevice": "Eining",
+    "sharedTestNotification": "Send testvarsel",
+    "sharedCalendar": "Kalender",
+    "sharedCalendars": "Kalendrar",
+    "sharedFile": "Fil",
+    "sharedSelectFile": "Velg fil",
+    "sharedPhone": "Telefon",
+    "sharedRequired": "Naudsynt",
+    "sharedPreferences": "Innstillingar",
+    "sharedPermissions": "Løyve",
+    "sharedExtra": "Ekstra",
+    "sharedTypeString": "Streng",
+    "sharedTypeNumber": "Nummer",
+    "sharedTypeBoolean": "Boolsk",
+    "sharedTimezone": "Tidssone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Fartsgrense",
+    "attributeReportIgnoreOdometer": "Rapporter: Ignorer kilometerteller",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Vedlikehald: Intervall",
+    "attributeWebReportColor": "Web: Rapportfarge",
+    "attributeDevicePassword": "Einingspassord",
+    "attributeProcessingCopyAttributes": "Prosesser: Kopieigenskapar",
+    "attributeColor": "Farge",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "attributeMailSmtpHost": "E-post: SMTP-vert",
+    "attributeMailSmtpPort": "E-post: SMTP-port",
+    "attributeMailSmtpStarttlsEnable": "E-post: SMTP STARTTLS aktivert",
+    "attributeMailSmtpStarttlsRequired": "E-post: SMTP STARTTLS nøydsynt",
+    "attributeMailSmtpSslEnable": "E-post: SMTP SSL aktivert",
+    "attributeMailSmtpSslTrust": "E-Post: SMTP SSL tillit",
+    "attributeMailSmtpSslProtocols": "E-post: SMTP SSL protokollar",
+    "attributeMailSmtpFrom": "E-post: SMTP Frå",
+    "attributeMailSmtpAuth": "E-post: SMTP autentisitet aktivert ",
+    "attributeMailSmtpUsername": "E-post: SMTP brukarnamn",
+    "attributeMailSmtpPassword": "E-post: SMTP passord",
     "errorTitle": "Feil",
-    "errorUnknown": "Ukjent feil",
+    "errorGeneral": "ugyldige parameterar eller avgrensingsbrot",
     "errorConnection": "Forbindelse feila",
-    "errorSocket": "Web socket connection error",
+    "errorSocket": "Web socket tilkoplingsfeil",
     "userEmail": "E-post",
     "userPassword": "Passord",
     "userAdmin": "Admin",
     "userRemember": "Hugs",
-    "userDisabled": "Disabled",
-    "userExpirationTime": "Expiration",
-    "userDeviceLimit": "Device Limit",
-    "userUserLimit": "User Limit",
-    "userDeviceReadonly": "Device Readonly",
-    "userToken": "Token",
+    "userDisabled": "Deaktivert",
+    "userExpirationTime": "Utløp",
+    "userDeviceLimit": "Einingsgrense",
+    "userUserLimit": "Brukargrense",
+    "userDeviceReadonly": "Eining skrivebeskytta",
+    "userToken": "Symbol",
     "loginTitle": "Logg inn",
     "loginLanguage": "Språk",
     "loginRegister": "Registrer",
@@ -80,16 +112,16 @@
     "deviceTitle": "Einingar",
     "deviceIdentifier": "Identifikator",
     "deviceModel": "Model",
-    "deviceContact": "Contact",
-    "deviceCategory": "Category",
+    "deviceContact": "Kontakt",
+    "deviceCategory": "Kategori",
     "deviceLastUpdate": "Sist oppdatert",
     "deviceCommand": "Kommando",
     "deviceFollow": "Følj",
-    "deviceTotalDistance": "Total Distance",
+    "deviceTotalDistance": "Total avstand",
     "deviceStatus": "Status",
-    "deviceStatusOnline": "Online",
-    "deviceStatusOffline": "Offline",
-    "deviceStatusUnknown": "Unknown",
+    "deviceStatusOnline": "Tilkopla",
+    "deviceStatusOffline": "Fråkopla",
+    "deviceStatusUnknown": "Ukjend",
     "groupDialog": "Gruppe",
     "groupParent": "Gruppe",
     "groupNoGroup": "Inga gruppe",
@@ -110,7 +142,7 @@
     "reportClear": "Nullstill",
     "positionFixTime": "Tid",
     "positionValid": "Gyldig",
-    "positionAccuracy": "Accuracy",
+    "positionAccuracy": "Nøyaktigheit",
     "positionLatitude": "Breddegrad",
     "positionLongitude": "Lengdegrad",
     "positionAltitude": "Høgde",
@@ -118,7 +150,52 @@
     "positionCourse": "Retning",
     "positionAddress": "Adresse",
     "positionProtocol": "Protokoll",
-    "positionDistance": "Distance",
+    "positionDistance": "Avstand",
+    "positionRpm": "RPM",
+    "positionFuel": "Drivstoff",
+    "positionPower": "Kraft",
+    "positionBattery": "Batteri",
+    "positionRaw": "Rå",
+    "positionIndex": "Indeks",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satellittar",
+    "positionSatVisible": "Synlege satellittar",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Hending",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Kilometerteller",
+    "positionServiceOdometer": "Service kilometertellar",
+    "positionTripOdometer": "Turmålar",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD kilometerteller",
     "serverTitle": "Tenarinnstillingar",
     "serverZoom": "Zoom",
     "serverRegistration": "Registering",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefonnummer",
     "commandMessage": "Melding",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "Alle hendingar",
     "eventDeviceOnline": "Eining er tilkopla",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Eininga rører seg",
     "eventDeviceStopped": "Eininga har stoppa",
     "eventDeviceOverspeed": "Eininga bryt fartsgrensa",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Kommandoresultat",
     "eventGeofenceEnter": "Eininga har komme inn i geo-gjerde",
     "eventGeofenceExit": "Eininga har forlatt geo-gjerde",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Tenninga er AV",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "SOS-alarm",
     "alarmVibration": "Vibrasjonsalarm",
     "alarmMovement": "Rørslealarm",
     "alarmOverspeed": "Fartsgrensealarm",
     "alarmFallDown": "Fallalarm",
     "alarmLowBattery": "Lavt-batteri-alarm",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "Feilalarm",
     "alarmPowerOff": "Power Off Alarm",
     "alarmPowerOn": "Power On Alarm",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Varseltype",
     "notificationWeb": "Send via web",
     "notificationMail": "Send via e-post",
@@ -225,6 +308,7 @@
     "reportRoute": "Rute",
     "reportEvents": "Hendingar",
     "reportTrips": "Turar",
+    "reportStops": "Stops",
     "reportSummary": "Oppsumering",
     "reportChart": "Chart",
     "reportConfigure": "Set opp",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Førespurnadar",
     "statisticsMessagesReceived": "Meldingar motteke",
     "statisticsMessagesStored": "Meldingar lagra",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/pl.json b/web/l10n/pl.json
index ddfd8b10..bc352d30 100644
--- a/web/l10n/pl.json
+++ b/web/l10n/pl.json
@@ -32,30 +32,62 @@
     "sharedAttributes": "Atrybuty",
     "sharedAttribute": "Atrybut",
     "sharedArea": "Strefa",
-    "sharedSound": "Dźwięk powiadomienia",
+    "sharedSound": "Powiadomienia dźwiękowe",
     "sharedType": "Typ",
     "sharedDistance": "Odległość",
     "sharedHourAbbreviation": "g",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Pobierz stan mapy",
     "sharedAttributeAlias": "Alias atrybutu",
     "sharedAttributeAliases": "Aliasy atrybutów",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Obliczony atrybut",
+    "sharedComputedAttributes": "Obliczone atrybuty",
+    "sharedCheckComputedAttribute": "Sprawdź obliczony atrybut",
+    "sharedExpression": "Wyrażenie",
     "sharedDeviceDistance": "Dystans urządzenia",
     "sharedDevice": "Urządzenie",
-    "sharedTestNotification": "Wyślij testowe powiadomienie\\",
+    "sharedTestNotification": "Wyślij powiadomienie testowe",
     "sharedCalendar": "Kalendarz",
     "sharedCalendars": "Kalendarze",
     "sharedFile": "Plik",
     "sharedSelectFile": "Wybierz plik",
     "sharedPhone": "Telefon",
-    "sharedRequired": "Wymagany",
+    "sharedRequired": "Wymagane",
     "sharedPreferences": "Preferencje",
     "sharedPermissions": "Zezwolenia",
-    "sharedExtra": "Dodatki",
+    "sharedExtra": "Dodatkowe",
+    "sharedTypeString": "Tekst",
+    "sharedTypeNumber": "Liczba",
+    "sharedTypeBoolean": "Wartość binarna",
     "sharedTimezone": "Strefa czasowa",
+    "sharedInfoTitle": "Informacja",
+    "attributeSpeedLimit": "Ograniczenie prędkości",
+    "attributeReportIgnoreOdometer": "Raport: Ignoruj licznik kilometrów",
+    "attributeMaintenanceStart": "Konserwacja: Start",
+    "attributeMaintenanceInterval": "Konserwacja: Interwał",
+    "attributeWebReportColor": "Web: Kolor raportów",
+    "attributeDevicePassword": "Hasło urządzenia",
+    "attributeProcessingCopyAttributes": "Przetwarzanie: Kopiuj atrybuty",
+    "attributeColor": "Kolor",
+    "attributeWebLiveRouteLength": "Web: Długość ścieżki na żywo",
+    "attributeWebSelectZoom": "Sieć: Powiększ po zaznaczeniu",
+    "attributeMailSmtpHost": "Poczta: Host SMTP",
+    "attributeMailSmtpPort": "Poczta: Port SMTP",
+    "attributeMailSmtpStarttlsEnable": "Poczta: Włącz SMTP STARTTLS",
+    "attributeMailSmtpStarttlsRequired": "Poczta: Wymagane ",
+    "attributeMailSmtpSslEnable": "Poczta: Włącz ",
+    "attributeMailSmtpSslTrust": "Poczta: Ufaj ",
+    "attributeMailSmtpSslProtocols": "Poczta: Protokoły ",
+    "attributeMailSmtpFrom": "Poczta: Od SMTP",
+    "attributeMailSmtpAuth": "Poczta: Włącz autoryzację SMTP",
+    "attributeMailSmtpUsername": "Poczta: Nazwa użytkownika SMTP",
+    "attributeMailSmtpPassword": "Poczta: Hasło SMTP",
     "errorTitle": "Bląd",
-    "errorUnknown": "Nieznany błąd",
+    "errorGeneral": "Niepoprawny parametr albo naruszenie ograniczeń",
     "errorConnection": "Błąd przy połączeniu",
     "errorSocket": "Błąd połączenia gniazda sieciowego",
     "userEmail": "Email",
@@ -83,7 +115,7 @@
     "deviceContact": "Kontakt",
     "deviceCategory": "Kategoria",
     "deviceLastUpdate": "Ostatnia aktualizacja",
-    "deviceCommand": "Polecenie",
+    "deviceCommand": "Rozkaz",
     "deviceFollow": "Podążaj",
     "deviceTotalDistance": "Całkowity dystans",
     "deviceStatus": "Status",
@@ -119,6 +151,51 @@
     "positionAddress": "Adres",
     "positionProtocol": "Protokół",
     "positionDistance": "Odległość",
+    "positionRpm": "RPM",
+    "positionFuel": "Paliwo",
+    "positionPower": "Moc",
+    "positionBattery": "Bateria",
+    "positionRaw": "Surowy",
+    "positionIndex": "Indeks",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satelity",
+    "positionSatVisible": "Widoczne satelity",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Zdarzenie",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Drogomierz",
+    "positionServiceOdometer": "Drogomierz usługi",
+    "positionTripOdometer": "Drogomierz podróży",
+    "positionHours": "Godziny",
+    "positionInput": "Wejście",
+    "positionOutput": "Wyjście",
+    "positionBatteryLevel": "Poziom baterii",
+    "positionFuelConsumption": "Zużycie paliwa",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Wersja firmware",
+    "positionVersionHw": "Wersja sprzętu",
+    "positionIgnition": "Zapłon",
+    "positionFlags": "Flagi",
+    "positionCharge": "Ładowanie",
+    "positionIp": "IP",
+    "positionArchive": "Archiwum",
+    "positionVin": "VIN",
+    "positionApproximate": "Przybliżony",
+    "positionThrottle": "Przepustnica",
+    "positionMotion": "Ruch",
+    "positionArmed": "Uzbrojony",
+    "positionAcceleration": "Przyśpieszenie",
+    "positionDeviceTemp": "Temperatura urządzenia",
+    "positionOperator": "Operator",
+    "positionCommand": "Command",
+    "positionBlocked": "Zablokowany",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "Prędkość OBD",
+    "positionObdOdometer": "Drogomierz OBD",
     "serverTitle": "Ustawienia serwera",
     "serverZoom": "Powiększenie",
     "serverRegistration": "Rejestracja",
@@ -132,10 +209,10 @@
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
     "mapBingAerial": "Bing Maps Aerial",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Mapa hybrydowa Bing",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Mapa Yandex",
+    "mapYandexSat": "Satelita Yandex",
     "mapShapePolygon": "Wielokąt",
     "mapShapeCircle": "Okrąg",
     "mapShapePolyline": "Krzywa",
@@ -174,6 +251,8 @@
     "commandPhone": "Numer telefonu",
     "commandMessage": "Wiadomość",
     "commandTimezone": "Przesunięcie strefy czasowej",
+    "commandgetModemStatus": "Status modemu",
+    "commandgetDeviceStatus": "Status urządzenia",
     "eventAll": "Wszystkie zdarzenia",
     "eventDeviceOnline": "Urządzenie jest online",
     "eventDeviceUnknown": "Status urządzenia nieznany",
@@ -181,21 +260,23 @@
     "eventDeviceMoving": "Urządzenie przemieszcza się",
     "eventDeviceStopped": "Urządzenie się zatrzymało",
     "eventDeviceOverspeed": "Urządzenie przekroczyło prędkość",
+    "eventDeviceFuelDrop": "Zdarzenie spadku paliwa",
     "eventCommandResult": "Rezultat polecenia",
     "eventGeofenceEnter": "Urządzenie wkroczyło w strefę nadzoru",
-    "eventGeofenceExit": "Urządzenie wykroczyło po za strefę nadzoru",
+    "eventGeofenceExit": "Urządzenie opuściło strefę nadzoru",
     "eventAlarm": "Alarmy",
     "eventIgnitionOn": "Zapłon włączony",
     "eventIgnitionOff": "Zapłon wyłączony",
     "eventMaintenance": "Wymagana konserwacja",
     "eventTextMessage": "Odebrano wiadomość tekstową",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Alarm twardego hamowania",
     "alarmFatigueDriving": "Alarm zmęczenia",
     "alarmPowerCut": "Alarm odcięcia zasilania",
+    "alarmPowerRestored": "Alarm odzyskania mocy",
     "alarmJamming": "Alarm zagłuszania",
     "alarmTemperature": "Alarm temperatury",
     "alarmParking": "Alarm parkingowy",
@@ -218,13 +300,15 @@
     "alarmFootBrake": "Alarm hamulca nożnego",
     "alarmOilLeak": "Alarm wycieku oleju",
     "alarmTampering": "Alarm ruszania",
+    "alarmRemoving": "Usuwanie alarmu",
     "notificationType": "Rodzaj powiadomienia",
-    "notificationWeb": "Wyślij przez sieć",
+    "notificationWeb": "Wyślij przez stronę",
     "notificationMail": "Wyślij przez Email",
     "notificationSms": "Wyślij przez SMS",
     "reportRoute": "Trasa",
     "reportEvents": "Zdarzenia",
     "reportTrips": "Trips",
+    "reportStops": "Zatrzymania",
     "reportSummary": "Podsumowanie",
     "reportChart": "Wykres",
     "reportConfigure": "Konfiguracja",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Żądania",
     "statisticsMessagesReceived": "Odebrane wiadomości",
     "statisticsMessagesStored": "Zapisane wiadomości",
+    "statisticsGeocoder": "Żądania Geokodera",
+    "statisticsGeolocation": "Żądania Geolokacji",
     "categoryArrow": "Strzałka",
     "categoryDefault": "Domyślny",
-    "categoryCar": "Samochód",
+    "categoryAnimal": "Zwierze",
+    "categoryBicycle": "Rower",
+    "categoryBoat": "Łódź",
     "categoryBus": "Autobus",
-    "categoryTruck": "Ciężarówk",
-    "categoryShip": "Statek",
-    "categoryPlane": "Samolot",
+    "categoryCar": "Samochód",
+    "categoryCrane": "Dźwig",
+    "categoryHelicopter": "Śmigłowiec",
     "categoryMotorcycle": "Motocykl",
-    "categoryBicycle": "Rower",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Osob",
-    "categoryAnimal": "Zwierze"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Samolot",
+    "categoryShip": "Statek",
+    "categoryTractor": "Traktor",
+    "categoryTruck": "Ciężarówk",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/pt.json b/web/l10n/pt.json
index 6fac1149..55432edd 100644
--- a/web/l10n/pt.json
+++ b/web/l10n/pt.json
@@ -1,5 +1,5 @@
 {
-    "sharedLoading": "Carregando...",
+    "sharedLoading": "A Carregar...",
     "sharedHide": "Ocultar",
     "sharedSave": "Salvar",
     "sharedSet": "Conjunto",
@@ -17,9 +17,9 @@
     "sharedHour": "Hora",
     "sharedMinute": "Minuto",
     "sharedSecond": "Segundo",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "Dias",
+    "sharedHours": "Horas",
+    "sharedMinutes": "Minutos",
     "sharedDecimalDegrees": "Graus Decimais",
     "sharedDegreesDecimalMinutes": "Graus Decimais Minutos",
     "sharedDegreesMinutesSeconds": "Graus Decimais Segundos",
@@ -37,10 +37,17 @@
     "sharedDistance": "Distância",
     "sharedHourAbbreviation": "H",
     "sharedMinuteAbbreviation": "M",
+    "sharedVoltAbbreviation": "Volts",
+    "sharedLiterAbbreviation": "Litros",
+    "sharedLiterPerHourAbbreviation": "Litros/Hora",
     "sharedGetMapState": "Obter Estado do Mapa",
     "sharedAttributeAlias": "Alias de Atributo",
     "sharedAttributeAliases": "Alias de Atributos",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Atributo",
+    "sharedComputedAttributes": "Atributos",
+    "sharedCheckComputedAttribute": "Verificar Atributos",
+    "sharedExpression": "Expressão",
     "sharedDeviceDistance": "Distancia do Dispositivo",
     "sharedDevice": "Dispositivo",
     "sharedTestNotification": "Enviar Notificação Teste",
@@ -53,18 +60,43 @@
     "sharedPreferences": "Preferências",
     "sharedPermissions": "Permissões",
     "sharedExtra": "Extra",
+    "sharedTypeString": "Corda",
+    "sharedTypeNumber": "Número",
+    "sharedTypeBoolean": "Boleano",
     "sharedTimezone": "Fuso-Horário",
+    "sharedInfoTitle": "Informação",
+    "attributeSpeedLimit": "Limite de Velocidade",
+    "attributeReportIgnoreOdometer": "Relatório: Ignorar Conta-Quilómetros",
+    "attributeMaintenanceStart": "Manutenção: Inicio",
+    "attributeMaintenanceInterval": "Manutenção: Intervalo",
+    "attributeWebReportColor": "Web: Cor do Relatório",
+    "attributeDevicePassword": "Password do Dispositivo",
+    "attributeProcessingCopyAttributes": "Processando: Cópia dos Atributos",
+    "attributeColor": "Cor",
+    "attributeWebLiveRouteLength": "Web: Comprimento da Rota ao Vivo",
+    "attributeWebSelectZoom": "Web: Zoom na Selecção",
+    "attributeMailSmtpHost": "Mail: Alojamento SMTP",
+    "attributeMailSmtpPort": "Mail: Porta SMTP",
+    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Activo",
+    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS Necessário",
+    "attributeMailSmtpSslEnable": "Mail: SMTP SSL Activo",
+    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Verificado",
+    "attributeMailSmtpSslProtocols": "Mail: SMTP Protocolos SSL",
+    "attributeMailSmtpFrom": "Mail: SMTP de",
+    "attributeMailSmtpAuth": "Mail: SMTP Autenticação Activa",
+    "attributeMailSmtpUsername": "Mail: Utilizador SMTP",
+    "attributeMailSmtpPassword": "Mail: Password SMTP",
     "errorTitle": "Erro",
-    "errorUnknown": "Erro desconhecido",
+    "errorGeneral": "Parâmetros Inválidos",
     "errorConnection": "Erro de conexão",
     "errorSocket": "Erro de Conexão",
-    "userEmail": "Email",
+    "userEmail": "Email / Utilizador",
     "userPassword": "Senha",
     "userAdmin": "Administrador",
     "userRemember": "Relembrar",
     "userDisabled": "Desactivado",
-    "userExpirationTime": "Expiração",
-    "userDeviceLimit": "Limite do Dipositivo",
+    "userExpirationTime": "Expira em:",
+    "userDeviceLimit": "Limite de Dispositivos",
     "userUserLimit": "Limite de Utilizadores",
     "userDeviceReadonly": "Dispositivo apenas de Leitura",
     "userToken": "Símbolo",
@@ -72,7 +104,7 @@
     "loginLanguage": "Idioma",
     "loginRegister": "Registar",
     "loginLogin": "Entrar",
-    "loginFailed": "Endereço de e-mail ou senha incorrectos",
+    "loginFailed": "Dados incorrectos ou inexistentes",
     "loginCreated": "Novo utilizador foi registado",
     "loginLogout": "Sair",
     "loginLogo": "Logótipo",
@@ -108,7 +140,7 @@
     "reportTo": "Para",
     "reportShow": "Mostrar",
     "reportClear": "Limpar",
-    "positionFixTime": "Tempo",
+    "positionFixTime": "Data",
     "positionValid": "Válido",
     "positionAccuracy": "Precisão",
     "positionLatitude": "Latitude",
@@ -119,23 +151,68 @@
     "positionAddress": "Endereço",
     "positionProtocol": "Protocolo",
     "positionDistance": "Distância",
+    "positionRpm": "Rpm",
+    "positionFuel": "Combustível",
+    "positionPower": "Potência",
+    "positionBattery": "Bateria",
+    "positionRaw": "Aberto",
+    "positionIndex": "Início",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satélites",
+    "positionSatVisible": "Satélites Visíveis",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Evento",
+    "positionAlarm": "Alarme",
+    "positionStatus": "Estado",
+    "positionOdometer": "Conta-Quilómetros ",
+    "positionServiceOdometer": "Serviço Conta-Quilómetros",
+    "positionTripOdometer": "Conta-Quilómetros de Viagem",
+    "positionHours": "Horas",
+    "positionInput": "Dentro",
+    "positionOutput": "Fora",
+    "positionBatteryLevel": "Nível da Bateria",
+    "positionFuelConsumption": "Consumo de Combustível",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Versão de Firmware",
+    "positionVersionHw": "Versão de Hardware",
+    "positionIgnition": "Ignição",
+    "positionFlags": "Bandeiras",
+    "positionCharge": "Carregar",
+    "positionIp": "IP",
+    "positionArchive": "Arquivo",
+    "positionVin": "VIN",
+    "positionApproximate": "Aproximação",
+    "positionThrottle": "Acelerador",
+    "positionMotion": "Movimento",
+    "positionArmed": "Armado",
+    "positionAcceleration": "Aceleração",
+    "positionDeviceTemp": "Temperatura do Dispositivo",
+    "positionOperator": "Operador",
+    "positionCommand": "Command",
+    "positionBlocked": "Bloqueado",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "Velocidade OBD",
+    "positionObdOdometer": "Conta-Quilómetros OBD",
     "serverTitle": "Configurações do Servidor",
     "serverZoom": "Zoom",
     "serverRegistration": "Registo",
     "serverReadonly": "Apenas Leitura",
     "serverForceSettings": "Forçar Configurações",
     "mapTitle": "Mapa",
-    "mapLayer": "Camada Mapa",
+    "mapLayer": "Mapa",
     "mapCustom": "Mapa personalizado",
     "mapCarto": "Mapa Carto",
     "mapOsm": "Mapa Open Street",
     "mapBingKey": "Mapa Bing Key",
     "mapBingRoad": "Mapa Bing Road",
     "mapBingAerial": "Mapa Bing Aéreo",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Bing Maps Híbrido",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Mapa Yandex",
+    "mapYandexSat": "Satélite Yandex",
     "mapShapePolygon": "Polígono",
     "mapShapeCircle": "Circulo",
     "mapShapePolyline": "Linha Poligono",
@@ -174,6 +251,8 @@
     "commandPhone": "Número de Telefone",
     "commandMessage": "Mensagem",
     "commandTimezone": "Deslocamento do Fuso Horário",
+    "commandgetModemStatus": "Estado do Modem",
+    "commandgetDeviceStatus": "Estado do Dispositivo",
     "eventAll": "Todos os Eventos",
     "eventDeviceOnline": "Dispositivo Conectado",
     "eventDeviceUnknown": "Estado do dispositivo desconhecido",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Dispositivo em Movimento",
     "eventDeviceStopped": "Dispositivo Parado",
     "eventDeviceOverspeed": "Dispositivo em Excesso de Velocidade",
+    "eventDeviceFuelDrop": "Evento de Perda de Combústivel",
     "eventCommandResult": "Resultado do Comando",
     "eventGeofenceEnter": "Dispositivo Entrou na Cerca Geográfica",
     "eventGeofenceExit": "Dispositivo Saiu da Cerca Geográfica",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignição Desligada",
     "eventMaintenance": "Necessária manutenção",
     "eventTextMessage": "Mensagem de Texto Recebida",
-    "alarm": "Alarme",
+    "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",
@@ -210,21 +291,24 @@
     "alarmHardBreaking": "Alarme de Travagem Brusca",
     "alarmFatigueDriving": "Alarme de Condução com Fadiga",
     "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",
-    "alarmBonnet": "Bonnet Alarm",
+    "alarmBonnet": "Alarme do Capô",
     "alarmFootBrake": "Alarme de Travão de Mão",
     "alarmOilLeak": "Alarme de Perda de Óleo",
     "alarmTampering": "Alarme de Falsificação",
+    "alarmRemoving": "Removendo Alarme",
     "notificationType": "Tipo de Notificação",
     "notificationWeb": "Enviar por Web",
     "notificationMail": "Enviar por Email",
     "notificationSms": "Enviar por SMS",
-    "reportRoute": "Rota",
+    "reportRoute": "Histórico de Rotas",
     "reportEvents": "Eventos",
     "reportTrips": "Viagens",
+    "reportStops": "Paragens",
     "reportSummary": "Resumo",
     "reportChart": "Gráfico",
     "reportConfigure": "Configurar",
@@ -237,9 +321,9 @@
     "reportMaximumSpeed": "Velocidade Máxima",
     "reportEngineHours": "Horas do Motor",
     "reportDuration": "Duração",
-    "reportStartTime": "Iniciar Hora",
+    "reportStartTime": "Hora de Inicio",
     "reportStartAddress": "Iniciar Morada",
-    "reportEndTime": "Terminar Hora",
+    "reportEndTime": "Hora de Fim",
     "reportEndAddress": "Terminar Morada",
     "reportSpentFuel": "Combustível Gasto",
     "statisticsTitle": "Estatísticas",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Pedidos",
     "statisticsMessagesReceived": "Mensagens Recebidas",
     "statisticsMessagesStored": "Mensagens Armazenadas",
+    "statisticsGeocoder": "Pedidos de Codificador Geográfico",
+    "statisticsGeolocation": "Pedidos de Geo Localização",
     "categoryArrow": "Seta",
     "categoryDefault": "Padrão",
-    "categoryCar": "Carro",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicicleta",
+    "categoryBoat": "Barco",
     "categoryBus": "Autocarro",
-    "categoryTruck": "Camião",
-    "categoryShip": "Barco",
-    "categoryPlane": "Avião",
+    "categoryCar": "Carro",
+    "categoryCrane": "Guindaste",
+    "categoryHelicopter": "Helicóptero",
     "categoryMotorcycle": "Mota",
-    "categoryBicycle": "Bicicleta",
+    "categoryOffroad": "Fora de Estrada",
     "categoryPerson": "Pessoa",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Jipe",
+    "categoryPlane": "Avião",
+    "categoryShip": "Barco",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Camião",
+    "categoryVan": "Caravana"
 }
\ No newline at end of file
diff --git a/web/l10n/pt_BR.json b/web/l10n/pt_BR.json
index 650d5852..92d6dd7f 100644
--- a/web/l10n/pt_BR.json
+++ b/web/l10n/pt_BR.json
@@ -1,7 +1,7 @@
 {
     "sharedLoading": "Carregando...",
     "sharedHide": "Esconder",
-    "sharedSave": "Gravar",
+    "sharedSave": "Salvar",
     "sharedSet": "Aplicar",
     "sharedCancel": "Cancelar",
     "sharedAdd": "Adicionar",
@@ -10,7 +10,7 @@
     "sharedRemoveConfirm": "Remover item?",
     "sharedKm": "km",
     "sharedMi": "mi",
-    "sharedNmi": "milhas nauticas",
+    "sharedNmi": "Milhas Náuticas",
     "sharedKn": "kn",
     "sharedKmh": "km/h",
     "sharedMph": "mph",
@@ -37,10 +37,17 @@
     "sharedDistance": "Distância",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "L",
+    "sharedLiterPerHourAbbreviation": "L/h",
     "sharedGetMapState": "Obter Estado do Mapa",
     "sharedAttributeAlias": "Alias ​​de atributo",
     "sharedAttributeAliases": "Alias ​​de atributos",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Atributo Calculado",
+    "sharedComputedAttributes": "Atributos Calculados",
+    "sharedCheckComputedAttribute": "Verificar Atributo Calculado",
+    "sharedExpression": "Expressão",
     "sharedDeviceDistance": "Distância do dispositivo",
     "sharedDevice": "Dispositivo",
     "sharedTestNotification": "Enviar notificação de teste",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferências",
     "sharedPermissions": "Permissões",
     "sharedExtra": "Adicional",
+    "sharedTypeString": "Texto",
+    "sharedTypeNumber": "Número",
+    "sharedTypeBoolean": "Lógico",
     "sharedTimezone": "Fuso horário",
+    "sharedInfoTitle": "Informação",
+    "attributeSpeedLimit": "Limite de velocidade",
+    "attributeReportIgnoreOdometer": "Relatório: Ignorar Odômetro",
+    "attributeMaintenanceStart": "Manutenção: Início",
+    "attributeMaintenanceInterval": "Manutenção: Intervalo",
+    "attributeWebReportColor": "Web: Cor do Relatório",
+    "attributeDevicePassword": "Senha do aparelho",
+    "attributeProcessingCopyAttributes": "Processamento: Copiar Atributos",
+    "attributeColor": "Cor",
+    "attributeWebLiveRouteLength": "Web: Comprimento da Rota ao Vivo",
+    "attributeWebSelectZoom": "Web: Zoom Selecionado ",
+    "attributeMailSmtpHost": "Email: Host SMTP",
+    "attributeMailSmtpPort": "Email: Porta SMTP",
+    "attributeMailSmtpStarttlsEnable": "Email: Ativar STARTTLS (SMTP)",
+    "attributeMailSmtpStarttlsRequired": "Email: Exigir STARTTLS (SMTP)",
+    "attributeMailSmtpSslEnable": "Email: Ativar SSL (SMTP)",
+    "attributeMailSmtpSslTrust": "Email: Certificado SSL (SMTP)",
+    "attributeMailSmtpSslProtocols": "Email: Protocolo SSL (SMTP)",
+    "attributeMailSmtpFrom": "Email: Remetente",
+    "attributeMailSmtpAuth": "Email: Ativar Autenticação (SMTP)",
+    "attributeMailSmtpUsername": "Email: Nome de Usuário (SMTP)",
+    "attributeMailSmtpPassword": "Email: Senha (SMTP)",
     "errorTitle": "Erro",
-    "errorUnknown": "Erro desconhecido",
+    "errorGeneral": "Parâmetros inválidos ou violação de restrições",
     "errorConnection": "Erro de conexão",
     "errorSocket": "Erro na conexão com Web Socket ",
     "userEmail": "Email",
@@ -64,18 +96,18 @@
     "userRemember": "Lembrar",
     "userDisabled": "Desativado",
     "userExpirationTime": "Expiração",
-    "userDeviceLimit": "Limite do dispositivo",
-    "userUserLimit": "Limite do Usuário",
-    "userDeviceReadonly": "Dispositivo apenas de Leitura",
+    "userDeviceLimit": "Limite de dispositivos",
+    "userUserLimit": "Limite de Usuários",
+    "userDeviceReadonly": "Dispositivos Somente Leitura",
     "userToken": "Token",
     "loginTitle": "Login",
     "loginLanguage": "Idioma",
     "loginRegister": "Registrar",
     "loginLogin": "Entrar",
-    "loginFailed": "Endereço de email ou senha incorretos",
-    "loginCreated": "O novo usuário foi registrado",
+    "loginFailed": "Email ou senha incorretos",
+    "loginCreated": "Novo usuário registrado",
     "loginLogout": "Sair",
-    "loginLogo": "Logo",
+    "loginLogo": "Logotipo",
     "devicesAndState": "Dispositivo e Estado",
     "deviceTitle": "Dispositivos",
     "deviceIdentifier": "Identificador",
@@ -115,10 +147,55 @@
     "positionLongitude": "Longitude",
     "positionAltitude": "Altitude",
     "positionSpeed": "Velocidade",
-    "positionCourse": "Curso",
+    "positionCourse": "Direção",
     "positionAddress": "Endereço",
     "positionProtocol": "Protocolo",
     "positionDistance": "Distância",
+    "positionRpm": "RPM",
+    "positionFuel": "Combustível",
+    "positionPower": "Potência",
+    "positionBattery": "Bateria",
+    "positionRaw": "Bruto",
+    "positionIndex": "Índice",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satélites",
+    "positionSatVisible": "Satélites Visíveis",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Evento",
+    "positionAlarm": "Alarme",
+    "positionStatus": "Estado",
+    "positionOdometer": "Odômetro",
+    "positionServiceOdometer": "Odômetro de Serviço",
+    "positionTripOdometer": "Odômetro de Viagem",
+    "positionHours": "Horas",
+    "positionInput": "Entrada",
+    "positionOutput": "Saída",
+    "positionBatteryLevel": "Nível de Bateria",
+    "positionFuelConsumption": "Consumo de Combustível",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Versão de Firmware",
+    "positionVersionHw": "Versão de Hardware",
+    "positionIgnition": "Ignição",
+    "positionFlags": "Sinais",
+    "positionCharge": "Carga",
+    "positionIp": "IP",
+    "positionArchive": "Arquivar",
+    "positionVin": "VIN",
+    "positionApproximate": "Estimado",
+    "positionThrottle": "Acelerador",
+    "positionMotion": "Movimento",
+    "positionArmed": "Alarme Ativado",
+    "positionAcceleration": "Aceleração",
+    "positionDeviceTemp": "Temperatura do Dispositivo",
+    "positionOperator": "Operadora",
+    "positionCommand": "Comando",
+    "positionBlocked": "Bloqueado",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "Velocidade OBD",
+    "positionObdOdometer": "Odômetro OBD",
     "serverTitle": "Configurações do Servidor",
     "serverZoom": "Zoom",
     "serverRegistration": "Registro",
@@ -127,15 +204,15 @@
     "mapTitle": "Mapa",
     "mapLayer": "Camada de Mapa",
     "mapCustom": "Mapa Personalizado",
-    "mapCarto": "base de mapas cartográficas ",
+    "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Map",
-    "mapBingKey": "Bing Maps Key",
-    "mapBingRoad": "Bing Maps Estradas",
-    "mapBingAerial": "Bing Maps Aéreo",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingKey": "Bing Mapas API Key",
+    "mapBingRoad": "Bing Mapas Estradas",
+    "mapBingAerial": "Bing Mapas Aéreo",
+    "mapBingHybrid": "Bing Mapas Híbrido",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Mapa Yandex",
+    "mapYandexSat": "Satélite Yandex",
     "mapShapePolygon": "Polígono",
     "mapShapeCircle": "Círculo",
     "mapShapePolyline": "Polilinha",
@@ -145,13 +222,13 @@
     "stateValue": "Valor",
     "commandTitle": "Comando",
     "commandSend": "Enviar",
-    "commandSent": "Comando foi enviado",
+    "commandSent": "O comando foi enviado",
     "commandPositionPeriodic": "Atualização Periódica",
-    "commandPositionStop": "Parar Atualizaçao",
+    "commandPositionStop": "Parar Atualização",
     "commandEngineStop": "Desligar Motor",
     "commandEngineResume": "Religar Motor",
-    "commandFrequency": "Frequencia",
-    "commandUnit": "Unidade",
+    "commandFrequency": "Frequência",
+    "commandUnit": "Aparelho",
     "commandCustom": "Comando personalizado",
     "commandPositionSingle": "Relatório avulso",
     "commandAlarmArm": "Ativar Alarme",
@@ -169,11 +246,13 @@
     "commandOutputControl": "Controle de saída",
     "commandAlarmSpeed": "Alarme de excesso de velocidade",
     "commandDeviceIdentification": "Identificação do dispositivo",
-    "commandIndex": "Indice",
+    "commandIndex": "Índice",
     "commandData": "Data",
     "commandPhone": "Número de Telefone",
     "commandMessage": "Mensagem",
     "commandTimezone": "Ajuste de Fuso horário",
+    "commandgetModemStatus": "Estado do Modem",
+    "commandgetDeviceStatus": "Estado do Dispositivo",
     "eventAll": "Todos Eventos",
     "eventDeviceOnline": "Dispositivo está on-line",
     "eventDeviceUnknown": "Estado do dispositivo desconhecido",
@@ -181,43 +260,47 @@
     "eventDeviceMoving": "Dispositivo está se movendo",
     "eventDeviceStopped": "Dispositivo parou",
     "eventDeviceOverspeed": "Dispositivo excede a velocidade",
+    "eventDeviceFuelDrop": "Evento de queda de combustível",
     "eventCommandResult": "Resultado do comando",
-    "eventGeofenceEnter": "Dispositivo entrou geocerca",
-    "eventGeofenceExit": "Dispositivo saiu geocerca",
+    "eventGeofenceEnter": "Dispositivo entrou em geocerca",
+    "eventGeofenceExit": "Dispositivo saiu de geocerca",
     "eventAlarm": "Alarmes",
     "eventIgnitionOn": "Ignição está ON",
     "eventIgnitionOff": "Ignição está OFF",
     "eventMaintenance": "Manutenção necessária",
     "eventTextMessage": "Mensagem de texto recebida",
-    "alarm": "Alarme",
+    "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 Geofence",
-    "alarmGeofenceEnter": "Alarme de entrada Geofence",
-    "alarmGeofenceExit": "Alarme de Saída Geofence",
+    "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",
+    "alarmAccident": "Alarme de Acidente",
     "alarmTow": "Alarme de Reboque",
     "alarmHardAcceleration": "Alarme de Aceleração Forte",
     "alarmHardBreaking": "Alarme de Frenagem",
     "alarmFatigueDriving": "Alarme de Fadiga na Direção",
-    "alarmPowerCut": "Alarme de corte de energia",
+    "alarmPowerCut": "Alarme de Corte de Energia",
+    "alarmPowerRestored": "Alarme de Potência Restaurada",
     "alarmJamming": "Alarme de Bloqueio",
-    "alarmTemperature": "Alarme de temperatura",
-    "alarmParking": "Alarme de estacionamento",
-    "alarmShock": "Alarme de choque",
+    "alarmTemperature": "Alarme de Temperatura",
+    "alarmParking": "Alarme deEstacionamento",
+    "alarmShock": "Alarme de Choque",
     "alarmBonnet": "Alarme de Capota",
     "alarmFootBrake": "Alarme de freio de pé",
-    "alarmOilLeak": "Alarme de vazamento de óleo",
-    "alarmTampering": "Alarme de violação",
+    "alarmOilLeak": "Alarme de Vazamento de Óleo",
+    "alarmTampering": "Alarme de Violação",
+    "alarmRemoving": "Removendo Alarme",
     "notificationType": "Tipo de Notificação",
     "notificationWeb": "Enviar via Web",
     "notificationMail": "Enviar via Email",
@@ -225,6 +308,7 @@
     "reportRoute": "Rota",
     "reportEvents": "Eventos",
     "reportTrips": "Viagens",
+    "reportStops": "Paradas",
     "reportSummary": "Resumo",
     "reportChart": "Gráfico",
     "reportConfigure": "Configurar",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Pedidos",
     "statisticsMessagesReceived": "Mensagens Recebidas",
     "statisticsMessagesStored": "Mensagens armazenadas",
+    "statisticsGeocoder": "Solicitações de Geocódigo",
+    "statisticsGeolocation": "Solicitações de Geolocalização",
     "categoryArrow": "Seta",
     "categoryDefault": "Padrão",
-    "categoryCar": "Carro",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicicleta",
+    "categoryBoat": "Barco",
     "categoryBus": "Ônibus",
-    "categoryTruck": "Caminhão",
-    "categoryShip": "Navio",
-    "categoryPlane": "Avião",
+    "categoryCar": "Carro",
+    "categoryCrane": "Guindaste",
+    "categoryHelicopter": "Helicóptero",
     "categoryMotorcycle": "Motocicleta",
-    "categoryBicycle": "Bicicleta",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Pessoa",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pick-up",
+    "categoryPlane": "Avião",
+    "categoryShip": "Navio",
+    "categoryTractor": "Trator",
+    "categoryTruck": "Caminhão",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/ro.json b/web/l10n/ro.json
index 9646ec28..7f1ddf00 100644
--- a/web/l10n/ro.json
+++ b/web/l10n/ro.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Distanţă",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Cere status harta",
     "sharedAttributeAlias": "Redenumire atribut",
     "sharedAttributeAliases": "Redenumire atribute",
     "sharedAlias": "Redenumire",
+    "sharedComputedAttribute": "Atribut Calculat",
+    "sharedComputedAttributes": "Atribute Calculate",
+    "sharedCheckComputedAttribute": "Verifica atributul calculat",
+    "sharedExpression": "expresie",
     "sharedDeviceDistance": "Distanta echipament",
     "sharedDevice": "Echipament",
     "sharedTestNotification": "Trimite notificare de test",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferinte",
     "sharedPermissions": "Permisiuni",
     "sharedExtra": "Suplimentar",
+    "sharedTypeString": "caracter",
+    "sharedTypeNumber": "numar",
+    "sharedTypeBoolean": "boolean",
     "sharedTimezone": "Fus orar",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Limita de viteza",
+    "attributeReportIgnoreOdometer": "Raport: Ignora kilometrajul",
+    "attributeMaintenanceStart": "Intretinere: Start",
+    "attributeMaintenanceInterval": "Intretinere: Interval",
+    "attributeWebReportColor": "Web: Culoare raport",
+    "attributeDevicePassword": "Parola dispozitiv",
+    "attributeProcessingCopyAttributes": "Procesare: Copiaza atributele",
+    "attributeColor": "Culoare",
+    "attributeWebLiveRouteLength": "Web: Lungime rute",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "attributeMailSmtpHost": "Mail: SMTP Host",
+    "attributeMailSmtpPort": "Mail: SMTP Port",
+    "attributeMailSmtpStarttlsEnable": "Mail: Activeaza  SMTP STARTTLS ",
+    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS  necesar",
+    "attributeMailSmtpSslEnable": "Mail: Activeaza SMTP SSL",
+    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Trust",
+    "attributeMailSmtpSslProtocols": "Mail: Protocol SMTP SSL",
+    "attributeMailSmtpFrom": "Mail: SMTP expeditor",
+    "attributeMailSmtpAuth": "Mail: Activeaza autentificare SMTP ",
+    "attributeMailSmtpUsername": "Mail: SMTP utilizator",
+    "attributeMailSmtpPassword": "Mail: SMTP parola",
     "errorTitle": "Eroare",
-    "errorUnknown": "Eroare necunoscută",
+    "errorGeneral": "Parametri invalizi",
     "errorConnection": "Eroare de conexiune",
     "errorSocket": "Eroare conectare socket",
     "userEmail": "Email",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresă",
     "positionProtocol": "Protocol",
     "positionDistance": "Distanta",
+    "positionRpm": "Turatia",
+    "positionFuel": "Nivel combustibil",
+    "positionPower": "Alimentare",
+    "positionBattery": "Baterie",
+    "positionRaw": "Brut",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP Eroare pe orizontala",
+    "positionVdop": "VDOP Eroare pe verticala",
+    "positionPdop": "PDOP Eroarea pozitiei",
+    "positionSat": "Sateliti",
+    "positionSatVisible": "Sateliti vizibili",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Eveniment",
+    "positionAlarm": "Alarma",
+    "positionStatus": "Stare",
+    "positionOdometer": "Kilometraj",
+    "positionServiceOdometer": "Valoare kilometraj service",
+    "positionTripOdometer": "Kilometraj tronson",
+    "positionHours": "Ore",
+    "positionInput": "Intrare",
+    "positionOutput": "Iesire",
+    "positionBatteryLevel": "Nivel baterie",
+    "positionFuelConsumption": "Consum combustibil",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Vesiune firmware",
+    "positionVersionHw": "Versiune hardware",
+    "positionIgnition": "Contact motor",
+    "positionFlags": "Marcaj",
+    "positionCharge": "Incarca",
+    "positionIp": "Adresa IP",
+    "positionArchive": "Arhiva",
+    "positionVin": "Numar identificare vehicul (VIN)",
+    "positionApproximate": "Aproximeaza",
+    "positionThrottle": "Pedala acceleratie",
+    "positionMotion": "Miscare",
+    "positionArmed": "Armat",
+    "positionAcceleration": "Acceleratie",
+    "positionDeviceTemp": "Temperatura echipament",
+    "positionOperator": "Operator",
+    "positionCommand": "Command",
+    "positionBlocked": "Blocat",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "Kilometraj OBD",
     "serverTitle": "Setări server",
     "serverZoom": "Zoom",
     "serverRegistration": "Înregistrare",
@@ -134,8 +211,8 @@
     "mapBingAerial": "Bing Hartă Aeriană",
     "mapBingHybrid": "Bing Maps Hybrid",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Harta Yandex",
+    "mapYandexSat": "Satelit Yandex",
     "mapShapePolygon": "Poligon",
     "mapShapeCircle": "Cerc",
     "mapShapePolyline": "Polilinie",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefon",
     "commandMessage": "Mesaj",
     "commandTimezone": "Diferenta fus orar",
+    "commandgetModemStatus": "Stare modem",
+    "commandgetDeviceStatus": "Stare echipament",
     "eventAll": "Toate evenimentele",
     "eventDeviceOnline": "Dispozitivul este pornit",
     "eventDeviceUnknown": "Starea dispozitivului necunoscuta",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Dispozitivul este în mişcare",
     "eventDeviceStopped": "Dispozitivul este stationar",
     "eventDeviceOverspeed": "Dispozitivul a depăşit limita de viteză",
+    "eventDeviceFuelDrop": "Alarma nivel combustibil",
     "eventCommandResult": "Rezultat comandă",
     "eventGeofenceEnter": "Dispozitivul a intrat in zona geofence",
     "eventGeofenceExit": "Dispozitivul a ieşit din zona geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Contact oprit",
     "eventMaintenance": "Intretinere necesara",
     "eventTextMessage": "Mesaj test primit",
-    "alarm": "Alarmă",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Alarma franare puternica",
     "alarmFatigueDriving": "Alarma oboseala",
     "alarmPowerCut": "Alarma intrerupere alimentare",
+    "alarmPowerRestored": "Avertizare revenire alimentare",
     "alarmJamming": "Alarma bruiere",
     "alarmTemperature": "Alarma de temperatura",
     "alarmParking": "Alarma parcare",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Alarma de franare",
     "alarmOilLeak": "Alarma scurgere ulei",
     "alarmTampering": "Alarma obstructionare",
+    "alarmRemoving": "Eliminare alarma",
     "notificationType": "Tip de notificare",
     "notificationWeb": "Trimite din Web",
     "notificationMail": "Trimite din Mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Ruta",
     "reportEvents": "Evenimente",
     "reportTrips": "Tronsoane",
+    "reportStops": "Opriri",
     "reportSummary": "Sumar",
     "reportChart": "Grafic",
     "reportConfigure": "Configureaza",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Solicitari",
     "statisticsMessagesReceived": "Mesaje primite",
     "statisticsMessagesStored": "Mesaje salvate",
+    "statisticsGeocoder": "Solicitari de geocodare",
+    "statisticsGeolocation": "Solicitari de localizare",
     "categoryArrow": "Sageata",
     "categoryDefault": "Implicit",
-    "categoryCar": "Masina",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicicleta",
+    "categoryBoat": "Barca",
     "categoryBus": "Autobuz",
-    "categoryTruck": "Camion",
-    "categoryShip": "Nava",
-    "categoryPlane": "Avion",
+    "categoryCar": "Masina",
+    "categoryCrane": "Macara",
+    "categoryHelicopter": "Elicopter",
     "categoryMotorcycle": "Motocicleta",
-    "categoryBicycle": "Bicicleta",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Persoana",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Papuc",
+    "categoryPlane": "Avion",
+    "categoryShip": "Nava",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Camion",
+    "categoryVan": "Duba"
 }
\ No newline at end of file
diff --git a/web/l10n/ru.json b/web/l10n/ru.json
index d0b08ccf..34e0f21e 100644
--- a/web/l10n/ru.json
+++ b/web/l10n/ru.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Расстояние",
     "sharedHourAbbreviation": "ч",
     "sharedMinuteAbbreviation": "м",
+    "sharedVoltAbbreviation": "В",
+    "sharedLiterAbbreviation": "л",
+    "sharedLiterPerHourAbbreviation": "л/ч",
     "sharedGetMapState": "Получить состояние карты",
     "sharedAttributeAlias": "Псевдоним атрибута",
     "sharedAttributeAliases": "Псевдонимы атрибутов",
     "sharedAlias": "Псевдоним",
+    "sharedComputedAttribute": "Вычисляемый Атрибут",
+    "sharedComputedAttributes": "Вычисляемые Атрибуты",
+    "sharedCheckComputedAttribute": "Проверить Вычисляемый Атрибут",
+    "sharedExpression": "Выражение",
     "sharedDeviceDistance": "Пробег Устройства",
     "sharedDevice": "Устройство",
     "sharedTestNotification": "Отправить Тестовое Уведомление",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Настройки",
     "sharedPermissions": "Разрешения",
     "sharedExtra": "Экстра",
+    "sharedTypeString": "Строка",
+    "sharedTypeNumber": "Число",
+    "sharedTypeBoolean": "Логическое Значение",
     "sharedTimezone": "Часовой Пояс",
+    "sharedInfoTitle": "Инфо",
+    "attributeSpeedLimit": "Ограничение Скорости",
+    "attributeReportIgnoreOdometer": "Отчет: Игнорировать Одометер",
+    "attributeMaintenanceStart": "Обслуживание: Начало",
+    "attributeMaintenanceInterval": "Обслуживание: Интервал",
+    "attributeWebReportColor": "Веб: Цвет Отчета",
+    "attributeDevicePassword": "Пароль Устройтва",
+    "attributeProcessingCopyAttributes": "Обработка: Копирование Атрибутов",
+    "attributeColor": "Цвет",
+    "attributeWebLiveRouteLength": "Веб: Длина Онлайн Маршрута",
+    "attributeWebSelectZoom": "Веб: Увеличение При Выборе",
+    "attributeMailSmtpHost": "Почта: SMTP Хост",
+    "attributeMailSmtpPort": "Почта: SMTP Порт",
+    "attributeMailSmtpStarttlsEnable": "Почта: Включить SMTP STARTTLS",
+    "attributeMailSmtpStarttlsRequired": "Почта: SMTP STARTTLS Необходим",
+    "attributeMailSmtpSslEnable": "Почта: Включить SMTP SSL",
+    "attributeMailSmtpSslTrust": "Почта: SMTP SSL Доверие",
+    "attributeMailSmtpSslProtocols": "Почта: SMTP SSL Протоколы",
+    "attributeMailSmtpFrom": "Почта: SMTP Отправитель",
+    "attributeMailSmtpAuth": "Почта: Включить SMTP Аутентификацию",
+    "attributeMailSmtpUsername": "Почта: SMTP Имя Пользователя",
+    "attributeMailSmtpPassword": "Почта: SMTP Пароль",
     "errorTitle": "Ошибка",
-    "errorUnknown": "Неизвестная ошибка",
+    "errorGeneral": "Неправильные параметры или нарушение ограничений",
     "errorConnection": "Ошибка соединения",
     "errorSocket": "Ошибка web socket соединения",
     "userEmail": "Email",
@@ -119,6 +151,51 @@
     "positionAddress": "Адрес",
     "positionProtocol": "Протокол",
     "positionDistance": "Расстояние",
+    "positionRpm": "Обороты",
+    "positionFuel": "Топливо",
+    "positionPower": "Питание",
+    "positionBattery": "Батарея",
+    "positionRaw": "Сырые",
+    "positionIndex": "Индекс",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Спутники",
+    "positionSatVisible": "Видимые Спутники",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Событие",
+    "positionAlarm": "Тревога",
+    "positionStatus": "Статус",
+    "positionOdometer": "Одометр",
+    "positionServiceOdometer": "Одометр Обслуживания",
+    "positionTripOdometer": "Одометр Поездки",
+    "positionHours": "Часы",
+    "positionInput": "Входы",
+    "positionOutput": "Выходы",
+    "positionBatteryLevel": "Уровень Батареи",
+    "positionFuelConsumption": "Потребление Топлива",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Версия Прошивки",
+    "positionVersionHw": "Версия Железа",
+    "positionIgnition": "Зажигание",
+    "positionFlags": "Флаги",
+    "positionCharge": "Заряд",
+    "positionIp": "IP",
+    "positionArchive": "Архив",
+    "positionVin": "VIN",
+    "positionApproximate": "Приблизительный",
+    "positionThrottle": "Дроссель",
+    "positionMotion": "Движение",
+    "positionArmed": "Охрана",
+    "positionAcceleration": "Ускорение",
+    "positionDeviceTemp": "Температура Устройства",
+    "positionOperator": "Оператор",
+    "positionCommand": "Команда",
+    "positionBlocked": "Блокировка",
+    "positionDtcs": "Ошибки",
+    "positionObdSpeed": "OBD Скорость",
+    "positionObdOdometer": "OBD Одометр",
     "serverTitle": "Настройки Сервера",
     "serverZoom": "Приближение",
     "serverRegistration": "Регистрация",
@@ -174,6 +251,8 @@
     "commandPhone": "Номер Телефона",
     "commandMessage": "Сообщение",
     "commandTimezone": "Смещение Временной Зоны",
+    "commandgetModemStatus": "Состояние Модема",
+    "commandgetDeviceStatus": "Состояние Устройства",
     "eventAll": "Все События",
     "eventDeviceOnline": "Устройство в сети",
     "eventDeviceUnknown": "Статус устройства неизвестен",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Устройство движется",
     "eventDeviceStopped": "Устройство остановилось",
     "eventDeviceOverspeed": "Устройство превышает скорость",
+    "eventDeviceFuelDrop": "Событие слива топлива",
     "eventCommandResult": "Результат команды",
     "eventGeofenceEnter": "Устройство вошло в геозону",
     "eventGeofenceExit": "Устройство покинуло геозону",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Зажигание ВЫКЛ",
     "eventMaintenance": "Требуется обслуживание",
     "eventTextMessage": "Текстовое сообщение получено",
-    "alarm": "Тревога",
+    "eventsScrollToLast": "Прокрутка До Конца",
     "alarmSos": "Тревога SOS",
     "alarmVibration": "Тревога Вибрации",
     "alarmMovement": "Тревога Сигнализации",
     "alarmOverspeed": "Тревога Превышения скорости",
     "alarmFallDown": "Тревога Падения",
     "alarmLowBattery": "Тревога Батарея разряжена",
+    "alarmLowPower": "Тревога Низкое Напряжение",
     "alarmFault": "Тревога Неисправность",
     "alarmPowerOff": "Тревога Выключение",
     "alarmPowerOn": "Тревога Включение",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Тревога Резкое Торможение",
     "alarmFatigueDriving": "Тревога Усталость Водителя",
     "alarmPowerCut": "Тревога Отключение Питания",
+    "alarmPowerRestored": "Тревога Питание Восстановлено",
     "alarmJamming": "Тревога Глушение",
     "alarmTemperature": "Тревога Температура",
     "alarmParking": "Тревога Парковка",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Тревога Ножной Тормоз",
     "alarmOilLeak": "Тревога Утечка Топлива",
     "alarmTampering": "Тревога Вмешательство",
+    "alarmRemoving": "Тревога Извлечение",
     "notificationType": "Тип уведомления",
     "notificationWeb": "Отправлять через Веб",
     "notificationMail": "Отправлять через Почту",
@@ -225,6 +308,7 @@
     "reportRoute": "Маршрут",
     "reportEvents": "События",
     "reportTrips": "Поездки",
+    "reportStops": "Остановки",
     "reportSummary": "Сводка",
     "reportChart": "Диаграмма",
     "reportConfigure": "Конфигурировать",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Запросы",
     "statisticsMessagesReceived": "Сообщений Получено",
     "statisticsMessagesStored": "Сообщений Сохранено",
+    "statisticsGeocoder": "Запросы Геокодера",
+    "statisticsGeolocation": "Запросы Геолокации",
     "categoryArrow": "Стрелка",
     "categoryDefault": "По умолчанию",
-    "categoryCar": "Автомобиль",
+    "categoryAnimal": "Животное",
+    "categoryBicycle": "Велосипед",
+    "categoryBoat": "Лодка",
     "categoryBus": "Автобус",
-    "categoryTruck": "Грузовой автомобиль",
-    "categoryShip": "Корабль",
-    "categoryPlane": "Самолёт",
+    "categoryCar": "Автомобиль",
+    "categoryCrane": "Кран",
+    "categoryHelicopter": "Вертолет",
     "categoryMotorcycle": "Мотоцикл",
-    "categoryBicycle": "Велосипед",
+    "categoryOffroad": "Внедорожник",
     "categoryPerson": "Человек",
-    "categoryAnimal": "Животное"
+    "categoryPickup": "Пикап",
+    "categoryPlane": "Самолёт",
+    "categoryShip": "Корабль",
+    "categoryTractor": "Трактор",
+    "categoryTruck": "Грузовой автомобиль",
+    "categoryVan": "Фургон"
 }
\ No newline at end of file
diff --git a/web/l10n/si.json b/web/l10n/si.json
index d58c9f74..598b96a4 100644
--- a/web/l10n/si.json
+++ b/web/l10n/si.json
@@ -37,10 +37,17 @@
     "sharedDistance": "දුර",
     "sharedHourAbbreviation": "පැ.",
     "sharedMinuteAbbreviation": "මි.",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "දෝෂයක් ",
-    "errorUnknown": "නොදන්නා දෝෂයක් !",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "සම්බන්ධතා දෝෂයක් !",
     "errorSocket": "Web socket connection error",
     "userEmail": "විද්යුත් තැපෑල",
@@ -119,6 +151,51 @@
     "positionAddress": "ලිපිනය",
     "positionProtocol": "ප්රොටොකෝලය",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "සේවාදායකයේ සැකසුම්",
     "serverZoom": "විශාලනය",
     "serverRegistration": "ලියාපදිංචි කිරීම",
@@ -174,6 +251,8 @@
     "commandPhone": "දුරකථන අංකය",
     "commandMessage": "පණිවිඩය",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "Device is online",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Device is moving",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "Device exceeds the speed",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Command result",
     "eventGeofenceEnter": "Device has entered geofence",
     "eventGeofenceExit": "Device has exited geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "අනතුරු ඇඟවීම්",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "නිවේදන ආකාරය",
     "notificationWeb": "ජාලය මගින් යවන්න",
     "notificationMail": "විද්‍යුත් තැපෑල මගින් යවන්න",
@@ -225,6 +308,7 @@
     "reportRoute": "ගමන් මඟ",
     "reportEvents": "සිදුවීම්",
     "reportTrips": "ගමන්",
+    "reportStops": "Stops",
     "reportSummary": "සාරාංශය",
     "reportChart": "Chart",
     "reportConfigure": "හැඩගසනවා",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/sk.json b/web/l10n/sk.json
index 52ea86ec..016d07d8 100644
--- a/web/l10n/sk.json
+++ b/web/l10n/sk.json
@@ -17,9 +17,9 @@
     "sharedHour": "Hodina",
     "sharedMinute": "Minúta",
     "sharedSecond": "Sekunda",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "dni",
+    "sharedHours": "hodiny",
+    "sharedMinutes": "minúty",
     "sharedDecimalDegrees": "Desatinné stupne",
     "sharedDegreesDecimalMinutes": "Stupne desatinných minút",
     "sharedDegreesMinutesSeconds": "Stupne desatinných sekúnd",
@@ -37,10 +37,17 @@
     "sharedDistance": "Vzdialenosť",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Získať mapu štát",
     "sharedAttributeAlias": "Alias atribút",
     "sharedAttributeAliases": "Alias atribútov",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Vzdialenosť zariadenia",
     "sharedDevice": "Zariadenie",
     "sharedTestNotification": "Pošli skúšobnú notifikáciu",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferencie",
     "sharedPermissions": "Povolenia",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Číslo",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Časová zóna",
+    "sharedInfoTitle": "Informácie",
+    "attributeSpeedLimit": "Limit rýchlosti",
+    "attributeReportIgnoreOdometer": "Report: Ignoruj kilometrovník",
+    "attributeMaintenanceStart": "Údržba: Štart",
+    "attributeMaintenanceInterval": "Údržba: Interval",
+    "attributeWebReportColor": "Web: Farba reportu",
+    "attributeDevicePassword": "Heslo zaridenia",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Farba",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "attributeMailSmtpHost": "E-Mail: SMTP Host",
+    "attributeMailSmtpPort": "E-Mail: SMTP Port",
+    "attributeMailSmtpStarttlsEnable": "E-Mail: SMTP STARTTLS Zapnuté",
+    "attributeMailSmtpStarttlsRequired": "E-Mail: SMTP STARTTLS Povinná",
+    "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",
     "errorTitle": "Chyba",
-    "errorUnknown": "Neznáma chyba",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Chyba pripojenia",
     "errorSocket": "Chyba pripojenia web konektora",
     "userEmail": "E-mail",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresa",
     "positionProtocol": "Protokol",
     "positionDistance": "Vzdialenosť",
+    "positionRpm": "OZM",
+    "positionFuel": "Palivo",
+    "positionPower": "Napätie",
+    "positionBattery": "Baterka",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satelity",
+    "positionSatVisible": "Viditeľne satelity",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Udalosť",
+    "positionAlarm": "Upozornenie",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Nastavenie servera",
     "serverZoom": "Zoom",
     "serverRegistration": "Registrácia",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefónne číslo",
     "commandMessage": "Správa",
     "commandTimezone": "Časová zóna Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "Všetky akcie",
     "eventDeviceOnline": "Zariadenie je online",
     "eventDeviceUnknown": "Stav zariadenie je neznámy",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Zariadenie je v pohybe",
     "eventDeviceStopped": "Zariadenie sa zastavilo",
     "eventDeviceOverspeed": "Zariadenie prekročilo rýchlosť",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Výsledok príkazu",
     "eventGeofenceEnter": "Zariadenie vstúpilo geofence zóny",
     "eventGeofenceExit": "Zariadenie opustilo geofence zónu",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Zapaľovanie je VYPNUTÉ",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Upozornenie",
+    "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": "Power Off Alarm",
     "alarmPowerOn": "Power On Alarm",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Typ notifikácie",
     "notificationWeb": "Poslať cez Web",
     "notificationMail": "Poslať e-mailom",
@@ -225,6 +308,7 @@
     "reportRoute": "Cesta",
     "reportEvents": "Udalosti",
     "reportTrips": "Cesty",
+    "reportStops": "Stops",
     "reportSummary": "Zhrnutie",
     "reportChart": "Chart",
     "reportConfigure": "Konfigurácia",
@@ -242,22 +326,31 @@
     "reportEndTime": "Čas ukončenia",
     "reportEndAddress": "Koncová adresa",
     "reportSpentFuel": "Spotrebované palivo",
-    "statisticsTitle": "Statistics",
-    "statisticsCaptureTime": "Capture Time",
-    "statisticsActiveUsers": "Active Users",
-    "statisticsActiveDevices": "Active Devices",
-    "statisticsRequests": "Requests",
-    "statisticsMessagesReceived": "Messages Received",
-    "statisticsMessagesStored": "Messages Stored",
-    "categoryArrow": "Arrow",
-    "categoryDefault": "Default",
-    "categoryCar": "Auto",
+    "statisticsTitle": "Štatistika",
+    "statisticsCaptureTime": "Zachyť čas",
+    "statisticsActiveUsers": "Aktívny užívateľia",
+    "statisticsActiveDevices": "Aktívne zariadenia",
+    "statisticsRequests": "Požiadavka",
+    "statisticsMessagesReceived": "Správa doručená",
+    "statisticsMessagesStored": "Správa uložená",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
+    "categoryArrow": "Šípka",
+    "categoryDefault": "Základné",
+    "categoryAnimal": "Zviera",
+    "categoryBicycle": "Bicykel",
+    "categoryBoat": "Loď",
     "categoryBus": "Autobus",
-    "categoryTruck": "Nákladné auto",
-    "categoryShip": "Loď",
-    "categoryPlane": "Lietadlo",
+    "categoryCar": "Auto",
+    "categoryCrane": "Žeriav",
+    "categoryHelicopter": "Helikoptéra",
     "categoryMotorcycle": "Motocykel",
-    "categoryBicycle": "Bicykel",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Osoba",
-    "categoryAnimal": "Zviera"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Lietadlo",
+    "categoryShip": "Loď",
+    "categoryTractor": "Traktor",
+    "categoryTruck": "Nákladné auto",
+    "categoryVan": "Dodávka"
 }
\ No newline at end of file
diff --git a/web/l10n/sl.json b/web/l10n/sl.json
index 6574f156..00a4c86d 100644
--- a/web/l10n/sl.json
+++ b/web/l10n/sl.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Razdalja",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Razdalja naprave",
     "sharedDevice": "Naprava",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Nastavitve",
     "sharedPermissions": "Dovoljenja",
     "sharedExtra": "Dodatno",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Časovni pas",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "Napaka",
-    "errorUnknown": "Neznana napaka",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Napaka v povezavi",
     "errorSocket": "Napaka v povezavi web socket",
     "userEmail": "E-Pošta",
@@ -119,6 +151,51 @@
     "positionAddress": "Naslov",
     "positionProtocol": "Protokol",
     "positionDistance": "Razdalja",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Nastavitve strežnika",
     "serverZoom": "Povečava",
     "serverRegistration": "Registracija",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefonska številka",
     "commandMessage": "Sporočilo",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "Vsi dogodki",
     "eventDeviceOnline": "Naprava je povezana",
     "eventDeviceUnknown": "Stanje naprave ni znano",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Naprava se premika",
     "eventDeviceStopped": "Naprava se je ustavila",
     "eventDeviceOverspeed": "Naprava je prekoračila omejitev hitrosti",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Command result",
     "eventGeofenceEnter": "Device has entered geofence",
     "eventGeofenceExit": "Device has exited geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Odvzem kontakta",
     "eventMaintenance": "Potrebno vzdrževanje",
     "eventTextMessage": "Sporočilo sprejeto",
-    "alarm": "Alaram",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Type of Notification",
     "notificationWeb": "Pošlji preko spleta",
     "notificationMail": "Pošlji po elektronski pošti",
@@ -225,12 +308,13 @@
     "reportRoute": "Pot",
     "reportEvents": "Dogodki",
     "reportTrips": "Poti",
+    "reportStops": "Stops",
     "reportSummary": "Povzetek",
-    "reportChart": "Chart",
+    "reportChart": "Graf",
     "reportConfigure": "Nastavi",
     "reportEventTypes": "Event Types",
-    "reportChartType": "Chart Type",
-    "reportShowMarkers": "Show Markers",
+    "reportChartType": "Tip grafa",
+    "reportShowMarkers": "Prikaži oznake",
     "reportExport": "Izvozi",
     "reportDeviceName": "Ime naprave",
     "reportAverageSpeed": "Povprečna hitrost",
@@ -243,21 +327,30 @@
     "reportEndAddress": "Končni naslov",
     "reportSpentFuel": "Porabljeno gorivo",
     "statisticsTitle": "Statistika",
-    "statisticsCaptureTime": "Capture Time",
+    "statisticsCaptureTime": "Začetni čas",
     "statisticsActiveUsers": "Aktivni uporabniki",
     "statisticsActiveDevices": "Aktivne naprave",
     "statisticsRequests": "Zahtevkov",
     "statisticsMessagesReceived": "Prejetih sporočil",
     "statisticsMessagesStored": "Shranjenih sporočil",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Puščica",
     "categoryDefault": "Privzeto",
-    "categoryCar": "Avto",
+    "categoryAnimal": "Žival",
+    "categoryBicycle": "Kolo",
+    "categoryBoat": "Boat",
     "categoryBus": "Avtobus",
-    "categoryTruck": "Tovornjak",
-    "categoryShip": "Ladja",
-    "categoryPlane": "Letalo",
+    "categoryCar": "Avto",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motor",
-    "categoryBicycle": "Kolo",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Oseba",
-    "categoryAnimal": "Žival"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Letalo",
+    "categoryShip": "Ladja",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Tovornjak",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/sq.json b/web/l10n/sq.json
index 73eee4b6..7f2f5607 100644
--- a/web/l10n/sq.json
+++ b/web/l10n/sq.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Distance",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "Gabim",
-    "errorUnknown": "Gabim i panjohur",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Gabim lidhjeje",
     "errorSocket": "Web socket connection error",
     "userEmail": "Email",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresa",
     "positionProtocol": "Protokolli",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Server-Parametrat",
     "serverZoom": "Fokus",
     "serverRegistration": "Regjistrim",
@@ -174,6 +251,8 @@
     "commandPhone": "Phone Number",
     "commandMessage": "Message",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "Device is online",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Device is moving",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "Device exceeds the speed",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Command result",
     "eventGeofenceEnter": "Device has entered geofence",
     "eventGeofenceExit": "Device has exited geofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Type of Notification",
     "notificationWeb": "Send via Web",
     "notificationMail": "Send via Mail",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/sr.json b/web/l10n/sr.json
index 18ecb674..4a6378ad 100644
--- a/web/l10n/sr.json
+++ b/web/l10n/sr.json
@@ -1,5 +1,5 @@
 {
-    "sharedLoading": "Loading...",
+    "sharedLoading": "Učitavanje...",
     "sharedHide": "Sakrij",
     "sharedSave": "Sačuvaj",
     "sharedSet": "Podesi",
@@ -18,7 +18,7 @@
     "sharedMinute": "Minut",
     "sharedSecond": "Sekunda",
     "sharedDays": "dana",
-    "sharedHours": "sati",
+    "sharedHours": "sata/i",
     "sharedMinutes": "minuta",
     "sharedDecimalDegrees": "Decimalni Stepeni",
     "sharedDegreesDecimalMinutes": "Minuti Decimalnih stepeni",
@@ -37,11 +37,18 @@
     "sharedDistance": "Razdaljina",
     "sharedHourAbbreviation": "č",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "L",
+    "sharedLiterPerHourAbbreviation": "L/h",
     "sharedGetMapState": "Stanje mape",
     "sharedAttributeAlias": "Osobina pseudonima",
     "sharedAttributeAliases": "Osobine Pseudonima",
     "sharedAlias": "Pseudonim",
-    "sharedDeviceDistance": "Device Distance",
+    "sharedComputedAttribute": "Kompjuterizovani atribut",
+    "sharedComputedAttributes": "Kompjuterizovani atributi",
+    "sharedCheckComputedAttribute": "Proveri kompjuterski atribut",
+    "sharedExpression": "Izraz",
+    "sharedDeviceDistance": "Ukupno prešao",
     "sharedDevice": "Uređaj",
     "sharedTestNotification": "Pošalji Test Poruku",
     "sharedCalendar": "Kalendar",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Podešavanja",
     "sharedPermissions": "Dozvole",
     "sharedExtra": "Dodatno",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Broj",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Vremenska zona",
+    "sharedInfoTitle": "Informacija",
+    "attributeSpeedLimit": "Ograničenje brzine",
+    "attributeReportIgnoreOdometer": "Izveštaj: Ignoriši odometar",
+    "attributeMaintenanceStart": "Održavanje: Start",
+    "attributeMaintenanceInterval": "Održavanje: Interval",
+    "attributeWebReportColor": "Web: Boja izveštaja",
+    "attributeDevicePassword": "Lozinka uređaja",
+    "attributeProcessingCopyAttributes": "Proces: Kopiraj atribute",
+    "attributeColor": "Boja",
+    "attributeWebLiveRouteLength": "Web: Dužina rute",
+    "attributeWebSelectZoom": "Web:Zumiraj izabrano",
+    "attributeMailSmtpHost": "Mail: SMTP host",
+    "attributeMailSmtpPort": "Mail: SMTP port",
+    "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable",
+    "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS Required",
+    "attributeMailSmtpSslEnable": "Mail: SMTP SSL omogući",
+    "attributeMailSmtpSslTrust": "Mail: SMTP SSL Trust",
+    "attributeMailSmtpSslProtocols": "Mail: SMTP SSL Protokoli",
+    "attributeMailSmtpFrom": "Mail: SMTP Od",
+    "attributeMailSmtpAuth": "Mail: SMTP Auten Omogući",
+    "attributeMailSmtpUsername": "Mail: SMTP Korisničko ime",
+    "attributeMailSmtpPassword": "Mail: SMTP Lozinka",
     "errorTitle": "Greška",
-    "errorUnknown": "Nepoznata greška",
+    "errorGeneral": "Nevažeći parametri ili kršenje ograničenja",
     "errorConnection": "Greška u konekciji",
     "errorSocket": "Greška u konekciji",
     "userEmail": "Email",
@@ -119,6 +151,51 @@
     "positionAddress": "Adresa",
     "positionProtocol": "Protokol",
     "positionDistance": "Razdaljina",
+    "positionRpm": "Obrtaji",
+    "positionFuel": "Gorivo",
+    "positionPower": "Napon",
+    "positionBattery": "Baterija",
+    "positionRaw": "Neobrađen",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satelita",
+    "positionSatVisible": "Vidljivo satelita",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Događaj",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Kilometar sat",
+    "positionServiceOdometer": "Servisni odometar",
+    "positionTripOdometer": "Putni odometar",
+    "positionHours": "Sati",
+    "positionInput": "Ulaz",
+    "positionOutput": "Izlaz",
+    "positionBatteryLevel": "Jačina baterije",
+    "positionFuelConsumption": "Ukupna potrošnja",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Verzija firmvera",
+    "positionVersionHw": "Verzija hardvera",
+    "positionIgnition": "Kontakt",
+    "positionFlags": "Oznake",
+    "positionCharge": "Punjenje",
+    "positionIp": "IP adresa",
+    "positionArchive": "Arhiva",
+    "positionVin": "Broj šasije",
+    "positionApproximate": "Približno",
+    "positionThrottle": "Gas",
+    "positionMotion": "Kretanje",
+    "positionArmed": "Naoružan",
+    "positionAcceleration": "Ubrzanje",
+    "positionDeviceTemp": "Temperatura uređaja",
+    "positionOperator": "Operator",
+    "positionCommand": "Komanda",
+    "positionBlocked": "Blokirano",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD brzina",
+    "positionObdOdometer": "OBD odometar",
     "serverTitle": "Podešavanja Servera",
     "serverZoom": "Zumiranje",
     "serverRegistration": "Registracija",
@@ -132,10 +209,10 @@
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
     "mapBingAerial": "Bing Maps Aerial",
-    "mapBingHybrid": "Bing Maps Hybrid",
-    "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapBingHybrid": "Bing Hibrid Mapa",
+    "mapBaidu": "Badu",
+    "mapYandexMap": "Yandex Mapa",
+    "mapYandexSat": "Yandex Satelit",
     "mapShapePolygon": "Višeugao",
     "mapShapeCircle": "Krug",
     "mapShapePolyline": "Višelinijski",
@@ -174,6 +251,8 @@
     "commandPhone": "Broj telefona",
     "commandMessage": "Poruka",
     "commandTimezone": "Vremenska zona ",
+    "commandgetModemStatus": "Status modema",
+    "commandgetDeviceStatus": "Status uređaja",
     "eventAll": "Svi događaji",
     "eventDeviceOnline": "Uređaj je na mreži",
     "eventDeviceUnknown": "Status uređaja je nepoznat",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Uređaj se kreće",
     "eventDeviceStopped": "Uređaj se zaustavio",
     "eventDeviceOverspeed": "Uređaj prelazi brzinu",
+    "eventDeviceFuelDrop": "Pad nivoa goriva",
     "eventCommandResult": "Stanje komande",
     "eventGeofenceEnter": "Uređaj je ušao u geoogradu",
     "eventGeofenceExit": "Uređaj je izašao iz geoograde",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Kontakt isklj.",
     "eventMaintenance": "Potrebno održavanje",
     "eventTextMessage": "Tekstualma poruka primljena",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Alarm Naglo Kočenje",
     "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",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Alarm Nožne Kočnice",
     "alarmOilLeak": "Curenje Ulja Alarm",
     "alarmTampering": "Alarm Kvara",
+    "alarmRemoving": "Uklanjanje Alarma",
     "notificationType": "Tip obaveštenja",
     "notificationWeb": "Pošalji preko Web-a",
     "notificationMail": "Pošalji putem Email-a",
@@ -225,6 +308,7 @@
     "reportRoute": "Ruta",
     "reportEvents": "Događaji",
     "reportTrips": "Vožnje",
+    "reportStops": "Zaustavljanja",
     "reportSummary": "Izveštaj",
     "reportChart": "Grafikon",
     "reportConfigure": "Konfiguracija",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Zahtevi",
     "statisticsMessagesReceived": "Primljene poruke",
     "statisticsMessagesStored": "Sačuvane poruke",
+    "statisticsGeocoder": "Geokoder upiti",
+    "statisticsGeolocation": "Geolokacijski upiti",
     "categoryArrow": "Strelica",
     "categoryDefault": "Osnovni",
-    "categoryCar": "Auto",
+    "categoryAnimal": "Životinja",
+    "categoryBicycle": "Bicikl",
+    "categoryBoat": "Brod",
     "categoryBus": "Autobus",
-    "categoryTruck": "Kamion",
-    "categoryShip": "Brod",
-    "categoryPlane": "Avion",
+    "categoryCar": "Auto",
+    "categoryCrane": "Kran",
+    "categoryHelicopter": "Helikopter",
     "categoryMotorcycle": "Motor",
-    "categoryBicycle": "Bicikl",
+    "categoryOffroad": "Terensko",
     "categoryPerson": "Osoba",
-    "categoryAnimal": "Životinja"
+    "categoryPickup": "Pikap",
+    "categoryPlane": "Avion",
+    "categoryShip": "Brod",
+    "categoryTractor": "Traktor",
+    "categoryTruck": "Kamion",
+    "categoryVan": "Kombi"
 }
\ No newline at end of file
diff --git a/web/l10n/sv.json b/web/l10n/sv.json
index 045b6de0..36eb56d4 100644
--- a/web/l10n/sv.json
+++ b/web/l10n/sv.json
@@ -14,12 +14,12 @@
     "sharedKn": "kn",
     "sharedKmh": "km/h",
     "sharedMph": "mph",
-    "sharedHour": "Timme",
-    "sharedMinute": "Minut",
-    "sharedSecond": "Sekund",
-    "sharedDays": "Dagar",
-    "sharedHours": "Timmar",
-    "sharedMinutes": "Minuter",
+    "sharedHour": "tim",
+    "sharedMinute": "min",
+    "sharedSecond": "sek",
+    "sharedDays": "d",
+    "sharedHours": "tim",
+    "sharedMinutes": "min",
     "sharedDecimalDegrees": "Decimalgrader",
     "sharedDegreesDecimalMinutes": "Decimalgrader Minuter",
     "sharedDegreesMinutesSeconds": "Decimalgrader Sekunder",
@@ -37,10 +37,17 @@
     "sharedDistance": "Distans",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Få karttillstånd",
     "sharedAttributeAlias": "Attribut alias",
     "sharedAttributeAliases": "Attribut alias",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Uttryck",
     "sharedDeviceDistance": "Enhet Avstånd",
     "sharedDevice": "Enhet",
     "sharedTestNotification": "Skicka testnortis",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Inställningar",
     "sharedPermissions": "Rättigheter",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Tidszon",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Hastighetsbegränsning",
+    "attributeReportIgnoreOdometer": "Rapport: Ignorera Odometer",
+    "attributeMaintenanceStart": "Underhåll: Start",
+    "attributeMaintenanceInterval": "Underhåll: Intervall",
+    "attributeWebReportColor": "Web: Rapport färg",
+    "attributeDevicePassword": "Enhetslösenord",
+    "attributeProcessingCopyAttributes": "Processing:",
+    "attributeColor": "Färg",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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 Från",
+    "attributeMailSmtpAuth": "Mail: SMTP Auth Enable",
+    "attributeMailSmtpUsername": "Mail: SMTP Användarnamn",
+    "attributeMailSmtpPassword": "Mail: SMTP Lösenord",
     "errorTitle": "Fel",
-    "errorUnknown": "Okänt fel",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Anslutningsfel",
     "errorSocket": "Anslutningsfel till Web socket",
     "userEmail": "Epost",
@@ -119,6 +151,51 @@
     "positionAddress": "Adress",
     "positionProtocol": "Protokoll",
     "positionDistance": "Distans",
+    "positionRpm": "RPM",
+    "positionFuel": "Bränsle",
+    "positionPower": "Power",
+    "positionBattery": "Batteri",
+    "positionRaw": "Rå",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Satelliter",
+    "positionSatVisible": "Synbara satelliter",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Händelser",
+    "positionAlarm": "Larm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip",
+    "positionHours": "tim",
+    "positionInput": "Input",
+    "positionOutput": "Output",
+    "positionBatteryLevel": "Batteri nivå",
+    "positionFuelConsumption": "Bränsle åtgång",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Firmware version",
+    "positionVersionHw": "Hardware version",
+    "positionIgnition": "Tändning",
+    "positionFlags": "Flaggor",
+    "positionCharge": "Laddar",
+    "positionIp": "IP",
+    "positionArchive": "Arkivera",
+    "positionVin": "VIN",
+    "positionApproximate": "Uppskattningsvis",
+    "positionThrottle": "Gasreglage",
+    "positionMotion": "Rörelse",
+    "positionArmed": "Larmad",
+    "positionAcceleration": "Acceleration",
+    "positionDeviceTemp": "Enhetstemperatur",
+    "positionOperator": "Operatör",
+    "positionCommand": "Command",
+    "positionBlocked": "Blockerad ",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "ODB Hastighet",
+    "positionObdOdometer": "ODB Odometer",
     "serverTitle": "Serverinställningar",
     "serverZoom": "Zoom",
     "serverRegistration": "Registrera",
@@ -132,10 +209,10 @@
     "mapBingKey": "Bing Maps Nyckel",
     "mapBingRoad": "Bing Maps Väg",
     "mapBingAerial": "Bing Maps Flygfoto",
-    "mapBingHybrid": "Bing Maps Hybrid",
+    "mapBingHybrid": "Bing kartor hybrid",
     "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapYandexMap": "Yandex kartor",
+    "mapYandexSat": "Yandex satellit",
     "mapShapePolygon": "Polygon",
     "mapShapeCircle": "Cirkel",
     "mapShapePolyline": "Polyline",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefonnummer",
     "commandMessage": "Meddelande",
     "commandTimezone": "Tidszon Offset",
+    "commandgetModemStatus": "Modemstatus",
+    "commandgetDeviceStatus": "Enhetsstatus",
     "eventAll": "Alla event",
     "eventDeviceOnline": "Enheten är online",
     "eventDeviceUnknown": "Okänd status på enheten",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Enheten rör sig",
     "eventDeviceStopped": "Enheten har stannat",
     "eventDeviceOverspeed": "Enheten har överskridit hastigheten",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Kommando resultat",
     "eventGeofenceEnter": "Enheten har anlänt till geofence",
     "eventGeofenceExit": "Enheten har lämnat genofence",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Tändningen är AV",
     "eventMaintenance": "Underhåll krävs",
     "eventTextMessage": "Textmeddelande mottaget",
-    "alarm": "Larm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hårt Broms Larm",
     "alarmFatigueDriving": "Trötthetslarm",
     "alarmPowerCut": "Strömavbrott Larm",
+    "alarmPowerRestored": "Spänning återställd",
     "alarmJamming": "Störningslarm",
     "alarmTemperature": "Temperaturlarm",
     "alarmParking": "Parkeringslarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Fotbromslarm",
     "alarmOilLeak": "Larm oljeläckage",
     "alarmTampering": "Manipuleringlarm",
+    "alarmRemoving": "Ta bort larm",
     "notificationType": "Typ av notis",
     "notificationWeb": "Skicka via Web",
     "notificationMail": "Skicka via Epost",
@@ -225,6 +308,7 @@
     "reportRoute": "Rutt",
     "reportEvents": "Händelser",
     "reportTrips": "Resor",
+    "reportStops": "Stop",
     "reportSummary": "Sammanfattning",
     "reportChart": "Diagram",
     "reportConfigure": "Konfigurera",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Förfrågningar",
     "statisticsMessagesReceived": "Meddelande mottaget",
     "statisticsMessagesStored": "Meddelande lagrat",
+    "statisticsGeocoder": "Geocoder förfrågan",
+    "statisticsGeolocation": "Geolocation förfrågan",
     "categoryArrow": "Pil",
     "categoryDefault": "Standart",
-    "categoryCar": "Bil",
+    "categoryAnimal": "Djur",
+    "categoryBicycle": "Cykel",
+    "categoryBoat": "Båt",
     "categoryBus": "Buss",
-    "categoryTruck": "Lastbil",
-    "categoryShip": "Fartyg",
-    "categoryPlane": "Flygplan",
+    "categoryCar": "Bil",
+    "categoryCrane": "Kran",
+    "categoryHelicopter": "Helikopter",
     "categoryMotorcycle": "Motorcykel",
-    "categoryBicycle": "Cykel",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Djur"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Flygplan",
+    "categoryShip": "Fartyg",
+    "categoryTractor": "Traktor",
+    "categoryTruck": "Lastbil",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/ta.json b/web/l10n/ta.json
index 21218e68..4bfb3026 100644
--- a/web/l10n/ta.json
+++ b/web/l10n/ta.json
@@ -37,10 +37,17 @@
     "sharedDistance": "தொலைவு",
     "sharedHourAbbreviation": "ம",
     "sharedMinuteAbbreviation": "நி",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "வரைபட நிலையை பெறு",
     "sharedAttributeAlias": "Attribute Alias",
     "sharedAttributeAliases": "Attribute Aliases",
     "sharedAlias": "Alias",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "பிழை",
-    "errorUnknown": "அறியப்படாத பிழை",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "இணைப்புப் பிழை",
     "errorSocket": "Web socket connection error",
     "userEmail": "மின்னஞ்சல்",
@@ -119,6 +151,51 @@
     "positionAddress": "முகவரி",
     "positionProtocol": "புரோட்டோகால்",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "சர்வர் அமைப்பு",
     "serverZoom": "பெரிதாக்கு",
     "serverRegistration": "பதிவுசெய்ய",
@@ -174,6 +251,8 @@
     "commandPhone": "தொலைபேசி எண்",
     "commandMessage": "குறுஞ்செய்தி",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "All Events",
     "eventDeviceOnline": "சாதனம் இணைப்பில் உள்ளது",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "சாதனம் நகருகிறது",
     "eventDeviceStopped": "Device has stopped",
     "eventDeviceOverspeed": "சாதனம் நிர்ணயித்த வேகத் திற்கு மேல்",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "கட்டளை விளைவு",
     "eventGeofenceEnter": "சாதனம் பூகோள வேலியினுள் நுழைந்துள்ளது",
     "eventGeofenceExit": "சாதனம் பூகோள வேலியை விட்டு வெளியேறியது",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ignition is OFF",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Alarm",
+    "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",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "type of notification",
     "notificationWeb": "வலைதளம்  வழி அனுப்புக ",
     "notificationMail": "மின்னஞ்சல்  வழி அனுப்புக",
@@ -225,6 +308,7 @@
     "reportRoute": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
+    "reportStops": "Stops",
     "reportSummary": "Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/th.json b/web/l10n/th.json
index 22296491..4b014c00 100644
--- a/web/l10n/th.json
+++ b/web/l10n/th.json
@@ -37,10 +37,17 @@
     "sharedDistance": "ระยะทาง",
     "sharedHourAbbreviation": "ชม.",
     "sharedMinuteAbbreviation": "นาที",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "ลิตร",
+    "sharedLiterPerHourAbbreviation": "ลิตรต่อชั่วโมง",
     "sharedGetMapState": "ได้รับสถานะแผนที่",
     "sharedAttributeAlias": "คุณลักษณะ นามแฝง",
     "sharedAttributeAliases": "คุณลักษณะ นามแฝง",
     "sharedAlias": "นามแฝง",
+    "sharedComputedAttribute": "คำนวณแอตทริบิวต์",
+    "sharedComputedAttributes": "คำนวณแอตทริบิวต์",
+    "sharedCheckComputedAttribute": "ตรวจสอบคอมพิวเตอร์แอตทริบิวต์",
+    "sharedExpression": "การแสดงออก",
     "sharedDeviceDistance": "ระยะทาง อุปกรณ์",
     "sharedDevice": "อุปกรณ์",
     "sharedTestNotification": "ส่งการแจ้งเตือนการทดสอบ",
@@ -53,9 +60,34 @@
     "sharedPreferences": "การตั้งค่า",
     "sharedPermissions": "สิทธิ์",
     "sharedExtra": "พิเศษ",
+    "sharedTypeString": "แถว",
+    "sharedTypeNumber": "จำนวน",
+    "sharedTypeBoolean": "บูลีน",
     "sharedTimezone": "เขตเวลา",
+    "sharedInfoTitle": "ข้อมูล",
+    "attributeSpeedLimit": "จำกัดความเร็ว",
+    "attributeReportIgnoreOdometer": "รายงาน: ละเว้นวัดระยะ",
+    "attributeMaintenanceStart": "การบำรุงรักษา: เริ่มต้น",
+    "attributeMaintenanceInterval": "การบำรุงรักษา: ช่วง",
+    "attributeWebReportColor": "เว็บ: สีรายงาน",
+    "attributeDevicePassword": "รหัสผ่านอุปกรณ์",
+    "attributeProcessingCopyAttributes": "การประมวลผล: คัดลอกคุณสมบัติ",
+    "attributeColor": "สี",
+    "attributeWebLiveRouteLength": "เว็บ: สดเส้นทางความยาว",
+    "attributeWebSelectZoom": "เว็บ: ขยายเมื่อเลือก",
+    "attributeMailSmtpHost": "Mail: SMTP Host",
+    "attributeMailSmtpPort": "Mail: SMTP Host",
+    "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",
     "errorTitle": "ผิดพลาด",
-    "errorUnknown": "ข้อผิดพลาดที่ไม่รู้จัก",
+    "errorGeneral": "ไม่ถูกต้องพารามิเตอร์หรือ จำกัด การละเมิด",
     "errorConnection": "การเชื่อมต่อผิดพลาด",
     "errorSocket": "ข้อผิดพลาดการเชื่อมต่อซ็อกเก็ตเว็บ",
     "userEmail": "อีเมล์",
@@ -96,7 +128,7 @@
     "settingsTitle": "การตั้งค่า",
     "settingsUser": "บัญชีผู้ใช้",
     "settingsGroups": "ตั้งค่ากลุ่ม",
-    "settingsServer": "ตั้งค่าระบบ",
+    "settingsServer": "เซิร์ฟเวอร์",
     "settingsUsers": "ตั้งค่าผู้ใช้งาน",
     "settingsSpeedUnit": "หน่วยความเร็ว",
     "settingsTwelveHourFormat": "รูปแบบเวลา 12 ชั่วโมง",
@@ -119,6 +151,51 @@
     "positionAddress": "ที่อยู่",
     "positionProtocol": "โปรโตคอล",
     "positionDistance": "ระยะทาง",
+    "positionRpm": "RPM",
+    "positionFuel": "เชื้อเพลิง",
+    "positionPower": "พลังงาน",
+    "positionBattery": "แบตเตอรี่",
+    "positionRaw": "ดิบ",
+    "positionIndex": "ดัชนี",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "ดาวเทียม",
+    "positionSatVisible": "มองเห็นในดาวเทียม",
+    "positionRssi": "RSSI",
+    "positionGps": "จีพีเอส",
+    "positionEvent": "กิจกรรม",
+    "positionAlarm": "ปลุก",
+    "positionStatus": "สถานะ",
+    "positionOdometer": "วัดระยะทาง",
+    "positionServiceOdometer": "บริการวัดระยะทาง",
+    "positionTripOdometer": "มาตรวัดการเดินทาง",
+    "positionHours": "ชั่วโมง",
+    "positionInput": "อินพุต",
+    "positionOutput": "เอาต์พุต",
+    "positionBatteryLevel": "ระดับแบตเตอรี่",
+    "positionFuelConsumption": "การใช้น้ำมันเชื้อเพลิง",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Firmware Version",
+    "positionVersionHw": "Hardware Version",
+    "positionIgnition": "ระบบจุดระเบิด",
+    "positionFlags": "ธง",
+    "positionCharge": "ชาร์จ",
+    "positionIp": "IP",
+    "positionArchive": "เก็บ",
+    "positionVin": "VIN",
+    "positionApproximate": "ประมาณ",
+    "positionThrottle": "คันเร่ง",
+    "positionMotion": "เคลื่อนไหว",
+    "positionArmed": "Armed",
+    "positionAcceleration": "การเร่งความเร็ว",
+    "positionDeviceTemp": "อุณหภูมิของอุปกรณ์",
+    "positionOperator": "ผู้ประกอบการ",
+    "positionCommand": "Command",
+    "positionBlocked": "อุดตัน",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "ความเร็ว OBD",
+    "positionObdOdometer": "มาตรวัดระยะ OBD",
     "serverTitle": "การตั้งค่าเซิร์ฟเวอ",
     "serverZoom": "ชยาย +/-",
     "serverRegistration": "ลงทะเบียน",
@@ -174,6 +251,8 @@
     "commandPhone": "หมายเลขโทรศัพท์",
     "commandMessage": "ข้อความ",
     "commandTimezone": "เขตเวลา ตรงข้าม",
+    "commandgetModemStatus": "สถานะโมเด็ม",
+    "commandgetDeviceStatus": "สถานะอุปกรณ์",
     "eventAll": "เหตุการณ์ทั้งหมด",
     "eventDeviceOnline": "อุปกรณ์เชื่อมต่อแล้ว",
     "eventDeviceUnknown": "สถานะของอุปกรณ์ไม่เป็นที่รู้จัก",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "อุปกรณ์กำลังเคลื่อนที่",
     "eventDeviceStopped": "อุปกรณ์กำลังหยุด",
     "eventDeviceOverspeed": "อุปกรณ์เกินกำหนดความเร็ว",
+    "eventDeviceFuelDrop": "เหตุการณ์ลดน้ำมันเชื้อเพลิง",
     "eventCommandResult": "ผลลัพธ์จากคำสั่ง",
     "eventGeofenceEnter": "อุปกรณ์เข้าในเขตพื้นที่",
     "eventGeofenceExit": "อุปกรณ์ออกนอกเขตพื้นที่",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "สวิทย์กุญแจ ปิด",
     "eventMaintenance": "จำเป็นต้อง บำรุงรักษา",
     "eventTextMessage": "ข้อความที่ได้รับ",
-    "alarm": "แจ้งเตือน",
+    "eventsScrollToLast": "เลื่อนไปที่ล่าสุด",
     "alarmSos": "แจ้งเตือนฉุกเฉิน SOS",
     "alarmVibration": "แจ้งเตือนการสั่นสะเทือน",
     "alarmMovement": "แจ้งเตือนการเคลื่อนไหว",
     "alarmOverspeed": "แจ้งเตือนความเร็วเกินกำหนด",
     "alarmFallDown": "แจ้งเตือนการล้ม",
     "alarmLowBattery": "แจ้งเตือนแบตเตอรี่เหลือน้อย",
+    "alarmLowPower": "แจ้งเตือนพลังงานต่ำ",
     "alarmFault": "แจ้งเตือนข้อผิดพลาด",
     "alarmPowerOff": "ปิดการแจ้งเตือน",
     "alarmPowerOn": "เปิดการแจ้งเตือน",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "แจ้งเตือน ตัดพลังงาน",
+    "alarmPowerRestored": "ปลุกการเรียกคืนพลัง",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "แจ้งเตือน อุณหภูมิ",
     "alarmParking": "แจ้งเตือนที่จอดรถ",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "แจ้งเตือน เบรกเท้า",
     "alarmOilLeak": "แจ้งเตือน น้ำมัน",
     "alarmTampering": "แจ้งเตือนแทรกแซงสัญญาณ",
+    "alarmRemoving": "แจ้งเตือนกำลังลบออก",
     "notificationType": "ชนิดการแจ้งเตือน",
     "notificationWeb": "ส่งทางเว็บ",
     "notificationMail": "ส่งทางเมล์",
@@ -225,6 +308,7 @@
     "reportRoute": "เส้นทาง",
     "reportEvents": "เหตุการณ์",
     "reportTrips": "การเดินทาง",
+    "reportStops": "จุดจอด",
     "reportSummary": "ผลรวม",
     "reportChart": "แผนภูมิ",
     "reportConfigure": "ตั้งค่า",
@@ -249,15 +333,24 @@
     "statisticsRequests": "การร้องขอ",
     "statisticsMessagesReceived": "ข้อความที่ได้รับ",
     "statisticsMessagesStored": "ข้อความที่เก็บไว้",
+    "statisticsGeocoder": "คำขอรหัสทางภูมิศาสตร์",
+    "statisticsGeolocation": "คำขอตำแหน่งทางภูมิศาสตร์",
     "categoryArrow": "ลูกศร",
     "categoryDefault": "ค่าเริ่มต้น",
-    "categoryCar": "รถยนต์",
+    "categoryAnimal": "สัตว์",
+    "categoryBicycle": "จักรยาน",
+    "categoryBoat": "เรือ",
     "categoryBus": "รถบัส",
-    "categoryTruck": "รถบรรทุก",
-    "categoryShip": "เรือ",
-    "categoryPlane": "เครื่องบิน",
+    "categoryCar": "รถยนต์",
+    "categoryCrane": "เครน",
+    "categoryHelicopter": "เฮลิคอปเตอร์",
     "categoryMotorcycle": "รถจักรยานยนต์",
-    "categoryBicycle": "จักรยาน",
+    "categoryOffroad": "ออฟโร้ด",
     "categoryPerson": "บุคคล",
-    "categoryAnimal": "สัตว์"
+    "categoryPickup": "รถกระบะ",
+    "categoryPlane": "เครื่องบิน",
+    "categoryShip": "เรือ",
+    "categoryTractor": "รถแทรกเตอร์",
+    "categoryTruck": "รถบรรทุก",
+    "categoryVan": "รถตู้"
 }
\ No newline at end of file
diff --git a/web/l10n/tr.json b/web/l10n/tr.json
index bd2ea7d6..acfdb6de 100644
--- a/web/l10n/tr.json
+++ b/web/l10n/tr.json
@@ -17,9 +17,9 @@
     "sharedHour": "Saat",
     "sharedMinute": "Dakika",
     "sharedSecond": "Saniye",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "gün",
+    "sharedHours": "saat",
+    "sharedMinutes": "dakika",
     "sharedDecimalDegrees": "Onluk Derece",
     "sharedDegreesDecimalMinutes": "Onluk Dakika Derecesi",
     "sharedDegreesMinutesSeconds": "Dakika Saniye Derecesi",
@@ -37,10 +37,17 @@
     "sharedDistance": "Mesafe",
     "sharedHourAbbreviation": "s",
     "sharedMinuteAbbreviation": "d",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Harita Durumunu Getir",
     "sharedAttributeAlias": "Eşleştirilmiş Özellik",
     "sharedAttributeAliases": "Eşleştirilmiş Özellikler",
     "sharedAlias": "Takma ad",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Cihaz Mesafesi",
     "sharedDevice": "Cihaz",
     "sharedTestNotification": "Deneme bildirimi gönder",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Özellikler",
     "sharedPermissions": "Yetkiler",
     "sharedExtra": "Ekstra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Sayı",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Saat dilimi",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Hız Limiti",
+    "attributeReportIgnoreOdometer": "Rapor: Odometerı yoksay",
+    "attributeMaintenanceStart": "Bakım: Başlangıç",
+    "attributeMaintenanceInterval": "Bakım: Aralık",
+    "attributeWebReportColor": "Web: Rapor Rengi",
+    "attributeDevicePassword": "Araç şifresi",
+    "attributeProcessingCopyAttributes": "İşleniyor: Nitelikler Kopyalanıyor",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Rota Uzunluğu",
+    "attributeWebSelectZoom": "Web: Seçiliye Yaklaş",
+    "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",
     "errorTitle": "Hata",
-    "errorUnknown": "Bilinmeyen hata ",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Bağlantı Hatası",
     "errorSocket": "Web Soketine bağlanırken hata",
     "userEmail": "Eposta",
@@ -119,6 +151,51 @@
     "positionAddress": "Adres",
     "positionProtocol": "Protokol",
     "positionDistance": "Mesafe",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Uydular",
+    "positionSatVisible": "Görünür Uydular",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Durum",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "positionInput": "Input",
+    "positionOutput": "Output",
+    "positionBatteryLevel": "Pil Seviyesi",
+    "positionFuelConsumption": "Yakıt Tüketimi",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Firmware Version",
+    "positionVersionHw": "Hardware Version",
+    "positionIgnition": "Ignition",
+    "positionFlags": "Flags",
+    "positionCharge": "Charge",
+    "positionIp": "IP",
+    "positionArchive": "Arşiv",
+    "positionVin": "VIN",
+    "positionApproximate": "Yaklaşık",
+    "positionThrottle": "Throttle",
+    "positionMotion": "Motion",
+    "positionArmed": "Armed",
+    "positionAcceleration": "Acceleration",
+    "positionDeviceTemp": "Device Temperature",
+    "positionOperator": "Operator",
+    "positionCommand": "Komut",
+    "positionBlocked": "Blocked",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Sunucu Ayarları",
     "serverZoom": "Yakınlaştırma",
     "serverRegistration": "Kayıt",
@@ -174,6 +251,8 @@
     "commandPhone": "Telefon Numarası",
     "commandMessage": "Mesaj",
     "commandTimezone": "Saat Dilimi Dışında",
+    "commandgetModemStatus": "Modem Durumu",
+    "commandgetDeviceStatus": "Cihaz Durumu",
     "eventAll": "Tüm Olaylar",
     "eventDeviceOnline": "Cihaz çevrimiçi",
     "eventDeviceUnknown": "Cihaz Durumu Bilinmiyor",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Cihaz hareket halinde",
     "eventDeviceStopped": "Cihaz çalışmıyor",
     "eventDeviceOverspeed": "Cihaz hızı aştı",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Komut sonucu",
     "eventGeofenceEnter": "Cihaz güvenli bölgede",
     "eventGeofenceExit": "Cihaz güvenli bölgeden çıktı",
@@ -189,20 +269,21 @@
     "eventIgnitionOff": "Kontak Kapalı",
     "eventMaintenance": "Bakım Gerekli",
     "eventTextMessage": "Kısa mesaj alındı",
-    "alarm": "Alarm",
+    "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": "Güvenli alan alarmı",
-    "alarmGeofenceEnter": "Güvenli bölgeye girildi",
-    "alarmGeofenceExit": "Güvenli bölgeden çıkıldı",
+    "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ı",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "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ı",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Fren alarmı",
     "alarmOilLeak": "Yağ sızıntısı alarmı",
     "alarmTampering": "Sıcaklık alarmı",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Bildirim tipi",
     "notificationWeb": "Wed ile gönder",
     "notificationMail": "E-posta ile gönder",
@@ -225,6 +308,7 @@
     "reportRoute": "Rota",
     "reportEvents": "Olaylar",
     "reportTrips": "Turlar",
+    "reportStops": "Stops",
     "reportSummary": "Özet",
     "reportChart": "Grafik",
     "reportConfigure": "Ayarlar",
@@ -249,15 +333,24 @@
     "statisticsRequests": "İstenilenler",
     "statisticsMessagesReceived": "Mesajlar Alındı",
     "statisticsMessagesStored": "Mesajlar Kaydedildi",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Ok",
     "categoryDefault": "Varsayılan",
-    "categoryCar": "Araba",
+    "categoryAnimal": "Hayvan",
+    "categoryBicycle": "Bisiklet",
+    "categoryBoat": "Tekne",
     "categoryBus": "Otobüs",
-    "categoryTruck": "Kamyon",
-    "categoryShip": "Gemi",
-    "categoryPlane": "Uçak",
+    "categoryCar": "Araba",
+    "categoryCrane": "Vinç",
+    "categoryHelicopter": "Helikopter",
     "categoryMotorcycle": "Motorsiklet",
-    "categoryBicycle": "Bisiklet",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "İnsan",
-    "categoryAnimal": "Hayvan"
+    "categoryPickup": "Kamyonet",
+    "categoryPlane": "Uçak",
+    "categoryShip": "Gemi",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Kamyon",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/uk.json b/web/l10n/uk.json
index ed9a65ff..a31fc45a 100644
--- a/web/l10n/uk.json
+++ b/web/l10n/uk.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Відстань",
     "sharedHourAbbreviation": "г",
     "sharedMinuteAbbreviation": "хв",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Отримати стан карти",
     "sharedAttributeAlias": "Атрибут Алиас",
     "sharedAttributeAliases": "Атрибут Алиасів",
     "sharedAlias": "Алиас",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Відстань пристроїв",
     "sharedDevice": "Пристрій",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "Помилка",
-    "errorUnknown": "Невiдома помилка",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Помилка з'єднання",
     "errorSocket": "Web socket connection error",
     "userEmail": "E-mail",
@@ -119,6 +151,51 @@
     "positionAddress": "Адреса",
     "positionProtocol": "Протокол",
     "positionDistance": "Distance",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Налаштування сервера",
     "serverZoom": "Наближення",
     "serverRegistration": "Реєстрація",
@@ -174,6 +251,8 @@
     "commandPhone": "Номер телефону",
     "commandMessage": "Повідомлення",
     "commandTimezone": "Timezone Offset",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "Всі події",
     "eventDeviceOnline": "Пристрій з'єднався",
     "eventDeviceUnknown": "Device status is unknown",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Пристрій в русі",
     "eventDeviceStopped": "Пристрій зупинився",
     "eventDeviceOverspeed": "Пристрій перевищує швидкість",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Результат команди",
     "eventGeofenceEnter": "Пристрій в геозоні",
     "eventGeofenceExit": "Пристрій залишив геозону",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Запалення ВИМК",
     "eventMaintenance": "Maintenance required",
     "eventTextMessage": "Text message received",
-    "alarm": "Тревога",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "Тривога SOS",
     "alarmVibration": "Тривога вібрації",
     "alarmMovement": "Тривога сигналізації",
     "alarmOverspeed": "Тривога перевищення швидкості",
     "alarmFallDown": "Тривога падіння",
     "alarmLowBattery": "Тривога низького заряду",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "Тривога несправності",
     "alarmPowerOff": "Power Off Alarm",
     "alarmPowerOn": "Power On Alarm",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Тип повідомлення",
     "notificationWeb": "Повідомляти у Web",
     "notificationMail": "Надсилати на Пошту",
@@ -225,6 +308,7 @@
     "reportRoute": "Маршрут",
     "reportEvents": "Події",
     "reportTrips": "Подорожі",
+    "reportStops": "Stops",
     "reportSummary": "Звіт",
     "reportChart": "Chart",
     "reportConfigure": "Конфігурувати",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Запити",
     "statisticsMessagesReceived": "Отримано повідомлень",
     "statisticsMessagesStored": "Збережено повідомлень",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/uz.json b/web/l10n/uz.json
index ccea7f8b..a3088d2d 100644
--- a/web/l10n/uz.json
+++ b/web/l10n/uz.json
@@ -37,10 +37,17 @@
     "sharedDistance": "Масофа",
     "sharedHourAbbreviation": "с",
     "sharedMinuteAbbreviation": "д",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Харита ҳолатини билиш",
     "sharedAttributeAlias": "Атрибут тахаллуси",
     "sharedAttributeAliases": "Атрибутлар тахаллусилари",
     "sharedAlias": "Тахаллус",
+    "sharedComputedAttribute": "Computed Attribute",
+    "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
+    "sharedExpression": "Expression",
     "sharedDeviceDistance": "Қурилма ишлаган кўрсатгич",
     "sharedDevice": "Қурилма",
     "sharedTestNotification": "Send Test Notification",
@@ -53,9 +60,34 @@
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
     "sharedExtra": "Extra",
+    "sharedTypeString": "String",
+    "sharedTypeNumber": "Number",
+    "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedInfoTitle": "Info",
+    "attributeSpeedLimit": "Speed Limit",
+    "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+    "attributeMaintenanceStart": "Maintenance: Start",
+    "attributeMaintenanceInterval": "Maintenance: Interval",
+    "attributeWebReportColor": "Web: Report Color",
+    "attributeDevicePassword": "Device Password",
+    "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+    "attributeColor": "Color",
+    "attributeWebLiveRouteLength": "Web: Live Route Length",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "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",
     "errorTitle": "Хато",
-    "errorUnknown": "Номаълум хато",
+    "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Уланишда хато",
     "errorSocket": "Web socket connection error",
     "userEmail": "Email",
@@ -119,6 +151,51 @@
     "positionAddress": "Манзил",
     "positionProtocol": "Баённома",
     "positionDistance": "Оралиқ масофа",
+    "positionRpm": "RPM",
+    "positionFuel": "Fuel",
+    "positionPower": "Power",
+    "positionBattery": "Battery",
+    "positionRaw": "Raw",
+    "positionIndex": "Index",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Sattelites",
+    "positionSatVisible": "Visible Sattelites",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Event",
+    "positionAlarm": "Alarm",
+    "positionStatus": "Status",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "Trip Odometer",
+    "positionHours": "Hours",
+    "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",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD Speed",
+    "positionObdOdometer": "OBD Odometer",
     "serverTitle": "Сервер созламалари",
     "serverZoom": "Яқинлаштириш",
     "serverRegistration": "Рўйхатдан ўтиш",
@@ -174,6 +251,8 @@
     "commandPhone": "Телефон рақами",
     "commandMessage": "Хабар",
     "commandTimezone": "Соат қутбининг силжиши",
+    "commandgetModemStatus": "Modem Status",
+    "commandgetDeviceStatus": "Device Status",
     "eventAll": "Барча воқеалар",
     "eventDeviceOnline": "Қурилма тармоқда",
     "eventDeviceUnknown": "Қурилма мақоми номаълум",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "Қурилма ҳаракатланмоқда",
     "eventDeviceStopped": "Қурилма тўхтади",
     "eventDeviceOverspeed": "Қурилма тезликни оширмоқда",
+    "eventDeviceFuelDrop": "Fuel drop event",
     "eventCommandResult": "Буйруқ натижаси",
     "eventGeofenceEnter": "Қурилма геозонага кирди",
     "eventGeofenceExit": "Қурилма геозонадан чиқди",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "Ўт олдириш ЎЧР",
     "eventMaintenance": "Хизмат кўрсатиш талаб этилади",
     "eventTextMessage": "Text message received",
-    "alarm": "Хавф сигнали",
+    "eventsScrollToLast": "Scroll To Last",
     "alarmSos": "SOS сигнали",
     "alarmVibration": "Вибрация хавф сигнали",
     "alarmMovement": "Сигнализация хавф сигнали",
     "alarmOverspeed": "Тезликни ошириш хавф сигнали",
     "alarmFallDown": "Йиқилиш хавф сигнали",
     "alarmLowBattery": "Батарейка ўтирди хавф сигнали",
+    "alarmLowPower": "LowPower Alarm",
     "alarmFault": "Носозлик хавф сигнали",
     "alarmPowerOff": "Power Off Alarm",
     "alarmPowerOn": "Power On Alarm",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "Hard Breaking Alarm",
     "alarmFatigueDriving": "Fatigue Driving Alarm",
     "alarmPowerCut": "Power Cut Alarm",
+    "alarmPowerRestored": "Power Restored Alarm",
     "alarmJamming": "Jamming Alarm",
     "alarmTemperature": "Temperature Alarm",
     "alarmParking": "Parking Alarm",
@@ -218,6 +300,7 @@
     "alarmFootBrake": "Foot Brake Alarm",
     "alarmOilLeak": "Oil Leak Alarm",
     "alarmTampering": "Tampering Alarm",
+    "alarmRemoving": "Removing Alarm",
     "notificationType": "Хабарнома тури",
     "notificationWeb": "Веб орқали жўнатиш",
     "notificationMail": "Почта орқали жўнатиш",
@@ -225,6 +308,7 @@
     "reportRoute": "Маршрут",
     "reportEvents": "Ҳодисалар",
     "reportTrips": "Сафарлар",
+    "reportStops": "Stops",
     "reportSummary": "Маълумот",
     "reportChart": "График",
     "reportConfigure": "Конфигурациялаш",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Сўровлар",
     "statisticsMessagesReceived": "Хабарлар қабул қилинган",
     "statisticsMessagesStored": "Хабарлар сақланган",
+    "statisticsGeocoder": "Geocoder Requests",
+    "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Стрелка",
     "categoryDefault": "Сўзсиз",
-    "categoryCar": "Автомобиль",
+    "categoryAnimal": "Жонивор",
+    "categoryBicycle": "Велосипед",
+    "categoryBoat": "Boat",
     "categoryBus": "Автобус",
-    "categoryTruck": "Юк автомобили",
-    "categoryShip": "Кема",
-    "categoryPlane": "Самолёт",
+    "categoryCar": "Автомобиль",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Мотоцикл",
-    "categoryBicycle": "Велосипед",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Одам",
-    "categoryAnimal": "Жонивор"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Самолёт",
+    "categoryShip": "Кема",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Юк автомобили",
+    "categoryVan": "Van"
 }
\ No newline at end of file
diff --git a/web/l10n/vi.json b/web/l10n/vi.json
index 9ed8731d..02ffee6d 100644
--- a/web/l10n/vi.json
+++ b/web/l10n/vi.json
@@ -17,9 +17,9 @@
     "sharedHour": "Giờ",
     "sharedMinute": "Phút",
     "sharedSecond": "Giây",
-    "sharedDays": "days",
-    "sharedHours": "hours",
-    "sharedMinutes": "minutes",
+    "sharedDays": "Ngày",
+    "sharedHours": "Giờ",
+    "sharedMinutes": "Phút",
     "sharedDecimalDegrees": "Độ thập phân",
     "sharedDegreesDecimalMinutes": "Độ thập phân phút",
     "sharedDegreesMinutesSeconds": "Độ thập phân giây",
@@ -32,32 +32,64 @@
     "sharedAttributes": "Thuộc tính",
     "sharedAttribute": "Thuộc tính",
     "sharedArea": "Khu vực",
-    "sharedSound": "Notification Sound",
+    "sharedSound": "Tiếng thông báo",
     "sharedType": "Loại",
     "sharedDistance": "Khoảng cách",
     "sharedHourAbbreviation": "h",
     "sharedMinuteAbbreviation": "m",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Lấy trạng thái bản đồ",
     "sharedAttributeAlias": "Tên thuộc tính",
     "sharedAttributeAliases": "Tên tượng trưng",
     "sharedAlias": "Biệt hiệu",
+    "sharedComputedAttribute": "Tính toán thuộc tính",
+    "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": "Send Test Notification",
-    "sharedCalendar": "Calendar",
-    "sharedCalendars": "Calendars",
-    "sharedFile": "File",
-    "sharedSelectFile": "Select File",
-    "sharedPhone": "Phone",
-    "sharedRequired": "Required",
-    "sharedPreferences": "Preferences",
-    "sharedPermissions": "Permissions",
-    "sharedExtra": "Extra",
-    "sharedTimezone": "Timezone",
+    "sharedTestNotification": "Gửi thông báo thử",
+    "sharedCalendar": "Lịch",
+    "sharedCalendars": "Lịch",
+    "sharedFile": "Tập tin",
+    "sharedSelectFile": "Lựa chọn tập tin",
+    "sharedPhone": "Điện thoại",
+    "sharedRequired": "Bắt buộc",
+    "sharedPreferences": "Ưu tiên",
+    "sharedPermissions": "Cấp phép",
+    "sharedExtra": "Thêm vào",
+    "sharedTypeString": "Chuỗi",
+    "sharedTypeNumber": "Số",
+    "sharedTypeBoolean": "Toán tử",
+    "sharedTimezone": "Múi giờ",
+    "sharedInfoTitle": "Thông tin",
+    "attributeSpeedLimit": "Giới hạn tốc độ",
+    "attributeReportIgnoreOdometer": "Báo cáo: Bỏ qua đồng hồ đo",
+    "attributeMaintenanceStart": "Bảo dưỡng: Bắt đầu",
+    "attributeMaintenanceInterval": "Bảo dưỡng: Chu kỳ",
+    "attributeWebReportColor": "Web: Màu báo cáo",
+    "attributeDevicePassword": "Mật khẩu thiết bị",
+    "attributeProcessingCopyAttributes": "Thực thi: sao chép thuộc tính",
+    "attributeColor": "Màu",
+    "attributeWebLiveRouteLength": "Web: Độ dài tuyến",
+    "attributeWebSelectZoom": "Web: phóng to lựa chọn",
+    "attributeMailSmtpHost": "Email: SMTP Host",
+    "attributeMailSmtpPort": "Email: Cổng SMTP",
+    "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",
     "errorTitle": "Lỗi",
-    "errorUnknown": "Lỗi không xác định",
+    "errorGeneral": "Tham số không hợp lệ hoặc hạn chế vi phạm",
     "errorConnection": "Lỗi kết nối",
-    "errorSocket": "Web socket connection error",
+    "errorSocket": "Lỗi kết nối trang",
     "userEmail": "Email",
     "userPassword": "Mật khẩu",
     "userAdmin": "Quản trị",
@@ -65,8 +97,8 @@
     "userDisabled": "Không kích hoạt",
     "userExpirationTime": "Hết hạn",
     "userDeviceLimit": "Hạn chế thiết bị",
-    "userUserLimit": "User Limit",
-    "userDeviceReadonly": "Device Readonly",
+    "userUserLimit": "Hạn chế người dùng",
+    "userDeviceReadonly": "Chỉ xem thiết bị",
     "userToken": "Token",
     "loginTitle": "Đăng nhập",
     "loginLanguage": "Ngôn ngữ",
@@ -86,10 +118,10 @@
     "deviceCommand": "Lệnh",
     "deviceFollow": "Theo dõi",
     "deviceTotalDistance": "Tổng quãng đường",
-    "deviceStatus": "Status",
-    "deviceStatusOnline": "Online",
-    "deviceStatusOffline": "Offline",
-    "deviceStatusUnknown": "Unknown",
+    "deviceStatus": "Trạng thái",
+    "deviceStatusOnline": "Trực tuyến",
+    "deviceStatusOffline": "Ngoại tuyến",
+    "deviceStatusUnknown": "Không xác định",
     "groupDialog": "Nhóm",
     "groupParent": "Nhóm",
     "groupNoGroup": "Không có nhóm",
@@ -110,7 +142,7 @@
     "reportClear": "Xóa",
     "positionFixTime": "Thời gian",
     "positionValid": "Có hiệu lực",
-    "positionAccuracy": "Accuracy",
+    "positionAccuracy": "Chính xác",
     "positionLatitude": "Vĩ độ",
     "positionLongitude": "Kinh độ",
     "positionAltitude": "Độ cao",
@@ -118,7 +150,52 @@
     "positionCourse": "Hướng",
     "positionAddress": "Địa chỉ",
     "positionProtocol": "Giao thức",
-    "positionDistance": "Distance",
+    "positionDistance": "Khoảng cách",
+    "positionRpm": "RPM",
+    "positionFuel": "Nhiên liệu",
+    "positionPower": "Nguồn",
+    "positionBattery": "Pin",
+    "positionRaw": "Thô",
+    "positionIndex": "Danh mục",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "Vệ tinh",
+    "positionSatVisible": "Vệ tinh khả dụng",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "Sự kiện",
+    "positionAlarm": "Cảnh báo",
+    "positionStatus": "Trạng thái",
+    "positionOdometer": "Đồng hồ đo",
+    "positionServiceOdometer": "Đồng hồ đo",
+    "positionTripOdometer": "Quãng đường",
+    "positionHours": "Giờ",
+    "positionInput": "Nhập",
+    "positionOutput": "Xuất",
+    "positionBatteryLevel": "Mức pin",
+    "positionFuelConsumption": "Tiêu thụ nhiên liệu",
+    "positionRfid": "RFID",
+    "positionVersionFw": "Phiên bản",
+    "positionVersionHw": "Phiên bản phần cứng",
+    "positionIgnition": "Máy",
+    "positionFlags": "Cờ",
+    "positionCharge": "Nạp tiền",
+    "positionIp": "IP",
+    "positionArchive": "Lưu trữ",
+    "positionVin": "VIN",
+    "positionApproximate": "Độ chính xác",
+    "positionThrottle": "Cổ hút",
+    "positionMotion": "Chuyển động",
+    "positionArmed": "Bật báo động",
+    "positionAcceleration": "Tăng tốc",
+    "positionDeviceTemp": "Nhiệt độ thiết bị",
+    "positionOperator": "Operator",
+    "positionCommand": "Command",
+    "positionBlocked": "Chặn",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "Tốc độ OBD",
+    "positionObdOdometer": "Quãng đường ODB",
     "serverTitle": "Cài đặt máy chủ",
     "serverZoom": "Phóng to",
     "serverRegistration": "Đăng ký",
@@ -132,10 +209,10 @@
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
     "mapBingAerial": "Bing Maps Aerial",
-    "mapBingHybrid": "Bing Maps Hybrid",
-    "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapBingHybrid": "Bản đồ Bing Hybird",
+    "mapBaidu": "Bản đồ Baidu",
+    "mapYandexMap": "Bản đồ Yandex",
+    "mapYandexSat": "Bản đồ Yandex Vệ tinh ",
     "mapShapePolygon": "Đa giác",
     "mapShapeCircle": "Vòng tròn",
     "mapShapePolyline": "Đường kẻ đa giác",
@@ -164,7 +241,7 @@
     "commandSosNumber": "Thiết lập số khẩn cấp",
     "commandSilenceTime": "Thiêt lập giờ im lặng",
     "commandSetPhonebook": "Thiết lập danh bạ điện thoại",
-    "commandSetIndicator": "Set Indicator",
+    "commandSetIndicator": "Thiết lập hiển thị",
     "commandVoiceMessage": "Tin nhắn thoại",
     "commandOutputControl": "Điều khiển đầu ra",
     "commandAlarmSpeed": "Báo động quá tốc độ",
@@ -173,7 +250,9 @@
     "commandData": "Dữ liệu",
     "commandPhone": "Số điện thoại",
     "commandMessage": "Thông báo",
-    "commandTimezone": "Timezone Offset",
+    "commandTimezone": "Múi giờ",
+    "commandgetModemStatus": "Trạng thái Modem",
+    "commandgetDeviceStatus": "Trạng thái thiết bị",
     "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ị",
@@ -181,6 +260,7 @@
     "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",
     "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ý",
@@ -188,49 +268,53 @@
     "eventIgnitionOn": "Mở khóa",
     "eventIgnitionOff": "Ngắt khóa",
     "eventMaintenance": "Yêu cầu bảo dưỡng",
-    "eventTextMessage": "Text message received",
-    "alarm": "Báo động",
+    "eventTextMessage": "Đã nhận tin nhắn",
+    "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": "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",
-    "alarmHardAcceleration": "Hard Acceleration Alarm",
-    "alarmHardBreaking": "Hard Breaking Alarm",
-    "alarmFatigueDriving": "Fatigue Driving Alarm",
-    "alarmPowerCut": "Power Cut Alarm",
-    "alarmJamming": "Jamming Alarm",
-    "alarmTemperature": "Temperature Alarm",
-    "alarmParking": "Parking Alarm",
-    "alarmShock": "Shock Alarm",
-    "alarmBonnet": "Bonnet Alarm",
-    "alarmFootBrake": "Foot Brake Alarm",
-    "alarmOilLeak": "Oil Leak Alarm",
-    "alarmTampering": "Tampering Alarm",
+    "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",
+    "alarmHardAcceleration": "Cảnh báo tăng ga đột ngột",
+    "alarmHardBreaking": "Cảnh báo phanh gấp",
+    "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",
+    "alarmOilLeak": "Cảnh báo rò rỉ dầu",
+    "alarmTampering": "Cảnh báo đập phá",
+    "alarmRemoving": "Loại bỏ cảnh báo",
     "notificationType": "Loại thông báo",
     "notificationWeb": "Gửi từ web",
     "notificationMail": "Gửi từ mail",
-    "notificationSms": "Send via SMS",
+    "notificationSms": "Gửi qua tin nhắn",
     "reportRoute": "Lộ trình",
     "reportEvents": "Sự kiện",
     "reportTrips": "Hành trình",
+    "reportStops": "Dừng đỗ",
     "reportSummary": "Sơ lược",
-    "reportChart": "Chart",
+    "reportChart": "Biểu đồ",
     "reportConfigure": "Cấu hình",
     "reportEventTypes": "Loại sự kiện",
-    "reportChartType": "Chart Type",
-    "reportShowMarkers": "Show Markers",
+    "reportChartType": "Kiểu biều đồ",
+    "reportShowMarkers": "Hiển thị dấu",
     "reportExport": "Xuất",
     "reportDeviceName": "Tên thiết bị",
     "reportAverageSpeed": "Tốc độ trung bình",
@@ -249,15 +333,24 @@
     "statisticsRequests": "Yêu cầu",
     "statisticsMessagesReceived": "Thông báo đã nhận",
     "statisticsMessagesStored": "Thông báo đã nhận",
+    "statisticsGeocoder": "Yêu cầu địa chỉ",
+    "statisticsGeolocation": "Yêu cầu địa chỉ",
     "categoryArrow": "Mũi tên",
     "categoryDefault": "Mặc định",
-    "categoryCar": "Xe con",
+    "categoryAnimal": "Vật nuôi",
+    "categoryBicycle": "Xe đạp",
+    "categoryBoat": "Tầu thuyền",
     "categoryBus": "Xe buýt",
-    "categoryTruck": "Xe tải",
-    "categoryShip": "Tàu thủy",
-    "categoryPlane": "Máy bay",
+    "categoryCar": "Xe con",
+    "categoryCrane": "Cần cẩu",
+    "categoryHelicopter": "Trực thăng",
     "categoryMotorcycle": "Xe máy",
-    "categoryBicycle": "Xe đạp",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Cá nhân",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Máy bay",
+    "categoryShip": "Tàu thủy",
+    "categoryTractor": "Máy kéo",
+    "categoryTruck": "Xe tải",
+    "categoryVan": "Xe thùng"
 }
\ No newline at end of file
diff --git a/web/l10n/zh.json b/web/l10n/zh.json
index 67fce0a8..90da7d4c 100644
--- a/web/l10n/zh.json
+++ b/web/l10n/zh.json
@@ -4,13 +4,13 @@
     "sharedSave": "保存",
     "sharedSet": "设置",
     "sharedCancel": "取消",
-    "sharedAdd": "新建",
+    "sharedAdd": "添加",
     "sharedEdit": "编辑",
-    "sharedRemove": "移除",
-    "sharedRemoveConfirm": "要移除选项吗？",
+    "sharedRemove": "删除",
+    "sharedRemoveConfirm": "要删除设备吗？",
     "sharedKm": "千米",
     "sharedMi": "海里",
-    "sharedNmi": "nmi",
+    "sharedNmi": "海里",
     "sharedKn": "节单元",
     "sharedKmh": "千米/小时",
     "sharedMph": "每小时英里数",
@@ -26,21 +26,28 @@
     "sharedName": "名称",
     "sharedDescription": "描述",
     "sharedSearch": "搜索",
-    "sharedGeofence": "围栏",
+    "sharedGeofence": "电子围栏",
     "sharedGeofences": "围栏",
     "sharedNotifications": "通知",
     "sharedAttributes": "属性",
     "sharedAttribute": "属性",
     "sharedArea": "区域",
     "sharedSound": "通知声音",
-    "sharedType": "类型",
-    "sharedDistance": "距离",
+    "sharedType": "报表类型",
+    "sharedDistance": "里程",
     "sharedHourAbbreviation": "小时",
     "sharedMinuteAbbreviation": "分",
+    "sharedVoltAbbreviation": "V",
+    "sharedLiterAbbreviation": "l",
+    "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "获取地图状态",
     "sharedAttributeAlias": "属性别名",
     "sharedAttributeAliases": "属性别名",
     "sharedAlias": "别名",
+    "sharedComputedAttribute": "计算属性",
+    "sharedComputedAttributes": "计算属性",
+    "sharedCheckComputedAttribute": "确认计算属性",
+    "sharedExpression": "表达",
     "sharedDeviceDistance": "设备距离",
     "sharedDevice": "设备",
     "sharedTestNotification": "发送测试通知",
@@ -53,15 +60,40 @@
     "sharedPreferences": "参数选择",
     "sharedPermissions": "权限",
     "sharedExtra": "附加",
+    "sharedTypeString": "字符串",
+    "sharedTypeNumber": "数字",
+    "sharedTypeBoolean": "布尔",
     "sharedTimezone": "时区",
+    "sharedInfoTitle": "信息",
+    "attributeSpeedLimit": "速度限制",
+    "attributeReportIgnoreOdometer": "报告：忽略里程表",
+    "attributeMaintenanceStart": "维护：开始",
+    "attributeMaintenanceInterval": "维护：间隔",
+    "attributeWebReportColor": "页面：报告颜色",
+    "attributeDevicePassword": "设备密码",
+    "attributeProcessingCopyAttributes": "处理中：复制属性",
+    "attributeColor": "颜色",
+    "attributeWebLiveRouteLength": "页面：活动路径长度",
+    "attributeWebSelectZoom": "页面：放大所选择的",
+    "attributeMailSmtpHost": "邮件：SMTP主机",
+    "attributeMailSmtpPort": "邮件：SMTP端口",
+    "attributeMailSmtpStarttlsEnable": "邮件：SMTP STARTTLS开启",
+    "attributeMailSmtpStarttlsRequired": "邮件：SMTP STARTTLS需要开启",
+    "attributeMailSmtpSslEnable": "邮件：SMTP SSL开启",
+    "attributeMailSmtpSslTrust": "邮件：SMTP SSL信任",
+    "attributeMailSmtpSslProtocols": "邮件：SMTP SSL协议",
+    "attributeMailSmtpFrom": "邮件：SMTP来源",
+    "attributeMailSmtpAuth": "邮件：SMTP认证开启",
+    "attributeMailSmtpUsername": "邮件：SMTP用户名",
+    "attributeMailSmtpPassword": "邮件：SMTP密码",
     "errorTitle": "错误",
-    "errorUnknown": "未知错误",
+    "errorGeneral": "无效参数",
     "errorConnection": "连接错误",
     "errorSocket": "网络通讯错误",
     "userEmail": "邮箱",
     "userPassword": "密码",
     "userAdmin": "管理员",
-    "userRemember": "记住",
+    "userRemember": "记住密码",
     "userDisabled": "关闭",
     "userExpirationTime": "截止日期",
     "userDeviceLimit": "设备限制",
@@ -78,14 +110,14 @@
     "loginLogo": "图标",
     "devicesAndState": "设备和状态",
     "deviceTitle": "设备",
-    "deviceIdentifier": "标识符",
+    "deviceIdentifier": "编号",
     "deviceModel": "模型",
     "deviceContact": "联系人",
     "deviceCategory": "类别",
-    "deviceLastUpdate": "最后更新",
-    "deviceCommand": "指令",
-    "deviceFollow": "遵循",
-    "deviceTotalDistance": "总距离",
+    "deviceLastUpdate": "最后更新时间",
+    "deviceCommand": "下发指令",
+    "deviceFollow": "跟踪",
+    "deviceTotalDistance": "总里程",
     "deviceStatus": "状态",
     "deviceStatusOnline": "在线",
     "deviceStatusOffline": "离线",
@@ -101,7 +133,7 @@
     "settingsSpeedUnit": "速度",
     "settingsTwelveHourFormat": "12小时制",
     "settingsCoordinateFormat": "坐标格式",
-    "reportTitle": "报表",
+    "reportTitle": "统计报表",
     "reportDevice": "设备",
     "reportGroup": "组",
     "reportFrom": "开始",
@@ -119,6 +151,51 @@
     "positionAddress": "地址",
     "positionProtocol": "协议",
     "positionDistance": "距离",
+    "positionRpm": "转速",
+    "positionFuel": "燃料",
+    "positionPower": "电源",
+    "positionBattery": "电量",
+    "positionRaw": "Raw",
+    "positionIndex": "索引",
+    "positionHdop": "水平精度",
+    "positionVdop": "垂直精度",
+    "positionPdop": "位置精度",
+    "positionSat": "卫星",
+    "positionSatVisible": "可见卫星",
+    "positionRssi": "接收信号强度",
+    "positionGps": "GPS",
+    "positionEvent": "事件",
+    "positionAlarm": "报警",
+    "positionStatus": "状态",
+    "positionOdometer": "Odometer",
+    "positionServiceOdometer": "Service Odometer",
+    "positionTripOdometer": "里程表",
+    "positionHours": "小时",
+    "positionInput": "输入",
+    "positionOutput": "输出",
+    "positionBatteryLevel": "电量级别",
+    "positionFuelConsumption": "耗油率",
+    "positionRfid": "RFID",
+    "positionVersionFw": "固件版本",
+    "positionVersionHw": "硬件版本",
+    "positionIgnition": "点火",
+    "positionFlags": "Flags",
+    "positionCharge": "Charge",
+    "positionIp": "IP",
+    "positionArchive": "档案",
+    "positionVin": "车辆识别码",
+    "positionApproximate": "近似值",
+    "positionThrottle": "Throttle",
+    "positionMotion": "Motion",
+    "positionArmed": "Armed",
+    "positionAcceleration": "加速度",
+    "positionDeviceTemp": "设备温度",
+    "positionOperator": "Operator",
+    "positionCommand": "指令",
+    "positionBlocked": "Blocked",
+    "positionDtcs": "DTCs",
+    "positionObdSpeed": "OBD速度",
+    "positionObdOdometer": "OBD里程表",
     "serverTitle": "服务器设置",
     "serverZoom": "缩放",
     "serverRegistration": "注册",
@@ -129,21 +206,21 @@
     "mapCustom": "自定义地图",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap 地图",
-    "mapBingKey": "Bing 旅游重点",
-    "mapBingRoad": "Bing 公路线路地图",
-    "mapBingAerial": "Bing 航测地图",
-    "mapBingHybrid": "Bing Maps Hybrid",
-    "mapBaidu": "Baidu",
-    "mapYandexMap": "Yandex Map",
-    "mapYandexSat": "Yandex Satellite",
+    "mapBingKey": "必应重点地图",
+    "mapBingRoad": "必应公路线路地图",
+    "mapBingAerial": "必应航测地图",
+    "mapBingHybrid": "必应混合地图",
+    "mapBaidu": "百度地图",
+    "mapYandexMap": "Yandex地图",
+    "mapYandexSat": "Yandex卫星地图",
     "mapShapePolygon": "多边形",
     "mapShapeCircle": "圆形",
     "mapShapePolyline": "折线",
-    "mapLiveRoutes": "活动路径",
+    "mapLiveRoutes": "活动轨迹",
     "stateTitle": "状态",
     "stateName": "参数",
-    "stateValue": "数值",
-    "commandTitle": "命令",
+    "stateValue": "值",
+    "commandTitle": "下发指令",
     "commandSend": "发送",
     "commandSent": "命令已发送",
     "commandPositionPeriodic": "位置获取",
@@ -174,6 +251,8 @@
     "commandPhone": "电话号码",
     "commandMessage": "消息",
     "commandTimezone": "时区偏移",
+    "commandgetModemStatus": "Modem状态",
+    "commandgetDeviceStatus": "设备状态",
     "eventAll": "所有事件",
     "eventDeviceOnline": "设备在线",
     "eventDeviceUnknown": "设备状态未知",
@@ -181,6 +260,7 @@
     "eventDeviceMoving": "设备移动中",
     "eventDeviceStopped": "设备已停止",
     "eventDeviceOverspeed": "设备超速",
+    "eventDeviceFuelDrop": "燃料泄漏事件",
     "eventCommandResult": "指令结果",
     "eventGeofenceEnter": "设备已进入区域",
     "eventGeofenceExit": "设备已离开区域",
@@ -189,13 +269,14 @@
     "eventIgnitionOff": "点火关闭",
     "eventMaintenance": "需要维护",
     "eventTextMessage": "已接收文本信息",
-    "alarm": "报警",
+    "eventsScrollToLast": "滚动到最后",
     "alarmSos": "SOS报警",
     "alarmVibration": "振动报警",
     "alarmMovement": "移动报警",
     "alarmOverspeed": "超速报警",
     "alarmFallDown": "坠落报警",
     "alarmLowBattery": "低电报警",
+    "alarmLowPower": "低电报警",
     "alarmFault": "故障报警",
     "alarmPowerOff": "关机报警",
     "alarmPowerOn": "开机报警",
@@ -210,6 +291,7 @@
     "alarmHardBreaking": "急减速报警",
     "alarmFatigueDriving": "疲劳驾驶报警",
     "alarmPowerCut": "断电报警",
+    "alarmPowerRestored": "电源恢复报警",
     "alarmJamming": "干扰报警",
     "alarmTemperature": "温度报警",
     "alarmParking": "停车报警",
@@ -218,13 +300,15 @@
     "alarmFootBrake": "制动报警",
     "alarmOilLeak": "油料泄漏报警",
     "alarmTampering": "篡改报警",
+    "alarmRemoving": "移除报警",
     "notificationType": "通知类型",
     "notificationWeb": "通过网页发送",
     "notificationMail": "通过邮件发送",
     "notificationSms": "通过短信发送",
-    "reportRoute": "路线",
+    "reportRoute": "轨迹",
     "reportEvents": "事件",
     "reportTrips": "行程",
+    "reportStops": "油轮",
     "reportSummary": "概要",
     "reportChart": "图表",
     "reportConfigure": "配置",
@@ -249,15 +333,24 @@
     "statisticsRequests": "请求",
     "statisticsMessagesReceived": "已收到消息",
     "statisticsMessagesStored": "已存储消息",
+    "statisticsGeocoder": "地理编码请求",
+    "statisticsGeolocation": "地理定位请求",
     "categoryArrow": "箭头",
     "categoryDefault": "默认",
-    "categoryCar": "汽车",
+    "categoryAnimal": "动物",
+    "categoryBicycle": "自行车",
+    "categoryBoat": "船",
     "categoryBus": "巴士",
-    "categoryTruck": "卡车",
-    "categoryShip": "船",
-    "categoryPlane": "飞机",
+    "categoryCar": "汽车",
+    "categoryCrane": "起重机",
+    "categoryHelicopter": "直升机",
     "categoryMotorcycle": "摩托车",
-    "categoryBicycle": "自行车",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "个人",
-    "categoryAnimal": "动物"
+    "categoryPickup": "皮卡",
+    "categoryPlane": "飞机",
+    "categoryShip": "船",
+    "categoryTractor": "拖拉机",
+    "categoryTruck": "卡车",
+    "categoryVan": "厢式货车"
 }
\ No newline at end of file
diff --git a/web/l10n/zh_TW.json b/web/l10n/zh_TW.json
new file mode 100644
index 00000000..dca051cb
--- /dev/null
+++ b/web/l10n/zh_TW.json
@@ -0,0 +1,356 @@
+{
+    "sharedLoading": "讀取中……",
+    "sharedHide": "藏藏",
+    "sharedSave": "存檔",
+    "sharedSet": "設定",
+    "sharedCancel": "取消",
+    "sharedAdd": "新增",
+    "sharedEdit": "編輯",
+    "sharedRemove": "移除",
+    "sharedRemoveConfirm": "確認要移除嗎？",
+    "sharedKm": "公里",
+    "sharedMi": "英里",
+    "sharedNmi": "海里",
+    "sharedKn": "節",
+    "sharedKmh": "公里/小時",
+    "sharedMph": "英里/小時",
+    "sharedHour": "小時",
+    "sharedMinute": "分鐘",
+    "sharedSecond": "秒",
+    "sharedDays": "天",
+    "sharedHours": "小時",
+    "sharedMinutes": "分鐘",
+    "sharedDecimalDegrees": "度",
+    "sharedDegreesDecimalMinutes": "分",
+    "sharedDegreesMinutesSeconds": "秒",
+    "sharedName": "名稱",
+    "sharedDescription": "描述",
+    "sharedSearch": "搜尋",
+    "sharedGeofence": "地圖圍籬",
+    "sharedGeofences": "地圖圍籬",
+    "sharedNotifications": "通知",
+    "sharedAttributes": "屬性",
+    "sharedAttribute": "屬性",
+    "sharedArea": "區域",
+    "sharedSound": "通知音效",
+    "sharedType": "類型",
+    "sharedDistance": "距離",
+    "sharedHourAbbreviation": "時",
+    "sharedMinuteAbbreviation": "分",
+    "sharedVoltAbbreviation": "伏特",
+    "sharedLiterAbbreviation": "公升",
+    "sharedLiterPerHourAbbreviation": "公升/小時",
+    "sharedGetMapState": "獲得地圖狀態",
+    "sharedAttributeAlias": "屬性暱稱",
+    "sharedAttributeAliases": "屬性暱稱",
+    "sharedAlias": "暱稱",
+    "sharedComputedAttribute": "計算屬性",
+    "sharedComputedAttributes": "計算屬性",
+    "sharedCheckComputedAttribute": "檢查計算屬性",
+    "sharedExpression": "表示式",
+    "sharedDeviceDistance": "設備距離",
+    "sharedDevice": "設備",
+    "sharedTestNotification": "傳送測試通知",
+    "sharedCalendar": "日曆",
+    "sharedCalendars": "日曆",
+    "sharedFile": "檔案",
+    "sharedSelectFile": "選擇檔案",
+    "sharedPhone": "手機",
+    "sharedRequired": "必需",
+    "sharedPreferences": "偏好",
+    "sharedPermissions": "權限",
+    "sharedExtra": "更多",
+    "sharedTypeString": "字串",
+    "sharedTypeNumber": "整數",
+    "sharedTypeBoolean": "布林值",
+    "sharedTimezone": "時區",
+    "sharedInfoTitle": "資訊",
+    "attributeSpeedLimit": "速限",
+    "attributeReportIgnoreOdometer": "報告：忽略里程表",
+    "attributeMaintenanceStart": "保養：開始",
+    "attributeMaintenanceInterval": "保養：中止",
+    "attributeWebReportColor": "網頁：報告顏色",
+    "attributeDevicePassword": "設備密碼",
+    "attributeProcessingCopyAttributes": "處理中：複製屬性",
+    "attributeColor": "顏色",
+    "attributeWebLiveRouteLength": "網頁：即時路長",
+    "attributeWebSelectZoom": "Web: Zoom On Select",
+    "attributeMailSmtpHost": "電子郵件：SMTP 主機",
+    "attributeMailSmtpPort": "電子郵件：SMTP 埠口",
+    "attributeMailSmtpStarttlsEnable": "電子郵件：啟用 SMTP STARTTLS",
+    "attributeMailSmtpStarttlsRequired": "電子郵件：需要 SMTP STARTTLS",
+    "attributeMailSmtpSslEnable": "電子郵件：啟用 SMTP SSL",
+    "attributeMailSmtpSslTrust": "電子郵件：信任 SMTP SSL",
+    "attributeMailSmtpSslProtocols": "電子郵件：SMTP SSL 協定",
+    "attributeMailSmtpFrom": "電子郵件：SMTP 來源",
+    "attributeMailSmtpAuth": "電子郵件：啟用 SMTP 認證",
+    "attributeMailSmtpUsername": "電子郵件：SMTP 用戶名稱",
+    "attributeMailSmtpPassword": "電子郵件：SMTP 密碼",
+    "errorTitle": "錯誤",
+    "errorGeneral": "非法的參數或違反限制",
+    "errorConnection": "連線錯誤",
+    "errorSocket": "網頁接口連線錯誤",
+    "userEmail": "電子郵件",
+    "userPassword": "密碼",
+    "userAdmin": "管理員",
+    "userRemember": "記住密碼",
+    "userDisabled": "關閉帳號",
+    "userExpirationTime": "有效期限",
+    "userDeviceLimit": "設備限制",
+    "userUserLimit": "用戶限制",
+    "userDeviceReadonly": "唯讀設備",
+    "userToken": "簽證",
+    "loginTitle": "登入",
+    "loginLanguage": "語言",
+    "loginRegister": "註冊",
+    "loginLogin": "登入",
+    "loginFailed": "錯誤的電子信箱地址或密碼",
+    "loginCreated": "已成功註冊新用戶",
+    "loginLogout": "登出",
+    "loginLogo": "標識",
+    "devicesAndState": "設備與狀態",
+    "deviceTitle": "設備",
+    "deviceIdentifier": "識別號",
+    "deviceModel": "型號",
+    "deviceContact": "聯絡人",
+    "deviceCategory": "分類",
+    "deviceLastUpdate": "最近更新",
+    "deviceCommand": "命令",
+    "deviceFollow": "跟隨",
+    "deviceTotalDistance": "總距離",
+    "deviceStatus": "狀態",
+    "deviceStatusOnline": "上線",
+    "deviceStatusOffline": "下線",
+    "deviceStatusUnknown": "未知",
+    "groupDialog": "群組",
+    "groupParent": "上層群組",
+    "groupNoGroup": "無所屬群組",
+    "settingsTitle": "設定",
+    "settingsUser": "用戶",
+    "settingsGroups": "群組",
+    "settingsServer": "伺服器",
+    "settingsUsers": "用戶",
+    "settingsSpeedUnit": "速率單位",
+    "settingsTwelveHourFormat": "十二小時制",
+    "settingsCoordinateFormat": "座標格式",
+    "reportTitle": "報告",
+    "reportDevice": "設備",
+    "reportGroup": "群組",
+    "reportFrom": "開始",
+    "reportTo": "至",
+    "reportShow": "顯示",
+    "reportClear": "清空",
+    "positionFixTime": "時間",
+    "positionValid": "有效",
+    "positionAccuracy": "精準度",
+    "positionLatitude": "緯度",
+    "positionLongitude": "經度",
+    "positionAltitude": "海拔",
+    "positionSpeed": "速率",
+    "positionCourse": "方向",
+    "positionAddress": "地址",
+    "positionProtocol": "協定",
+    "positionDistance": "距離",
+    "positionRpm": "轉速",
+    "positionFuel": "燃油",
+    "positionPower": "電源",
+    "positionBattery": "電池",
+    "positionRaw": "Raw",
+    "positionIndex": "索引",
+    "positionHdop": "HDOP",
+    "positionVdop": "VDOP",
+    "positionPdop": "PDOP",
+    "positionSat": "衛星",
+    "positionSatVisible": "可見的衛星數",
+    "positionRssi": "RSSI",
+    "positionGps": "GPS",
+    "positionEvent": "事件",
+    "positionAlarm": "提醒",
+    "positionStatus": "狀態",
+    "positionOdometer": "里程表",
+    "positionServiceOdometer": "伺服器里程表",
+    "positionTripOdometer": "旅程里程表",
+    "positionHours": "小時",
+    "positionInput": "輸入",
+    "positionOutput": "輸出",
+    "positionBatteryLevel": "電池計量",
+    "positionFuelConsumption": "燃油消耗",
+    "positionRfid": "RFID",
+    "positionVersionFw": "韌體版本",
+    "positionVersionHw": "更體版本",
+    "positionIgnition": "點火",
+    "positionFlags": "旗標",
+    "positionCharge": "充電",
+    "positionIp": "IP",
+    "positionArchive": "車籍",
+    "positionVin": "車輛識別號碼",
+    "positionApproximate": "約",
+    "positionThrottle": "油門",
+    "positionMotion": "移動",
+    "positionArmed": "警報",
+    "positionAcceleration": "加速",
+    "positionDeviceTemp": "設備溫度",
+    "positionOperator": "司機",
+    "positionCommand": "Command",
+    "positionBlocked": "已封鎖",
+    "positionDtcs": "動態扭力控制",
+    "positionObdSpeed": "車上診斷系統速率",
+    "positionObdOdometer": "車上診斷系統里程表",
+    "serverTitle": "伺服器設定",
+    "serverZoom": "縮放",
+    "serverRegistration": "登錄",
+    "serverReadonly": "唯讀",
+    "serverForceSettings": "強制覆寫設定",
+    "mapTitle": "地圖",
+    "mapLayer": "地圖圖層",
+    "mapCustom": "自訂地圖",
+    "mapCarto": "CARTO 地圖",
+    "mapOsm": "OpenStreetMap",
+    "mapBingKey": "Bing 地圖金鑰",
+    "mapBingRoad": "Bing 道路地圖",
+    "mapBingAerial": "Bing 空照圖地圖",
+    "mapBingHybrid": "Bing 溫合地圖",
+    "mapBaidu": "百度",
+    "mapYandexMap": "Yandex 地圖",
+    "mapYandexSat": "Yandex 衛星",
+    "mapShapePolygon": "多邊形",
+    "mapShapeCircle": "圓形",
+    "mapShapePolyline": "多邊形",
+    "mapLiveRoutes": "即時路況",
+    "stateTitle": "狀態",
+    "stateName": "名稱",
+    "stateValue": "數值",
+    "commandTitle": "命令",
+    "commandSend": "傳送",
+    "commandSent": "已傳送命令",
+    "commandPositionPeriodic": "定期報告",
+    "commandPositionStop": "停止報告",
+    "commandEngineStop": "停止引擎",
+    "commandEngineResume": "恢復引擎",
+    "commandFrequency": "頻率",
+    "commandUnit": "單位",
+    "commandCustom": "自訂命令",
+    "commandPositionSingle": "個別報告",
+    "commandAlarmArm": "啟動警報",
+    "commandAlarmDisarm": "解除警報",
+    "commandSetTimezone": "設定時區",
+    "commandRequestPhoto": "請求照片",
+    "commandRebootDevice": "重啟設備",
+    "commandSendSms": "傳送簡訊",
+    "commandSendUssd": "傳送 USSD 簡訊",
+    "commandSosNumber": "設定救援號碼",
+    "commandSilenceTime": "設定靜音時段",
+    "commandSetPhonebook": "設定電話簿",
+    "commandSetIndicator": "設定指標",
+    "commandVoiceMessage": "語音訊息",
+    "commandOutputControl": "輸出控制",
+    "commandAlarmSpeed": "超速警報",
+    "commandDeviceIdentification": "設備識別號",
+    "commandIndex": "索引",
+    "commandData": "資料",
+    "commandPhone": "電話號碼",
+    "commandMessage": "訊息",
+    "commandTimezone": "時區",
+    "commandgetModemStatus": "數據機狀態",
+    "commandgetDeviceStatus": "設備狀態",
+    "eventAll": "所有事件",
+    "eventDeviceOnline": "設備上線",
+    "eventDeviceUnknown": "設備狀態未知",
+    "eventDeviceOffline": "設備下線",
+    "eventDeviceMoving": "設備正在移動",
+    "eventDeviceStopped": "設備已停止",
+    "eventDeviceOverspeed": "設備超速",
+    "eventDeviceFuelDrop": "加油",
+    "eventCommandResult": "命令結果",
+    "eventGeofenceEnter": "設備進入地圖圍籬",
+    "eventGeofenceExit": "設備離開地圖圍籬",
+    "eventAlarm": "警報",
+    "eventIgnitionOn": "點火開",
+    "eventIgnitionOff": "點火關",
+    "eventMaintenance": "需要保養",
+    "eventTextMessage": "已接收文字訊息",
+    "eventsScrollToLast": "卷軸已拉到底",
+    "alarmSos": "求救警報",
+    "alarmVibration": "振動警報",
+    "alarmMovement": "移動警報",
+    "alarmOverspeed": "超速警報",
+    "alarmFallDown": "墜落警報",
+    "alarmLowBattery": "電池耗盡警報",
+    "alarmLowPower": "電力耗盡警報",
+    "alarmFault": "故障錯誤",
+    "alarmPowerOff": "關機警報",
+    "alarmPowerOn": "開機警報",
+    "alarmDoor": "開門警報",
+    "alarmGeofence": "地圖圍籬警報",
+    "alarmGeofenceEnter": "進入地圖圍籬警報",
+    "alarmGeofenceExit": "離開地圖圍籬警報",
+    "alarmGpsAntennaCut": "GPS 天線脫落警報",
+    "alarmAccident": "事故警報",
+    "alarmTow": "拖吊警報",
+    "alarmHardAcceleration": "緊急加速警報",
+    "alarmHardBreaking": "緊急煞車警報",
+    "alarmFatigueDriving": "疲勞駕駛",
+    "alarmPowerCut": "失去電力警報",
+    "alarmPowerRestored": "電力恢復警報",
+    "alarmJamming": "塞車警報",
+    "alarmTemperature": "溫度異常警報",
+    "alarmParking": "停車警報",
+    "alarmShock": "震動警報",
+    "alarmBonnet": "引擎蓋警報",
+    "alarmFootBrake": "腳煞車警報",
+    "alarmOilLeak": "漏油警報",
+    "alarmTampering": "舞弊警報",
+    "alarmRemoving": "Removing Alarm",
+    "notificationType": "通知類型",
+    "notificationWeb": "以網頁通知",
+    "notificationMail": "以電子郵件通知",
+    "notificationSms": "以簡訊通知",
+    "reportRoute": "路線",
+    "reportEvents": "事件",
+    "reportTrips": "旅程",
+    "reportStops": "Stops",
+    "reportSummary": "摘要",
+    "reportChart": "圖表",
+    "reportConfigure": "設置",
+    "reportEventTypes": "事件類型",
+    "reportChartType": "圖表類型",
+    "reportShowMarkers": "顯示地標",
+    "reportExport": "匯出",
+    "reportDeviceName": "設備名稱",
+    "reportAverageSpeed": "平均速率",
+    "reportMaximumSpeed": "最高速率",
+    "reportEngineHours": "引擎時數",
+    "reportDuration": "持續時間",
+    "reportStartTime": "起始時間",
+    "reportStartAddress": "起始地點",
+    "reportEndTime": "結束時間",
+    "reportEndAddress": "結束地點",
+    "reportSpentFuel": "燃油消耗",
+    "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": "曳引機",
+    "categoryTruck": "貨車",
+    "categoryVan": "箱型車"
+}
\ No newline at end of file