Merge branch 'master' into modern

1 files changed, 66 insertions, 58 deletions

diff --git a/web/l10n/id.json b/web/l10n/id.json
index 45125710..65086ee9 100644
--- a/web/l10n/id.json
+++ b/web/l10n/id.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "Semua Atribut Terkomputerisasi",
     "sharedCheckComputedAttribute": "Pilih Atribut Terkomputerisasi",
     "sharedExpression": "Ekspresi",
-    "sharedDeviceDistance": "Jarak Perangkat",
     "sharedDevice": "Perangkat",
     "sharedTestNotification": "Kirim Test Notifikasi",
     "sharedCalendar": "Kalender",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "Batas Kecepatan",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "Laporan: Biarkan Odometer",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI : Nonaktifkan Antarmuka",
     "attributeUiDisableComputedAttributes": "UI : Nonaktifkan Computed Attributes",
     "attributeUiDisableCalendars": "UI : Nonaktifkan Kalender",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "errorTitle": "Bermasalah",
     "errorGeneral": "Semua Parameter Salah Atau Salah Aturan",
@@ -231,7 +231,9 @@
     "serverForceSettings": "Semua Pengaturan Paksa",
     "mapTitle": "Peta",
     "mapLayer": "Layer Peta",
-    "mapCustom": "Peta Buatan",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "Peta Carto",
     "mapOsm": "Peta Open Street",
     "mapBingKey": "Key Peta Bing",
@@ -252,8 +254,8 @@
     "stateValue": "Nilai",
     "commandTitle": "Perintah",
     "commandSend": "Kirim",
-    "commandSent": "Perintah Terkirim",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "Unit",
     "commandCustom": "Perintah Buatan",
     "commandDeviceIdentification": "Identifikasi Perangkat",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "Alarm Tidak Aktif",
     "commandSetTimezone": "Setel Zona Waktu",
     "commandRequestPhoto": "Permintaan Foto",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "Hidupkan Ulang Perangkat",
     "commandSendSms": "Kirim SMS",
     "commandSendUssd": "Kirim USSD",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Modify Power Saving",
     "commandModeDeepSleep": "Modify Deep Sleep",
     "commandMovementAlarm": "Movement Alarm",
-    "commandAlarmBattery": "Alarm Baterai",
-    "commandAlarmSos": "Alarm SOS",
-    "commandAlarmRemove": "Remove Alarm",
-    "commandAlarmClock": "Clock Alarm",
-    "commandAlarmSpeed": "Alarm Melebihi Kecepatan",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Alarm Getaran",
     "commandFrequency": "Frekuensi",
     "commandTimezone": "Zona Waktu Tidak Tepat",
     "commandMessage": "Pesan",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "Semua Peristiwa",
-    "eventDeviceOnline": "Perangkat Online",
-    "eventDeviceUnknown": "Perangkat Tidak Diketahui",
-    "eventDeviceOffline": "Perangkat Offline",
-    "eventDeviceMoving": "Perangkat bergerak",
-    "eventDeviceStopped": "Perangkat Berhenti",
-    "eventDeviceOverspeed": "Perangkat Melebihi Kecepatan",
-    "eventDeviceFuelDrop": "Peristiwa BBM Berkurang",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "Hasil Perintah",
-    "eventGeofenceEnter": "Perangkat Memasuki Batas Wilayah",
-    "eventGeofenceExit": "Perangkat Keluar Batas Wilayah",
-    "eventAlarm": "Semua Alarm",
-    "eventIgnitionOn": "Mesin Hidup",
-    "eventIgnitionOff": "Mesin Mati",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "Perlu Perbaikan",
     "eventTextMessage": "Pesan Teks Diterima",
-    "eventDriverChanged": "Antarmuka berubah",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "Bergulir Ke Terakhir",
-    "alarmSos": "Alarm Darurat",
-    "alarmVibration": "Alarm Getar",
-    "alarmMovement": "Alarm Pergerakan",
-    "alarmOverspeed": "Alarm Melebihi Kecepatan",
-    "alarmFallDown": "Alarm Jatuh",
-    "alarmLowBattery": "Alarm Baterai Lemah",
-    "alarmLowPower": "Alarm Tenaga Lemah",
-    "alarmFault": "Alarm Kesalahan",
-    "alarmPowerOff": "Matikan Alarm",
-    "alarmPowerOn": "Hidupkan Alarm",
-    "alarmDoor": "Alarm Pintu",
-    "alarmGeofence": "Alarm Batas Wilayah",
-    "alarmGeofenceEnter": "Alarm Masuk Batas Wilayah",
-    "alarmGeofenceExit": "Alarm Keluar Batas Wilayah",
-    "alarmGpsAntennaCut": "Alarm GPS Antenna Terputus",
-    "alarmAccident": "Alarm Kecelakaan",
-    "alarmTow": "Alarm Tow",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "Alarm Ngebut",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "Alarm Mengemudi Ugal-ugalan",
-    "alarmPowerCut": "Alarm Listrik Terputus",
-    "alarmPowerRestored": "Alarm Tenaga Dipulihkan",
-    "alarmJamming": "Alarm Pengacau Signal",
-    "alarmTemperature": "Alarm Suhu",
-    "alarmParking": "Alarm Parkir",
-    "alarmShock": "Alarm Kejut",
-    "alarmBonnet": "Alarm Kap Mesin",
-    "alarmFootBrake": "Alarm Rem",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "Alarm Temper",
-    "alarmRemoving": "Alarm Dihapus",
+    "alarmGeneral": "General",
+    "alarmSos": "SOS",
+    "alarmVibration": "Vibration",
+    "alarmMovement": "Movement",
+    "alarmLowspeed": "Low Speed",
+    "alarmOverspeed": "Overspeed",
+    "alarmFallDown": "Fall Down",
+    "alarmLowPower": "Low Power",
+    "alarmLowBattery": "Low Battery",
+    "alarmFault": "Fault",
+    "alarmPowerOff": "Power Off",
+    "alarmPowerOn": "Power On",
+    "alarmDoor": "Door",
+    "alarmLock": "Lock",
+    "alarmUnlock": "Unlock",
+    "alarmGeofence": "Geofence",
+    "alarmGeofenceEnter": "Geofence Enter",
+    "alarmGeofenceExit": "Geofence Exit",
+    "alarmGpsAntennaCut": "GPS Antenna Cut",
+    "alarmAccident": "Accident",
+    "alarmTow": "Tow",
+    "alarmIdle": "Idle",
+    "alarmHighRpm": "High RPM",
+    "alarmHardAcceleration": "Hard Acceleration",
+    "alarmHardBraking": "Hard Braking",
+    "alarmHardCornering": "Hard Cornering",
+    "alarmLaneChange": "Lane Change",
+    "alarmFatigueDriving": "Fatigue Driving",
+    "alarmPowerCut": "Power Cut",
+    "alarmPowerRestored": "Power Restored",
+    "alarmJamming": "Jamming",
+    "alarmTemperature": "Temperature",
+    "alarmParking": "Parking",
+    "alarmShock": "Shock",
+    "alarmBonnet": "Bonnet",
+    "alarmFootBrake": "Foot Brake",
+    "alarmFuelLeak": "Fuel Leak",
+    "alarmTampering": "Tampering",
+    "alarmRemoving": "Removing",
     "notificationType": "Tipe Notifikasi",
     "notificationAlways": "All Devices",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "Rute",
     "reportEvents": "Semua Peristiwa",
     "reportTrips": "Perjalanan",
@@ -371,6 +375,7 @@
     "reportChartType": "Tipe Grafik",
     "reportShowMarkers": "Tampilkan Tanda",
     "reportExport": "Ekspor",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "Waktu Akhir",
     "reportEndAddress": "Alamat Akhir",
     "reportSpentFuel": "BBM Terpakai",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistik",
     "statisticsCaptureTime": "Waktu Didapat",
     "statisticsActiveUsers": "Pengguna Aktif",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Truk",
     "categoryVan": "Van",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file