Resolving conflicts with master

1 files changed, 35 insertions, 17 deletions

diff --git a/web/l10n/lv.json b/web/l10n/lv.json
index a6612741..0d657067 100644
--- a/web/l10n/lv.json
+++ b/web/l10n/lv.json
@@ -8,6 +8,8 @@
     "sharedEdit": "Rediģēt",
     "sharedRemove": "Dzēst",
     "sharedRemoveConfirm": "Izdzēst?",
+    "sharedYes": "Jā",
+    "sharedNo": "Nē",
     "sharedKm": "km",
     "sharedMi": "jū",
     "sharedNmi": "nmi",
@@ -63,6 +65,7 @@
     "sharedRequired": "Obligāts",
     "sharedPreferences": "Izvēlnes",
     "sharedPermissions": "Atļaujas",
+    "sharedConnections": "Connections",
     "sharedExtra": "Ekstra",
     "sharedTypeString": "Teksts",
     "sharedTypeNumber": "Skaitlis",
@@ -73,15 +76,20 @@
     "sharedSavedCommands": "Saglabātās komandas",
     "sharedNew": "Jauns...",
     "sharedShowAddress": "Rādīt adresi",
+    "sharedShowDetails": "Vairāk detaļu",
     "sharedDisabled": "Atspējots",
     "sharedMaintenance": "Uzturēšana",
     "sharedDeviceAccumulators": "Akumulatori",
-    "sharedAlarms": "Alarms",
+    "sharedAlarms": "Trauksmes",
+    "sharedLocation": "Atrašanās vieta",
+    "sharedImport": "Import",
     "attributeSpeedLimit": "Ātruma ierobežojums",
     "attributePolylineDistance": "Maršruta Distance",
     "attributeReportIgnoreOdometer": "Ziņojums: Ignorēt Odometru",
     "attributeWebReportColor": "Web: Atskaites krāsa",
     "attributeDevicePassword": "Ierīces parole",
+    "attributeDeviceInactivityStart": "Ierīces Neaktivitātes Sākšana",
+    "attributeDeviceInactivityPeriod": "Ierīces Neaktivitātes Periods",
     "attributeProcessingCopyAttributes": "Apstrāde: Kopē Atribūtus",
     "attributeColor": "Krāsa",
     "attributeWebLiveRouteLength": "Web: Reāllaika Ceļa Garums",
@@ -104,8 +112,9 @@
     "attributeUiDisableDrivers": "UI: Atslēgt vadītājus",
     "attributeUiDisableComputedAttributes": "UI: Atslēgt aprēķinātos atribūtus",
     "attributeUiDisableCalendars": "UI: Atslēgt kalendārus",
-    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
+    "attributeUiDisableMaintenance": "UI: Atslegt Apkopi",
     "attributeUiHidePositionAttributes": "UI: Slēpt pozīcijas atribūtus",
+    "attributeNotificationTokens": "Paziņojumu Žetoni",
     "errorTitle": "Kļūda",
     "errorGeneral": "Kļūdaini parametri vai satur kļūdas",
     "errorConnection": "Savienojuma kļūda",
@@ -229,11 +238,12 @@
     "serverRegistration": "Reģistrācija",
     "serverReadonly": "Tikai lasāms",
     "serverForceSettings": "Pāriestatīt Iestatījumus",
+    "serverAnnouncement": "Paziņojums",
     "mapTitle": "Karte",
     "mapLayer": "Kartes slānis",
-    "mapCustom": "Custom (XYZ)",
-    "mapCustomArcgis": "Custom (ArcGIS)",
-    "mapCustomLabel": "Custom map",
+    "mapCustom": "Personalizēts (XYZ)",
+    "mapCustomArcgis": "Personalizēts (ArcGIS)",
+    "mapCustomLabel": "Personalizēta karte",
     "mapCarto": "Carto Basemaps",
     "mapOsm": "Open Street Kartes",
     "mapBingKey": "Bing Karšu Atslēga",
@@ -244,6 +254,9 @@
     "mapYandexMap": "Yandex Kartes",
     "mapYandexSat": "Yandex Satelliti",
     "mapWikimedia": "Wikimedia",
+    "mapMapboxStreets": "Mapbox Streets",
+    "mapMapboxOutdoors": "Mapbox Outdoors",
+    "mapMapboxSatellite": "Mapbox Satellite",
     "mapShapePolygon": "Daudzstūris",
     "mapShapeCircle": "Aplis",
     "mapShapePolyline": "Lauzta līnija",
@@ -266,9 +279,10 @@
     "commandEngineResume": "Motora Startēšana",
     "commandAlarmArm": "Aktivizēt Trauksmi",
     "commandAlarmDisarm": "Izslēgt Trauksmi",
+    "commandAlarmDismiss": "Atslēgt Paziņojumu",
     "commandSetTimezone": "Iestatīt Laika Zonu",
     "commandRequestPhoto": "Pieprasīt Fotoattēlu",
-    "commandPowerOff": "Power Off Device",
+    "commandPowerOff": "Izslēgt Ierīci",
     "commandRebootDevice": "Pārstartēt Ierīci",
     "commandSendSms": "Nosūtīt Īsziņu",
     "commandSendUssd": "Nosūtīt USSD",
@@ -304,6 +318,7 @@
     "eventDeviceOnline": "Statuss aktīvs",
     "eventDeviceUnknown": "Statuss nezināms",
     "eventDeviceOffline": "Statuss bezsaistē",
+    "eventDeviceInactive": "Ierīce neaktīva",
     "eventDeviceMoving": "Ierīce pārvietojas",
     "eventDeviceStopped": "Ierīce apturēta",
     "eventDeviceOverspeed": "Ātruma limits pārsniegts",
@@ -318,21 +333,21 @@
     "eventTextMessage": "Saņemta īsziņa",
     "eventDriverChanged": "Mainījies vadītājs",
     "eventsScrollToLast": "Ritināt Uz Pēdējo",
-    "alarmGeneral": "General",
+    "alarmGeneral": "Vispārēji",
     "alarmSos": "SOS",
     "alarmVibration": "Vibrācija",
     "alarmMovement": "Kustība",
-    "alarmLowspeed": "Low Speed",
+    "alarmLowspeed": "Zems Ātrums",
     "alarmOverspeed": "Ātruma pārsniegšana",
-    "alarmFallDown": "Fall Down",
-    "alarmLowPower": "Low Power",
-    "alarmLowBattery": "Low Battery",
+    "alarmFallDown": "Savienojuma Pārrāvums",
+    "alarmLowPower": "Zema Enerģija",
+    "alarmLowBattery": "Tukša Baterija",
     "alarmFault": "Kļūda",
     "alarmPowerOff": "Barošana Izsl.",
     "alarmPowerOn": "Barošana Iesl.",
     "alarmDoor": "Durvis",
-    "alarmLock": "Lock",
-    "alarmUnlock": "Unlock",
+    "alarmLock": "Slēgt",
+    "alarmUnlock": "Atslēgt",
     "alarmGeofence": "Apgabals",
     "alarmGeofenceEnter": "Ienākšana Apgabalā",
     "alarmGeofenceExit": "Apgabala pamešana",
@@ -340,11 +355,11 @@
     "alarmAccident": "Negadījums",
     "alarmTow": "Vilkšana",
     "alarmIdle": "Tukšgaita",
-    "alarmHighRpm": "High RPM",
+    "alarmHighRpm": "Augsti Apgriezieni",
     "alarmHardAcceleration": "Straujšs paātrinājums",
     "alarmHardBraking": "Strauja Bremzēšana",
-    "alarmHardCornering": "Hard Cornering",
-    "alarmLaneChange": "Lane Change",
+    "alarmHardCornering": "Strauja Manevrēšana",
+    "alarmLaneChange": "Joslas Maiņa",
     "alarmFatigueDriving": "Neadekvāta Braukšana",
     "alarmPowerCut": "Barošana Noslēgta",
     "alarmPowerRestored": "Barošana Atjaunota",
@@ -365,11 +380,13 @@
     "notificatorSms": "SMS",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
+    "reportReplay": "Replay",
     "reportRoute": "Maršruts",
     "reportEvents": "Notikumi",
     "reportTrips": "Braucieni",
     "reportStops": "Pieturas",
     "reportSummary": "Kopsavilkums",
+    "reportDaily": "Dienas Kopsavilkums",
     "reportChart": "Grafiks",
     "reportConfigure": "Konfigurēt",
     "reportEventTypes": "Notikumu Veidi",
@@ -390,6 +407,7 @@
     "reportMaximumSpeed": "Maksimālais Ātrums",
     "reportEngineHours": "Motorstundas",
     "reportDuration": "Ilgums",
+    "reportStartDate": "Sākuma Datums",
     "reportStartTime": "Sākuma Laiks",
     "reportStartAddress": "Sākuma Adrese",
     "reportEndTime": "Beigu Laiks",
@@ -427,7 +445,7 @@
     "categoryTrolleybus": "Trolejbuss",
     "categoryTruck": "Smagā mašīna",
     "categoryVan": "Busiņš",
-    "categoryScooter": "Scooter",
+    "categoryScooter": "Skrejritenis",
     "maintenanceStart": "Sākt",
     "maintenancePeriod": "Periods"
 }
\ No newline at end of file