Resolving conflicts with master

1 files changed, 18 insertions, 0 deletions

diff --git a/web/l10n/id.json b/web/l10n/id.json
index 710aa29c..3f94373f 100644
--- a/web/l10n/id.json
+++ b/web/l10n/id.json
@@ -8,6 +8,8 @@
     "sharedEdit": "Ubah",
     "sharedRemove": "Hapus",
     "sharedRemoveConfirm": "Hapus Item?",
+    "sharedYes": "Yes",
+    "sharedNo": "No",
     "sharedKm": "km",
     "sharedMi": "mi",
     "sharedNmi": "nmi",
@@ -63,6 +65,7 @@
     "sharedRequired": "Diperlukan",
     "sharedPreferences": "Preferensi",
     "sharedPermissions": "Kewenangan",
+    "sharedConnections": "Connections",
     "sharedExtra": "Ekstra",
     "sharedTypeString": "String",
     "sharedTypeNumber": "Nomor",
@@ -73,15 +76,20 @@
     "sharedSavedCommands": "Saved Commands",
     "sharedNew": "Baru...",
     "sharedShowAddress": "Show Address",
+    "sharedShowDetails": "More Details",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
     "sharedDeviceAccumulators": "Accumulators",
     "sharedAlarms": "Alarms",
+    "sharedLocation": "Location",
+    "sharedImport": "Import",
     "attributeSpeedLimit": "Batas Kecepatan",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Laporan: Biarkan Odometer",
     "attributeWebReportColor": "Web: Warna Laporan",
     "attributeDevicePassword": "Sandi Perangkat",
+    "attributeDeviceInactivityStart": "Device Inactivity Start",
+    "attributeDeviceInactivityPeriod": "Device Inactivity Period",
     "attributeProcessingCopyAttributes": "Memproses: Salin Semua Atribut",
     "attributeColor": "Warna",
     "attributeWebLiveRouteLength": "Web: Panjang Rute Aktif",
@@ -106,6 +114,7 @@
     "attributeUiDisableCalendars": "UI : Nonaktifkan Kalender",
     "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
+    "attributeNotificationTokens": "Notification Tokens",
     "errorTitle": "Bermasalah",
     "errorGeneral": "Semua Parameter Salah Atau Salah Aturan",
     "errorConnection": "Koneksi Bermasalah",
@@ -229,6 +238,7 @@
     "serverRegistration": "Pendaftaran",
     "serverReadonly": "Hanya Dilihat",
     "serverForceSettings": "Semua Pengaturan Paksa",
+    "serverAnnouncement": "Announcement",
     "mapTitle": "Peta",
     "mapLayer": "Layer Peta",
     "mapCustom": "Custom (XYZ)",
@@ -244,6 +254,9 @@
     "mapYandexMap": "Peta Yandex",
     "mapYandexSat": "Satelit Yandex",
     "mapWikimedia": "Wikimedia",
+    "mapMapboxStreets": "Mapbox Streets",
+    "mapMapboxOutdoors": "Mapbox Outdoors",
+    "mapMapboxSatellite": "Mapbox Satellite",
     "mapShapePolygon": "Poligon",
     "mapShapeCircle": "Lingkaran",
     "mapShapePolyline": "Garis Poli",
@@ -266,6 +279,7 @@
     "commandEngineResume": "HIdupkan Mesin",
     "commandAlarmArm": "Alarm Aktif",
     "commandAlarmDisarm": "Alarm Tidak Aktif",
+    "commandAlarmDismiss": "Dismiss Alarm",
     "commandSetTimezone": "Setel Zona Waktu",
     "commandRequestPhoto": "Permintaan Foto",
     "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": "Rute",
     "reportEvents": "Semua Peristiwa",
     "reportTrips": "Perjalanan",
     "reportStops": "Berhenti",
     "reportSummary": "Ringkasan",
+    "reportDaily": "Daily Summary",
     "reportChart": "Grafik",
     "reportConfigure": "Pengaturan",
     "reportEventTypes": "Tipe Peristiwa",
@@ -390,6 +407,7 @@
     "reportMaximumSpeed": "Kecepatan Tertinggi",
     "reportEngineHours": "Durasi Mesin",
     "reportDuration": "Durasi",
+    "reportStartDate": "Start Date",
     "reportStartTime": "Waktu  Awal",
     "reportStartAddress": "Alamat Awal",
     "reportEndTime": "Waktu Akhir",