Resolving conflicts with master

1 files changed, 18 insertions, 0 deletions

diff --git a/web/l10n/af.json b/web/l10n/af.json
index b4d1abf..8daf430 100644
--- a/web/l10n/af.json
+++ b/web/l10n/af.json
@@ -8,6 +8,8 @@
     "sharedEdit": "Redigeer",
     "sharedRemove": "Verwyder",
     "sharedRemoveConfirm": "Verwyder item",
+    "sharedYes": "Yes",
+    "sharedNo": "No",
     "sharedKm": "km",
     "sharedMi": "mi",
     "sharedNmi": "nmi",
@@ -63,6 +65,7 @@
     "sharedRequired": "Word Vereis",
     "sharedPreferences": "Voorkeure",
     "sharedPermissions": "Toelaatbaarhede",
+    "sharedConnections": "Connections",
     "sharedExtra": "Ekstra",
     "sharedTypeString": "String",
     "sharedTypeNumber": "Nommer",
@@ -73,15 +76,20 @@
     "sharedSavedCommands": "Gestoorde Bevele",
     "sharedNew": "Nuut...",
     "sharedShowAddress": "Wys Adres",
+    "sharedShowDetails": "More Details",
     "sharedDisabled": "Buite aksie gestel",
     "sharedMaintenance": "Onderhoud",
     "sharedDeviceAccumulators": "Akkumulators ",
     "sharedAlarms": "Alarms",
+    "sharedLocation": "Location",
+    "sharedImport": "Import",
     "attributeSpeedLimit": "Spoedgrens",
     "attributePolylineDistance": "Polielynafstand",
     "attributeReportIgnoreOdometer": "Verslag: Ignoreer Odometer",
     "attributeWebReportColor": "Web: Rapporteer kleur",
     "attributeDevicePassword": "Toestelwagwoord",
+    "attributeDeviceInactivityStart": "Device Inactivity Start",
+    "attributeDeviceInactivityPeriod": "Device Inactivity Period",
     "attributeProcessingCopyAttributes": "Verwerking: Kopieër attribute",
     "attributeColor": "Kleur",
     "attributeWebLiveRouteLength": "Web: Regstreekse Roete Lengte",
@@ -106,6 +114,7 @@
     "attributeUiDisableCalendars": "UI: deaktiveer kalenders",
     "attributeUiDisableMaintenance": "UI: deaktiveer onderhoud",
     "attributeUiHidePositionAttributes": "UI: Verberg posisie attribute",
+    "attributeNotificationTokens": "Notification Tokens",
     "errorTitle": "Fout",
     "errorGeneral": "Ongeldige parameters of beperking oortreding",
     "errorConnection": "Verbindings fout",
@@ -229,6 +238,7 @@
     "serverRegistration": "Registrasie",
     "serverReadonly": "Leesalleen",
     "serverForceSettings": "Dwing instellings",
+    "serverAnnouncement": "Announcement",
     "mapTitle": "Kaart",
     "mapLayer": "Kaartlaag",
     "mapCustom": "Pasgemaak (XYZ)",
@@ -244,6 +254,9 @@
     "mapYandexMap": "Yandex Kaart",
     "mapYandexSat": "Yandex Satelliet",
     "mapWikimedia": "Wikimedia",
+    "mapMapboxStreets": "Mapbox Streets",
+    "mapMapboxOutdoors": "Mapbox Outdoors",
+    "mapMapboxSatellite": "Mapbox Satellite",
     "mapShapePolygon": "Veelhoek",
     "mapShapeCircle": "Sirkel",
     "mapShapePolyline": "Veelhoeklyn",
@@ -266,6 +279,7 @@
     "commandEngineResume": "Engin Herbegin",
     "commandAlarmArm": "Aktivering Alarm",
     "commandAlarmDisarm": "Onaktivering Alarm",
+    "commandAlarmDismiss": "Dismiss Alarm",
     "commandSetTimezone": "Stel Tydsone",
     "commandRequestPhoto": "Versoek Foto",
     "commandPowerOff": "Skakel Toestel Af",
@@ -304,6 +318,7 @@
     "eventDeviceOnline": "Status aanlyn",
     "eventDeviceUnknown": "Status onbekend",
     "eventDeviceOffline": "Status vanlyn",
+    "eventDeviceInactive": "Device inactive",
     "eventDeviceMoving": "Toestel in beweging",
     "eventDeviceStopped": "Toestel tot stilstand gekom",
     "eventDeviceOverspeed": "Spoedgrens oortree",
@@ -365,11 +380,13 @@
     "notificatorSms": "SMS",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
+    "reportReplay": "Replay",
     "reportRoute": "Roete",
     "reportEvents": "Gebeure",
     "reportTrips": "Ritte",
     "reportStops": "Stops",
     "reportSummary": "Opsomming",
+    "reportDaily": "Daily Summary",
     "reportChart": "Grafiek",
     "reportConfigure": "Konfigureer",
     "reportEventTypes": "Gebeurtenistipes",
@@ -390,6 +407,7 @@
     "reportMaximumSpeed": "Maksimum Spoed",
     "reportEngineHours": "Engin Ure",
     "reportDuration": "Duur",
+    "reportStartDate": "Start Date",
     "reportStartTime": "Begin tyd",
     "reportStartAddress": "Begin Adres",
     "reportEndTime": "Einde tyd",