Update localization files

54 files changed, 1466 insertions, 710 deletions

diff --git a/modern/src/resources/l10n/af.json b/modern/src/resources/l10n/af.json
index 2c2a5e8f..54525d19 100644
--- a/modern/src/resources/l10n/af.json
+++ b/modern/src/resources/l10n/af.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Spoedgrens",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Verberg posisie attribute",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Fout",
     "errorGeneral": "Ongeldige parameters of beperking oortreding",
     "errorConnection": "Verbindings fout",
@@ -182,7 +184,10 @@
     "loginLogout": "Teken uit",
     "loginLogo": "Logo",
     "devicesAndState": "Toestelle en staat",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Toestelle",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifiseerder",
     "deviceModel": "Model",
     "deviceContact": "Kontak",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Eenheid",
     "settingsTwelveHourFormat": "12-uur Formaat",
     "settingsCoordinateFormat": "Koördinate Formaat",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Verslae",
     "reportDevice": "Toestel",
     "reportGroup": "Groep",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Pasgemaakte kaart",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Kaart Sleutel",
     "mapBingRoad": "Bing Kaart Pad",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Vlak",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Toestand",
     "stateName": "Attribuut",
     "stateValue": "Waarde",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Bestuurder geruil",
     "eventMedia": "Media",
     "eventsScrollToLast": "Blaai na laaste",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Algemeen",
     "alarmSos": "SOS",
     "alarmVibration": "Vibrasie",
diff --git a/modern/src/resources/l10n/ar.json b/modern/src/resources/l10n/ar.json
index d821eae5..bd7a414c 100644
--- a/modern/src/resources/l10n/ar.json
+++ b/modern/src/resources/l10n/ar.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "الحد الأقصى للسرعة",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "واجهة المستخدم: إخفاء سمات الموقع",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "رموز الإشعارات",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "خطأ",
     "errorGeneral": "معطيات غير صحيحة او مخالفة للصلاحيات",
     "errorConnection": "خطأ في الاتصال",
@@ -182,7 +184,10 @@
     "loginLogout": "تسجيل الخروج",
     "loginLogo": "الشعار",
     "devicesAndState": "الأجهزة والحالة",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "الأجهزة",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "المعرف",
     "deviceModel": "الطراز",
     "deviceContact": "بيانات التواصل",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "وحدة الحجم",
     "settingsTwelveHourFormat": "صيغة 12-ساعة",
     "settingsCoordinateFormat": "صيغة الإحداثيات",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "التقارير",
     "reportDevice": "الجهاز",
     "reportGroup": "المجموعة",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "خريطة مخصصة",
     "mapCarto": "خرائط Carto Base",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "مفتاح خرائط Bing",
     "mapBingRoad": "خرائط  الطرق Bing",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "طبقة POI نقاط الإهتمام",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "حالة",
     "stateName": "خاصية",
     "stateValue": "قيمة",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "تم تغيير السائق",
     "eventMedia": "Media",
     "eventsScrollToLast": "الانتقال للأخير",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "عام",
     "alarmSos": "استغاثة",
     "alarmVibration": "اهتزاز",
diff --git a/modern/src/resources/l10n/az.json b/modern/src/resources/l10n/az.json
index 9b327208..3389fc38 100644
--- a/modern/src/resources/l10n/az.json
+++ b/modern/src/resources/l10n/az.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Sürət həddi",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI : Vəzifə xüsusiyyətlərini gizləyin",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Xəta",
     "errorGeneral": "Yanlış parametrlər və ya məhdudiyyətlərin pozulması",
     "errorConnection": "Bağlantı xətası",
@@ -182,7 +184,10 @@
     "loginLogout": "Çıxış",
     "loginLogo": "Giriş",
     "devicesAndState": "Cihaz və vəziyyəti",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Cihaz",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "İdentifikator",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Həcm vahidi",
     "settingsTwelveHourFormat": "12 saatlıq format",
     "settingsCoordinateFormat": "Koordinatlar formatı",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Hesabatlar",
     "reportDevice": "Cihaz",
     "reportGroup": "Qrup",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI təbəqə",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Vəziyyət",
     "stateName": "Parametr",
     "stateValue": "Dəyər",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Sonadək fırlanma",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "fəlakət siqnalı",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/bg.json b/modern/src/resources/l10n/bg.json
index 4a3efa8e..36bddb25 100644
--- a/modern/src/resources/l10n/bg.json
+++ b/modern/src/resources/l10n/bg.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Ограничение на скоростта",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "Скрий атрибутите на позицията",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Грешка",
     "errorGeneral": "Невалидни параметри",
     "errorConnection": "Грешка във връзката",
@@ -182,7 +184,10 @@
     "loginLogout": "Изход",
     "loginLogo": "Лого",
     "devicesAndState": "Устройства и състояние",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Обекти",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Идентификатор",
     "deviceModel": "Модел",
     "deviceContact": "Контакт",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Мерна единица за обем",
     "settingsTwelveHourFormat": "12 часов формат",
     "settingsCoordinateFormat": "Формат на координатите",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Отчети",
     "reportDevice": "Устройство",
     "reportGroup": "Група",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Потребителска карта",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Ключ за Bing Maps",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI слой",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Състояние",
     "stateName": "Параметър",
     "stateValue": "Стойност",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Шофьорът се смени",
     "eventMedia": "Media",
     "eventsScrollToLast": "Отиди на последния",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Общи",
     "alarmSos": "SOS",
     "alarmVibration": "Вибрация",
diff --git a/modern/src/resources/l10n/bn.json b/modern/src/resources/l10n/bn.json
index 721e3b6a..224bfab3 100644
--- a/modern/src/resources/l10n/bn.json
+++ b/modern/src/resources/l10n/bn.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "ডিভাইসের গতি সীমা",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "ত্রুটি",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "সংযোগ ত্রুটি",
@@ -182,7 +184,10 @@
     "loginLogout": "লগ আউট",
     "loginLogo": "লোগো",
     "devicesAndState": "ডিভাইস ও অবস্থা",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "ডিভাইস",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifier",
     "deviceModel": "মডেল",
     "deviceContact": "যোগাযোগ",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "12-hour Format",
     "settingsCoordinateFormat": "Coordinates Format",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Reports",
     "reportDevice": "ডিভাইস",
     "reportGroup": "গ্রুপ",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "State",
     "stateName": "বৈশিষ্ট্যাবলী / গুণাবলী",
     "stateValue": "মান",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/ca.json b/modern/src/resources/l10n/ca.json
index 1ff30a5c..6e521e07 100644
--- a/modern/src/resources/l10n/ca.json
+++ b/modern/src/resources/l10n/ca.json
@@ -78,8 +78,8 @@
     "sharedPermissions": "Permisos",
     "sharedConnections": "Connexions",
     "sharedExtra": "Extra",
-    "sharedPrimary": "Primary",
-    "sharedSecondary": "Secondary",
+    "sharedPrimary": "Primari",
+    "sharedSecondary": "Secondari",
     "sharedTypeString": "Cadena",
     "sharedTypeNumber": "Número",
     "sharedTypeBoolean": "Booleà",
@@ -112,6 +112,7 @@
     "calendarThursday": "Dijous",
     "calendarFriday": "Divendres",
     "calendarSaturday": "Dissabte",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Límit de velocitat",
     "attributeFuelDropThreshold": "Llindar de caiguda de combustible",
     "attributeFuelIncreaseThreshold": "Llindar d\\\\'augment del combustible",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Ocultar Atributs de Posició",
     "attributeUiDisableLoginLanguage": "UI: Deshabilitar Idioma de inici de sessió",
     "attributeNotificationTokens": "Notificació Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Error",
     "errorGeneral": "Paràmetres no vàlids o fora dels límits",
     "errorConnection": "Error en la connexió",
@@ -182,7 +184,10 @@
     "loginLogout": "Tancar Sessió",
     "loginLogo": "Logotipus",
     "devicesAndState": "Dispositius i Estat",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Dispositius",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identificador",
     "deviceModel": "Model",
     "deviceContact": "Contacte",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Unitat de Volum",
     "settingsTwelveHourFormat": "Format de 12h.",
     "settingsCoordinateFormat": "Format de Coordenades",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Informes",
     "reportDevice": "Dispositius",
     "reportGroup": "Grup",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Mapa Personalitzat",
     "mapCarto": "Carto",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Clau Bing Maps",
     "mapBingRoad": "Bing Maps - Carretera",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Capa POI",
     "mapClustering": "Agrupar Marcadors",
     "mapOnSelect": "Mostrar Mapes en la selecció",
+    "mapDefault": "Default Map",
     "stateTitle": "Estat",
     "stateName": "Paràmetre",
     "stateValue": "Valor",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "El conductor ha canviat",
     "eventMedia": "Media",
     "eventsScrollToLast": "Desplaçar-se fins l'últim",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibració",
diff --git a/modern/src/resources/l10n/cs.json b/modern/src/resources/l10n/cs.json
index 4bf92431..fcd8d5d2 100644
--- a/modern/src/resources/l10n/cs.json
+++ b/modern/src/resources/l10n/cs.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Rychlostní limit",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Skrýt atributy pozice",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notifikační tokeny",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Chyba",
     "errorGeneral": "Nesprávné parametry nebo překročení omezení",
     "errorConnection": "Chyba spojení",
@@ -182,7 +184,10 @@
     "loginLogout": "Odhlášení",
     "loginLogo": "Logo",
     "devicesAndState": "Zařízení a stav",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Zařízení",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifikace",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Jednotka objemu",
     "settingsTwelveHourFormat": "12-hodinový formát",
     "settingsCoordinateFormat": "Formát souřadnic",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Reporty",
     "reportDevice": "Zařízení",
     "reportGroup": "Skupina",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Vlastní mapa",
     "mapCarto": "Základní mapy nákladu",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps klíč",
     "mapBingRoad": "Bing Maps silniční",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Vrstva s POI",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Stav",
     "stateName": "Atribut",
     "stateValue": "Hodnota",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Řidič vyměněn",
     "eventMedia": "Media",
     "eventsScrollToLast": "Posunout na poslední",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Hlavní",
     "alarmSos": "SOS",
     "alarmVibration": "Vibrace",
diff --git a/modern/src/resources/l10n/da.json b/modern/src/resources/l10n/da.json
index 53adfbcf..9f5f564f 100644
--- a/modern/src/resources/l10n/da.json
+++ b/modern/src/resources/l10n/da.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Hastigheds grænse",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "Skjul positionsattributter",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notifikations Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Fejl",
     "errorGeneral": "ulovlig parameter ",
     "errorConnection": "Tilslutning fejl",
@@ -182,7 +184,10 @@
     "loginLogout": "Log af",
     "loginLogo": "Logo",
     "devicesAndState": "Enheder og status",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Enheder",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Imei nr",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume enhed",
     "settingsTwelveHourFormat": "12 timers format",
     "settingsCoordinateFormat": "Koordinats format",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Rapporter",
     "reportDevice": "Enhed",
     "reportGroup": "Gruppe",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Brugerdefineret kort",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Lag",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Status",
     "stateName": "Parameter",
     "stateValue": "Værdi",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Chaufførskift",
     "eventMedia": "Media",
     "eventsScrollToLast": "Rul til sidste",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Generel",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/de.json b/modern/src/resources/l10n/de.json
index 8c2df217..fdbc516f 100644
--- a/modern/src/resources/l10n/de.json
+++ b/modern/src/resources/l10n/de.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Donnerstag",
     "calendarFriday": "Freitag",
     "calendarSaturday": "Samstag",
+    "attributeShowGeofences": "Geozäune anzeigen",
     "attributeSpeedLimit": "Höchstgeschwindigkeit",
     "attributeFuelDropThreshold": "Fuel Drop Schwelle",
     "attributeFuelIncreaseThreshold": "Fuel Increase Schwelle",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "Oberfläche: Positionsattribute ausblenden",
     "attributeUiDisableLoginLanguage": "UI: Loginsprache deaktivieren",
     "attributeNotificationTokens": "Benachrichtungsschlüssel",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Fehler",
     "errorGeneral": "Ungültige Eingabe oder keine Berechtigung",
     "errorConnection": "Verbindungsfehler",
@@ -182,7 +184,10 @@
     "loginLogout": "Abmelden",
     "loginLogo": "Logo",
     "devicesAndState": "Geräte und Status",
+    "deviceSelected": "Ausgewähltes Gerät",
     "deviceTitle": "Geräte",
+    "devicePrimaryInfo": "Gerät Titel",
+    "deviceSecondaryInfo": "Gerät Detail",
     "deviceIdentifier": "Kennung",
     "deviceModel": "Modell",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volumeneinheit",
     "settingsTwelveHourFormat": "12 Stunden Format",
     "settingsCoordinateFormat": "Koordinatenformat",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Berichte",
     "reportDevice": "Gerät",
     "reportGroup": "Gruppe",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Benutzerdefinierte Karte",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Straßen",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellit",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Strassenkarte",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Ebene",
     "mapClustering": "Marker zusammenfassen",
     "mapOnSelect": "Karte bei Auswahl anzeigen",
+    "mapDefault": "Standartkarte",
     "stateTitle": "Status",
     "stateName": "Parameter",
     "stateValue": "Wert",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Fahrer gewechselt",
     "eventMedia": "Medien",
     "eventsScrollToLast": "Zur Neuesten scrollen",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarme",
     "alarmGeneral": "Allgemein",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/el.json b/modern/src/resources/l10n/el.json
index c10efab2..9fe8e16b 100644
--- a/modern/src/resources/l10n/el.json
+++ b/modern/src/resources/l10n/el.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Όριο ταχύτητας",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "Διεπαφή: Απόκρυψη Ιδιοτήτων Θέσης",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Διακριτικά ειδοποίησης",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Σφάλμα",
     "errorGeneral": "Μη έγκυρες παράμετροι ή παραβίαση περιορισμών",
     "errorConnection": "Σφάλμα σύνδεσης",
@@ -182,7 +184,10 @@
     "loginLogout": "Αποσύνδεση",
     "loginLogo": "Λογότυπο",
     "devicesAndState": "Κατάσταση συσκευών",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Συσκευές",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Αναγνωριστικό",
     "deviceModel": "Μοντέλο",
     "deviceContact": "Επαφή",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Μονάδα Όγκου",
     "settingsTwelveHourFormat": "12ώρη μορφή",
     "settingsCoordinateFormat": "Τύπος Συντεταγμένων",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Αναφορές",
     "reportDevice": "Συσκευή",
     "reportGroup": "Ομάδα",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Προσαρμοσμένος χάρτης",
     "mapCarto": "Βασικοί χάρτες Carto",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Κλειδί Bing Maps",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Επίπεδο POI",
     "mapClustering": "Ομαδοποίηση δεικτών",
     "mapOnSelect": "Εμφάνιση χάρτη κατά την επιλογή",
+    "mapDefault": "Default Map",
     "stateTitle": "Κατάσταση",
     "stateName": "Παράμετρος",
     "stateValue": "Τιμή",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Ο οδηγός άλλαξε",
     "eventMedia": "Media",
     "eventsScrollToLast": "Κύλιση στο τέλος",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Γενικά",
     "alarmSos": "SOS",
     "alarmVibration": "Δόνηση",
diff --git a/modern/src/resources/l10n/es.json b/modern/src/resources/l10n/es.json
index e600a841..244c925b 100644
--- a/modern/src/resources/l10n/es.json
+++ b/modern/src/resources/l10n/es.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Jueves",
     "calendarFriday": "Viernes",
     "calendarSaturday": "Sábado",
+    "attributeShowGeofences": "Mostrar Geo-Zonas",
     "attributeSpeedLimit": "Límite de velocidad",
     "attributeFuelDropThreshold": "Umbral de pérdida de combustible",
     "attributeFuelIncreaseThreshold": "Umbral del subida de combustible",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Ocultar Atributos de Posición",
     "attributeUiDisableLoginLanguage": "UI: Deshabilitar Idioma de inicio de sesión",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Información popup",
     "errorTitle": "Error",
     "errorGeneral": "Parámetros no válidos o fuera de los límites",
     "errorConnection": "Error en la conexión",
@@ -182,7 +184,10 @@
     "loginLogout": "Cerrar Sesión",
     "loginLogo": "Logotipo",
     "devicesAndState": "Dispositivos y Estado",
+    "deviceSelected": "Dispositivo seleccionado",
     "deviceTitle": "Dispositivos",
+    "devicePrimaryInfo": "Título del dispositivo",
+    "deviceSecondaryInfo": "Detalles del dispositivo",
     "deviceIdentifier": "Identificador",
     "deviceModel": "Modelo",
     "deviceContact": "Contacto",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Unidad de Volumen",
     "settingsTwelveHourFormat": "Formato de 12h.",
     "settingsCoordinateFormat": "Formato de Coordenadas",
+    "settingsServerVersion": "Versión del servidor",
+    "settingsAppVersion": "Versión de la app",
+    "settingsConnection": "Conexión",
     "reportTitle": "Reportes",
     "reportDevice": "Dispositivos",
     "reportGroup": "Grupo",
@@ -220,7 +228,7 @@
     "linkAppleMaps": "Apple Maps",
     "linkStreetView": "Street View",
     "positionFixTime": "Hora ajustada",
-    "positionDeviceTime": "Hora del Dispositivo",
+    "positionDeviceTime": "Hora del dispositivo",
     "positionServerTime": "Hora del Servidor",
     "positionValid": "Válida",
     "positionAccuracy": "Precisión",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Mapa Personalizado",
     "mapCarto": "Carto",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Carreteras",
+    "mapGoogleHybrid": "Google Híbrido",
+    "mapGoogleSatellite": "Google Satélite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps - Carretera",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Capa POI",
     "mapClustering": "Agrupar Marcadores",
     "mapOnSelect": "Mostrar Mapas en la selección",
+    "mapDefault": "Mapa por defecto",
     "stateTitle": "Estado",
     "stateName": "Parámetro",
     "stateValue": "Valor",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "El conductor ha cambiado",
     "eventMedia": "Media",
     "eventsScrollToLast": "Desplazarse hasta el último",
+    "eventsSoundEvents": "Sonido para eventos",
+    "eventsSoundAlarms": "Sonido para alarmas",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibración",
diff --git a/modern/src/resources/l10n/fa.json b/modern/src/resources/l10n/fa.json
index 0777905b..d7acf153 100644
--- a/modern/src/resources/l10n/fa.json
+++ b/modern/src/resources/l10n/fa.json
@@ -8,14 +8,14 @@
     "sharedEdit": "ویرایش",
     "sharedRemove": "پاک کردن",
     "sharedRemoveConfirm": "پاک کردن آیتم",
-    "sharedNoData": "No data",
-    "sharedYes": "Yes",
-    "sharedNo": "No",
+    "sharedNoData": "داده ای نیست",
+    "sharedYes": "بلی",
+    "sharedNo": "خیر",
     "sharedKm": "Km",
     "sharedMi": "Mile",
     "sharedNmi": "مایل دریایی",
-    "sharedMeters": "m",
-    "sharedFeet": "ft",
+    "sharedMeters": "متر",
+    "sharedFeet": "فوت",
     "sharedKn": "گره دریایی",
     "sharedKmh": "Km/h",
     "sharedMph": "M/h",
@@ -31,10 +31,10 @@
     "sharedName": "نام",
     "sharedDescription": "توضیحات",
     "sharedSearch": "جستجو",
-    "sharedIconScale": "Icon Scale",
+    "sharedIconScale": "اندازه آیکن",
     "sharedGeofence": "حصار جغرافیایی",
     "sharedGeofences": "حصارهای جغرافیایی",
-    "sharedCreateGeofence": "Create Geofence",
+    "sharedCreateGeofence": "ایجاد جغرافیا",
     "sharedNotifications": "رویدادها",
     "sharedNotification": "اطلاعیه",
     "sharedAttributes": "ویژگی ها",
@@ -61,25 +61,25 @@
     "sharedCheckComputedAttribute": "بررسی ویژگی محاسبه شده",
     "sharedExpression": "اصطلاح",
     "sharedDevice": "دستگاه",
-    "sharedTest": "Test",
+    "sharedTest": "تست",
     "sharedTestNotification": "ارسال تست اخطار",
-    "sharedTestNotificators": "Test Channels",
-    "sharedTestExpression": "Test Expression",
+    "sharedTestNotificators": "تست کانال",
+    "sharedTestExpression": "تست اصطلاح",
     "sharedCalendar": "تقویم",
     "sharedCalendars": "تقویمها",
     "sharedFile": "فایل",
-    "sharedSearchDevices": "Search Devices",
-    "sharedSortBy": "Sort By",
-    "sharedFilterMap": "Filter on Map",
+    "sharedSearchDevices": "جستجوی دستگاهها",
+    "sharedSortBy": "مرتب سازی",
+    "sharedFilterMap": "فیلتر بر روی نقشه",
     "sharedSelectFile": "انتخاب فایل",
     "sharedPhone": "تلفن",
     "sharedRequired": "ضروری",
     "sharedPreferences": "تنظیمات",
     "sharedPermissions": "دسترسیها",
-    "sharedConnections": "Connections",
+    "sharedConnections": "ارتباطات",
     "sharedExtra": "بیشتر",
-    "sharedPrimary": "Primary",
-    "sharedSecondary": "Secondary",
+    "sharedPrimary": "اولیه",
+    "sharedSecondary": "ثانویه",
     "sharedTypeString": "رشته",
     "sharedTypeNumber": "شماره",
     "sharedTypeBoolean": "بولی",
@@ -89,47 +89,48 @@
     "sharedSavedCommands": "دستورات ذخیره شده",
     "sharedNew": "جدید...",
     "sharedShowAddress": "نمایش آدرس",
-    "sharedShowDetails": "More Details",
+    "sharedShowDetails": "جزئیات بیشتر",
     "sharedDisabled": "غیرفعال شده",
     "sharedMaintenance": "تعمیر و نگهداری",
     "sharedDeviceAccumulators": "باطری",
     "sharedAlarms": "هشدارها",
-    "sharedLocation": "Location",
-    "sharedImport": "Import",
-    "sharedColumns": "Columns",
-    "sharedDropzoneText": "Drag and drop a file here or click",
-    "calendarSimple": "Simple",
-    "calendarRecurrence": "Recurrence",
-    "calendarOnce": "Once",
-    "calendarDaily": "Daily",
-    "calendarWeekly": "Weekly",
-    "calendarMonthly": "Monthly",
-    "calendarDays": "Days",
-    "calendarSunday": "Sunday",
-    "calendarMonday": "Monday",
-    "calendarTuesday": "Tuesday",
-    "calendarWednesday": "Wednesday",
-    "calendarThursday": "Thursday",
-    "calendarFriday": "Friday",
-    "calendarSaturday": "Saturday",
+    "sharedLocation": "مکان",
+    "sharedImport": "ورود",
+    "sharedColumns": "ستونها",
+    "sharedDropzoneText": "فایل را اینجا بکشید",
+    "calendarSimple": "ساده",
+    "calendarRecurrence": "عکس العمل",
+    "calendarOnce": "یکبار",
+    "calendarDaily": "روزانه",
+    "calendarWeekly": "هفتگی",
+    "calendarMonthly": "ماهانه",
+    "calendarDays": "روز (ها)",
+    "calendarSunday": "یکشنبه",
+    "calendarMonday": "دوشنبه",
+    "calendarTuesday": "سه شنبه",
+    "calendarWednesday": "چهارشنبه",
+    "calendarThursday": "پنجشنبه",
+    "calendarFriday": "جمعه",
+    "calendarSaturday": "شنبه",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "محدودیت سرعت",
-    "attributeFuelDropThreshold": "Fuel Drop Threshold",
-    "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
+    "attributeFuelDropThreshold": "حد اتمام سوخت",
+    "attributeFuelIncreaseThreshold": "حد تکمیل سوخت",
     "attributePolylineDistance": "مسافت چند مسیری",
     "attributeReportIgnoreOdometer": "گزارش : بدون کیلومتر شمار",
     "attributeWebReportColor": "وب : گزارش رنگ",
     "attributeDevicePassword": "رمز عبور ردیاب",
-    "attributeDeviceImage": "Device Image",
-    "attributeDeviceInactivityStart": "Device Inactivity Start",
-    "attributeDeviceInactivityPeriod": "Device Inactivity Period",
+    "attributeDeviceImage": "عکس دستگاه",
+    "attributeDeviceInactivityStart": "آغاز عدم فعالیت دستگاه",
+    "attributeDeviceInactivityPeriod": "دوره عدم فعالیت دستگاه",
     "attributeProcessingCopyAttributes": "در حال پردازش : کپی ویژگیها",
     "attributeColor": "رنگ",
     "attributeWebLiveRouteLength": "وب : طول جاده آنلاین",
     "attributeWebSelectZoom": "وب : زوم با انتخاب",
     "attributeWebMaxZoom": "بیشترین زوم",
-    "attributeTelegramChatId": "Telegram Chat ID",
-    "attributePushoverUserKey": "Pushover User Key",
-    "attributePushoverDeviceNames": "Pushover Device Names",
+    "attributeTelegramChatId": "آی دی تلگرام",
+    "attributePushoverUserKey": "Pushover کلید کاربری",
+    "attributePushoverDeviceNames": "Pushover نام دستگاه",
     "attributeMailSmtpHost": "ایمیل : هاست SMTP",
     "attributeMailSmtpPort": "ایمیل : پورت SMTP",
     "attributeMailSmtpStarttlsEnable": "ایمیل : SMTP STARTTLS فعال",
@@ -141,8 +142,8 @@
     "attributeMailSmtpAuth": "ایمیل : معتبر سازی SMTP فعال",
     "attributeMailSmtpUsername": "ایمیل : نام کاربری SMTP",
     "attributeMailSmtpPassword": "ایمیل : رمز عبور SMTP",
-    "attributeUiDisableAttributes": "UI: Disable Attributes",
-    "attributeUiDisableGroups": "UI: Disable Groups",
+    "attributeUiDisableAttributes": "UI: ویژگیها غیرفعال",
+    "attributeUiDisableGroups": "UI: گروهها غیرفعال",
     "attributeUiDisableEvents": "وقایع غیرفعال",
     "attributeUiDisableVehicleFetures": "غیرفعالسازی عملیات خودرو",
     "attributeUiDisableDrivers": "غیرفعالسازی رانندگان",
@@ -150,8 +151,9 @@
     "attributeUiDisableCalendars": "غیرفعالسازی تقویم",
     "attributeUiDisableMaintenance": "تعمیر غیر فعال",
     "attributeUiHidePositionAttributes": "مخفی شدن موقعیت صفات",
-    "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
-    "attributeNotificationTokens": "Notification Tokens",
+    "attributeUiDisableLoginLanguage": "UI: زبانهای ورود غیرفعال",
+    "attributeNotificationTokens": "اخطار توکن",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "خطا",
     "errorGeneral": "پارامترهای نامعتبر یا نقص محدودیت",
     "errorConnection": "خطا در اتصال",
@@ -166,23 +168,26 @@
     "userUserLimit": "محدودیت کاربر",
     "userDeviceReadonly": "دستگاه فقط خواندنی",
     "userLimitCommands": "دستورات محدود",
-    "userDisableReports": "Disable Reports",
-    "userFixedEmail": "No Email Change",
+    "userDisableReports": "گزارشات غیرفعال",
+    "userFixedEmail": "عدم تغییر ایمیل",
     "userToken": "رمز یکبار",
-    "userDeleteAccount": "Delete Account",
+    "userDeleteAccount": "حذف اکانت",
     "loginTitle": "ورود",
     "loginLanguage": "انتخاب زبان",
-    "loginReset": "Reset Password",
+    "loginReset": "ریست رمز عبور",
     "loginRegister": "ثبت نام",
     "loginLogin": "ورود",
     "loginFailed": "نام كاربرى يا گذرواژه اشتباه است",
     "loginCreated": "ثبت نام با موفقيت انجام شد",
-    "loginResetSuccess": "Check your email",
-    "loginUpdateSuccess": "New password is set",
+    "loginResetSuccess": "ایمیلتان را چک کنید",
+    "loginUpdateSuccess": "رمز جدید اعمال شد",
     "loginLogout": "خروج",
     "loginLogo": "لوگو",
     "devicesAndState": "دستگاه ها و وضعیت",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "دستگاهها",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "سريال دستگاه",
     "deviceModel": "مدل",
     "deviceContact": "تماس",
@@ -204,11 +209,14 @@
     "settingsServer": "سرور",
     "settingsUsers": "کاربر",
     "settingsDistanceUnit": "واحد مسافت",
-    "settingsAltitudeUnit": "Altitude Unit",
+    "settingsAltitudeUnit": "واحد ارتفاع",
     "settingsSpeedUnit": "واحد سرعت",
     "settingsVolumeUnit": "واحد حجم",
     "settingsTwelveHourFormat": "فرمت 12 ساعتی",
     "settingsCoordinateFormat": "فرمت مختصاتی",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "گزارشات ",
     "reportDevice": "دستگاه",
     "reportGroup": "گروه",
@@ -216,12 +224,12 @@
     "reportTo": "تا",
     "reportShow": "نمایش",
     "reportClear": "خالی کردن",
-    "linkGoogleMaps": "Google Maps",
-    "linkAppleMaps": "Apple Maps",
-    "linkStreetView": "Street View",
-    "positionFixTime": "Fix Time",
-    "positionDeviceTime": "Device Time",
-    "positionServerTime": "Server Time",
+    "linkGoogleMaps": "نقشه گوگل",
+    "linkAppleMaps": "نقشه اپل",
+    "linkStreetView": "نمای خیابان",
+    "positionFixTime": "زمان ثابت",
+    "positionDeviceTime": "زمان دستگاه",
+    "positionServerTime": "زمان سرور",
     "positionValid": "معتبر",
     "positionAccuracy": "دقت",
     "positionLatitude": "عرض جغرافيايى",
@@ -272,7 +280,7 @@
     "positionMotion": "حرکت",
     "positionArmed": "مسلح",
     "positionAcceleration": "شتاب",
-    "positionTemp": "Temperature",
+    "positionTemp": "درجه حرارت",
     "positionDeviceTemp": "دمای دستگاه",
     "positionOperator": "اوپراتور",
     "positionCommand": "کد دستوری",
@@ -282,18 +290,18 @@
     "positionObdOdometer": "کیلومتر شمار ODB",
     "positionDriverUniqueId": "کد شناسایی راننده",
     "positionImage": "تصویر",
-    "positionVideo": "Video",
+    "positionVideo": "ویدیو",
     "positionAudio": "صدا",
     "serverTitle": "تنظیمات سرور",
     "serverZoom": "بزرگنمایی",
     "serverRegistration": "ثبت نام",
     "serverReadonly": "فقط خواندنی",
     "serverForceSettings": "تنظیمات اجباری",
-    "serverAnnouncement": "Announcement",
+    "serverAnnouncement": "اطلاعیه",
     "mapTitle": "نقشه",
-    "mapActive": "Active Maps",
-    "mapOverlay": "Map Overlay",
-    "mapOverlayCustom": "Custom Overlay",
+    "mapActive": "نقشه های فعال",
+    "mapOverlay": "لایه نقشه",
+    "mapOverlayCustom": "لایه سفارشی",
     "mapOpenSeaMap": "OpenSeaMap",
     "mapOpenWeatherKey": "OpenWeather API Key",
     "mapOpenWeatherClouds": "OpenWeather Clouds",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "نقشه اختیاری",
     "mapCarto": "نقشه کارتو",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "کلید نقشه Bing",
     "mapBingRoad": "نقشه جاده Bing",
@@ -340,10 +351,11 @@
     "mapShapeCircle": "دایره ",
     "mapShapePolyline": "چند خطی",
     "mapLiveRoutes": "تعقیب مسیر",
-    "mapCurrentLocation": "Current Location",
+    "mapCurrentLocation": "موقعیت فعلی",
     "mapPoiLayer": "لایه POI",
     "mapClustering": "Markers Clustering",
-    "mapOnSelect": "Show Map on Selection",
+    "mapOnSelect": "نمایش نقشه در انتخاب",
+    "mapDefault": "Default Map",
     "stateTitle": "وضعیت",
     "stateName": "ویژگی",
     "stateValue": "مقدار",
@@ -366,7 +378,7 @@
     "commandRequestPhoto": "درخواست عکس",
     "commandPowerOff": "خاموش شدن دستگاه",
     "commandRebootDevice": "ریست کردن دستگاه",
-    "commandFactoryReset": "Factory Reset",
+    "commandFactoryReset": "ریست تنظیم کارخانه",
     "commandSendSms": "ارسال پیام کوتاه",
     "commandSendUssd": "ارسال کد USSD",
     "commandSosNumber": "انتخاب شماره مدیر ",
@@ -384,15 +396,15 @@
     "commandSetOdometer": "تنظیم کیلومتر شمار",
     "commandGetModemStatus": "دریافت وضعیت مودم",
     "commandGetDeviceStatus": "دریافت وضعیت دستگاه",
-    "commandSetSpeedLimit": "Set Speed Limit",
-    "commandModePowerSaving": "Power Saving Mode",
-    "commandModeDeepSleep": "Deep Sleep Mode",
-    "commandAlarmGeofence": "Set Geofence Alarm",
-    "commandAlarmBattery": "Set Battery Alarm",
-    "commandAlarmSos": "Set SOS Alarm",
-    "commandAlarmRemove": "Set Remove Alarm",
-    "commandAlarmClock": "Set Clock Alarm",
-    "commandAlarmSpeed": "Set Speed Alarm",
+    "commandSetSpeedLimit": "تنظیم محدودیت سرعت",
+    "commandModePowerSaving": "حالت کم مصرف",
+    "commandModeDeepSleep": "حالت خواب عمیق",
+    "commandAlarmGeofence": "تنظیم هشدار محدوده جغرافیایی",
+    "commandAlarmBattery": "تنظیم هشدار باتری",
+    "commandAlarmSos": "تنظیم هشدار کمک",
+    "commandAlarmRemove": "تنظیم حذف هشدار",
+    "commandAlarmClock": "تنظیم ساعت هشدار",
+    "commandAlarmSpeed": "تنظیم هشدار سرعت",
     "commandAlarmFall": "Set Fall Alarm",
     "commandAlarmVibration": "Set Vibration Alarm",
     "commandFrequency": "تاخیر ارسال",
@@ -414,7 +426,7 @@
     "eventDeviceStopped": "ایست دستگاه",
     "eventDeviceOverspeed": "محدودیت سرعت بالا",
     "eventDeviceFuelDrop": "افت سوخت",
-    "eventDeviceFuelIncrease": "Fuel increase",
+    "eventDeviceFuelIncrease": "افزایش سوخت",
     "eventCommandResult": "نتیجه ارسال دستور",
     "eventGeofenceEnter": "ورود محدوده جغرافیایی",
     "eventGeofenceExit": "خروج محدوده جغرافیایی",
@@ -424,8 +436,10 @@
     "eventMaintenance": "نیاز به تعمیر",
     "eventTextMessage": "پیامک دریافت شد",
     "eventDriverChanged": "تعویض راننده",
-    "eventMedia": "Media",
+    "eventMedia": "مدیا",
     "eventsScrollToLast": "اسکرول تا آخر",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "اصلی",
     "alarmSos": "درخواست کمک",
     "alarmVibration": "لرزش",
@@ -470,17 +484,17 @@
     "notificatorWeb": "وب",
     "notificatorMail": "ایمیل",
     "notificatorSms": "پیامک",
-    "notificatorFirebase": "Firebase",
-    "notificatorTraccar": "Traccar",
-    "notificatorTelegram": "Telegram",
+    "notificatorFirebase": "آتش نشانی",
+    "notificatorTraccar": "ردیاب خودرو",
+    "notificatorTelegram": "تلگرام",
     "notificatorPushover": "Pushover",
-    "reportReplay": "Replay",
+    "reportReplay": "پخش تکرار",
     "reportRoute": "مسیر های پیموده شده ",
     "reportEvents": "رویداد ها",
     "reportTrips": "مسافرتها",
     "reportStops": "توقفها",
     "reportSummary": "خلاصه وضعیت ",
-    "reportDaily": "Daily Summary",
+    "reportDaily": "وقایع روزانه",
     "reportChart": "نمودار",
     "reportConfigure": "تنظیمات",
     "reportEventTypes": "نوع رویدادها",
@@ -501,7 +515,7 @@
     "reportMaximumSpeed": "حداکثر سرعت",
     "reportEngineHours": "مدت زمان روشن بودن وسیله",
     "reportDuration": "مسافت",
-    "reportStartDate": "Start Date",
+    "reportStartDate": "تاریخ آغاز",
     "reportStartTime": "زمان شروع",
     "reportStartAddress": "آدرس شروع",
     "reportEndTime": "زمان پایانی",
diff --git a/modern/src/resources/l10n/fi.json b/modern/src/resources/l10n/fi.json
index 3141578a..0f598b2c 100644
--- a/modern/src/resources/l10n/fi.json
+++ b/modern/src/resources/l10n/fi.json
@@ -98,20 +98,21 @@
     "sharedImport": "Tuo",
     "sharedColumns": "Sarakkeet",
     "sharedDropzoneText": "Vedä ja pudota tiedosto tähän tai klikkaa",
-    "calendarSimple": "Simple",
-    "calendarRecurrence": "Recurrence",
-    "calendarOnce": "Once",
-    "calendarDaily": "Daily",
-    "calendarWeekly": "Weekly",
-    "calendarMonthly": "Monthly",
-    "calendarDays": "Days",
-    "calendarSunday": "Sunday",
-    "calendarMonday": "Monday",
-    "calendarTuesday": "Tuesday",
-    "calendarWednesday": "Wednesday",
-    "calendarThursday": "Thursday",
-    "calendarFriday": "Friday",
-    "calendarSaturday": "Saturday",
+    "calendarSimple": "Yksinkertainen",
+    "calendarRecurrence": "Toisto",
+    "calendarOnce": "Kerran",
+    "calendarDaily": "Päivittäin",
+    "calendarWeekly": "Viikoittain",
+    "calendarMonthly": "Kuukausittain",
+    "calendarDays": "Päivät",
+    "calendarSunday": "Sunnuntai",
+    "calendarMonday": "Maanantai",
+    "calendarTuesday": "Tiistai",
+    "calendarWednesday": "Keskiviikko",
+    "calendarThursday": "Torstai",
+    "calendarFriday": "Perjantai",
+    "calendarSaturday": "Lauantai",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Nopeusrajoitus",
     "attributeFuelDropThreshold": "Polttoaineen vähenemisen raja-arvo",
     "attributeFuelIncreaseThreshold": "Polttoaineen lisäämisen raja-arvo",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Piilota sijainnin ominaisuudet",
     "attributeUiDisableLoginLanguage": "UI: Piilota kielivalinta kirjautumisesta",
     "attributeNotificationTokens": "Ilmoitustunnukset",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Virhe",
     "errorGeneral": "Epäkelvot parametrit tai rajoitteiden rikkomus",
     "errorConnection": "Yhteysvirhe",
@@ -182,7 +184,10 @@
     "loginLogout": "Kirjaudu ulos",
     "loginLogo": "Logo",
     "devicesAndState": "Laitteet ja Tilat",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Laitteet",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Tunniste",
     "deviceModel": "Malli",
     "deviceContact": "Yhteyshenkilö",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Tilavuusyksikkö",
     "settingsTwelveHourFormat": "12-tunnin formaatti",
     "settingsCoordinateFormat": "Koordinaattien formaatti",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Raportit",
     "reportDevice": "Laite",
     "reportGroup": "Ryhmä",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Oma kartta",
     "mapCarto": "Carto-pohjakartat",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps -avain",
     "mapBingRoad": "Bing Maps -tiet",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Kohdepistetaso",
     "mapClustering": "Merkkien ryvästäminen",
     "mapOnSelect": "Näytä kartta valittaessa",
+    "mapDefault": "Default Map",
     "stateTitle": "Tila",
     "stateName": "Ominaisuus",
     "stateValue": "Arvo",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Kuljettaja vaihtunut",
     "eventMedia": "Media",
     "eventsScrollToLast": "Vieritä viimeiseen",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Yleinen",
     "alarmSos": "SOS",
     "alarmVibration": "Tärinä",
diff --git a/modern/src/resources/l10n/fr.json b/modern/src/resources/l10n/fr.json
index 1432cb49..c338b4d8 100644
--- a/modern/src/resources/l10n/fr.json
+++ b/modern/src/resources/l10n/fr.json
@@ -31,10 +31,10 @@
     "sharedName": "Nom",
     "sharedDescription": "Description",
     "sharedSearch": "Recherche",
-    "sharedIconScale": "Icon Scale",
+    "sharedIconScale": "Echelle des icônes",
     "sharedGeofence": "Périmètre virtuel",
     "sharedGeofences": "Périmètres virtuels",
-    "sharedCreateGeofence": "Create Geofence",
+    "sharedCreateGeofence": "Créé un périmètre virtuel",
     "sharedNotifications": "Notifications",
     "sharedNotification": "Notification",
     "sharedAttributes": "Attributs",
@@ -63,8 +63,8 @@
     "sharedDevice": "Appareil",
     "sharedTest": "Test",
     "sharedTestNotification": "Test d'envoi de notification",
-    "sharedTestNotificators": "Test Channels",
-    "sharedTestExpression": "Test Expression",
+    "sharedTestNotificators": "Test canaux",
+    "sharedTestExpression": "Test expression",
     "sharedCalendar": "Calendrier",
     "sharedCalendars": "Calendriers",
     "sharedFile": "Fichier",
@@ -78,8 +78,8 @@
     "sharedPermissions": "Permissions",
     "sharedConnections": "Connexions",
     "sharedExtra": "Extra",
-    "sharedPrimary": "Primary",
-    "sharedSecondary": "Secondary",
+    "sharedPrimary": "Primaire",
+    "sharedSecondary": "Secondaire",
     "sharedTypeString": "Chaîne de caractères",
     "sharedTypeNumber": "Nombre",
     "sharedTypeBoolean": "Booléen",
@@ -97,24 +97,25 @@
     "sharedLocation": "Localisation",
     "sharedImport": "Importer",
     "sharedColumns": "Colonnes",
-    "sharedDropzoneText": "Drag and drop a file here or click",
+    "sharedDropzoneText": "Glissez et déposez un fichier ici ou cliquez",
     "calendarSimple": "Simple",
-    "calendarRecurrence": "Recurrence",
-    "calendarOnce": "Once",
-    "calendarDaily": "Daily",
-    "calendarWeekly": "Weekly",
-    "calendarMonthly": "Monthly",
-    "calendarDays": "Days",
-    "calendarSunday": "Sunday",
-    "calendarMonday": "Monday",
-    "calendarTuesday": "Tuesday",
-    "calendarWednesday": "Wednesday",
-    "calendarThursday": "Thursday",
-    "calendarFriday": "Friday",
-    "calendarSaturday": "Saturday",
+    "calendarRecurrence": "Récurrence",
+    "calendarOnce": "Une fois",
+    "calendarDaily": "Journalier",
+    "calendarWeekly": "Hebdomadaire",
+    "calendarMonthly": "Mensuel",
+    "calendarDays": "Jours",
+    "calendarSunday": "Dimanche",
+    "calendarMonday": "Lundi",
+    "calendarTuesday": "Mardi",
+    "calendarWednesday": "Mercredi",
+    "calendarThursday": "Jeudi",
+    "calendarFriday": "Vendredi",
+    "calendarSaturday": "Samedi",
+    "attributeShowGeofences": "Afficher les périmètres virtuels",
     "attributeSpeedLimit": "Limite de vitesse",
-    "attributeFuelDropThreshold": "Fuel Drop Threshold",
-    "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
+    "attributeFuelDropThreshold": "Seuil perte de carburant",
+    "attributeFuelIncreaseThreshold": "Seuil ajout de carburant",
     "attributePolylineDistance": "Distance polyligne",
     "attributeReportIgnoreOdometer": "Rapport: Ignorer l'odomètre",
     "attributeWebReportColor": "Web: couleur du rapport",
@@ -141,7 +142,7 @@
     "attributeMailSmtpAuth": "Mail: Activer l'authentification",
     "attributeMailSmtpUsername": "Mail: Nom d'utilisateur",
     "attributeMailSmtpPassword": "Mail: Mot de passe",
-    "attributeUiDisableAttributes": "UI: Disable Attributes",
+    "attributeUiDisableAttributes": "UI: Désactiver les attributs",
     "attributeUiDisableGroups": "UI: Désactiver groupes",
     "attributeUiDisableEvents": "UI: Désactiver évènements ",
     "attributeUiDisableVehicleFetures": "UI: Désactiver les fonctionalités véhicule",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Cacher Attributs de Position",
     "attributeUiDisableLoginLanguage": "UI: Désactiver choix des languges",
     "attributeNotificationTokens": "Jeton de notification",
+    "attributePopupInfo": "Informations dans popup",
     "errorTitle": "Erreur",
     "errorGeneral": "Paramètres invalides ou violation de contrainte",
     "errorConnection": "Erreur de connexion",
@@ -167,9 +169,9 @@
     "userDeviceReadonly": "Appareil - Lecture seule",
     "userLimitCommands": "Commandes de limite",
     "userDisableReports": "Désactiver les rapports",
-    "userFixedEmail": "No Email Change",
+    "userFixedEmail": "Changement d'email bloqué",
     "userToken": "Jeton",
-    "userDeleteAccount": "Delete Account",
+    "userDeleteAccount": "Supprimer le compte",
     "loginTitle": "Identification",
     "loginLanguage": "Langue",
     "loginReset": "Réinitialiser le mot de passe",
@@ -182,7 +184,10 @@
     "loginLogout": "Déconnexion",
     "loginLogo": "Logo",
     "devicesAndState": "Appareils et État",
+    "deviceSelected": "Appareil sélectionné",
     "deviceTitle": "Appareils",
+    "devicePrimaryInfo": "Titre de l'appareil",
+    "deviceSecondaryInfo": "Détail de l'appareil",
     "deviceIdentifier": "Identifiant",
     "deviceModel": "Modèle",
     "deviceContact": "Contact",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Unité de volume",
     "settingsTwelveHourFormat": "Format d'heure - 12 heures",
     "settingsCoordinateFormat": "Format des coordonées",
+    "settingsServerVersion": "Version serveur",
+    "settingsAppVersion": "Version application",
+    "settingsConnection": "Connexion",
     "reportTitle": "Rapports",
     "reportDevice": "Appareil",
     "reportGroup": "Groupe",
@@ -217,11 +225,11 @@
     "reportShow": "Afficher",
     "reportClear": "Effacer",
     "linkGoogleMaps": "Google Maps",
-    "linkAppleMaps": "Apple Maps",
+    "linkAppleMaps": "Apple Plans",
     "linkStreetView": "Street View",
     "positionFixTime": "Horodatage",
-    "positionDeviceTime": "Device Time",
-    "positionServerTime": "Server Time",
+    "positionDeviceTime": "Heure de l'appareil",
+    "positionServerTime": "Heure du serveur",
     "positionValid": "Valide",
     "positionAccuracy": "Précision",
     "positionLatitude": "Latitude",
@@ -282,7 +290,7 @@
     "positionObdOdometer": "Odomètre OBD",
     "positionDriverUniqueId": "ID unique du pilote",
     "positionImage": "Image",
-    "positionVideo": "Video",
+    "positionVideo": "Vidéo",
     "positionAudio": "Audio",
     "serverTitle": "Paramètres de serveur",
     "serverZoom": "Zoom",
@@ -307,8 +315,11 @@
     "mapCustomLabel": "Carte Personnalisée",
     "mapCarto": "Cartographie Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
-    "mapBingKey": "Clé Bing Maps",
+    "mapBingKey": "Bing Maps API Key",
     "mapBingRoad": "Bing Maps Road",
     "mapBingAerial": "Bing Maps Aerial",
     "mapBingHybrid": "Bing Maps Hybride",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Couche Point d'intérêt",
     "mapClustering": "Regroupement des marqueurs",
     "mapOnSelect": "Afficher la carte lors de la sélection",
+    "mapDefault": "Carte par défaut",
     "stateTitle": "État",
     "stateName": "Paramètre",
     "stateValue": "Valeur",
@@ -385,16 +397,16 @@
     "commandGetModemStatus": "Acquérir le statut du modem",
     "commandGetDeviceStatus": "Acquérir le statut du périphérique",
     "commandSetSpeedLimit": "Définir la limite de vitesse",
-    "commandModePowerSaving": "Power Saving Mode",
-    "commandModeDeepSleep": "Deep Sleep Mode",
-    "commandAlarmGeofence": "Set Geofence Alarm",
-    "commandAlarmBattery": "Set Battery Alarm",
-    "commandAlarmSos": "Set SOS Alarm",
-    "commandAlarmRemove": "Set Remove Alarm",
-    "commandAlarmClock": "Set Clock Alarm",
-    "commandAlarmSpeed": "Set Speed Alarm",
-    "commandAlarmFall": "Set Fall Alarm",
-    "commandAlarmVibration": "Set Vibration Alarm",
+    "commandModePowerSaving": "Mode économie d'énergie",
+    "commandModeDeepSleep": "Mode veille profonde",
+    "commandAlarmGeofence": "Définir l'alarme périmètre virtuel",
+    "commandAlarmBattery": "Définir l'alarme de batterie",
+    "commandAlarmSos": "Définir l'alarme SOS",
+    "commandAlarmRemove": "Définir l'effacement des alarmes",
+    "commandAlarmClock": "Définir l'alarme de l'horloge",
+    "commandAlarmSpeed": "Définir l'alarme de vitesse",
+    "commandAlarmFall": "Définir l'alarme de chute",
+    "commandAlarmVibration": "Définir l'alarme de vibration",
     "commandFrequency": "Fréquence",
     "commandTimezone": "Décalage horaire",
     "commandMessage": "Message",
@@ -414,7 +426,7 @@
     "eventDeviceStopped": "Appareil arrêté",
     "eventDeviceOverspeed": "Vitesse limite dépassée",
     "eventDeviceFuelDrop": "Perte de carburant",
-    "eventDeviceFuelIncrease": "Fuel increase",
+    "eventDeviceFuelIncrease": "Ajout de carburant",
     "eventCommandResult": "Résultat de la commande",
     "eventGeofenceEnter": "Entrée dans le périmètre virtuel",
     "eventGeofenceExit": "Sortie du périmètre virtuel",
@@ -424,8 +436,10 @@
     "eventMaintenance": "Entretien requis",
     "eventTextMessage": "Message textuel reçu",
     "eventDriverChanged": "Changement de conducteur",
-    "eventMedia": "Media",
+    "eventMedia": "Média",
     "eventsScrollToLast": "Faire défiler jusqu'à la fin",
+    "eventsSoundEvents": "Son d'événements",
+    "eventsSoundAlarms": "Son d'alarmes",
     "alarmGeneral": "Général",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/he.json b/modern/src/resources/l10n/he.json
index edf84f8f..ffb1fdca 100644
--- a/modern/src/resources/l10n/he.json
+++ b/modern/src/resources/l10n/he.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "הגבלת מהירות",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "ממשק : הסתר מיקום תכונות",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "שגיאה",
     "errorGeneral": "גורם לא בתוקף או הפרת אילוצים ",
     "errorConnection": "בעייה בחיבור",
@@ -182,7 +184,10 @@
     "loginLogout": "יציאה",
     "loginLogo": "לוגו",
     "devicesAndState": "מכשירים וסטטוס",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "מכשירים",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "מזהה",
     "deviceModel": "דגם",
     "deviceContact": "איש קשר",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "יחידת נפח",
     "settingsTwelveHourFormat": "פורמט של 12 שעות",
     "settingsCoordinateFormat": "פורמט קואורדינטות",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "דו\"חות",
     "reportDevice": "מכשיר",
     "reportGroup": "קבוצה",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "מפה מותאמת ",
     "mapCarto": "Carto Basemaps\n",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "מפתח מפות בינג",
     "mapBingRoad": "מפות כביש בינג",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "שכבת נק' עניין",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "מצב",
     "stateName": "תכונה",
     "stateValue": "ערך",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "נהג הוחלף",
     "eventMedia": "Media",
     "eventsScrollToLast": "גלול אל האחרון",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "כללי",
     "alarmSos": "חירום",
     "alarmVibration": "ויברציה",
diff --git a/modern/src/resources/l10n/hi.json b/modern/src/resources/l10n/hi.json
index 5b55bc31..de9890b1 100644
--- a/modern/src/resources/l10n/hi.json
+++ b/modern/src/resources/l10n/hi.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "गति सीमा",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "यूआई: स्थिति गुण छुपाएं",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "त्रुटि",
     "errorGeneral": "अमान्य पैरामीटर या बाधाओं का उल्लंघन",
     "errorConnection": "कनेक्शन त्रुटि",
@@ -182,7 +184,10 @@
     "loginLogout": "लॉगआउट /  निष्कासन करें",
     "loginLogo": "लोगो",
     "devicesAndState": "उपकरण एवम स्तिति",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "उपकरण",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "पहचानकर्ता",
     "deviceModel": "आदर्श",
     "deviceContact": "संपर्क",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "वॉल्यूम यूनिट",
     "settingsTwelveHourFormat": "12 - घंटा का प्रारूप",
     "settingsCoordinateFormat": "समन्वय प्रारूप",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "रिपोर्ट्स / एक से अधिक रिपोर्ट / विवरण",
     "reportDevice": "उपकरण",
     "reportGroup": "समूह",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "बिंग मैप्स की कुंजी",
     "mapBingRoad": "बिंग मैप्स रोड / सड़क",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "पीओआई परत",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "स्थिति / अवस्ता",
     "stateName": "गुण",
     "stateValue": "मान / वेल्यु",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "अंतिम तक स्क्रॉल करें",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/hr.json b/modern/src/resources/l10n/hr.json
index 0cb1399b..1e91976d 100644
--- a/modern/src/resources/l10n/hr.json
+++ b/modern/src/resources/l10n/hr.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Ograničenje brzine",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Sakrij atribute pozicioniranja",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Token za notifikacije",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Greška",
     "errorGeneral": "Nevažeći parametri ili kršenje ograničenja",
     "errorConnection": "Greška konekcije",
@@ -182,7 +184,10 @@
     "loginLogout": "Odjava",
     "loginLogo": "Logo",
     "devicesAndState": "Uređaji i stanje",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Uređaji",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifikator",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Mjerna jedinica za volumen",
     "settingsTwelveHourFormat": "12-satno vrijeme",
     "settingsCoordinateFormat": "Format koordinata",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Izvještaji",
     "reportDevice": "Uređaj",
     "reportGroup": "Grupa",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Prilagođena karta",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Točke interesa sloj",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Stanje",
     "stateName": "Atribut",
     "stateValue": "Vrijednost",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Vozač promijenjen",
     "eventMedia": "Media",
     "eventsScrollToLast": "Pomakni na zadnji",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Općenito",
     "alarmSos": "SOS",
     "alarmVibration": "Vibracija",
diff --git a/modern/src/resources/l10n/hu.json b/modern/src/resources/l10n/hu.json
index 5874fff9..1995d509 100644
--- a/modern/src/resources/l10n/hu.json
+++ b/modern/src/resources/l10n/hu.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Sebesség határ",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Pozíciós attribútumok elrejtése",
     "attributeUiDisableLoginLanguage": "UI: Bejelentkezés nyelv letiltás",
     "attributeNotificationTokens": "Értesítés tokenek",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Hiba",
     "errorGeneral": "Érvénytelen paraméterek vagy integritási szabályok megsértése",
     "errorConnection": "Kapcsolódási hiba",
@@ -182,7 +184,10 @@
     "loginLogout": "Kilépés",
     "loginLogo": "Logo",
     "devicesAndState": "Eszközök és állapotuk",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Eszközök",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Azonosító",
     "deviceModel": "Modell",
     "deviceContact": "Kapcsolat",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Térfogat egysége",
     "settingsTwelveHourFormat": "12-órás formátum",
     "settingsCoordinateFormat": "Koordináta formátuma",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Jelentések",
     "reportDevice": "Eszköz",
     "reportGroup": "Csoport",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Egyedi térkép",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps kulcs",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI réteg",
     "mapClustering": "Jelölő csoportosítás",
     "mapOnSelect": "Térkép mutatása a kijelölésen",
+    "mapDefault": "Default Map",
     "stateTitle": "Helyzet",
     "stateName": "Paraméter",
     "stateValue": "Érték",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Vezető váltás",
     "eventMedia": "Media",
     "eventsScrollToLast": "Utolsóhoz ugrás",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Általános",
     "alarmSos": "SOS",
     "alarmVibration": "Rezgés",
diff --git a/modern/src/resources/l10n/id.json b/modern/src/resources/l10n/id.json
index 4d3229a6..fa6a1e7c 100644
--- a/modern/src/resources/l10n/id.json
+++ b/modern/src/resources/l10n/id.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Batas Kecepatan",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Bermasalah",
     "errorGeneral": "Semua Parameter Salah Atau Salah Aturan",
     "errorConnection": "Koneksi Bermasalah",
@@ -182,7 +184,10 @@
     "loginLogout": "Keluar",
     "loginLogo": "Lambang",
     "devicesAndState": "Perangkat Dan Status",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Semua Perangkat",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Pengindetifikasi",
     "deviceModel": "Model",
     "deviceContact": "Kontak",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "Format 12 Jam",
     "settingsCoordinateFormat": "Format Koordinat",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Semua Laporan",
     "reportDevice": "Perangkat",
     "reportGroup": "Grup",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Peta Carto",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Key Peta Bing",
     "mapBingRoad": "Peta Jalan Bing",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Status",
     "stateName": "Atribut",
     "stateValue": "Nilai",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Bergulir Ke Terakhir",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/it.json b/modern/src/resources/l10n/it.json
index 9c47da7f..542e7b95 100644
--- a/modern/src/resources/l10n/it.json
+++ b/modern/src/resources/l10n/it.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Limite Di Velocità",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Nascondi Attributi Posizione",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Token di Notifica",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Errore",
     "errorGeneral": "Parametri non validi o violazione dei vincoli",
     "errorConnection": "Errore di connessione",
@@ -182,7 +184,10 @@
     "loginLogout": "Esci",
     "loginLogo": "Logo",
     "devicesAndState": "Dispositivi e Stato",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Dispositivi",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identificativo",
     "deviceModel": "Modello",
     "deviceContact": "Contatto",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Unità volume",
     "settingsTwelveHourFormat": "Formato 12 ore",
     "settingsCoordinateFormat": "Formato Coordinate",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Rapporti",
     "reportDevice": "Dispositivo",
     "reportGroup": "Gruppo",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Mappa Personalizzata",
     "mapCarto": "Mappe base di Carto",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Chiave Mappa",
     "mapBingRoad": "Bing Mappa Stradale",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Layer POI",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Stato",
     "stateName": "Attributo",
     "stateValue": "Valore",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Guidatore cambiato",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scorri fino all'ultimo",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Generale",
     "alarmSos": "SOS",
     "alarmVibration": "Vibrazione",
diff --git a/modern/src/resources/l10n/ja.json b/modern/src/resources/l10n/ja.json
index 83f9c977..5af26bf1 100644
--- a/modern/src/resources/l10n/ja.json
+++ b/modern/src/resources/l10n/ja.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "速度制限",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: 位置属性を非表示にする",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "エラー",
     "errorGeneral": "無効なパラメータまたは制約違反",
     "errorConnection": "接続エラー",
@@ -182,7 +184,10 @@
     "loginLogout": "ログアウト",
     "loginLogo": "ロゴ",
     "devicesAndState": "デバイスと状態",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "デバイス",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "ID",
     "deviceModel": "モデル",
     "deviceContact": "連絡先",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "容量の単位",
     "settingsTwelveHourFormat": "12 時間形式",
     "settingsCoordinateFormat": "座標形式",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "レポート",
     "reportDevice": "デバイス",
     "reportGroup": "グループ",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "カスタム地図",
     "mapCarto": "Cartoベースマップ",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bingマップキー",
     "mapBingRoad": "Bingマップ",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI レイヤー",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "詳細",
     "stateName": "属性",
     "stateValue": "値",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "ドライバーが交代しました。",
     "eventMedia": "Media",
     "eventsScrollToLast": "最後にスクロール",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "全般",
     "alarmSos": "SOS",
     "alarmVibration": "振動",
diff --git a/modern/src/resources/l10n/ka.json b/modern/src/resources/l10n/ka.json
index 78ea5dc4..fc38aec2 100644
--- a/modern/src/resources/l10n/ka.json
+++ b/modern/src/resources/l10n/ka.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "სიჩქარის ლიმიტი",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: პოზიციის ატრიბუტების დამალვა",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "შეტყობინების ნიშნები",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "შეცდომა",
     "errorGeneral": "პარამეტრების ან შეზღუდვების არასწორი დარღვევა",
     "errorConnection": "კავშირის შეცდომა",
@@ -182,7 +184,10 @@
     "loginLogout": "გამოსვლა",
     "loginLogo": "ლოგო",
     "devicesAndState": "მოწყობილობები და სტატუსი",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "მოწყობილობები",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "იდენტიფიკატორი",
     "deviceModel": "მოდელი",
     "deviceContact": "კონტაქტი",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "მოცულობის ერთეული",
     "settingsTwelveHourFormat": "12-საათიანი ფორმატი",
     "settingsCoordinateFormat": "კოორდინატების ფორმატი",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "რეპორტები",
     "reportDevice": "მოწყობილობა",
     "reportGroup": "ჯგუფი",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "მორგებული რუკა",
     "mapCarto": "Carto ძირითადი რუკა",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps გასაღები",
     "mapBingRoad": "Bing Maps გზები",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI ფენა",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "სტატუსი",
     "stateName": "ატრიბუტი",
     "stateValue": "მნიშვნელობა",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "მძღოლის ცვლილება",
     "eventMedia": "Media",
     "eventsScrollToLast": "გადაახვიეთ ბოლომდე",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "საერთო",
     "alarmSos": "SOS",
     "alarmVibration": "ვიბრაცია",
diff --git a/modern/src/resources/l10n/kk.json b/modern/src/resources/l10n/kk.json
index 0b20e9f3..1d56a8cc 100644
--- a/modern/src/resources/l10n/kk.json
+++ b/modern/src/resources/l10n/kk.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Жылдамдықты Шектеу",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Қате",
     "errorGeneral": "Қолайсыз бұзылуы параметрлері немесе шектеулер",
     "errorConnection": "Қосылу қатесі",
@@ -182,7 +184,10 @@
     "loginLogout": "Шығу",
     "loginLogo": "Логотип",
     "devicesAndState": "Құрылғылар және Жай - күйлер",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Құрылғылар",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Идентификатор",
     "deviceModel": "Моделі",
     "deviceContact": "Байланыс",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "12 сағаттық пішім",
     "settingsCoordinateFormat": "Координат пішімі",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Есептер",
     "reportDevice": "Құрылғы",
     "reportGroup": "Топ",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps кілті",
     "mapBingRoad": "Bing Maps жолдары",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Жай күйі",
     "stateName": "Параметрі",
     "stateValue": "Мағынасы",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/km.json b/modern/src/resources/l10n/km.json
index d7fb7def..d293498e 100644
--- a/modern/src/resources/l10n/km.json
+++ b/modern/src/resources/l10n/km.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Speed Limit",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "កំហុស",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "កំហុសក្នុងការតភ្ជាប់",
@@ -182,7 +184,10 @@
     "loginLogout": "ចាកចេញ",
     "loginLogo": "រូបសញ្ញា",
     "devicesAndState": "ឧបករណ៍និងសភាព",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "ឧបករណ៍",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "គ្រឿងសម្គាល់",
     "deviceModel": "គំរូ",
     "deviceContact": "ទំនក់ទំនង",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "ទំរង់ 12 ម៉ោង",
     "settingsCoordinateFormat": "ទំរង់កូអរដោនេ",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "របាយការណ៍",
     "reportDevice": "ឧបករណ៍",
     "reportGroup": "ក្រុម",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "ផែនទីគោល Carto",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "គន្លឹះផែនទី Bing",
     "mapBingRoad": "ផ្លូវ​​​លើផែនទី​​​Bing",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "សភាព",
     "stateName": "គុណលក្ខណៈ",
     "stateValue": "តម្លៃ",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/ko.json b/modern/src/resources/l10n/ko.json
index 094a3fd3..a8fb7570 100644
--- a/modern/src/resources/l10n/ko.json
+++ b/modern/src/resources/l10n/ko.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Speed Limit",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "오류",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "연결오류",
@@ -182,7 +184,10 @@
     "loginLogout": "로그아웃",
     "loginLogo": "로고",
     "devicesAndState": "장치와 상태",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "장치",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "식별자",
     "deviceModel": "모델",
     "deviceContact": "접촉",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "12시간 형식",
     "settingsCoordinateFormat": "좌표 형식",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "보고서",
     "reportDevice": "장치",
     "reportGroup": "그룹",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "카토 지도",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "빙 지도키",
     "mapBingRoad": "빙 도로지도",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "상태",
     "stateName": "속성",
     "stateValue": "값",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/lo.json b/modern/src/resources/l10n/lo.json
index 72b50214..fc42282f 100644
--- a/modern/src/resources/l10n/lo.json
+++ b/modern/src/resources/l10n/lo.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Speed Limit",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "ຜິດພາດ",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "ການເຊື່ອມຕໍ່ຜິດພາດ",
@@ -182,7 +184,10 @@
     "loginLogout": "ອອກຈາກລະບົບ",
     "loginLogo": "Logo",
     "devicesAndState": "ອຸປະກອນແລະສະຖານະ",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "ເຄື່ອງ/ອຸປະກອນ",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "ລະບຸເລກອຸປະກອນ",
     "deviceModel": "Model",
     "deviceContact": "Contact",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "ຮູບແບບເວລາ 12 ຊົ່ວໂມງ",
     "settingsCoordinateFormat": "Coordinates Format",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "ລາຍງານ",
     "reportDevice": "ລາຍງານເຄື່ອງ/ອຸປະກອນ",
     "reportGroup": "Group",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps ສຳຄັນ",
     "mapBingRoad": "Bing Maps ຖະຫນົນ",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "ສະຖານະ",
     "stateName": "ຄຸນລັກສະນະ",
     "stateValue": "ມູນຄ່າ",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/lt.json b/modern/src/resources/l10n/lt.json
index 9edefc41..70b24359 100644
--- a/modern/src/resources/l10n/lt.json
+++ b/modern/src/resources/l10n/lt.json
@@ -8,14 +8,14 @@
     "sharedEdit": "Redaguoti",
     "sharedRemove": "Ištrinti",
     "sharedRemoveConfirm": "Pašalinti objektą?",
-    "sharedNoData": "No data",
+    "sharedNoData": "Nėra duomenų",
     "sharedYes": "Taip",
     "sharedNo": "Ne",
     "sharedKm": "km",
     "sharedMi": "mi",
     "sharedNmi": "jurmylė",
     "sharedMeters": "m",
-    "sharedFeet": "ft",
+    "sharedFeet": "pėdos",
     "sharedKn": "mazgai",
     "sharedKmh": "km/h",
     "sharedMph": "mph",
@@ -34,7 +34,7 @@
     "sharedIconScale": "Icon Scale",
     "sharedGeofence": "Georiba",
     "sharedGeofences": "Georibos",
-    "sharedCreateGeofence": "Create Geofence",
+    "sharedCreateGeofence": "Sukurti Georibas",
     "sharedNotifications": "Perspėjimai",
     "sharedNotification": "Pranešimas",
     "sharedAttributes": "Parametrai",
@@ -61,16 +61,16 @@
     "sharedCheckComputedAttribute": "Patikrinti apskaičiuotą parametrą",
     "sharedExpression": "Išraiška",
     "sharedDevice": "Prietaisas",
-    "sharedTest": "Test",
+    "sharedTest": "Testas",
     "sharedTestNotification": "Siųsti bandomąjį perspėjimą",
-    "sharedTestNotificators": "Test Channels",
+    "sharedTestNotificators": "Bandyti kanalus",
     "sharedTestExpression": "Test Expression",
     "sharedCalendar": "Kalendorius",
     "sharedCalendars": "Kalendoriai",
     "sharedFile": "Failas",
-    "sharedSearchDevices": "Search Devices",
-    "sharedSortBy": "Sort By",
-    "sharedFilterMap": "Filter on Map",
+    "sharedSearchDevices": "Ieškoti įrenginių",
+    "sharedSortBy": "Rūšiuoti pagal",
+    "sharedFilterMap": "Filtruoti žemėlapyje",
     "sharedSelectFile": "Parinkite failą",
     "sharedPhone": "Telefonas",
     "sharedRequired": "Privalomas",
@@ -78,8 +78,8 @@
     "sharedPermissions": "Leidimai",
     "sharedConnections": "Susijungimai",
     "sharedExtra": "Extra",
-    "sharedPrimary": "Primary",
-    "sharedSecondary": "Secondary",
+    "sharedPrimary": "Pagrindinis",
+    "sharedSecondary": "Antrinis",
     "sharedTypeString": "Tekstas",
     "sharedTypeNumber": "Skaičius",
     "sharedTypeBoolean": "Loginis",
@@ -96,22 +96,23 @@
     "sharedAlarms": "Alarms",
     "sharedLocation": "Lokacija",
     "sharedImport": "Importuoti",
-    "sharedColumns": "Columns",
-    "sharedDropzoneText": "Drag and drop a file here or click",
-    "calendarSimple": "Simple",
+    "sharedColumns": "Stulpeliai",
+    "sharedDropzoneText": "Nutempkite failą čia arba paspauskite",
+    "calendarSimple": "Paprastas",
     "calendarRecurrence": "Recurrence",
-    "calendarOnce": "Once",
-    "calendarDaily": "Daily",
-    "calendarWeekly": "Weekly",
-    "calendarMonthly": "Monthly",
-    "calendarDays": "Days",
-    "calendarSunday": "Sunday",
-    "calendarMonday": "Monday",
-    "calendarTuesday": "Tuesday",
-    "calendarWednesday": "Wednesday",
-    "calendarThursday": "Thursday",
-    "calendarFriday": "Friday",
-    "calendarSaturday": "Saturday",
+    "calendarOnce": "Vienkartinis",
+    "calendarDaily": "Kasdien",
+    "calendarWeekly": "Savaitinis",
+    "calendarMonthly": "Mėnesinis",
+    "calendarDays": "Dienos",
+    "calendarSunday": "Sekmadienis",
+    "calendarMonday": "Pirmadienis",
+    "calendarTuesday": "Antradienis",
+    "calendarWednesday": "Trečiadienis",
+    "calendarThursday": "Ketvirtadienis",
+    "calendarFriday": "Penktadienis",
+    "calendarSaturday": "Šeštadienis",
+    "attributeShowGeofences": "Rodyti Georibas",
     "attributeSpeedLimit": "Greičio limitas",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -119,7 +120,7 @@
     "attributeReportIgnoreOdometer": "Ataskaita: Ignoruoti odometrą",
     "attributeWebReportColor": "Web: Ataskaitos spalva",
     "attributeDevicePassword": "Įrenginio slaptažodis",
-    "attributeDeviceImage": "Device Image",
+    "attributeDeviceImage": "Įrenginio vaizdas",
     "attributeDeviceInactivityStart": "Įrenginio neaktyvumo pradžia",
     "attributeDeviceInactivityPeriod": "Įrenginio neaktyvumo trukmė",
     "attributeProcessingCopyAttributes": "Apdorojimas: Kopijuoti atributus",
@@ -141,8 +142,8 @@
     "attributeMailSmtpAuth": "Mail: SMTP autentifikacija įjungta",
     "attributeMailSmtpUsername": "Mail: SMTP prisijungimas",
     "attributeMailSmtpPassword": "Mail: SMTP slaptažodis",
-    "attributeUiDisableAttributes": "UI: Disable Attributes",
-    "attributeUiDisableGroups": "UI: Disable Groups",
+    "attributeUiDisableAttributes": "UI: išjungti atributus",
+    "attributeUiDisableGroups": "UI: išjungti grupes",
     "attributeUiDisableEvents": "UI: Išjungti įvykius",
     "attributeUiDisableVehicleFetures": "UI: Išjungti mašinos funkcijas",
     "attributeUiDisableDrivers": "UI: Išjungti vairuotojus",
@@ -150,8 +151,9 @@
     "attributeUiDisableCalendars": "UI: Išjungti kalendorius",
     "attributeUiDisableMaintenance": "UI: Išjungti aptarnavimus",
     "attributeUiHidePositionAttributes": "UI: Slėpti pozicijos adresą",
-    "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
+    "attributeUiDisableLoginLanguage": "UI: Išjungti prisijungimo kalbą",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Klaida",
     "errorGeneral": "Netinkami parametrai ar apribojimų pažeidimas",
     "errorConnection": "Ryšio klaida",
@@ -166,23 +168,26 @@
     "userUserLimit": "Vartotojo limitas",
     "userDeviceReadonly": "Prietaisai skaitymo rėžimu",
     "userLimitCommands": "Apriboti komandas",
-    "userDisableReports": "Disable Reports",
-    "userFixedEmail": "No Email Change",
+    "userDisableReports": "Išjungti ataskaitas",
+    "userFixedEmail": "Neleisti keisti Email",
     "userToken": "Token",
-    "userDeleteAccount": "Delete Account",
+    "userDeleteAccount": "Pašalinti vartotoją",
     "loginTitle": "Prisijungimas",
     "loginLanguage": "Kalba",
-    "loginReset": "Reset Password",
+    "loginReset": "Atstatyti slaptažodį",
     "loginRegister": "Registruotis",
     "loginLogin": "Prisijungti",
     "loginFailed": "Neteisingas el.paštas ir/ar slaptažodis",
     "loginCreated": "Registracija sėkminga",
-    "loginResetSuccess": "Check your email",
-    "loginUpdateSuccess": "New password is set",
+    "loginResetSuccess": "Patikrinkite savo el. paštą",
+    "loginUpdateSuccess": "Naujas slaptažodis sukurtas",
     "loginLogout": "Atsijungti",
     "loginLogo": "Logotipas",
     "devicesAndState": "Prietaisai ir Statusas",
+    "deviceSelected": "Pasirinktas įrenginys",
     "deviceTitle": "Prietaisai",
+    "devicePrimaryInfo": "Įrenginio antraštė",
+    "deviceSecondaryInfo": "Įrenginio aprašymas",
     "deviceIdentifier": "Identifikacinis kodas",
     "deviceModel": "Modelis",
     "deviceContact": "Kontaktas",
@@ -203,12 +208,15 @@
     "settingsGroups": "Grupės",
     "settingsServer": "Serveris",
     "settingsUsers": "Vartotojai",
-    "settingsDistanceUnit": "Atstumo vieneta",
-    "settingsAltitudeUnit": "Altitude Unit",
+    "settingsDistanceUnit": "Atstumo vienetai",
+    "settingsAltitudeUnit": "Aukščio vienetai",
     "settingsSpeedUnit": "Greičio vienetai",
     "settingsVolumeUnit": "Tūrio vienetai",
     "settingsTwelveHourFormat": "12-val formatas",
     "settingsCoordinateFormat": "Koordinačių formatas",
+    "settingsServerVersion": "Serverio versija",
+    "settingsAppVersion": "App versija",
+    "settingsConnection": "Susijungimas",
     "reportTitle": "Ataskaitos",
     "reportDevice": "Prietaisas",
     "reportGroup": "Grupė",
@@ -216,12 +224,12 @@
     "reportTo": "Iki",
     "reportShow": "Rodyti",
     "reportClear": "Valyti",
-    "linkGoogleMaps": "Google Maps",
-    "linkAppleMaps": "Apple Maps",
+    "linkGoogleMaps": "Google žemėlapiai",
+    "linkAppleMaps": "Apple žemėlapiai",
     "linkStreetView": "Street View",
-    "positionFixTime": "Fix Time",
-    "positionDeviceTime": "Device Time",
-    "positionServerTime": "Server Time",
+    "positionFixTime": "Fiksuoti laiką",
+    "positionDeviceTime": "Įrenginio laikas",
+    "positionServerTime": "Serverio laikas",
     "positionValid": "Galiojantis",
     "positionAccuracy": "Tikslumas",
     "positionLatitude": "Platuma",
@@ -272,7 +280,7 @@
     "positionMotion": "Judantis",
     "positionArmed": "Uždėtas",
     "positionAcceleration": "Akseleracija",
-    "positionTemp": "Temperature",
+    "positionTemp": "Temperatūra",
     "positionDeviceTemp": "Įrenginio temperatūra",
     "positionOperator": "Operatorius",
     "positionCommand": "Komanda",
@@ -282,7 +290,7 @@
     "positionObdOdometer": "OBD odometras",
     "positionDriverUniqueId": "Vairuotojo unikalus ID",
     "positionImage": "Atvaizdas",
-    "positionVideo": "Video",
+    "positionVideo": "Vaizdo įrašas",
     "positionAudio": "Garso įrašas",
     "serverTitle": "Serverio nustatymai",
     "serverZoom": "Priartinimas",
@@ -291,9 +299,9 @@
     "serverForceSettings": "Priverstiniai nustatymai",
     "serverAnnouncement": "Pranešimai",
     "mapTitle": "Žemėlapis",
-    "mapActive": "Active Maps",
-    "mapOverlay": "Map Overlay",
-    "mapOverlayCustom": "Custom Overlay",
+    "mapActive": "Aktyvūs žemėlapiai",
+    "mapOverlay": "Žemėlapių sluoksniai",
+    "mapOverlayCustom": "Pasirinkti sluoksnį",
     "mapOpenSeaMap": "OpenSeaMap",
     "mapOpenWeatherKey": "OpenWeather API Key",
     "mapOpenWeatherClouds": "OpenWeather Clouds",
@@ -302,11 +310,14 @@
     "mapOpenWeatherWind": "OpenWeather Wind",
     "mapOpenWeatherTemperature": "OpenWeather Temperature",
     "mapLayer": "Žemėlapio sluoksnis",
-    "mapCustom": "Pasirinktas (XYZ)",
-    "mapCustomArcgis": "Pasirinktas (ArcGIS)",
-    "mapCustomLabel": "Pasirinktas žemėlapis",
+    "mapCustom": "Pasirinkti (XYZ)",
+    "mapCustomArcgis": "Pasirinkti (ArcGIS)",
+    "mapCustomLabel": "Pasirinkti žemėlapį",
     "mapCarto": "Carto žemėlapiai",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps raktas",
     "mapBingRoad": "Bing Maps Keliai",
@@ -340,10 +351,11 @@
     "mapShapeCircle": "Apskritimas",
     "mapShapePolyline": "Polilinija",
     "mapLiveRoutes": "Tiesioginiai maršrutai",
-    "mapCurrentLocation": "Current Location",
+    "mapCurrentLocation": "Esama pozicija",
     "mapPoiLayer": "Lankytinų vietų sluoksnis",
-    "mapClustering": "Markers Clustering",
-    "mapOnSelect": "Show Map on Selection",
+    "mapClustering": "Žymų grupavimas",
+    "mapOnSelect": "Rodyti žemėlapį pažymėjus",
+    "mapDefault": "Pagrindinis žemėlapis",
     "stateTitle": "Būklė",
     "stateName": "Parametras",
     "stateValue": "Reikšmė",
@@ -361,12 +373,12 @@
     "commandEngineResume": "Paleisti variklį",
     "commandAlarmArm": "Uždėti signalą",
     "commandAlarmDisarm": "Nuimti signalą",
-    "commandAlarmDismiss": "Dismiss Alarm",
+    "commandAlarmDismiss": "Nutraukti signalą",
     "commandSetTimezone": "Nustatyti laiko zoną",
     "commandRequestPhoto": "Gauti nuotrauką",
-    "commandPowerOff": "Power Off Device",
-    "commandRebootDevice": "Perkrauti prietaisą",
-    "commandFactoryReset": "Factory Reset",
+    "commandPowerOff": "Išjungti įrenginį",
+    "commandRebootDevice": "Perkrauti įrenginį",
+    "commandFactoryReset": "Gamykliniai nustatymai",
     "commandSendSms": "Siųsti SMS",
     "commandSendUssd": "Siųsti USSD",
     "commandSosNumber": "Nustatyti SOS numerį",
@@ -384,17 +396,17 @@
     "commandSetOdometer": "Nustatyti odometrą",
     "commandGetModemStatus": "Gauti modemo statusą",
     "commandGetDeviceStatus": "Gauti įrenginio statusą",
-    "commandSetSpeedLimit": "Set Speed Limit",
-    "commandModePowerSaving": "Power Saving Mode",
-    "commandModeDeepSleep": "Deep Sleep Mode",
-    "commandAlarmGeofence": "Set Geofence Alarm",
-    "commandAlarmBattery": "Set Battery Alarm",
-    "commandAlarmSos": "Set SOS Alarm",
-    "commandAlarmRemove": "Set Remove Alarm",
-    "commandAlarmClock": "Set Clock Alarm",
-    "commandAlarmSpeed": "Set Speed Alarm",
-    "commandAlarmFall": "Set Fall Alarm",
-    "commandAlarmVibration": "Set Vibration Alarm",
+    "commandSetSpeedLimit": "Nustatyti greičio limitą",
+    "commandModePowerSaving": "Energijos taupymo režimas",
+    "commandModeDeepSleep": "\"Užmigdyti\" įrenginį",
+    "commandAlarmGeofence": "Nustatyti georibos signalą",
+    "commandAlarmBattery": "Nustatyti baterijos signalą",
+    "commandAlarmSos": "Nustatyti SOS signalą",
+    "commandAlarmRemove": "Nustatyti pašalinimo signalą",
+    "commandAlarmClock": "Nustatyti laiko signalą",
+    "commandAlarmSpeed": "Nustatyti greičio signalą",
+    "commandAlarmFall": "Nustatyti kritimo signalą",
+    "commandAlarmVibration": "Nustatyti vibravimo signalą",
     "commandFrequency": "Dažnis",
     "commandTimezone": "Laiko zonos pataisa",
     "commandMessage": "Žinutė",
@@ -406,88 +418,90 @@
     "commandServer": "Serveris",
     "commandPort": "Prievadas",
     "eventAll": "Visi įvykiai",
-    "eventDeviceOnline": "Status online",
-    "eventDeviceUnknown": "Status unknown",
-    "eventDeviceOffline": "Status offline",
-    "eventDeviceInactive": "Device inactive",
-    "eventDeviceMoving": "Device moving",
-    "eventDeviceStopped": "Device stopped",
-    "eventDeviceOverspeed": "Speed limit exceeded",
-    "eventDeviceFuelDrop": "Fuel drop",
-    "eventDeviceFuelIncrease": "Fuel increase",
+    "eventDeviceOnline": "Būsena pasiekiamas",
+    "eventDeviceUnknown": "Būsena nežinoma",
+    "eventDeviceOffline": "Būsena atsijungęs",
+    "eventDeviceInactive": "Įrenginys neaktyvus",
+    "eventDeviceMoving": "Įrenginys juda",
+    "eventDeviceStopped": "Įrenginys sustojo",
+    "eventDeviceOverspeed": "Greičio limitas viršytas",
+    "eventDeviceFuelDrop": "Kuras sumažėjo",
+    "eventDeviceFuelIncrease": "Kuras papildytas",
     "eventCommandResult": "Komandos rezultatas",
-    "eventGeofenceEnter": "Geofence entered",
-    "eventGeofenceExit": "Geofence exited",
-    "eventAlarm": "Alarm",
-    "eventIgnitionOn": "Ignition on",
-    "eventIgnitionOff": "Ignition off",
+    "eventGeofenceEnter": "Georibų viduje",
+    "eventGeofenceExit": "Už georibų",
+    "eventAlarm": "Signalas",
+    "eventIgnitionOn": "Degimas įjungtas",
+    "eventIgnitionOff": "Degimas išjungtas",
     "eventMaintenance": "Aptarnavimo poreikis",
     "eventTextMessage": "Gauta tekstinė žinutė",
-    "eventDriverChanged": "Driver changed",
-    "eventMedia": "Media",
+    "eventDriverChanged": "Vairuotojas pasikeitė",
+    "eventMedia": "Medija",
     "eventsScrollToLast": "Slinkti iki paskutinio",
-    "alarmGeneral": "General",
+    "eventsSoundEvents": "Garso įvykiai",
+    "eventsSoundAlarms": "Garso signalai",
+    "alarmGeneral": "Pagrindinis",
     "alarmSos": "SOS",
-    "alarmVibration": "Vibration",
-    "alarmMovement": "Movement",
-    "alarmLowspeed": "Low Speed",
-    "alarmOverspeed": "Overspeed",
-    "alarmFallDown": "Fall Down",
-    "alarmLowPower": "Low Power",
-    "alarmLowBattery": "Low Battery",
-    "alarmFault": "Fault",
-    "alarmPowerOff": "Power Off",
-    "alarmPowerOn": "Power On",
-    "alarmDoor": "Door",
-    "alarmLock": "Lock",
-    "alarmUnlock": "Unlock",
-    "alarmGeofence": "Geofence",
-    "alarmGeofenceEnter": "Geofence Enter",
-    "alarmGeofenceExit": "Geofence Exit",
-    "alarmGpsAntennaCut": "GPS Antenna Cut",
-    "alarmAccident": "Accident",
-    "alarmTow": "Tow",
-    "alarmIdle": "Idle",
-    "alarmHighRpm": "High RPM",
-    "alarmHardAcceleration": "Hard Acceleration",
-    "alarmHardBraking": "Hard Braking",
-    "alarmHardCornering": "Hard Cornering",
-    "alarmLaneChange": "Lane Change",
-    "alarmFatigueDriving": "Fatigue Driving",
-    "alarmPowerCut": "Power Cut",
-    "alarmPowerRestored": "Power Restored",
-    "alarmJamming": "Jamming",
-    "alarmTemperature": "Temperature",
-    "alarmParking": "Parking",
-    "alarmBonnet": "Bonnet",
-    "alarmFootBrake": "Foot Brake",
-    "alarmFuelLeak": "Fuel Leak",
-    "alarmTampering": "Tampering",
-    "alarmRemoving": "Removing",
+    "alarmVibration": "Vibracija",
+    "alarmMovement": "Judėjimas",
+    "alarmLowspeed": "Mažas greitis",
+    "alarmOverspeed": "Greičio viršijimas",
+    "alarmFallDown": "Nukrito",
+    "alarmLowPower": "Žema įtampa",
+    "alarmLowBattery": "Mažas baterijos lygis",
+    "alarmFault": "Klaida",
+    "alarmPowerOff": "Išjungtas",
+    "alarmPowerOn": "Įjungtas",
+    "alarmDoor": "Durys",
+    "alarmLock": "Užrakinta",
+    "alarmUnlock": "Atrakinta",
+    "alarmGeofence": "Georiba",
+    "alarmGeofenceEnter": "Georiba įeiti",
+    "alarmGeofenceExit": "Georiba išeiti",
+    "alarmGpsAntennaCut": "GPS antena nutraukta",
+    "alarmAccident": "Įvykis",
+    "alarmTow": "Vilkimas",
+    "alarmIdle": "Tuščia eiga",
+    "alarmHighRpm": "Aukštos apsukos",
+    "alarmHardAcceleration": "Didelis pagreitis",
+    "alarmHardBraking": "Staigus stabdymas",
+    "alarmHardCornering": "Staigus posūkis",
+    "alarmLaneChange": "Juostų keitimas",
+    "alarmFatigueDriving": "Nuovargis",
+    "alarmPowerCut": "Atjungtas maitinimas",
+    "alarmPowerRestored": "Maitinimas atstatytas",
+    "alarmJamming": "Kamštis",
+    "alarmTemperature": "Temperatūra",
+    "alarmParking": "Parkavimas",
+    "alarmBonnet": "Variklio dangtis",
+    "alarmFootBrake": "Pertrauka maistui",
+    "alarmFuelLeak": "Kuro nuotekis",
+    "alarmTampering": "Gadinimas",
+    "alarmRemoving": "Pašalinimas",
     "notificationType": "Įspėjimo tipas",
     "notificationAlways": "Visi prietaisai",
-    "notificationNotificators": "Channels",
+    "notificationNotificators": "Kanalai",
     "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
+    "notificatorMail": "El. paštas",
     "notificatorSms": "SMS",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
     "notificatorTelegram": "Telegram",
     "notificatorPushover": "Pushover",
-    "reportReplay": "Replay",
+    "reportReplay": "Pakartoti",
     "reportRoute": "Maršrutas",
     "reportEvents": "Įvykiai",
     "reportTrips": "Kelionės",
     "reportStops": "Sustojimai",
     "reportSummary": "Suvestinė",
-    "reportDaily": "Daily Summary",
+    "reportDaily": "Dienos suvestinė",
     "reportChart": "Diagrama",
     "reportConfigure": "Konfigūruoti",
     "reportEventTypes": "Įvykių tipai",
     "reportChartType": "Diagramų tipai",
     "reportShowMarkers": "Rodyti žymeklius",
     "reportExport": "Eksportuoti",
-    "reportEmail": "Email Report",
+    "reportEmail": "Ataskaitą siųsti el. paštu",
     "reportPeriod": "Periodas",
     "reportCustom": "Custom",
     "reportToday": "Šiandien",
@@ -501,14 +515,14 @@
     "reportMaximumSpeed": "Maksimalus greitis",
     "reportEngineHours": "Variklio valandos",
     "reportDuration": "Trukmė",
-    "reportStartDate": "Start Date",
+    "reportStartDate": "Pradžios data",
     "reportStartTime": "Pradžios laikas",
     "reportStartAddress": "Pradžios adresas",
     "reportEndTime": "Pabaigos laikas",
     "reportEndAddress": "Pabaigos adresas",
     "reportSpentFuel": "Suvartoto kuro",
-    "reportStartOdometer": "Odometer Start",
-    "reportEndOdometer": "Odometer End",
+    "reportStartOdometer": "Odometras startas",
+    "reportEndOdometer": "Odometras pabaiga",
     "statisticsTitle": "Statistika",
     "statisticsCaptureTime": "Užfiksuotas laikas",
     "statisticsActiveUsers": "Aktyvus vartotojai",
@@ -534,12 +548,12 @@
     "categoryPlane": "Lėktuvas",
     "categoryShip": "Laivas",
     "categoryTractor": "Traktorius",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Traukinys",
+    "categoryTram": "Tramvajus",
+    "categoryTrolleybus": "Troleibusas",
     "categoryTruck": "Vilkikas",
     "categoryVan": "Autobusiuskas",
-    "categoryScooter": "Scooter",
+    "categoryScooter": "Mopedas",
     "maintenanceStart": "Pradėti",
     "maintenancePeriod": "Periodas"
 }
\ No newline at end of file
diff --git a/modern/src/resources/l10n/lv.json b/modern/src/resources/l10n/lv.json
index 606b2813..7da29842 100644
--- a/modern/src/resources/l10n/lv.json
+++ b/modern/src/resources/l10n/lv.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Ātruma ierobežojums",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Slēpt pozīcijas atribūtus",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Paziņojumu Žetoni",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Kļūda",
     "errorGeneral": "Kļūdaini parametri vai satur kļūdas",
     "errorConnection": "Savienojuma kļūda",
@@ -182,7 +184,10 @@
     "loginLogout": "Iziet",
     "loginLogo": "Logo",
     "devicesAndState": "Ierīces un to statusi",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Ierīces",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifikators",
     "deviceModel": "Modelis",
     "deviceContact": "Kontakti",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Tilpuma mērvienība",
     "settingsTwelveHourFormat": "12-h Formāts",
     "settingsCoordinateFormat": "Koordinātu formāts",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Atskaites",
     "reportDevice": "Ierīce",
     "reportGroup": "Grupa",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Personalizēta karte",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetKarte",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Karšu Atslēga",
     "mapBingRoad": "Bing Karšu Ceļi",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Slānis",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Stāvoklis",
     "stateName": "Īpašības",
     "stateValue": "Vērtība",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Mainījies vadītājs",
     "eventMedia": "Media",
     "eventsScrollToLast": "Ritināt Uz Pēdējo",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Vispārēji",
     "alarmSos": "SOS",
     "alarmVibration": "Vibrācija",
diff --git a/modern/src/resources/l10n/ml.json b/modern/src/resources/l10n/ml.json
index d659528d..f2528199 100644
--- a/modern/src/resources/l10n/ml.json
+++ b/modern/src/resources/l10n/ml.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "സ്പീഡ് ലിമിറ്റ്‌ ",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "എറർ !",
     "errorGeneral": "പാരാമീറ്റർ  എറർ !",
     "errorConnection": "കണക്ഷൻ എറർ !",
@@ -182,7 +184,10 @@
     "loginLogout": "പുറത്തുകടക്കുക",
     "loginLogo": "ലോഗോ",
     "devicesAndState": "സാധനങ്ങളിന് നില ",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "സാധനങ്ങളിന് ",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "ഐഡന്റിഫയർ",
     "deviceModel": "Model",
     "deviceContact": "Contact",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "12-hour Format",
     "settingsCoordinateFormat": "Coordinates Format",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Reports",
     "reportDevice": "ഉപകരണം",
     "reportGroup": "Group",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "State",
     "stateName": "Attribute",
     "stateValue": "Value",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/mn.json b/modern/src/resources/l10n/mn.json
index 9cc320cf..859f7a98 100644
--- a/modern/src/resources/l10n/mn.json
+++ b/modern/src/resources/l10n/mn.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Хурдны хязгаар",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Алдаа",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Холболтын алдаа",
@@ -182,7 +184,10 @@
     "loginLogout": "Системээс гарах",
     "loginLogo": "Лого",
     "devicesAndState": "Devices and State",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Төхөөрөмжүүд",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifier",
     "deviceModel": "Модел",
     "deviceContact": "Contact",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Эзэлхүүний нэгж",
     "settingsTwelveHourFormat": "12-цагийн формат",
     "settingsCoordinateFormat": "Coordinates Format",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Тайлангууд",
     "reportDevice": "Төхөөрөмж",
     "reportGroup": "Group",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "State",
     "stateName": "Attribute",
     "stateValue": "Value",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/ms.json b/modern/src/resources/l10n/ms.json
index ecd5ff33..226ed025 100644
--- a/modern/src/resources/l10n/ms.json
+++ b/modern/src/resources/l10n/ms.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Speed Limit",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Ralat",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Ralat penyambungan",
@@ -182,7 +184,10 @@
     "loginLogout": "Keluar",
     "loginLogo": "Logo",
     "devicesAndState": "Peranti dan State",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Peranti",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "IMEI/ID",
     "deviceModel": "Model",
     "deviceContact": "Contact",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "12-hour Format",
     "settingsCoordinateFormat": "Coordinates Format",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Laporan",
     "reportDevice": "Peranti",
     "reportGroup": "Group",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Negeri",
     "stateName": "Atribut",
     "stateValue": "Nilai",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/nb.json b/modern/src/resources/l10n/nb.json
index 95af2dd3..28804c79 100644
--- a/modern/src/resources/l10n/nb.json
+++ b/modern/src/resources/l10n/nb.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Fartsgrense",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Skjul posisjonsegenskaper",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Feil",
     "errorGeneral": "Ugyldige parametere eller begrensingsbrudd",
     "errorConnection": "Forbindelse feilet",
@@ -182,7 +184,10 @@
     "loginLogout": "Logg ut",
     "loginLogo": "Logo",
     "devicesAndState": "Enheter og status",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Enheter",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifikator",
     "deviceModel": "Modell",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volumenhet",
     "settingsTwelveHourFormat": "Tolvtimersformat",
     "settingsCoordinateFormat": "Koordinatformat",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Rapporter",
     "reportDevice": "Enhet",
     "reportGroup": "Gruppe",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Tilpasset kart",
     "mapCarto": "Carto basiskart",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps-nøkkel",
     "mapBingRoad": "Bing Maps-veg",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI-lag",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Status",
     "stateName": "Egenskap",
     "stateValue": "Verdi",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Sjåfør endret",
     "eventMedia": "Media",
     "eventsScrollToLast": "Vis siste",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Generell",
     "alarmSos": "SOS",
     "alarmVibration": "Vibrasjon",
diff --git a/modern/src/resources/l10n/ne.json b/modern/src/resources/l10n/ne.json
index e69c5f94..e267a218 100644
--- a/modern/src/resources/l10n/ne.json
+++ b/modern/src/resources/l10n/ne.json
@@ -112,6 +112,7 @@
     "calendarThursday": "बिहीबार",
     "calendarFriday": "शुक्रबार",
     "calendarSaturday": "शनिबार",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "गति सिमित",
     "attributeFuelDropThreshold": "इन्धन ड्रप थ्रेसहोल्ड",
     "attributeFuelIncreaseThreshold": "इन्धन वृद्धि थ्रेसहोल्ड",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: स्थिति विशेषताहरू लुकाउनुहोस्",
     "attributeUiDisableLoginLanguage": "UI: लगइन भाषा असक्षम गर्नुहोस्",
     "attributeNotificationTokens": "सूचना टोकनहरू",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "त्रुटी",
     "errorGeneral": "अवैध प्यारामिटर वा बाधा उल्लङ्घन",
     "errorConnection": "जडान मा त्रुटी भयो ",
@@ -182,7 +184,10 @@
     "loginLogout": "बाहिरिने ",
     "loginLogo": "लोगो",
     "devicesAndState": "यन्त्रहरू तथा अवस्था ",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "यन्त्रहरू ",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "परिचायक ",
     "deviceModel": "मोडेल",
     "deviceContact": "सम्पर्क गर्नुहोस्",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "आयातन एकाई",
     "settingsTwelveHourFormat": "12-घण्टे ढाचाँ",
     "settingsCoordinateFormat": "निर्देशांक ढाचाँ",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "प्रतिबेदनहरु ",
     "reportDevice": "यन्त्र ",
     "reportGroup": "समुह",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "अनुकूल नक्शा",
     "mapCarto": "कार्टो आधारनक्सा",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "बिंग नक्शाको चाबी (कि) ",
     "mapBingRoad": "बिंग नक्शा (सडक)",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI तह",
     "mapClustering": "मार्कर क्लस्टरिङ",
     "mapOnSelect": "चयनमा नक्सा देखाउनुहोस्",
+    "mapDefault": "Default Map",
     "stateTitle": "अवस्था ",
     "stateName": "बिषेशता",
     "stateValue": "मूल्य ",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "चालक परिवर्तन भयो",
     "eventMedia": "मिडिया",
     "eventsScrollToLast": "अन्तिममा स्क्रोल गर्नुहोस्",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "सामान्य",
     "alarmSos": "SOS",
     "alarmVibration": "कम्पन",
diff --git a/modern/src/resources/l10n/nl.json b/modern/src/resources/l10n/nl.json
index 86ea4c71..cc977633 100644
--- a/modern/src/resources/l10n/nl.json
+++ b/modern/src/resources/l10n/nl.json
@@ -31,10 +31,10 @@
     "sharedName": "Naam",
     "sharedDescription": "Omschrijving",
     "sharedSearch": "Zoeken",
-    "sharedIconScale": "Icon Scale",
+    "sharedIconScale": "Schaal van iconen",
     "sharedGeofence": "Geografisch gebied",
     "sharedGeofences": "Geografische gebieden",
-    "sharedCreateGeofence": "Create Geofence",
+    "sharedCreateGeofence": "Maak geofence",
     "sharedNotifications": "Notificatie",
     "sharedNotification": "Notificatie",
     "sharedAttributes": "Attributen",
@@ -78,8 +78,8 @@
     "sharedPermissions": "Rechten",
     "sharedConnections": "Connecties",
     "sharedExtra": "Extra",
-    "sharedPrimary": "Primary",
-    "sharedSecondary": "Secondary",
+    "sharedPrimary": "Primair",
+    "sharedSecondary": "Secundair",
     "sharedTypeString": "Tekst",
     "sharedTypeNumber": "Getal",
     "sharedTypeBoolean": "Boolean",
@@ -98,20 +98,21 @@
     "sharedImport": "Importeren",
     "sharedColumns": "Kolommen",
     "sharedDropzoneText": "Sleep en plaats hier een bestand of klik hier",
-    "calendarSimple": "Simple",
-    "calendarRecurrence": "Recurrence",
-    "calendarOnce": "Once",
-    "calendarDaily": "Daily",
-    "calendarWeekly": "Weekly",
-    "calendarMonthly": "Monthly",
-    "calendarDays": "Days",
-    "calendarSunday": "Sunday",
-    "calendarMonday": "Monday",
-    "calendarTuesday": "Tuesday",
-    "calendarWednesday": "Wednesday",
-    "calendarThursday": "Thursday",
-    "calendarFriday": "Friday",
-    "calendarSaturday": "Saturday",
+    "calendarSimple": "Eenvoudig",
+    "calendarRecurrence": "Herhaling",
+    "calendarOnce": "Eenmalig",
+    "calendarDaily": "Dagelijks",
+    "calendarWeekly": "Wekelijks",
+    "calendarMonthly": "Maandelijks",
+    "calendarDays": "Dagen",
+    "calendarSunday": "Zondag",
+    "calendarMonday": "Maandag",
+    "calendarTuesday": "Dinsdag",
+    "calendarWednesday": "Woensdag",
+    "calendarThursday": "Donderdag",
+    "calendarFriday": "Vrijdag",
+    "calendarSaturday": "Zaterdag",
+    "attributeShowGeofences": "Toon geofences",
     "attributeSpeedLimit": "Snelheidslimiet",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Verberg positie-eigenschappen",
     "attributeUiDisableLoginLanguage": "UI: logintaal uitschakelen",
     "attributeNotificationTokens": "Notificatietokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Fout",
     "errorGeneral": "Ongeldige parameters of overschrijding van beperkingen",
     "errorConnection": "Verbindingsfout",
@@ -182,7 +184,10 @@
     "loginLogout": "Afmelden",
     "loginLogo": "Logo",
     "devicesAndState": "Apparaten en status",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Apparaten",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifier",
     "deviceModel": "Model",
     "deviceContact": "Contact",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume-eenheid",
     "settingsTwelveHourFormat": "12-uurs indeling",
     "settingsCoordinateFormat": "Coördinatenformaat ",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Rapportages",
     "reportDevice": "Apparaat",
     "reportGroup": "Groep",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Aangepaste map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps sleutel",
     "mapBingRoad": "Bing Maps Wegen",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI laag",
     "mapClustering": "Markeringen clusteren",
     "mapOnSelect": "Toon kaart bij selectie",
+    "mapDefault": "Default Map",
     "stateTitle": "Status",
     "stateName": "Parameter",
     "stateValue": "Waarde",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Bestuurder veranderd",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll naar laatste",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Algemeen",
     "alarmSos": "SOS",
     "alarmVibration": "Trilling",
diff --git a/modern/src/resources/l10n/nn.json b/modern/src/resources/l10n/nn.json
index ebe94c6b..2e2c0528 100644
--- a/modern/src/resources/l10n/nn.json
+++ b/modern/src/resources/l10n/nn.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Fartsgrense",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Gøym posisojonseigenskapar",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Feil",
     "errorGeneral": "ugyldige parameterar eller avgrensingsbrot",
     "errorConnection": "Forbindelse feila",
@@ -182,7 +184,10 @@
     "loginLogout": "Logg ut",
     "loginLogo": "Logo",
     "devicesAndState": "Einingar og status",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Einingar",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifikator",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volumeining",
     "settingsTwelveHourFormat": "Tolvtimersformat",
     "settingsCoordinateFormat": "Koordinatformat",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Rapportar",
     "reportDevice": "Eining",
     "reportGroup": "Gruppe",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Tilpassa kart",
     "mapCarto": "Carto basiskart",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps-nøkkel",
     "mapBingRoad": "Bing Maps-veg",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI-lag",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Status",
     "stateName": "Eigenskap",
     "stateValue": "Verdi",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Sjåfør endra",
     "eventMedia": "Media",
     "eventsScrollToLast": "Syn siste",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Generell",
     "alarmSos": "SOS",
     "alarmVibration": "Vibrasjon",
diff --git a/modern/src/resources/l10n/pl.json b/modern/src/resources/l10n/pl.json
index fcb59a28..da86cb18 100644
--- a/modern/src/resources/l10n/pl.json
+++ b/modern/src/resources/l10n/pl.json
@@ -32,8 +32,8 @@
     "sharedDescription": "Opis",
     "sharedSearch": "Szukaj",
     "sharedIconScale": "Skala ikon",
-    "sharedGeofence": "Nadzór",
-    "sharedGeofences": "Nadzory",
+    "sharedGeofence": "Obszar monitorowany",
+    "sharedGeofences": "Obszar monitorowany",
     "sharedCreateGeofence": "Utwórz obszar monitorowany",
     "sharedNotifications": "Powiadomienia",
     "sharedNotification": "Powiadomienie",
@@ -112,6 +112,7 @@
     "calendarThursday": "Czwartek",
     "calendarFriday": "Piątek",
     "calendarSaturday": "Sobota",
+    "attributeShowGeofences": "Pokaż obszar monitorowany",
     "attributeSpeedLimit": "Ograniczenie prędkości",
     "attributeFuelDropThreshold": "Próg spadku paliwa",
     "attributeFuelIncreaseThreshold": "Próg wzrostu paliwa",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Ukryj atrybuty pozycji",
     "attributeUiDisableLoginLanguage": "UI: Wyłącz język logowania",
     "attributeNotificationTokens": "Tokeny powiadomień",
+    "attributePopupInfo": "Wyskakujące informacje",
     "errorTitle": "Błąd",
     "errorGeneral": "Nieprawidłowe parametry lub naruszenie ograniczeń",
     "errorConnection": "Błąd przy połączeniu",
@@ -182,7 +184,10 @@
     "loginLogout": "Wyloguj",
     "loginLogo": "Logo",
     "devicesAndState": "Urządzenia i stan",
+    "deviceSelected": "Wybrane urządzenie",
     "deviceTitle": "Urządzenia",
+    "devicePrimaryInfo": "Tytuł urządzenia",
+    "deviceSecondaryInfo": "Szczegóły urządzenia",
     "deviceIdentifier": "Identyfikator",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Jednostka objętości",
     "settingsTwelveHourFormat": "Format 12-godz.",
     "settingsCoordinateFormat": "Format współrzędnych",
+    "settingsServerVersion": "Wersja serwera",
+    "settingsAppVersion": "Wersja aplikacji",
+    "settingsConnection": "Połączenie",
     "reportTitle": "Raporty",
     "reportDevice": "Urządzenie",
     "reportGroup": "Grupa",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Własna mapa",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Warstwa POI",
     "mapClustering": "Grupowanie znaczników",
     "mapOnSelect": "Pokaż mapę w zaznaczeniu",
+    "mapDefault": "Mapa domyślna",
     "stateTitle": "Stan i lokalizacja",
     "stateName": "Właściwość",
     "stateValue": "Wartość",
@@ -387,7 +399,7 @@
     "commandSetSpeedLimit": "Ustaw ograniczenie prędkości",
     "commandModePowerSaving": "Tryb oszczędzania energii",
     "commandModeDeepSleep": "Tryb głębokiego uśpienia",
-    "commandAlarmGeofence": "Ustaw alarm nadzoru",
+    "commandAlarmGeofence": "Ustaw alarm obszaru monitorowanego",
     "commandAlarmBattery": "Ustaw alarm baterii",
     "commandAlarmSos": "Ustaw alarm SOS",
     "commandAlarmRemove": "Ustaw usunięcie alarmu",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Zmieniana kierowcy",
     "eventMedia": "Media",
     "eventsScrollToLast": "Przewiń do ostatniego",
+    "eventsSoundEvents": "Dźwięk wydarzeń",
+    "eventsSoundAlarms": "Dźwięk alarmów",
     "alarmGeneral": "Ogólny",
     "alarmSos": "SOS",
     "alarmVibration": "WIbracja",
diff --git a/modern/src/resources/l10n/pt.json b/modern/src/resources/l10n/pt.json
index c9b0486f..540c0029 100644
--- a/modern/src/resources/l10n/pt.json
+++ b/modern/src/resources/l10n/pt.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Limite de Velocidade",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Ocultar Atributos de Localização",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Tokens de Notificação",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Erro",
     "errorGeneral": "Parâmetros Inválidos",
     "errorConnection": "Erro de conexão",
@@ -182,7 +184,10 @@
     "loginLogout": "Sair",
     "loginLogo": "Logótipo",
     "devicesAndState": "Dispositivos e Estados",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Dispositivos",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identificador",
     "deviceModel": "Modelo",
     "deviceContact": "Contacto",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Unidade de Volume",
     "settingsTwelveHourFormat": "Formato 12 Horas",
     "settingsCoordinateFormat": "Formato das Coordenadas",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Relatórios",
     "reportDevice": "Dispositivo",
     "reportGroup": "Grupo",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Mapa Personalizado",
     "mapCarto": "Mapa Carto",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Mapa Bing Key",
     "mapBingRoad": "Mapa Bing Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Camada POI",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Estado",
     "stateName": "Parâmetro",
     "stateValue": "Valor",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Alteração de Condutor",
     "eventMedia": "Media",
     "eventsScrollToLast": "Puxar para o Fim",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Geral",
     "alarmSos": "SOS",
     "alarmVibration": "Vibração",
diff --git a/modern/src/resources/l10n/pt_BR.json b/modern/src/resources/l10n/pt_BR.json
index e7c7e781..cfe12305 100644
--- a/modern/src/resources/l10n/pt_BR.json
+++ b/modern/src/resources/l10n/pt_BR.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Quinta-feira",
     "calendarFriday": "Sexta-feira",
     "calendarSaturday": "Sábado",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Limite de Velocidade",
     "attributeFuelDropThreshold": "Limite de decréscimo de combustível",
     "attributeFuelIncreaseThreshold": "Limite de acréscimo de combustível",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Ocultar os atributos de posição",
     "attributeUiDisableLoginLanguage": "UI: Desativar idioma de login",
     "attributeNotificationTokens": "Token de Notificação",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Erro",
     "errorGeneral": "Parâmetros inválidos ou violação de restrições",
     "errorConnection": "Erro de conexão",
@@ -182,7 +184,10 @@
     "loginLogout": "Sair",
     "loginLogo": "Logotipo",
     "devicesAndState": "Dispositivo e Estado",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Dispositivos",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identificador",
     "deviceModel": "Modelo",
     "deviceContact": "Contato",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Unidade de Volume",
     "settingsTwelveHourFormat": "Formato de 12 Horas",
     "settingsCoordinateFormat": "Formato de coordenadas",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Relatórios",
     "reportDevice": "Dispositivo",
     "reportGroup": "Grupo",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Personalizar mapa",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Mapas API Key",
     "mapBingRoad": "Bing Mapas Estradas",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Camada POI",
     "mapClustering": "Agrupamento de marcadores",
     "mapOnSelect": "Mostrar mapa na seleção",
+    "mapDefault": "Default Map",
     "stateTitle": "Estado",
     "stateName": "Atributo",
     "stateValue": "Valor",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Condutor alterado",
     "eventMedia": "Media",
     "eventsScrollToLast": "Rolar para o último",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Geral",
     "alarmSos": "SOS",
     "alarmVibration": "Vibrando",
diff --git a/modern/src/resources/l10n/ro.json b/modern/src/resources/l10n/ro.json
index 8fe5e55c..bc978cca 100644
--- a/modern/src/resources/l10n/ro.json
+++ b/modern/src/resources/l10n/ro.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Limita de viteza",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Ascunde Atributele de Pozitionare",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Eroare",
     "errorGeneral": "Parametri invalizi",
     "errorConnection": "Eroare de conexiune",
@@ -182,7 +184,10 @@
     "loginLogout": "Deconectare",
     "loginLogo": "Logo",
     "devicesAndState": "Stare dispozitive",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Dispozitive",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identificator",
     "deviceModel": "Model",
     "deviceContact": "Contact",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Unitate de masura Volum",
     "settingsTwelveHourFormat": "12-oră",
     "settingsCoordinateFormat": "Format coordonate",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Rapoarte",
     "reportDevice": "Dispozitiv",
     "reportGroup": "Grup",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Harta Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Cheie Hărți Bing",
     "mapBingRoad": "Bing Hartă Drumuri",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI ",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Stare",
     "stateName": "Atribut",
     "stateValue": "Valoare",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Sofer schimbat",
     "eventMedia": "Media",
     "eventsScrollToLast": "Deruleaza la sfarsit",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibratii",
diff --git a/modern/src/resources/l10n/ru.json b/modern/src/resources/l10n/ru.json
index e0bfd8ca..14dda959 100644
--- a/modern/src/resources/l10n/ru.json
+++ b/modern/src/resources/l10n/ru.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Ограничение скорости",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Скрывать атрибуты",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Токены Уведомлений",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Ошибка",
     "errorGeneral": "Неправильные параметры или нарушение ограничений",
     "errorConnection": "Ошибка соединения",
@@ -182,7 +184,10 @@
     "loginLogout": "Выход",
     "loginLogo": "Логотип",
     "devicesAndState": "Устройства и состояния",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Устройства",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Идентификатор",
     "deviceModel": "Модель",
     "deviceContact": "Контакт",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Единица объема",
     "settingsTwelveHourFormat": "12-часовой формат",
     "settingsCoordinateFormat": "Формат координат",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Отчеты",
     "reportDevice": "Устройство",
     "reportGroup": "Группа",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Пользовательская карта",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Ключ Bing Maps",
     "mapBingRoad": "Bing Maps Дороги",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Слой POI",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Состояние",
     "stateName": "Параметр",
     "stateValue": "Значение",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Водитель изменен",
     "eventMedia": "Media",
     "eventsScrollToLast": "Прокрутка до конца",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Общее",
     "alarmSos": "SOS",
     "alarmVibration": "Вибрация",
diff --git a/modern/src/resources/l10n/si.json b/modern/src/resources/l10n/si.json
index 32e472e5..9e47fe72 100644
--- a/modern/src/resources/l10n/si.json
+++ b/modern/src/resources/l10n/si.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "වේග සීමාව",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: ස්ථාන ගුණාංග සඟවන්න",
     "attributeUiDisableLoginLanguage": "UI: පිවිසුම් භාෂාව අක්‍රීය කරන්න",
     "attributeNotificationTokens": "දැනුම්දීම් ටෝකන",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "දෝෂයකි",
     "errorGeneral": "වලංගු නොවන පරාමිති හෝ සීමාවන් උල්ලංඝනය කිරීම",
     "errorConnection": "සම්බන්ධතාවේ දෝෂයකි",
@@ -182,7 +184,10 @@
     "loginLogout": "නික්මෙන්න",
     "loginLogo": "ලාංඡනය",
     "devicesAndState": "උපාංග සහ තත්ත්වය",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "උපාංග",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "හඳුන්වනවා",
     "deviceModel": "ආකෘතිය",
     "deviceContact": "අමතන්න",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "පරිමාව ඒකකය",
     "settingsTwelveHourFormat": "පැය 12 ආකෘතිය",
     "settingsCoordinateFormat": "ඛණ්ඩාංක ආකෘතිය",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "වාර්තාව",
     "reportDevice": "වැනි",
     "reportGroup": "සමුහය",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "අභිරුචි සිතියම",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "බිං මැප්ස් යතුර",
     "mapBingRoad": "බිං මැප්ස් පාර",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI ස්තරය",
     "mapClustering": "සලකුණු පොකුරු කිරීම",
     "mapOnSelect": "තේරීම මත සිතියම පෙන්වන්න",
+    "mapDefault": "Default Map",
     "stateTitle": "තත්ත්වය",
     "stateName": "ගුණාංගය",
     "stateValue": "අගය",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "රියදුරු වෙනස් විය",
     "eventMedia": "Media",
     "eventsScrollToLast": "අන්තිමට අනුචලනය කරන්න",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "ජනරාල්",
     "alarmSos": "SOS",
     "alarmVibration": "කම්පනය",
diff --git a/modern/src/resources/l10n/sk.json b/modern/src/resources/l10n/sk.json
index 548cb4d3..169a193e 100644
--- a/modern/src/resources/l10n/sk.json
+++ b/modern/src/resources/l10n/sk.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Limit rýchlosti",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Chyba",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Chyba pripojenia",
@@ -182,7 +184,10 @@
     "loginLogout": "Odhlásiť",
     "loginLogo": "Logo",
     "devicesAndState": "Zariadenia a Status",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Zariadena",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifikátor",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Jednotka objemu",
     "settingsTwelveHourFormat": "12-hodinový formát",
     "settingsCoordinateFormat": "Formát koordinátov",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Správy",
     "reportDevice": "Zariadenie",
     "reportGroup": "Skupina",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Klúč Bing Maps",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Parametre",
     "stateName": "Parameter",
     "stateValue": "Hodnota",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Zmena vodiča",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Všeobecné",
     "alarmSos": "SOS",
     "alarmVibration": "Vibrácia",
diff --git a/modern/src/resources/l10n/sl.json b/modern/src/resources/l10n/sl.json
index 64197efb..113f20c5 100644
--- a/modern/src/resources/l10n/sl.json
+++ b/modern/src/resources/l10n/sl.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Četrtek",
     "calendarFriday": "Petek",
     "calendarSaturday": "Sobota",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Omejitev hitrosti",
     "attributeFuelDropThreshold": "Mejna vrednost padca goriva",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Napaka",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Napaka v povezavi",
@@ -182,7 +184,10 @@
     "loginLogout": "Odjava",
     "loginLogo": "Logotip",
     "devicesAndState": "Naprava in stanje",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Naprave",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifikacija",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Enota za volumen",
     "settingsTwelveHourFormat": "12-urni format",
     "settingsCoordinateFormat": "Format koordinat",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Poročila",
     "reportDevice": "Naprava",
     "reportGroup": "Skupina",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Zemljevid po meri",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Ključ",
     "mapBingRoad": "Bing Maps Ceste",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Združevanje oznak",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Stanje",
     "stateName": "Parameter",
     "stateValue": "Vrednost",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Sprememba voznika",
     "eventMedia": "Mediji",
     "eventsScrollToLast": "Pomakni se na zadnje",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Splošno",
     "alarmSos": "SOS",
     "alarmVibration": "Vibracije",
diff --git a/modern/src/resources/l10n/sq.json b/modern/src/resources/l10n/sq.json
index af49256d..4b9bfa24 100644
--- a/modern/src/resources/l10n/sq.json
+++ b/modern/src/resources/l10n/sq.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Speed Limit",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Gabim",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Gabim lidhjeje",
@@ -182,7 +184,10 @@
     "loginLogout": "Shkëputu",
     "loginLogo": "Logo",
     "devicesAndState": "Gjendja e pajisjeve",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Pajisjet",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifikues",
     "deviceModel": "Model",
     "deviceContact": "Contact",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "Formë 12-orëshe",
     "settingsCoordinateFormat": "Coordinates Format",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Raporte",
     "reportDevice": "Pajisje",
     "reportGroup": "Group",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Gjëndja",
     "stateName": "Atribut",
     "stateValue": "Vlera",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/sr.json b/modern/src/resources/l10n/sr.json
index 9745823d..0f4a98de 100644
--- a/modern/src/resources/l10n/sr.json
+++ b/modern/src/resources/l10n/sr.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Četvrtak",
     "calendarFriday": "Petak",
     "calendarSaturday": "Subota",
+    "attributeShowGeofences": "Prikaži Geoograde",
     "attributeSpeedLimit": "Ograničenje brzine",
     "attributeFuelDropThreshold": "Granica opadanja goriva",
     "attributeFuelIncreaseThreshold": "Granica dodavanja goriva",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "KI:Sakrij poziciju atributa ",
     "attributeUiDisableLoginLanguage": "UI: Onemogući jezik za prijavu",
     "attributeNotificationTokens": "Tokeni obaveštenja",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Greška",
     "errorGeneral": "Nevažeći parametri ili kršenje ograničenja",
     "errorConnection": "Greška u konekciji",
@@ -182,7 +184,10 @@
     "loginLogout": "Odjava",
     "loginLogo": "Logo",
     "devicesAndState": "Uređaji i Stanje ",
+    "deviceSelected": "Izabrani uređaj",
     "deviceTitle": "Uređaji",
+    "devicePrimaryInfo": "Naziv uređaja",
+    "deviceSecondaryInfo": "Detalji uređaj",
     "deviceIdentifier": "Identifikator",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Jedinica zapremine",
     "settingsTwelveHourFormat": "12-časovni format",
     "settingsCoordinateFormat": "Koordinatni Format",
+    "settingsServerVersion": "Verzija servera",
+    "settingsAppVersion": "Verzija aplikacije",
+    "settingsConnection": "Konekcija",
     "reportTitle": "Izveštaji",
     "reportDevice": "Uređaj",
     "reportGroup": "Grupa",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Prilagođena mapa",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hibrid",
+    "mapGoogleSatellite": "Google Satelit",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI sloj",
     "mapClustering": "Klasterovanje markera",
     "mapOnSelect": "Prikaži Mapu pri selekciji",
+    "mapDefault": "Osnovna mapa",
     "stateTitle": "Stanje",
     "stateName": "Parametar",
     "stateValue": "Vrednost",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Vozač promenjen",
     "eventMedia": "Medija",
     "eventsScrollToLast": "Skroluj do zadnjeg",
+    "eventsSoundEvents": "Zvuci događaja",
+    "eventsSoundAlarms": "Zvuci alarma",
     "alarmGeneral": "Opšte",
     "alarmSos": "SOS",
     "alarmVibration": "Vibracija",
diff --git a/modern/src/resources/l10n/sv.json b/modern/src/resources/l10n/sv.json
index c31c58e5..171462f1 100644
--- a/modern/src/resources/l10n/sv.json
+++ b/modern/src/resources/l10n/sv.json
@@ -8,9 +8,9 @@
     "sharedEdit": "Redigera",
     "sharedRemove": "Radera",
     "sharedRemoveConfirm": "Radera objekt?",
-    "sharedNoData": "No data",
-    "sharedYes": "Yes",
-    "sharedNo": "No",
+    "sharedNoData": "Data saknas",
+    "sharedYes": "Ja",
+    "sharedNo": "Nej",
     "sharedKm": "km",
     "sharedMi": "mi",
     "sharedNmi": "nmi",
@@ -31,16 +31,16 @@
     "sharedName": "Namn",
     "sharedDescription": "Beskrivning",
     "sharedSearch": "Sök",
-    "sharedIconScale": "Icon Scale",
+    "sharedIconScale": "Ikonskala",
     "sharedGeofence": "Geofence",
     "sharedGeofences": "Geofences",
-    "sharedCreateGeofence": "Create Geofence",
+    "sharedCreateGeofence": "Skapa Geofence",
     "sharedNotifications": "Notiser",
-    "sharedNotification": "Notification",
+    "sharedNotification": "Notis",
     "sharedAttributes": "Attributer",
     "sharedAttribute": "Attribut",
-    "sharedDrivers": "Drivers",
-    "sharedDriver": "Driver",
+    "sharedDrivers": "Förare",
+    "sharedDriver": "Förare",
     "sharedArea": "Område",
     "sharedSound": "Ljudnotis",
     "sharedType": "Typ",
@@ -50,9 +50,9 @@
     "sharedSecondAbbreviation": "s",
     "sharedVoltAbbreviation": "V",
     "sharedLiterAbbreviation": "l",
-    "sharedGallonAbbreviation": "gal",
+    "sharedGallonAbbreviation": "gallon",
     "sharedLiter": "Liter",
-    "sharedImpGallon": "Imp. Gallon",
+    "sharedImpGallon": "Imp.Gallon",
     "sharedUsGallon": "U.S. Gallon",
     "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Få karttillstånd",
@@ -63,73 +63,74 @@
     "sharedDevice": "Enhet",
     "sharedTest": "Test",
     "sharedTestNotification": "Skicka testnortis",
-    "sharedTestNotificators": "Test Channels",
-    "sharedTestExpression": "Test Expression",
+    "sharedTestNotificators": "Testkanaler",
+    "sharedTestExpression": "Testuttryck",
     "sharedCalendar": "Kalender",
     "sharedCalendars": "Kalendrar",
     "sharedFile": "Fil",
-    "sharedSearchDevices": "Search Devices",
-    "sharedSortBy": "Sort By",
-    "sharedFilterMap": "Filter on Map",
+    "sharedSearchDevices": "Sök Enheter",
+    "sharedSortBy": "Sortera efter",
+    "sharedFilterMap": "Filtrera på kartan",
     "sharedSelectFile": "Välj fil",
     "sharedPhone": "Telefon",
     "sharedRequired": "Nödvändig",
     "sharedPreferences": "Inställningar",
     "sharedPermissions": "Rättigheter",
-    "sharedConnections": "Connections",
+    "sharedConnections": "Anslutningar",
     "sharedExtra": "Extra",
-    "sharedPrimary": "Primary",
-    "sharedSecondary": "Secondary",
+    "sharedPrimary": "Primär",
+    "sharedSecondary": "Sekundär",
     "sharedTypeString": "String",
     "sharedTypeNumber": "Number",
     "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Tidszon",
     "sharedInfoTitle": "Info",
-    "sharedSavedCommand": "Saved Command",
-    "sharedSavedCommands": "Saved Commands",
-    "sharedNew": "New…",
-    "sharedShowAddress": "Show Address",
-    "sharedShowDetails": "More Details",
-    "sharedDisabled": "Disabled",
-    "sharedMaintenance": "Maintenance",
-    "sharedDeviceAccumulators": "Accumulators",
-    "sharedAlarms": "Alarms",
-    "sharedLocation": "Location",
+    "sharedSavedCommand": "Sparade kommando",
+    "sharedSavedCommands": "Sparade kommandon",
+    "sharedNew": "Ny",
+    "sharedShowAddress": "Visa Adress",
+    "sharedShowDetails": "Mer Detaljer",
+    "sharedDisabled": "Inaktiverad",
+    "sharedMaintenance": "Underhåll",
+    "sharedDeviceAccumulators": "Ackumulatorer",
+    "sharedAlarms": "Alarm",
+    "sharedLocation": "Plats",
     "sharedImport": "Import",
-    "sharedColumns": "Columns",
-    "sharedDropzoneText": "Drag and drop a file here or click",
-    "calendarSimple": "Simple",
-    "calendarRecurrence": "Recurrence",
-    "calendarOnce": "Once",
-    "calendarDaily": "Daily",
-    "calendarWeekly": "Weekly",
-    "calendarMonthly": "Monthly",
-    "calendarDays": "Days",
-    "calendarSunday": "Sunday",
-    "calendarMonday": "Monday",
-    "calendarTuesday": "Tuesday",
-    "calendarWednesday": "Wednesday",
-    "calendarThursday": "Thursday",
-    "calendarFriday": "Friday",
-    "calendarSaturday": "Saturday",
+    "sharedColumns": "Kolumn",
+    "sharedDropzoneText": "Dra och släpp en fil här eller klicka",
+    "calendarSimple": "Enkel",
+    "calendarRecurrence": "Upprepning",
+    "calendarOnce": "En gång",
+    "calendarDaily": "Dagligen",
+    "calendarWeekly": "Varje vecka",
+    "calendarMonthly": "Varje Månad",
+    "calendarDays": "Dagar",
+    "calendarSunday": "Söndag",
+    "calendarMonday": "Måndag",
+    "calendarTuesday": "Tisdag",
+    "calendarWednesday": "Onsdag",
+    "calendarThursday": "Torsdag",
+    "calendarFriday": "Fredag",
+    "calendarSaturday": "Lördag",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Hastighetsbegränsning",
-    "attributeFuelDropThreshold": "Fuel Drop Threshold",
-    "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
-    "attributePolylineDistance": "Polyline Distance",
+    "attributeFuelDropThreshold": "Bränsleminskningströskel",
+    "attributeFuelIncreaseThreshold": "Bränsleökningsgräns",
+    "attributePolylineDistance": "Polylinedistans",
     "attributeReportIgnoreOdometer": "Rapport: Ignorera Odometer",
     "attributeWebReportColor": "Web: Rapport färg",
     "attributeDevicePassword": "Enhetslösenord",
-    "attributeDeviceImage": "Device Image",
-    "attributeDeviceInactivityStart": "Device Inactivity Start",
-    "attributeDeviceInactivityPeriod": "Device Inactivity Period",
+    "attributeDeviceImage": "Enhetsbild",
+    "attributeDeviceInactivityStart": "Enhetens inaktivitetsstart",
+    "attributeDeviceInactivityPeriod": "Enhetens inaktivitetslängd",
     "attributeProcessingCopyAttributes": "Processing:",
     "attributeColor": "Färg",
     "attributeWebLiveRouteLength": "Web: Live Route Length",
     "attributeWebSelectZoom": "Web: Zoom On Select",
-    "attributeWebMaxZoom": "Web: Maximum Zoom",
-    "attributeTelegramChatId": "Telegram Chat ID",
-    "attributePushoverUserKey": "Pushover User Key",
-    "attributePushoverDeviceNames": "Pushover Device Names",
+    "attributeWebMaxZoom": "Webb: Maximal Zoom",
+    "attributeTelegramChatId": "Telegram Chat-ID",
+    "attributePushoverUserKey": "Pushover användarnyckel",
+    "attributePushoverDeviceNames": "Pushover Enhetsnamn",
     "attributeMailSmtpHost": "Mail: SMTP Host",
     "attributeMailSmtpPort": "Mail: SMTP Port",
     "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable",
@@ -141,22 +142,23 @@
     "attributeMailSmtpAuth": "Mail: SMTP Auth Enable",
     "attributeMailSmtpUsername": "Mail: SMTP Användarnamn",
     "attributeMailSmtpPassword": "Mail: SMTP Lösenord",
-    "attributeUiDisableAttributes": "UI: Disable Attributes",
-    "attributeUiDisableGroups": "UI: Disable Groups",
-    "attributeUiDisableEvents": "UI: Disable Events",
-    "attributeUiDisableVehicleFetures": "UI: Disable Vehicle Fetures",
-    "attributeUiDisableDrivers": "UI: Disable Drivers",
-    "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
-    "attributeUiDisableCalendars": "UI: Disable Calendars",
-    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
-    "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
-    "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
-    "attributeNotificationTokens": "Notification Tokens",
+    "attributeUiDisableAttributes": "UI: Inaktivera attribut",
+    "attributeUiDisableGroups": "UI: Inaktivera Grupper",
+    "attributeUiDisableEvents": "UI: Inaktivera Händelser",
+    "attributeUiDisableVehicleFetures": "UI: Inaktivera Fordonsfunktioner",
+    "attributeUiDisableDrivers": "UI: Inaktivera Förare",
+    "attributeUiDisableComputedAttributes": "UI: Inaktivera Beräknade Attribut",
+    "attributeUiDisableCalendars": "UI: Inaktivera Kalendrar",
+    "attributeUiDisableMaintenance": "UI: Inaktivera Underhåll",
+    "attributeUiHidePositionAttributes": "UI: Göm Positionsattribut",
+    "attributeUiDisableLoginLanguage": "UI: Inaktivera Loginspråk",
+    "attributeNotificationTokens": "Notistoken",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Fel",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Anslutningsfel",
     "errorSocket": "Anslutningsfel till Web socket",
-    "errorZero": "Can't be zero",
+    "errorZero": "Kan inte vara noll",
     "userEmail": "Epost",
     "userPassword": "Lösenord",
     "userAdmin": "Admin",
@@ -165,24 +167,27 @@
     "userDeviceLimit": "Enhetsbegränsning",
     "userUserLimit": "Användarbegränsning",
     "userDeviceReadonly": "Enhet endast läsbar",
-    "userLimitCommands": "Limit Commands",
-    "userDisableReports": "Disable Reports",
-    "userFixedEmail": "No Email Change",
+    "userLimitCommands": "Begränsa kommandon",
+    "userDisableReports": "Inaktivera Rappporter",
+    "userFixedEmail": "Ingen förändring av Email",
     "userToken": "Token",
-    "userDeleteAccount": "Delete Account",
+    "userDeleteAccount": "Ta bor Konto",
     "loginTitle": "Logga in",
     "loginLanguage": "Språk",
-    "loginReset": "Reset Password",
+    "loginReset": "Återställ Lösenord",
     "loginRegister": "Registrera",
     "loginLogin": "Logga in",
     "loginFailed": "Felaktig epostadress eller lösenord",
     "loginCreated": "Ny användare har blivit registrerad",
-    "loginResetSuccess": "Check your email",
-    "loginUpdateSuccess": "New password is set",
+    "loginResetSuccess": "Kontrollera din Email",
+    "loginUpdateSuccess": "Nytt lösenord är sparat",
     "loginLogout": "Logga ut",
     "loginLogo": "Logo",
     "devicesAndState": "Enhet och tillstånd",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Enhet",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Identifierare",
     "deviceModel": "Model",
     "deviceContact": "Kontakt",
@@ -203,12 +208,15 @@
     "settingsGroups": "Grupper",
     "settingsServer": "Server",
     "settingsUsers": "Användare",
-    "settingsDistanceUnit": "Distance Unit",
-    "settingsAltitudeUnit": "Altitude Unit",
-    "settingsSpeedUnit": "Speed Unit",
-    "settingsVolumeUnit": "Volume Unit",
+    "settingsDistanceUnit": "Distansenhet",
+    "settingsAltitudeUnit": "Höjdenhet",
+    "settingsSpeedUnit": "Hastighetsenhet",
+    "settingsVolumeUnit": "Volymenhet",
     "settingsTwelveHourFormat": "12-timmars format",
     "settingsCoordinateFormat": "Kordinatformat",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Rapport",
     "reportDevice": "Enhet",
     "reportGroup": "Grupp",
@@ -218,10 +226,10 @@
     "reportClear": "Rensa",
     "linkGoogleMaps": "Google Maps",
     "linkAppleMaps": "Apple Maps",
-    "linkStreetView": "Street View",
-    "positionFixTime": "Fix Time",
-    "positionDeviceTime": "Device Time",
-    "positionServerTime": "Server Time",
+    "linkStreetView": "Gatuvy",
+    "positionFixTime": "Låst tid",
+    "positionDeviceTime": "Enhetstid",
+    "positionServerTime": "Servertid",
     "positionValid": "Giltig",
     "positionAccuracy": "Noggrannhet",
     "positionLatitude": "Latitud",
@@ -241,8 +249,8 @@
     "positionHdop": "HDOP",
     "positionVdop": "VDOP",
     "positionPdop": "PDOP",
-    "positionSat": "Satellites",
-    "positionSatVisible": "Visible Satellites",
+    "positionSat": "Sateliter",
+    "positionSatVisible": "Synliga sateliter",
     "positionRssi": "RSSI",
     "positionGps": "GPS",
     "positionRoaming": "Roaming",
@@ -253,7 +261,7 @@
     "positionServiceOdometer": "Service Odometer",
     "positionTripOdometer": "Trip",
     "positionHours": "tim",
-    "positionSteps": "Steps",
+    "positionSteps": "Steg",
     "positionInput": "Input",
     "positionOutput": "Output",
     "positionBatteryLevel": "Batteri nivå",
@@ -272,41 +280,44 @@
     "positionMotion": "Rörelse",
     "positionArmed": "Larmad",
     "positionAcceleration": "Acceleration",
-    "positionTemp": "Temperature",
+    "positionTemp": "Temperatur",
     "positionDeviceTemp": "Enhetstemperatur",
     "positionOperator": "Operatör",
-    "positionCommand": "Command",
+    "positionCommand": "Kommando",
     "positionBlocked": "Blockerad ",
     "positionDtcs": "DTCs",
     "positionObdSpeed": "ODB Hastighet",
     "positionObdOdometer": "ODB Odometer",
-    "positionDriverUniqueId": "Driver Unique Id",
-    "positionImage": "Image",
+    "positionDriverUniqueId": "Unikt Förar-id",
+    "positionImage": "Bild",
     "positionVideo": "Video",
-    "positionAudio": "Audio",
+    "positionAudio": "Ljud",
     "serverTitle": "Serverinställningar",
     "serverZoom": "Zoom",
     "serverRegistration": "Registrera",
     "serverReadonly": "Endast läsbar",
     "serverForceSettings": "Tvinga inställning",
-    "serverAnnouncement": "Announcement",
+    "serverAnnouncement": "Tillkännagivande",
     "mapTitle": "Karta",
-    "mapActive": "Active Maps",
-    "mapOverlay": "Map Overlay",
-    "mapOverlayCustom": "Custom Overlay",
+    "mapActive": "Aktiva Kartor",
+    "mapOverlay": "Kartöverlägg",
+    "mapOverlayCustom": "Specialöverlägg",
     "mapOpenSeaMap": "OpenSeaMap",
-    "mapOpenWeatherKey": "OpenWeather API Key",
-    "mapOpenWeatherClouds": "OpenWeather Clouds",
-    "mapOpenWeatherPrecipitation": "OpenWeather Precipitation",
-    "mapOpenWeatherPressure": "OpenWeather Pressure",
-    "mapOpenWeatherWind": "OpenWeather Wind",
-    "mapOpenWeatherTemperature": "OpenWeather Temperature",
+    "mapOpenWeatherKey": "OpenWeather API-nyckel",
+    "mapOpenWeatherClouds": "OpenWeather Moln",
+    "mapOpenWeatherPrecipitation": "OpenWeather Nederbörd",
+    "mapOpenWeatherPressure": "OpenWeather Lufttryck",
+    "mapOpenWeatherWind": "OpenWeather Vind",
+    "mapOpenWeatherTemperature": "OpenWeather Temperatur",
     "mapLayer": "Kartlager",
-    "mapCustom": "Custom (XYZ)",
-    "mapCustomArcgis": "Custom (ArcGIS)",
-    "mapCustomLabel": "Custom map",
+    "mapCustom": "Special (XYZ)",
+    "mapCustomArcgis": "Special (ArcGIS)",
+    "mapCustomLabel": "Specialkarta",
     "mapCarto": "Carto grundkarta",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Nyckel",
     "mapBingRoad": "Bing Maps Väg",
@@ -322,16 +333,16 @@
     "mapMapboxOutdoors": "Mapbox Outdoors",
     "mapMapboxSatellite": "Mapbox Satellite",
     "mapMapboxKey": "Mapbox Access Token",
-    "mapMapTilerBasic": "MapTiler Basic",
+    "mapMapTilerBasic": "MapTiler Bas",
     "mapMapTilerHybrid": "MapTiler Hybrid",
     "mapMapTilerKey": "MapTiler API Key",
     "mapLocationIqStreets": "LocationIQ Streets",
     "mapLocationIqKey": "LocationIQ Access Token",
-    "mapTomTomBasic": "TomTom Basic",
+    "mapTomTomBasic": "TomTom Bas",
     "mapTomTomFlow": "TomTom Traffic Flow",
     "mapTomTomIncidents": "TomTom Traffic Incidents",
     "mapTomTomKey": "TomTom API Key",
-    "mapHereBasic": "Here Basic",
+    "mapHereBasic": "Here Bas",
     "mapHereHybrid": "Here Hybrid",
     "mapHereSatellite": "Here Satellite",
     "mapHereFlow": "Here Traffic Flow",
@@ -340,17 +351,18 @@
     "mapShapeCircle": "Cirkel",
     "mapShapePolyline": "Polyline",
     "mapLiveRoutes": "Liverutter",
-    "mapCurrentLocation": "Current Location",
-    "mapPoiLayer": "POI Layer",
-    "mapClustering": "Markers Clustering",
-    "mapOnSelect": "Show Map on Selection",
+    "mapCurrentLocation": "Nuvarande position",
+    "mapPoiLayer": "POI Lager",
+    "mapClustering": "Markörssamling",
+    "mapOnSelect": "Visa karta på urval",
+    "mapDefault": "Default Map",
     "stateTitle": "Status",
     "stateName": "Attribut",
     "stateValue": "Värde",
     "commandTitle": "Kommando",
     "commandSend": "Skicka",
-    "commandSent": "Command sent",
-    "commandQueued": "Command queued",
+    "commandSent": "Kommando sänt",
+    "commandQueued": "Kommando i kö",
     "commandUnit": "Enhet",
     "commandCustom": "Anpassat kommandot",
     "commandDeviceIdentification": "Enhetsidentifikation",
@@ -361,12 +373,12 @@
     "commandEngineResume": "Motor Återuppta",
     "commandAlarmArm": "Slå på larm",
     "commandAlarmDisarm": "Slå av larm",
-    "commandAlarmDismiss": "Dismiss Alarm",
+    "commandAlarmDismiss": "Avvisa larm",
     "commandSetTimezone": "Ställ in tidszon",
     "commandRequestPhoto": "Begär fotografi",
-    "commandPowerOff": "Power Off Device",
+    "commandPowerOff": "Stäng av enheten",
     "commandRebootDevice": "Starta om enhet",
-    "commandFactoryReset": "Factory Reset",
+    "commandFactoryReset": "Fabriksåterställning",
     "commandSendSms": "Skicka SMS",
     "commandSendUssd": "Skicka USSD",
     "commandSosNumber": "Ställ in SOS nummer",
@@ -374,32 +386,32 @@
     "commandSetPhonebook": "Ställ in telefonbok",
     "commandVoiceMessage": "Typ av notis",
     "commandOutputControl": "Utgångskontroll",
-    "commandVoiceMonitoring": "Voice Monitoring",
-    "commandSetAgps": "Set AGPS",
+    "commandVoiceMonitoring": "Röstövervakning",
+    "commandSetAgps": "Ställ in AGPS",
     "commandSetIndicator": "Ställ in indikator",
-    "commandConfiguration": "Configuration",
-    "commandGetVersion": "Get Version",
-    "commandFirmwareUpdate": "Update Firmware",
-    "commandSetConnection": "Set Connection",
-    "commandSetOdometer": "Set Odometer",
-    "commandGetModemStatus": "Get Modem Status",
-    "commandGetDeviceStatus": "Get Device Status",
-    "commandSetSpeedLimit": "Set Speed Limit",
-    "commandModePowerSaving": "Power Saving Mode",
-    "commandModeDeepSleep": "Deep Sleep Mode",
-    "commandAlarmGeofence": "Set Geofence Alarm",
-    "commandAlarmBattery": "Set Battery Alarm",
-    "commandAlarmSos": "Set SOS Alarm",
-    "commandAlarmRemove": "Set Remove Alarm",
-    "commandAlarmClock": "Set Clock Alarm",
-    "commandAlarmSpeed": "Set Speed Alarm",
-    "commandAlarmFall": "Set Fall Alarm",
-    "commandAlarmVibration": "Set Vibration Alarm",
+    "commandConfiguration": "Konfigurering",
+    "commandGetVersion": "Hämta version",
+    "commandFirmwareUpdate": "Uppdatera programvara",
+    "commandSetConnection": "Ställ in anslutning",
+    "commandSetOdometer": "Ställ in Odometer",
+    "commandGetModemStatus": "Hämta modemstatus",
+    "commandGetDeviceStatus": "Hämta enhetsstatus",
+    "commandSetSpeedLimit": "Ställ in hastighetsgräns",
+    "commandModePowerSaving": "Strömsparläge",
+    "commandModeDeepSleep": "Ställ in djupviloläge",
+    "commandAlarmGeofence": "Ställ in Geofencealarm",
+    "commandAlarmBattery": "Ställ in batterinivåalarm",
+    "commandAlarmSos": "Stöll in SOS-larm",
+    "commandAlarmRemove": "Ställ in Ta bort larm",
+    "commandAlarmClock": "Ställ in klockalarm",
+    "commandAlarmSpeed": "Ställ in hastighetslarm",
+    "commandAlarmFall": "Ställ in fallarm",
+    "commandAlarmVibration": "Ställ in vibrationslarm",
     "commandFrequency": "Frekvens",
     "commandTimezone": "Tidszon Offset",
     "commandMessage": "Meddelande",
-    "commandRadius": "Radius",
-    "commandEnable": "Enable",
+    "commandRadius": "Radie",
+    "commandEnable": "Aktivera",
     "commandData": "Data",
     "commandIndex": "Register",
     "commandPhone": "Telefonnummer",
@@ -407,108 +419,110 @@
     "commandPort": "Port",
     "eventAll": "Alla event",
     "eventDeviceOnline": "Status online",
-    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceUnknown": "Status okänd",
     "eventDeviceOffline": "Status offline",
-    "eventDeviceInactive": "Device inactive",
-    "eventDeviceMoving": "Device moving",
-    "eventDeviceStopped": "Device stopped",
-    "eventDeviceOverspeed": "Speed limit exceeded",
-    "eventDeviceFuelDrop": "Fuel drop",
-    "eventDeviceFuelIncrease": "Fuel increase",
+    "eventDeviceInactive": "Enhet inaktiverad",
+    "eventDeviceMoving": "Enheten i rörelse",
+    "eventDeviceStopped": "Enheten stannade",
+    "eventDeviceOverspeed": "Hastighetsgränsen överskreds",
+    "eventDeviceFuelDrop": "Bränslenivåminskning",
+    "eventDeviceFuelIncrease": "Bränslenivåökning",
     "eventCommandResult": "Kommando resultat",
-    "eventGeofenceEnter": "Geofence entered",
-    "eventGeofenceExit": "Geofence exited",
-    "eventAlarm": "Alarm",
-    "eventIgnitionOn": "Ignition on",
-    "eventIgnitionOff": "Ignition off",
+    "eventGeofenceEnter": "Ankommit geofence",
+    "eventGeofenceExit": "Lämnat geofence",
+    "eventAlarm": "Larm",
+    "eventIgnitionOn": "Tändning påslagen",
+    "eventIgnitionOff": "Tändning avslagen",
     "eventMaintenance": "Underhåll krävs",
     "eventTextMessage": "Textmeddelande mottaget",
-    "eventDriverChanged": "Driver changed",
+    "eventDriverChanged": "Förarbyte",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scrolla till sista",
-    "alarmGeneral": "General",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
+    "alarmGeneral": "Generellt",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
-    "alarmMovement": "Movement",
-    "alarmLowspeed": "Low Speed",
-    "alarmOverspeed": "Overspeed",
-    "alarmFallDown": "Fall Down",
-    "alarmLowPower": "Low Power",
-    "alarmLowBattery": "Low Battery",
-    "alarmFault": "Fault",
-    "alarmPowerOff": "Power Off",
-    "alarmPowerOn": "Power On",
-    "alarmDoor": "Door",
-    "alarmLock": "Lock",
-    "alarmUnlock": "Unlock",
+    "alarmMovement": "Rörelse",
+    "alarmLowspeed": "Låg hastighet",
+    "alarmOverspeed": "För hög hastighet",
+    "alarmFallDown": "Fall",
+    "alarmLowPower": "Låg effekt",
+    "alarmLowBattery": "Låg laddnivå",
+    "alarmFault": "Fel",
+    "alarmPowerOff": "Avstängd",
+    "alarmPowerOn": "Påslagen",
+    "alarmDoor": "Dörr",
+    "alarmLock": "Lås",
+    "alarmUnlock": "Lås upp",
     "alarmGeofence": "Geofence",
-    "alarmGeofenceEnter": "Geofence Enter",
-    "alarmGeofenceExit": "Geofence Exit",
-    "alarmGpsAntennaCut": "GPS Antenna Cut",
-    "alarmAccident": "Accident",
-    "alarmTow": "Tow",
-    "alarmIdle": "Idle",
-    "alarmHighRpm": "High RPM",
-    "alarmHardAcceleration": "Hard Acceleration",
-    "alarmHardBraking": "Hard Braking",
-    "alarmHardCornering": "Hard Cornering",
-    "alarmLaneChange": "Lane Change",
-    "alarmFatigueDriving": "Fatigue Driving",
-    "alarmPowerCut": "Power Cut",
-    "alarmPowerRestored": "Power Restored",
-    "alarmJamming": "Jamming",
-    "alarmTemperature": "Temperature",
-    "alarmParking": "Parking",
-    "alarmBonnet": "Bonnet",
-    "alarmFootBrake": "Foot Brake",
-    "alarmFuelLeak": "Fuel Leak",
-    "alarmTampering": "Tampering",
-    "alarmRemoving": "Removing",
+    "alarmGeofenceEnter": "Ankom geofence",
+    "alarmGeofenceExit": "Lämnade geofence",
+    "alarmGpsAntennaCut": "Avklippt GPS-antenn",
+    "alarmAccident": "Olycka",
+    "alarmTow": "Bogsera",
+    "alarmIdle": "På tomgång",
+    "alarmHighRpm": "Högt motorvarv",
+    "alarmHardAcceleration": "Hård acceleration",
+    "alarmHardBraking": "Hård inbromsning",
+    "alarmHardCornering": "Hård kurvtagning",
+    "alarmLaneChange": "Körfältsbyte",
+    "alarmFatigueDriving": "Trötthetskörning",
+    "alarmPowerCut": "Strömavbrott",
+    "alarmPowerRestored": "Strömmen återställd",
+    "alarmJamming": "Störning",
+    "alarmTemperature": "Temperatur",
+    "alarmParking": "Parkering",
+    "alarmBonnet": "Motorhuv",
+    "alarmFootBrake": "Fotbroms",
+    "alarmFuelLeak": "Bränsleläcka",
+    "alarmTampering": "Manupulering",
+    "alarmRemoving": "Borttagning",
     "notificationType": "Typ av notis",
-    "notificationAlways": "All Devices",
-    "notificationNotificators": "Channels",
-    "notificatorWeb": "Web",
-    "notificatorMail": "Mail",
+    "notificationAlways": "Alla enheter",
+    "notificationNotificators": "Kanaler",
+    "notificatorWeb": "Webb",
+    "notificatorMail": "Emejl",
     "notificatorSms": "SMS",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
     "notificatorTelegram": "Telegram",
     "notificatorPushover": "Pushover",
-    "reportReplay": "Replay",
+    "reportReplay": "Svara",
     "reportRoute": "Rutt",
     "reportEvents": "Händelser",
     "reportTrips": "Resor",
     "reportStops": "Stop",
     "reportSummary": "Sammanfattning",
-    "reportDaily": "Daily Summary",
+    "reportDaily": "Daglig summering",
     "reportChart": "Diagram",
     "reportConfigure": "Konfigurera",
     "reportEventTypes": "Händelsetyp",
     "reportChartType": "Diagramtyp",
     "reportShowMarkers": "Visa markörer",
     "reportExport": "Export",
-    "reportEmail": "Email Report",
+    "reportEmail": "Emailrepport",
     "reportPeriod": "Period",
-    "reportCustom": "Custom",
-    "reportToday": "Today",
-    "reportYesterday": "Yesterday",
-    "reportThisWeek": "This Week",
-    "reportPreviousWeek": "Previous Week",
-    "reportThisMonth": "This Month",
-    "reportPreviousMonth": "Previous Month",
+    "reportCustom": "Anpassad",
+    "reportToday": "Idag",
+    "reportYesterday": "Igår",
+    "reportThisWeek": "Denna veckan",
+    "reportPreviousWeek": "Förra veckan",
+    "reportThisMonth": "Denna månaden",
+    "reportPreviousMonth": "Förra månaden",
     "reportDeviceName": "Enhetsnamn",
     "reportAverageSpeed": "Genomsnittshastighet",
     "reportMaximumSpeed": "Maxhastighet",
     "reportEngineHours": "Motortimmar",
     "reportDuration": "Varaktighet",
-    "reportStartDate": "Start Date",
+    "reportStartDate": "Startdatum",
     "reportStartTime": "Starttid",
     "reportStartAddress": "Startadress",
     "reportEndTime": "Sluttid",
     "reportEndAddress": "Slutadress",
     "reportSpentFuel": "Förbrukat bränsle",
     "reportStartOdometer": "Odometer Start",
-    "reportEndOdometer": "Odometer End",
+    "reportEndOdometer": "Odometer Slut",
     "statisticsTitle": "Statistik",
     "statisticsCaptureTime": "Inspelningstid",
     "statisticsActiveUsers": "Aktiva användare",
@@ -534,9 +548,9 @@
     "categoryPlane": "Flygplan",
     "categoryShip": "Fartyg",
     "categoryTractor": "Traktor",
-    "categoryTrain": "Train",
-    "categoryTram": "Tram",
-    "categoryTrolleybus": "Trolleybus",
+    "categoryTrain": "Täg",
+    "categoryTram": "Spårvagn",
+    "categoryTrolleybus": "Trådbuss",
     "categoryTruck": "Lastbil",
     "categoryVan": "Van",
     "categoryScooter": "Scooter",
diff --git a/modern/src/resources/l10n/ta.json b/modern/src/resources/l10n/ta.json
index f5a33486..9019b1b9 100644
--- a/modern/src/resources/l10n/ta.json
+++ b/modern/src/resources/l10n/ta.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "வேக வரம்பு",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: நிலை காரணிகள் மறை",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "பிழை",
     "errorGeneral": "தவறான அளவுருக்கள் அல்லது தடைகள் மீறல்",
     "errorConnection": "இணைப்புப் பிழை",
@@ -182,7 +184,10 @@
     "loginLogout": "வெளியேறு",
     "loginLogo": "இலட்சினை ",
     "devicesAndState": "கருவிகள் மற்றும் அதன் நிலை",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "சாதனம்",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "அடையாளங்காட்டி",
     "deviceModel": "மாதிரி",
     "deviceContact": "தொடர்பு",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "தொகுதி அலகு",
     "settingsTwelveHourFormat": "12 மணி நேர வடிவம்",
     "settingsCoordinateFormat": "வடிவமைப்பை ஒருங்கிணைக்கிறது",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "அறிக்கை",
     "reportDevice": "சாதனம்",
     "reportGroup": "குழு",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "கார்ட்டோ வரைபடங்கள்",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "பிங் வரைபட கீ",
     "mapBingRoad": "பிங் சாலை வரைபடம்",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI லேயர்",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "நிலை",
     "stateName": "சாட்டு",
     "stateValue": "மதிப்பு",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "இயக்குணர் மாற்றப்பட்டது",
     "eventMedia": "Media",
     "eventsScrollToLast": "நீடிக்கும்",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "பொது",
     "alarmSos": "அவசர உதவி ",
     "alarmVibration": "அதிர்வு",
diff --git a/modern/src/resources/l10n/th.json b/modern/src/resources/l10n/th.json
index 0a1ded17..9ea148b3 100644
--- a/modern/src/resources/l10n/th.json
+++ b/modern/src/resources/l10n/th.json
@@ -112,6 +112,7 @@
     "calendarThursday": "วันพฤหัสบดี",
     "calendarFriday": "วันศุกร์",
     "calendarSaturday": "วันเสาร์",
+    "attributeShowGeofences": "แสดงขอบเขตภูมิศาสตร์",
     "attributeSpeedLimit": "จำกัดความเร็ว",
     "attributeFuelDropThreshold": "เกณฑ์การลดของเชื้อเพลิง",
     "attributeFuelIncreaseThreshold": "เกณฑ์การเพิ่มของเชื้อเพลิง",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: ซ่อนตำแหน่งลักษณะ",
     "attributeUiDisableLoginLanguage": "UI: ปิดการใช้งานภาษาเข้าสู่ระบบ",
     "attributeNotificationTokens": "โทเค็นการแจ้งเตือน",
+    "attributePopupInfo": "ป๊อปอัปข้อมูล",
     "errorTitle": "ผิดพลาด",
     "errorGeneral": "ไม่ถูกต้องพารามิเตอร์หรือ จำกัด การละเมิด",
     "errorConnection": "การเชื่อมต่อผิดพลาด",
@@ -182,7 +184,10 @@
     "loginLogout": "ออกจากระบบ",
     "loginLogo": "Logo",
     "devicesAndState": "อุปกรณ์และสถานะ",
+    "deviceSelected": "อุปกรณ์ที่เลือก",
     "deviceTitle": "เครื่อง/อุปกรณ์",
+    "devicePrimaryInfo": "ชื่ออุปกรณ์",
+    "deviceSecondaryInfo": "รายละเอียดอุปกรณ์",
     "deviceIdentifier": "ระบุเลขอุปกรณ์",
     "deviceModel": "รุ่น",
     "deviceContact": "เบอร์ติดต่อ",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "หน่วยจำนวน",
     "settingsTwelveHourFormat": "รูปแบบเวลา 12 ชั่วโมง",
     "settingsCoordinateFormat": "รูปแบบพิกัด",
+    "settingsServerVersion": "เวอร์ชั่นเซิร์ฟเวอร์",
+    "settingsAppVersion": "เวอร์ชั่นแอพ",
+    "settingsConnection": "การเชื่อมต่อ",
     "reportTitle": "รายงาน",
     "reportDevice": "รายงานเครื่อง/อุปกรณ์",
     "reportGroup": "กลุ่ม",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "แผนที่ที่กำหนดเอง",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps สำคัญ",
     "mapBingRoad": "Bing Maps ถนน",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "การจัดกลุ่มเครื่องหมาย",
     "mapOnSelect": "แสดงแผนที่บริเวณที่เลือก",
+    "mapDefault": "แผนที่เริ่มต้น",
     "stateTitle": "สถานะ",
     "stateName": "พารามิเตอร์",
     "stateValue": "มูลค่า",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "เปลี่ยนคนขับ",
     "eventMedia": "สื่อ",
     "eventsScrollToLast": "เลื่อนไปที่ล่าสุด",
+    "eventsSoundEvents": "เสียงเหตุการณ์",
+    "eventsSoundAlarms": "เสียงปลุก",
     "alarmGeneral": "ทั่วไป",
     "alarmSos": "SOS",
     "alarmVibration": "สั่นสะเทือน",
diff --git a/modern/src/resources/l10n/tr.json b/modern/src/resources/l10n/tr.json
index f8169f58..35a04518 100644
--- a/modern/src/resources/l10n/tr.json
+++ b/modern/src/resources/l10n/tr.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Hız Limiti",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "Konum Özniteliklerini Gizle",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Hata",
     "errorGeneral": "Geçersiz parametre veya kısıtlama ihlali",
     "errorConnection": "Bağlantı Hatası",
@@ -182,7 +184,10 @@
     "loginLogout": "Oturumu sonlandır",
     "loginLogo": "Logo",
     "devicesAndState": "Cihazlar ve Bölge",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Cihazlar",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Kimlik",
     "deviceModel": "Model",
     "deviceContact": "İletişim",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Hacim Birimi",
     "settingsTwelveHourFormat": "12 saat formatı",
     "settingsCoordinateFormat": "Koordinat Formatı",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Raporlar",
     "reportDevice": "Aygıt",
     "reportGroup": "Grup",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Katmanı",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Bölge",
     "stateName": "Özellik",
     "stateValue": "Değer",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Sürücü değişti",
     "eventMedia": "Media",
     "eventsScrollToLast": "Sona Git",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "Acil Yardım",
     "alarmVibration": "Sarsıntı",
diff --git a/modern/src/resources/l10n/uk.json b/modern/src/resources/l10n/uk.json
index af76efcb..914e356f 100644
--- a/modern/src/resources/l10n/uk.json
+++ b/modern/src/resources/l10n/uk.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Обмеження швидкості",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Приховувати атрибути",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Помилка",
     "errorGeneral": "Неправильні параметри або порушення обмежень",
     "errorConnection": "Помилка з'єднання",
@@ -182,7 +184,10 @@
     "loginLogout": "Вийти",
     "loginLogo": "Логотип",
     "devicesAndState": "Пристрої та стан",
+    "deviceSelected": "Selected Device",
     "deviceTitle": " Прилади",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Iдентифікатор",
     "deviceModel": "Модель",
     "deviceContact": "Контакт",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Одиниця об'єму",
     "settingsTwelveHourFormat": "12-годинний формат",
     "settingsCoordinateFormat": "Формат координат",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Звіти",
     "reportDevice": "Пристрій ",
     "reportGroup": "Група",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Ключ Bing Maps ",
     "mapBingRoad": "Bing Maps Дороги",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "Шар POI",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Стан",
     "stateName": "Атрибут",
     "stateValue": "Значення ",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Водій змінений",
     "eventMedia": "Media",
     "eventsScrollToLast": "Прокрутка до кінця",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "Загальне",
     "alarmSos": "SOS",
     "alarmVibration": "Вібрація",
diff --git a/modern/src/resources/l10n/uz.json b/modern/src/resources/l10n/uz.json
index d6e2c416..e614657a 100644
--- a/modern/src/resources/l10n/uz.json
+++ b/modern/src/resources/l10n/uz.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Speed Limit",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Хато",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Уланишда хато",
@@ -182,7 +184,10 @@
     "loginLogout": "Чиқиш",
     "loginLogo": "Логотип",
     "devicesAndState": "Қурилмалар ва Ҳолатлар",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Қурилмалар",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Идентификатор",
     "deviceModel": "Модел",
     "deviceContact": "Алоқа воситаси",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "12-соатли формат",
     "settingsCoordinateFormat": "Координаталар формати",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Ҳисоботлар",
     "reportDevice": "Қурилма",
     "reportGroup": "Гуруҳ",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps калити",
     "mapBingRoad": "Bing Maps йўллар",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Ҳолат",
     "stateName": "Параметр",
     "stateValue": "Маъноси",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Scroll To Last",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/vi.json b/modern/src/resources/l10n/vi.json
index f2bb6c30..7829cf0b 100644
--- a/modern/src/resources/l10n/vi.json
+++ b/modern/src/resources/l10n/vi.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "Giới hạn tốc độ",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "Lỗi",
     "errorGeneral": "Tham số không hợp lệ hoặc hạn chế vi phạm",
     "errorConnection": "Lỗi kết nối",
@@ -182,7 +184,10 @@
     "loginLogout": "Đăng xuất",
     "loginLogo": "Biểu tượng",
     "devicesAndState": "Các thiết bị và trạng thái",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "Các thiết bị",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "Định danh",
     "deviceModel": "Mẫu",
     "deviceContact": "Liên hệ",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "Định dạng 12h",
     "settingsCoordinateFormat": "Cấu chúc tọa độ",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "Báo cáo",
     "reportDevice": "Thiết bị",
     "reportGroup": "Nhóm",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing Maps Key",
     "mapBingRoad": "Bing Maps Road",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "Trạng thái",
     "stateName": "Thuộc tính",
     "stateValue": "Giá trị",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "Kéo xuống cuối",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",
diff --git a/modern/src/resources/l10n/zh.json b/modern/src/resources/l10n/zh.json
index 67db25dd..762b299f 100644
--- a/modern/src/resources/l10n/zh.json
+++ b/modern/src/resources/l10n/zh.json
@@ -7,16 +7,16 @@
     "sharedAdd": "添加",
     "sharedEdit": "编辑",
     "sharedRemove": "删除",
-    "sharedRemoveConfirm": "要删除选中项吗？",
-    "sharedNoData": "No data",
+    "sharedRemoveConfirm": "删除选中项？",
+    "sharedNoData": "没有数据",
     "sharedYes": "是",
     "sharedNo": "否",
     "sharedKm": "千米",
-    "sharedMi": "海里",
+    "sharedMi": "英里",
     "sharedNmi": "海里",
-    "sharedMeters": "m",
-    "sharedFeet": "ft",
-    "sharedKn": "节（海里/小时）",
+    "sharedMeters": "米",
+    "sharedFeet": "英尺",
+    "sharedKn": "节",
     "sharedKmh": "千米/小时",
     "sharedMph": "英里/小时",
     "sharedHour": "小时",
@@ -25,16 +25,16 @@
     "sharedDays": "天",
     "sharedHours": "小时",
     "sharedMinutes": "分钟",
-    "sharedDecimalDegrees": "十进制角度",
-    "sharedDegreesDecimalMinutes": "十进制分钟",
-    "sharedDegreesMinutesSeconds": "十进制秒",
+    "sharedDecimalDegrees": "度",
+    "sharedDegreesDecimalMinutes": "度分",
+    "sharedDegreesMinutesSeconds": "度分秒",
     "sharedName": "名称",
     "sharedDescription": "描述",
     "sharedSearch": "搜索",
-    "sharedIconScale": "Icon Scale",
-    "sharedGeofence": "电子围栏",
-    "sharedGeofences": "电子围栏",
-    "sharedCreateGeofence": "Create Geofence",
+    "sharedIconScale": "图标比例",
+    "sharedGeofence": "围栏",
+    "sharedGeofences": "围栏",
+    "sharedCreateGeofence": "创建围栏",
     "sharedNotifications": "通知",
     "sharedNotification": "通知",
     "sharedAttributes": "属性",
@@ -42,98 +42,99 @@
     "sharedDrivers": "驾驶员",
     "sharedDriver": "驾驶员",
     "sharedArea": "区域",
-    "sharedSound": "通知声音",
+    "sharedSound": "通知铃声",
     "sharedType": "类型",
     "sharedDistance": "里程",
     "sharedHourAbbreviation": "小时",
     "sharedMinuteAbbreviation": "分",
     "sharedSecondAbbreviation": "秒",
-    "sharedVoltAbbreviation": "V",
-    "sharedLiterAbbreviation": "I",
-    "sharedGallonAbbreviation": "gal",
-    "sharedLiter": "公升",
-    "sharedImpGallon": "进口加仑",
-    "sharedUsGallon": "US加仑",
-    "sharedLiterPerHourAbbreviation": "l/h",
+    "sharedVoltAbbreviation": "伏",
+    "sharedLiterAbbreviation": "升",
+    "sharedGallonAbbreviation": "加仑",
+    "sharedLiter": "升",
+    "sharedImpGallon": "英制加仑",
+    "sharedUsGallon": "美制加仑",
+    "sharedLiterPerHourAbbreviation": "升/小时",
     "sharedGetMapState": "获取地图状态",
     "sharedComputedAttribute": "计算属性",
     "sharedComputedAttributes": "计算属性",
     "sharedCheckComputedAttribute": "确认计算属性",
-    "sharedExpression": "表达",
+    "sharedExpression": "表达式",
     "sharedDevice": "设备",
-    "sharedTest": "Test",
+    "sharedTest": "测试",
     "sharedTestNotification": "发送测试通知",
-    "sharedTestNotificators": "Test Channels",
-    "sharedTestExpression": "Test Expression",
+    "sharedTestNotificators": "测试通道",
+    "sharedTestExpression": "测试表达式",
     "sharedCalendar": "日历",
     "sharedCalendars": "日历",
     "sharedFile": "文件",
-    "sharedSearchDevices": "Search Devices",
-    "sharedSortBy": "Sort By",
-    "sharedFilterMap": "Filter on Map",
+    "sharedSearchDevices": "搜索设备",
+    "sharedSortBy": "排序方式",
+    "sharedFilterMap": "在地图上筛选",
     "sharedSelectFile": "选择文件",
     "sharedPhone": "电话",
     "sharedRequired": "必填",
-    "sharedPreferences": "个性化设置",
+    "sharedPreferences": "首选项",
     "sharedPermissions": "权限",
-    "sharedConnections": "链接",
+    "sharedConnections": "关联",
     "sharedExtra": "附加",
-    "sharedPrimary": "Primary",
-    "sharedSecondary": "Secondary",
+    "sharedPrimary": "设备信息首行",
+    "sharedSecondary": "设备信息次行",
     "sharedTypeString": "字符串",
     "sharedTypeNumber": "数字",
     "sharedTypeBoolean": "布尔",
     "sharedTimezone": "时区",
     "sharedInfoTitle": "信息",
     "sharedSavedCommand": "保存指令",
-    "sharedSavedCommands": "保存指令",
+    "sharedSavedCommands": "指令表",
     "sharedNew": "新建",
     "sharedShowAddress": "显示地址",
     "sharedShowDetails": "详情请见",
-    "sharedDisabled": "关闭",
+    "sharedDisabled": "禁用",
     "sharedMaintenance": "维护",
     "sharedDeviceAccumulators": "蓄电池",
-    "sharedAlarms": "报警",
+    "sharedAlarms": "警报",
     "sharedLocation": "位置",
-    "sharedImport": "接入",
-    "sharedColumns": "Columns",
-    "sharedDropzoneText": "Drag and drop a file here or click",
-    "calendarSimple": "Simple",
-    "calendarRecurrence": "Recurrence",
-    "calendarOnce": "Once",
-    "calendarDaily": "Daily",
-    "calendarWeekly": "Weekly",
-    "calendarMonthly": "Monthly",
-    "calendarDays": "Days",
-    "calendarSunday": "Sunday",
-    "calendarMonday": "Monday",
-    "calendarTuesday": "Tuesday",
-    "calendarWednesday": "Wednesday",
-    "calendarThursday": "Thursday",
-    "calendarFriday": "Friday",
-    "calendarSaturday": "Saturday",
+    "sharedImport": "导入",
+    "sharedColumns": "显示列",
+    "sharedDropzoneText": "将文件拖放到此处或者单击",
+    "calendarSimple": "简单",
+    "calendarRecurrence": "复现",
+    "calendarOnce": "单次",
+    "calendarDaily": "每日",
+    "calendarWeekly": "每周",
+    "calendarMonthly": "每月",
+    "calendarDays": "天",
+    "calendarSunday": "周日",
+    "calendarMonday": "周一",
+    "calendarTuesday": "周二",
+    "calendarWednesday": "周三",
+    "calendarThursday": "周四",
+    "calendarFriday": "周五",
+    "calendarSaturday": "周六",
+    "attributeShowGeofences": "显示围栏",
     "attributeSpeedLimit": "速度限制",
-    "attributeFuelDropThreshold": "Fuel Drop Threshold",
-    "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
-    "attributePolylineDistance": "折线距离",
+    "attributeFuelDropThreshold": "燃油下降阈值",
+    "attributeFuelIncreaseThreshold": "燃油增加阈值",
+    "attributePolylineDistance": "折线里程",
     "attributeReportIgnoreOdometer": "报告：忽略里程表",
-    "attributeWebReportColor": "页面：报告颜色",
+    "attributeWebReportColor": "网页：报告颜色",
     "attributeDevicePassword": "设备密码",
-    "attributeDeviceImage": "Device Image",
+    "attributeDeviceImage": "设备图片",
     "attributeDeviceInactivityStart": "设备无响应起始",
-    "attributeDeviceInactivityPeriod": "设备无响应时期",
+    "attributeDeviceInactivityPeriod": "设备无响应时段",
     "attributeProcessingCopyAttributes": "处理中：复制属性",
     "attributeColor": "颜色",
-    "attributeWebLiveRouteLength": "页面：活动路径长度",
-    "attributeWebSelectZoom": "页面：放大所选择的",
-    "attributeWebMaxZoom": "放大至最大",
-    "attributeTelegramChatId": "Telegram Chat ID",
-    "attributePushoverUserKey": "Pushover User Key",
-    "attributePushoverDeviceNames": "Pushover Device Names",
+    "attributeWebLiveRouteLength": "网页：活动路径长度",
+    "attributeWebSelectZoom": "网页：缩放选择项",
+    "attributeWebMaxZoom": "网页：最大的缩放",
+    "attributeTelegramChatId": "Telegram账号",
+    "attributePushoverUserKey": "Pushover用户密钥",
+    "attributePushoverDeviceNames": "Pushover设备名称",
     "attributeMailSmtpHost": "邮件：SMTP主机",
     "attributeMailSmtpPort": "邮件：SMTP端口",
     "attributeMailSmtpStarttlsEnable": "邮件：SMTP STARTTLS开启",
-    "attributeMailSmtpStarttlsRequired": "邮件：SMTP STARTTLS需要开启",
+    "attributeMailSmtpStarttlsRequired": "邮件：SMTP STARTTLS必填",
     "attributeMailSmtpSslEnable": "邮件：SMTP SSL开启",
     "attributeMailSmtpSslTrust": "邮件：SMTP SSL信任",
     "attributeMailSmtpSslProtocols": "邮件：SMTP SSL协议",
@@ -141,22 +142,23 @@
     "attributeMailSmtpAuth": "邮件：SMTP认证开启",
     "attributeMailSmtpUsername": "邮件：SMTP用户名",
     "attributeMailSmtpPassword": "邮件：SMTP密码",
-    "attributeUiDisableAttributes": "UI: Disable Attributes",
-    "attributeUiDisableGroups": "UI: Disable Groups",
-    "attributeUiDisableEvents": "关闭事件",
-    "attributeUiDisableVehicleFetures": "关闭车辆特性",
-    "attributeUiDisableDrivers": "关闭驾驶员",
-    "attributeUiDisableComputedAttributes": "关闭计算属性",
-    "attributeUiDisableCalendars": "关闭日历",
-    "attributeUiDisableMaintenance": "禁止维护",
-    "attributeUiHidePositionAttributes": "隐藏位置属性",
-    "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
-    "attributeNotificationTokens": "通知标识",
+    "attributeUiDisableAttributes": "用户界面：禁用属性",
+    "attributeUiDisableGroups": "用户界面：禁用分组",
+    "attributeUiDisableEvents": "用户界面：禁用事件",
+    "attributeUiDisableVehicleFetures": "用户界面：禁用车辆特性",
+    "attributeUiDisableDrivers": "用户界面：禁用驾驶员",
+    "attributeUiDisableComputedAttributes": "用户界面：禁用计算属性",
+    "attributeUiDisableCalendars": "用户界面：禁用日历",
+    "attributeUiDisableMaintenance": "用户界面：禁用维护",
+    "attributeUiHidePositionAttributes": "用户界面：隐藏位置属性",
+    "attributeUiDisableLoginLanguage": "用户界面：禁用登录语言",
+    "attributeNotificationTokens": "通知令牌",
+    "attributePopupInfo": "弹出信息",
     "errorTitle": "错误",
     "errorGeneral": "无效参数",
     "errorConnection": "连接错误",
     "errorSocket": "网络通讯错误",
-    "errorZero": "不能为0",
+    "errorZero": "不能为零",
     "userEmail": "邮箱",
     "userPassword": "密码",
     "userAdmin": "管理员",
@@ -165,31 +167,34 @@
     "userDeviceLimit": "设备限制",
     "userUserLimit": "用户限制",
     "userDeviceReadonly": "设备只读",
-    "userLimitCommands": "限制指令",
-    "userDisableReports": "Disable Reports",
-    "userFixedEmail": "No Email Change",
+    "userLimitCommands": "禁用指令",
+    "userDisableReports": "禁用报表",
+    "userFixedEmail": "禁止更改邮箱",
     "userToken": "令牌",
-    "userDeleteAccount": "Delete Account",
+    "userDeleteAccount": "删除账户",
     "loginTitle": "登录",
     "loginLanguage": "语言",
     "loginReset": "密码重设",
     "loginRegister": "注册",
     "loginLogin": "登录",
-    "loginFailed": "邮箱或密码不对",
-    "loginCreated": "该用户已经被注册了",
-    "loginResetSuccess": "邮件查询",
-    "loginUpdateSuccess": "新密码已重置",
+    "loginFailed": "邮箱或密码错误",
+    "loginCreated": "新用户已注册成功",
+    "loginResetSuccess": "查看您的电子邮件",
+    "loginUpdateSuccess": "密码已重置",
     "loginLogout": "注销",
     "loginLogo": "图标",
     "devicesAndState": "设备和状态",
+    "deviceSelected": "已选设备",
     "deviceTitle": "设备",
-    "deviceIdentifier": "编码",
+    "devicePrimaryInfo": "设备名称",
+    "deviceSecondaryInfo": "设备详情",
+    "deviceIdentifier": "标识符",
     "deviceModel": "型号",
     "deviceContact": "联系人",
     "deviceCategory": "类别",
     "deviceLastUpdate": "最后更新时间",
-    "deviceCommand": "下发指令",
-    "deviceFollow": "跟踪",
+    "deviceCommand": "指令",
+    "deviceFollow": "跟随",
     "deviceTotalDistance": "总里程",
     "deviceStatus": "状态",
     "deviceStatusOnline": "在线",
@@ -203,40 +208,43 @@
     "settingsGroups": "分组",
     "settingsServer": "服务器",
     "settingsUsers": "用户",
-    "settingsDistanceUnit": "距离单元",
-    "settingsAltitudeUnit": "Altitude Unit",
-    "settingsSpeedUnit": "速度单元",
-    "settingsVolumeUnit": "声音单元",
+    "settingsDistanceUnit": "里程单位",
+    "settingsAltitudeUnit": "海拔单位",
+    "settingsSpeedUnit": "速度单位",
+    "settingsVolumeUnit": "体积单位",
     "settingsTwelveHourFormat": "12小时制",
     "settingsCoordinateFormat": "坐标格式",
-    "reportTitle": "统计报表",
+    "settingsServerVersion": "服务器版本",
+    "settingsAppVersion": "应用版本",
+    "settingsConnection": "连接",
+    "reportTitle": "报表",
     "reportDevice": "设备",
     "reportGroup": "分组",
-    "reportFrom": "开始",
+    "reportFrom": "起始",
     "reportTo": "结束",
     "reportShow": "查询",
     "reportClear": "清空",
-    "linkGoogleMaps": "Google Maps",
-    "linkAppleMaps": "Apple Maps",
-    "linkStreetView": "Street View",
-    "positionFixTime": "Fix Time",
-    "positionDeviceTime": "Device Time",
-    "positionServerTime": "Server Time",
+    "linkGoogleMaps": "谷歌地图",
+    "linkAppleMaps": "苹果地图",
+    "linkStreetView": "街景",
+    "positionFixTime": "修正时间",
+    "positionDeviceTime": "设备时间",
+    "positionServerTime": "服务器时间",
     "positionValid": "有效",
     "positionAccuracy": "精度",
     "positionLatitude": "纬度",
     "positionLongitude": "经度",
     "positionAltitude": "海拔",
     "positionSpeed": "速度",
-    "positionCourse": "航向",
+    "positionCourse": "行驶方向",
     "positionAddress": "地址",
     "positionProtocol": "协议",
-    "positionDistance": "距离",
+    "positionDistance": "里程",
     "positionRpm": "转速",
-    "positionFuel": "燃料",
+    "positionFuel": "燃油",
     "positionPower": "电源",
-    "positionBattery": "电量",
-    "positionRaw": "Raw",
+    "positionBattery": "电池",
+    "positionRaw": "原生数据",
     "positionIndex": "索引",
     "positionHdop": "水平精度",
     "positionVdop": "垂直精度",
@@ -244,71 +252,74 @@
     "positionSat": "卫星",
     "positionSatVisible": "可见卫星",
     "positionRssi": "接收信号强度",
-    "positionGps": "GPS",
-    "positionRoaming": "漫游中",
+    "positionGps": "全球定位系统",
+    "positionRoaming": "漫游",
     "positionEvent": "事件",
-    "positionAlarm": "报警",
+    "positionAlarm": "警报",
     "positionStatus": "状态",
     "positionOdometer": "里程表",
     "positionServiceOdometer": "服务里程表",
-    "positionTripOdometer": "里程表",
+    "positionTripOdometer": "行程里程表",
     "positionHours": "小时",
     "positionSteps": "步骤",
     "positionInput": "输入",
     "positionOutput": "输出",
-    "positionBatteryLevel": "电量级别",
-    "positionFuelConsumption": "耗油率",
-    "positionRfid": "RFID",
+    "positionBatteryLevel": "电池电量",
+    "positionFuelConsumption": "油耗",
+    "positionRfid": "射频识别",
     "positionVersionFw": "固件版本",
     "positionVersionHw": "硬件版本",
     "positionIgnition": "点火",
-    "positionFlags": "Flags",
+    "positionFlags": "标记",
     "positionCharge": "充电",
-    "positionIp": "IP",
+    "positionIp": "IP地址",
     "positionArchive": "档案",
     "positionVin": "车辆识别码",
     "positionApproximate": "近似值",
-    "positionThrottle": "Throttle",
-    "positionMotion": "运动",
+    "positionThrottle": "油门",
+    "positionMotion": "移动",
     "positionArmed": "Armed",
     "positionAcceleration": "加速度",
-    "positionTemp": "Temperature",
+    "positionTemp": "温度",
     "positionDeviceTemp": "设备温度",
     "positionOperator": "操作员",
     "positionCommand": "指令",
-    "positionBlocked": "Blocked",
-    "positionDtcs": "DCTs",
+    "positionBlocked": "屏蔽",
+    "positionDtcs": "双离合变速箱",
     "positionObdSpeed": "OBD速度",
     "positionObdOdometer": "OBD里程表",
-    "positionDriverUniqueId": "驾驶员统一ID",
+    "positionDriverUniqueId": "驾驶员独有ID",
     "positionImage": "图片",
-    "positionVideo": "Video",
-    "positionAudio": "声音",
+    "positionVideo": "视频",
+    "positionAudio": "音频",
     "serverTitle": "服务器设置",
     "serverZoom": "缩放",
     "serverRegistration": "注册",
     "serverReadonly": "只读",
     "serverForceSettings": "强制设置",
-    "serverAnnouncement": "通知",
+    "serverAnnouncement": "公告",
     "mapTitle": "地图",
-    "mapActive": "Active Maps",
-    "mapOverlay": "Map Overlay",
-    "mapOverlayCustom": "Custom Overlay",
-    "mapOpenSeaMap": "OpenSeaMap",
-    "mapOpenWeatherKey": "OpenWeather API Key",
-    "mapOpenWeatherClouds": "OpenWeather Clouds",
-    "mapOpenWeatherPrecipitation": "OpenWeather Precipitation",
-    "mapOpenWeatherPressure": "OpenWeather Pressure",
-    "mapOpenWeatherWind": "OpenWeather Wind",
-    "mapOpenWeatherTemperature": "OpenWeather Temperature",
+    "mapActive": "已选地图",
+    "mapOverlay": "地图叠层",
+    "mapOverlayCustom": "自定义叠层",
+    "mapOpenSeaMap": "OpenSea地图",
+    "mapOpenWeatherKey": "OpenWeather API密钥",
+    "mapOpenWeatherClouds": "OpenWeather云层图",
+    "mapOpenWeatherPrecipitation": "OpenWeather降水图",
+    "mapOpenWeatherPressure": "OpenWeather气压图",
+    "mapOpenWeatherWind": "OpenWeather风力图",
+    "mapOpenWeatherTemperature": "OpenWeather气温图",
     "mapLayer": "地图图层",
-    "mapCustom": "自定义（XYZ） ",
-    "mapCustomArcgis": "自定义（ArcGIS）",
+    "mapCustom": "自定义(XYZ)",
+    "mapCustomArcgis": "自定义(ArcGIS)",
     "mapCustomLabel": "自定义地图",
-    "mapCarto": "Carto Basemaps",
-    "mapOsm": "OpenStreetMap",
-    "mapOpenTopoMap": "OpenTopoMap",
-    "mapBingKey": "必应重点地图",
+    "mapCarto": "Carto基础地图",
+    "mapOsm": "OpenStreet地图",
+    "mapGoogleRoad": "谷歌道路地图",
+    "mapGoogleHybrid": "谷歌混合地图",
+    "mapGoogleSatellite": "谷歌卫星地图",
+    "mapOpenTopoMap": "OpenTopo地图",
+    "mapBingKey": "必应地图密钥",
     "mapBingRoad": "必应公路地图",
     "mapBingAerial": "必应航测地图",
     "mapBingHybrid": "必应混合地图",
@@ -316,38 +327,39 @@
     "mapAutoNavi": " 高德地图",
     "mapYandexMap": "Yandex地图",
     "mapYandexSat": "Yandex卫星地图",
-    "mapWikimedia": "维基",
-    "mapOrdnanceSurvey": "Ordnance Survey",
+    "mapWikimedia": "维基媒体",
+    "mapOrdnanceSurvey": " 全国地形测量",
     "mapMapboxStreets": "Mapbox街道",
     "mapMapboxOutdoors": "Mapbox外景",
-    "mapMapboxSatellite": "Mapbox卫星",
-    "mapMapboxKey": "Mapbox Access Token",
-    "mapMapTilerBasic": "MapTiler Basic",
-    "mapMapTilerHybrid": "MapTiler Hybrid",
-    "mapMapTilerKey": "MapTiler API Key",
-    "mapLocationIqStreets": "LocationIQ Streets",
-    "mapLocationIqKey": "LocationIQ Access Token",
-    "mapTomTomBasic": "TomTom Basic",
-    "mapTomTomFlow": "TomTom Traffic Flow",
-    "mapTomTomIncidents": "TomTom Traffic Incidents",
-    "mapTomTomKey": "TomTom API Key",
-    "mapHereBasic": "Here Basic",
-    "mapHereHybrid": "Here Hybrid",
-    "mapHereSatellite": "Here Satellite",
-    "mapHereFlow": "Here Traffic Flow",
-    "mapHereKey": "Here API Key",
+    "mapMapboxSatellite": "Mapbox卫星地图",
+    "mapMapboxKey": "地图框访问令牌",
+    "mapMapTilerBasic": "MapTiler基础地图",
+    "mapMapTilerHybrid": "MapTiler混合地图",
+    "mapMapTilerKey": "MapTiler API密钥",
+    "mapLocationIqStreets": "LocationIQ街道地图",
+    "mapLocationIqKey": "LocationIQ访问令牌",
+    "mapTomTomBasic": "TomTom基础地图",
+    "mapTomTomFlow": "TomTom交通路况",
+    "mapTomTomIncidents": "TomTom交通事故",
+    "mapTomTomKey": "TomTom API密钥",
+    "mapHereBasic": "Here基础地图",
+    "mapHereHybrid": "Here混合地图",
+    "mapHereSatellite": "Here卫星地图",
+    "mapHereFlow": "Here交通路况",
+    "mapHereKey": "Here API密钥",
     "mapShapePolygon": "多边形",
     "mapShapeCircle": "圆形",
-    "mapShapePolyline": "折线",
-    "mapLiveRoutes": "运动轨迹",
+    "mapShapePolyline": "多段线",
+    "mapLiveRoutes": "移动轨迹",
     "mapCurrentLocation": "当前位置",
     "mapPoiLayer": "POI层",
-    "mapClustering": "Markers Clustering",
-    "mapOnSelect": "Show Map on Selection",
+    "mapClustering": "合并车辆标记",
+    "mapOnSelect": "显示地图选项",
+    "mapDefault": "默认地图",
     "stateTitle": "状态",
     "stateName": "参数",
     "stateValue": "值",
-    "commandTitle": "下发指令",
+    "commandTitle": "指令",
     "commandSend": "发送",
     "commandSent": "指令已发送",
     "commandQueued": "指令已排队",
@@ -355,46 +367,46 @@
     "commandCustom": "自定义指令",
     "commandDeviceIdentification": "设备标识",
     "commandPositionSingle": "单个报告",
-    "commandPositionPeriodic": "位置获取",
-    "commandPositionStop": "位置停止",
+    "commandPositionPeriodic": "定期报告",
+    "commandPositionStop": "停止报告",
     "commandEngineStop": "引擎熄火",
-    "commandEngineResume": "引擎启动",
-    "commandAlarmArm": "部署报警",
-    "commandAlarmDisarm": "解除报警",
-    "commandAlarmDismiss": "停止警报",
+    "commandEngineResume": "引擎重启",
+    "commandAlarmArm": "部署警报",
+    "commandAlarmDisarm": "解除警报",
+    "commandAlarmDismiss": "消除警报",
     "commandSetTimezone": "设置时区",
     "commandRequestPhoto": "请求图片",
-    "commandPowerOff": "设备关机",
+    "commandPowerOff": "关闭设备",
     "commandRebootDevice": "重启设备",
     "commandFactoryReset": "恢复出厂设置",
     "commandSendSms": "发送短信",
     "commandSendUssd": "发送USSD",
     "commandSosNumber": "设置SOS号码",
     "commandSilenceTime": "设置静音时间",
-    "commandSetPhonebook": "设置电话本",
+    "commandSetPhonebook": "设置通讯录",
     "commandVoiceMessage": "语音信息",
     "commandOutputControl": "输出控制",
     "commandVoiceMonitoring": "语音监控",
     "commandSetAgps": "设置AGPS",
-    "commandSetIndicator": "设置指标",
+    "commandSetIndicator": "设置指示器",
     "commandConfiguration": "配置",
     "commandGetVersion": "获取版本",
     "commandFirmwareUpdate": "更新固件",
     "commandSetConnection": "设置连接",
     "commandSetOdometer": "设置里程表",
-    "commandGetModemStatus": "获取Modem状态",
+    "commandGetModemStatus": "获取调制解调器状态",
     "commandGetDeviceStatus": "获取设备状态",
     "commandSetSpeedLimit": "设置速度限制",
-    "commandModePowerSaving": "Power Saving Mode",
-    "commandModeDeepSleep": "Deep Sleep Mode",
-    "commandAlarmGeofence": "Set Geofence Alarm",
-    "commandAlarmBattery": "Set Battery Alarm",
-    "commandAlarmSos": "Set SOS Alarm",
-    "commandAlarmRemove": "Set Remove Alarm",
-    "commandAlarmClock": "Set Clock Alarm",
-    "commandAlarmSpeed": "Set Speed Alarm",
-    "commandAlarmFall": "Set Fall Alarm",
-    "commandAlarmVibration": "Set Vibration Alarm",
+    "commandModePowerSaving": "节能模式",
+    "commandModeDeepSleep": "睡眠模式",
+    "commandAlarmGeofence": "设置围栏警报",
+    "commandAlarmBattery": "设置电池警报",
+    "commandAlarmSos": "设置SOS警报",
+    "commandAlarmRemove": "设置删除警报",
+    "commandAlarmClock": "设置时钟警报",
+    "commandAlarmSpeed": "设置速度警报",
+    "commandAlarmFall": "设置跌落警报",
+    "commandAlarmVibration": "设置振动警报",
     "commandFrequency": "频率",
     "commandTimezone": "时区偏移",
     "commandMessage": "消息",
@@ -413,19 +425,21 @@
     "eventDeviceMoving": "设备移动中",
     "eventDeviceStopped": "设备已停止",
     "eventDeviceOverspeed": "超速限制",
-    "eventDeviceFuelDrop": "燃料液滴",
-    "eventDeviceFuelIncrease": "Fuel increase",
+    "eventDeviceFuelDrop": "燃油下降",
+    "eventDeviceFuelIncrease": "燃油增加",
     "eventCommandResult": "指令结果",
     "eventGeofenceEnter": "进入围栏",
     "eventGeofenceExit": "离开围栏",
-    "eventAlarm": "报警",
+    "eventAlarm": "警报",
     "eventIgnitionOn": "点火",
     "eventIgnitionOff": "熄火",
     "eventMaintenance": "需要维护",
     "eventTextMessage": "已接收文本信息",
-    "eventDriverChanged": "驾驶员已改变",
-    "eventMedia": "Media",
+    "eventDriverChanged": "驾驶员变更",
+    "eventMedia": "媒体",
     "eventsScrollToLast": "移至最后",
+    "eventsSoundEvents": "事件铃声",
+    "eventsSoundAlarms": "报警铃声",
     "alarmGeneral": "通常",
     "alarmSos": "求救",
     "alarmVibration": "振动",
@@ -433,7 +447,7 @@
     "alarmLowspeed": "低速",
     "alarmOverspeed": "超速",
     "alarmFallDown": "跌落",
-    "alarmLowPower": "低电源",
+    "alarmLowPower": "低功率",
     "alarmLowBattery": "低电量",
     "alarmFault": "故障",
     "alarmPowerOff": "关闭电源",
@@ -452,7 +466,7 @@
     "alarmHardAcceleration": "急加速",
     "alarmHardBraking": "急刹车",
     "alarmHardCornering": "急转弯",
-    "alarmLaneChange": "紧急变线",
+    "alarmLaneChange": "车道改变",
     "alarmFatigueDriving": "疲劳驾驶",
     "alarmPowerCut": "断电",
     "alarmPowerRestored": "电源恢复",
@@ -461,8 +475,8 @@
     "alarmParking": "停车中",
     "alarmBonnet": "阀盖",
     "alarmFootBrake": "脚踏制动器",
-    "alarmFuelLeak": "燃料泄漏",
-    "alarmTampering": "篡改",
+    "alarmFuelLeak": "燃油泄漏",
+    "alarmTampering": "干预",
     "alarmRemoving": "移除中",
     "notificationType": "通知类型",
     "notificationAlways": "所有设备",
@@ -472,23 +486,23 @@
     "notificatorSms": "短信",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
-    "notificatorTelegram": "Telegram",
+    "notificatorTelegram": "Telegram账号",
     "notificatorPushover": "Pushover",
-    "reportReplay": "重播",
+    "reportReplay": "轨迹回放",
     "reportRoute": "轨迹",
     "reportEvents": "事件",
     "reportTrips": "行程",
     "reportStops": "停留点",
-    "reportSummary": "概要",
+    "reportSummary": "总览",
     "reportDaily": "每日汇报",
     "reportChart": "图表",
-    "reportConfigure": "筛选条件",
+    "reportConfigure": "筛选",
     "reportEventTypes": "事件类型",
     "reportChartType": "图表类型",
     "reportShowMarkers": "显示图标",
     "reportExport": "导出",
     "reportEmail": "邮件发送",
-    "reportPeriod": "时期",
+    "reportPeriod": "时段",
     "reportCustom": "自定义",
     "reportToday": "今天",
     "reportYesterday": "昨天",
@@ -499,18 +513,18 @@
     "reportDeviceName": "设备名称",
     "reportAverageSpeed": "平均速度",
     "reportMaximumSpeed": "最大速度",
-    "reportEngineHours": "发动机时间",
+    "reportEngineHours": "发动机使用时间",
     "reportDuration": "持续时间",
-    "reportStartDate": "开始日",
+    "reportStartDate": "开始日期",
     "reportStartTime": "开始时间",
     "reportStartAddress": "开始地址",
     "reportEndTime": "结束时间",
     "reportEndAddress": "结束地址",
-    "reportSpentFuel": "燃料消耗",
-    "reportStartOdometer": "里程开始",
-    "reportEndOdometer": "里程结束",
+    "reportSpentFuel": "燃油消耗",
+    "reportStartOdometer": "起始里程",
+    "reportEndOdometer": "结束里程",
     "statisticsTitle": "统计",
-    "statisticsCaptureTime": "时间",
+    "statisticsCaptureTime": "获取时间",
     "statisticsActiveUsers": "活动用户",
     "statisticsActiveDevices": "活动设备",
     "statisticsRequests": "请求",
@@ -521,18 +535,18 @@
     "categoryArrow": "箭头",
     "categoryDefault": "默认",
     "categoryAnimal": "动物",
-    "categoryBicycle": "自行车",
-    "categoryBoat": "船",
+    "categoryBicycle": "单车",
+    "categoryBoat": "船只",
     "categoryBus": "巴士",
     "categoryCar": "汽车",
     "categoryCrane": "起重机",
     "categoryHelicopter": "直升机",
     "categoryMotorcycle": "摩托车",
     "categoryOffroad": "越野车",
-    "categoryPerson": "个人",
+    "categoryPerson": "人员",
     "categoryPickup": "皮卡",
     "categoryPlane": "飞机",
-    "categoryShip": "船",
+    "categoryShip": "游轮",
     "categoryTractor": "拖拉机",
     "categoryTrain": "火车",
     "categoryTram": "有轨电车",
@@ -540,6 +554,6 @@
     "categoryTruck": "卡车",
     "categoryVan": "厢式货车",
     "categoryScooter": "小型摩托车",
-    "maintenanceStart": "开始",
-    "maintenancePeriod": "时期"
+    "maintenanceStart": "开启",
+    "maintenancePeriod": "时段"
 }
\ No newline at end of file
diff --git a/modern/src/resources/l10n/zh_TW.json b/modern/src/resources/l10n/zh_TW.json
index fef24135..667c630c 100644
--- a/modern/src/resources/l10n/zh_TW.json
+++ b/modern/src/resources/l10n/zh_TW.json
@@ -112,6 +112,7 @@
     "calendarThursday": "Thursday",
     "calendarFriday": "Friday",
     "calendarSaturday": "Saturday",
+    "attributeShowGeofences": "Show Geofences",
     "attributeSpeedLimit": "速限",
     "attributeFuelDropThreshold": "Fuel Drop Threshold",
     "attributeFuelIncreaseThreshold": "Fuel Increase Threshold",
@@ -152,6 +153,7 @@
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "attributeUiDisableLoginLanguage": "UI: Disable Login Language",
     "attributeNotificationTokens": "Notification Tokens",
+    "attributePopupInfo": "Popup Info",
     "errorTitle": "錯誤",
     "errorGeneral": "非法的參數或違反限制",
     "errorConnection": "連線錯誤",
@@ -182,7 +184,10 @@
     "loginLogout": "登出",
     "loginLogo": "標識",
     "devicesAndState": "設備與狀態",
+    "deviceSelected": "Selected Device",
     "deviceTitle": "設備",
+    "devicePrimaryInfo": "Device Title",
+    "deviceSecondaryInfo": "Device Detail",
     "deviceIdentifier": "識別號碼",
     "deviceModel": "型號",
     "deviceContact": "聯絡人",
@@ -209,6 +214,9 @@
     "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "十二小時制",
     "settingsCoordinateFormat": "座標格式",
+    "settingsServerVersion": "Server Version",
+    "settingsAppVersion": "App Version",
+    "settingsConnection": "Connection",
     "reportTitle": "報告",
     "reportDevice": "設備",
     "reportGroup": "群組",
@@ -307,6 +315,9 @@
     "mapCustomLabel": "Custom map",
     "mapCarto": "CARTO 地圖",
     "mapOsm": "OpenStreetMap",
+    "mapGoogleRoad": "Google Road",
+    "mapGoogleHybrid": "Google Hybrid",
+    "mapGoogleSatellite": "Google Satellite",
     "mapOpenTopoMap": "OpenTopoMap",
     "mapBingKey": "Bing 地圖金鑰",
     "mapBingRoad": "Bing 道路地圖",
@@ -344,6 +355,7 @@
     "mapPoiLayer": "POI Layer",
     "mapClustering": "Markers Clustering",
     "mapOnSelect": "Show Map on Selection",
+    "mapDefault": "Default Map",
     "stateTitle": "狀態",
     "stateName": "名稱",
     "stateValue": "數值",
@@ -426,6 +438,8 @@
     "eventDriverChanged": "Driver changed",
     "eventMedia": "Media",
     "eventsScrollToLast": "卷軸已拉到底",
+    "eventsSoundEvents": "Sound Events",
+    "eventsSoundAlarms": "Sound Alarms",
     "alarmGeneral": "General",
     "alarmSos": "SOS",
     "alarmVibration": "Vibration",