Resolving conflicts with master

1 files changed, 18 insertions, 0 deletions

diff --git a/web/l10n/lt.json b/web/l10n/lt.json
index cc8e1e46..254df488 100644
--- a/web/l10n/lt.json
+++ b/web/l10n/lt.json
@@ -8,6 +8,8 @@
     "sharedEdit": "Redaguoti",
     "sharedRemove": "Ištrinti",
     "sharedRemoveConfirm": "Pašalinti objektą?",
+    "sharedYes": "Yes",
+    "sharedNo": "No",
     "sharedKm": "km",
     "sharedMi": "mi",
     "sharedNmi": "jurmylė",
@@ -63,6 +65,7 @@
     "sharedRequired": "Privalomas",
     "sharedPreferences": "Pasirinkimai",
     "sharedPermissions": "Leidimai",
+    "sharedConnections": "Connections",
     "sharedExtra": "Extra",
     "sharedTypeString": "Tekstas",
     "sharedTypeNumber": "Skaičius",
@@ -73,15 +76,20 @@
     "sharedSavedCommands": "Užsaugotos komandos",
     "sharedNew": "Naujas...",
     "sharedShowAddress": "Rodyti adresą",
+    "sharedShowDetails": "More Details",
     "sharedDisabled": "Išjungtas",
     "sharedMaintenance": "Aptarnavimas",
     "sharedDeviceAccumulators": "Accumulators",
     "sharedAlarms": "Alarms",
+    "sharedLocation": "Location",
+    "sharedImport": "Import",
     "attributeSpeedLimit": "Greičio limitas",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Ataskaita: Ignoruoti odometrą",
     "attributeWebReportColor": "Web: Ataskaitos spalva",
     "attributeDevicePassword": "Įrenginio slaptažodis",
+    "attributeDeviceInactivityStart": "Device Inactivity Start",
+    "attributeDeviceInactivityPeriod": "Device Inactivity Period",
     "attributeProcessingCopyAttributes": "Apdorojimas: Kopijuoti atributus",
     "attributeColor": "Spalva",
     "attributeWebLiveRouteLength": "Web: Tiesioginio maršruto ilgis",
@@ -106,6 +114,7 @@
     "attributeUiDisableCalendars": "UI: Išjungti kalendorius",
     "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Slėpti pozicijos adresą",
+    "attributeNotificationTokens": "Notification Tokens",
     "errorTitle": "Klaida",
     "errorGeneral": "Netinkami parametrai ar apribojimų pažeidimas",
     "errorConnection": "Ryšio klaida",
@@ -229,6 +238,7 @@
     "serverRegistration": "Registracija",
     "serverReadonly": "Skaitymo",
     "serverForceSettings": "Priverstiniai nustatymai",
+    "serverAnnouncement": "Announcement",
     "mapTitle": "Žemėlapis",
     "mapLayer": "Žemėlapio sluoksnis",
     "mapCustom": "Custom (XYZ)",
@@ -244,6 +254,9 @@
     "mapYandexMap": "Yandex žemėlapis",
     "mapYandexSat": "Yandex Palydovinis",
     "mapWikimedia": "Wikimedia",
+    "mapMapboxStreets": "Mapbox Streets",
+    "mapMapboxOutdoors": "Mapbox Outdoors",
+    "mapMapboxSatellite": "Mapbox Satellite",
     "mapShapePolygon": "Polygonas",
     "mapShapeCircle": "Apskritimas",
     "mapShapePolyline": "Polilinija",
@@ -266,6 +279,7 @@
     "commandEngineResume": "Paleisti variklį",
     "commandAlarmArm": "Uždėti signalą",
     "commandAlarmDisarm": "Nuimti signalą",
+    "commandAlarmDismiss": "Dismiss Alarm",
     "commandSetTimezone": "Nustatyti laiko zoną",
     "commandRequestPhoto": "Gauti nuotrauką",
     "commandPowerOff": "Power Off Device",
@@ -304,6 +318,7 @@
     "eventDeviceOnline": "Status online",
     "eventDeviceUnknown": "Status unknown",
     "eventDeviceOffline": "Status offline",
+    "eventDeviceInactive": "Device inactive",
     "eventDeviceMoving": "Device moving",
     "eventDeviceStopped": "Device stopped",
     "eventDeviceOverspeed": "Speed limit exceeded",
@@ -365,11 +380,13 @@
     "notificatorSms": "SMS",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
+    "reportReplay": "Replay",
     "reportRoute": "Maršrutas",
     "reportEvents": "Įvykiai",
     "reportTrips": "Kelionės",
     "reportStops": "Sustojimai",
     "reportSummary": "Suvestinė",
+    "reportDaily": "Daily Summary",
     "reportChart": "Diagrama",
     "reportConfigure": "Konfigūruoti",
     "reportEventTypes": "Įvykių tipai",
@@ -390,6 +407,7 @@
     "reportMaximumSpeed": "Maksimalus greitis",
     "reportEngineHours": "Variklio valandos",
     "reportDuration": "Trukmė",
+    "reportStartDate": "Start Date",
     "reportStartTime": "Pradžios laikas",
     "reportStartAddress": "Pradžios adresas",
     "reportEndTime": "Pabaigos laikas",