Resolving conflicts with master

1 files changed, 18 insertions, 0 deletions

diff --git a/web/l10n/ms.json b/web/l10n/ms.json
index 42dc555c..b2d1f822 100644
--- a/web/l10n/ms.json
+++ b/web/l10n/ms.json
@@ -8,6 +8,8 @@
     "sharedEdit": "Ubah",
     "sharedRemove": "Hapus",
     "sharedRemoveConfirm": "Hapuskan item?",
+    "sharedYes": "Yes",
+    "sharedNo": "No",
     "sharedKm": "km",
     "sharedMi": "mi",
     "sharedNmi": "nmi",
@@ -63,6 +65,7 @@
     "sharedRequired": "Required",
     "sharedPreferences": "Preferences",
     "sharedPermissions": "Permissions",
+    "sharedConnections": "Connections",
     "sharedExtra": "Extra",
     "sharedTypeString": "String",
     "sharedTypeNumber": "Number",
@@ -73,15 +76,20 @@
     "sharedSavedCommands": "Saved Commands",
     "sharedNew": "New…",
     "sharedShowAddress": "Show Address",
+    "sharedShowDetails": "More Details",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
     "sharedDeviceAccumulators": "Accumulators",
     "sharedAlarms": "Alarms",
+    "sharedLocation": "Location",
+    "sharedImport": "Import",
     "attributeSpeedLimit": "Speed Limit",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
     "attributeWebReportColor": "Web: Report Color",
     "attributeDevicePassword": "Device Password",
+    "attributeDeviceInactivityStart": "Device Inactivity Start",
+    "attributeDeviceInactivityPeriod": "Device Inactivity Period",
     "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
     "attributeColor": "Color",
     "attributeWebLiveRouteLength": "Web: Live Route Length",
@@ -106,6 +114,7 @@
     "attributeUiDisableCalendars": "UI: Disable Calendars",
     "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
+    "attributeNotificationTokens": "Notification Tokens",
     "errorTitle": "Ralat",
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Ralat penyambungan",
@@ -229,6 +238,7 @@
     "serverRegistration": "Pendaftaran",
     "serverReadonly": "Baca Sahaja",
     "serverForceSettings": "Force Settings",
+    "serverAnnouncement": "Announcement",
     "mapTitle": "Peta",
     "mapLayer": "Map Layer",
     "mapCustom": "Custom (XYZ)",
@@ -244,6 +254,9 @@
     "mapYandexMap": "Yandex Map",
     "mapYandexSat": "Yandex Satellite",
     "mapWikimedia": "Wikimedia",
+    "mapMapboxStreets": "Mapbox Streets",
+    "mapMapboxOutdoors": "Mapbox Outdoors",
+    "mapMapboxSatellite": "Mapbox Satellite",
     "mapShapePolygon": "Polygon",
     "mapShapeCircle": "Circle",
     "mapShapePolyline": "Polyline",
@@ -266,6 +279,7 @@
     "commandEngineResume": "Hidupkan Enjin",
     "commandAlarmArm": "Arm Alarm",
     "commandAlarmDisarm": "Disarm Alarm",
+    "commandAlarmDismiss": "Dismiss Alarm",
     "commandSetTimezone": "Set Timezone",
     "commandRequestPhoto": "Request Photo",
     "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": "Route",
     "reportEvents": "Events",
     "reportTrips": "Trips",
     "reportStops": "Stops",
     "reportSummary": "Summary",
+    "reportDaily": "Daily Summary",
     "reportChart": "Chart",
     "reportConfigure": "Configure",
     "reportEventTypes": "Event Types",
@@ -390,6 +407,7 @@
     "reportMaximumSpeed": "Maximum Speed",
     "reportEngineHours": "Engine Hours",
     "reportDuration": "Duration",
+    "reportStartDate": "Start Date",
     "reportStartTime": "Start Time",
     "reportStartAddress": "Start Address",
     "reportEndTime": "End Time",