Merge branch 'master' into modern

1 files changed, 66 insertions, 58 deletions

diff --git a/web/l10n/zh_TW.json b/web/l10n/zh_TW.json
index a11e3e30..5c8dc1d4 100644
--- a/web/l10n/zh_TW.json
+++ b/web/l10n/zh_TW.json
@@ -53,7 +53,6 @@
     "sharedComputedAttributes": "計算屬性",
     "sharedCheckComputedAttribute": "檢查計算屬性",
     "sharedExpression": "表示式",
-    "sharedDeviceDistance": "設備距離",
     "sharedDevice": "設備",
     "sharedTestNotification": "傳送測試通知",
     "sharedCalendar": "日曆",
@@ -76,7 +75,8 @@
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
-    "sharedMaintenances": "Maintenances",
+    "sharedDeviceAccumulators": "Accumulators",
+    "sharedAlarms": "Alarms",
     "attributeSpeedLimit": "速限",
     "attributePolylineDistance": "Polyline Distance",
     "attributeReportIgnoreOdometer": "報告：忽略里程表",
@@ -104,7 +104,7 @@
     "attributeUiDisableDrivers": "UI: Disable Drivers",
     "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
     "attributeUiDisableCalendars": "UI: Disable Calendars",
-    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
+    "attributeUiDisableMaintenance": "UI: Disable Maintenance",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "errorTitle": "錯誤",
     "errorGeneral": "非法的參數或違反限制",
@@ -231,7 +231,9 @@
     "serverForceSettings": "強制覆寫設定",
     "mapTitle": "地圖",
     "mapLayer": "地圖圖層",
-    "mapCustom": "自訂地圖",
+    "mapCustom": "Custom (XYZ)",
+    "mapCustomArcgis": "Custom (ArcGIS)",
+    "mapCustomLabel": "Custom map",
     "mapCarto": "CARTO 地圖",
     "mapOsm": "OpenStreetMap",
     "mapBingKey": "Bing 地圖金鑰",
@@ -252,8 +254,8 @@
     "stateValue": "數值",
     "commandTitle": "命令",
     "commandSend": "傳送",
-    "commandSent": "已傳送命令",
-    "commandQueued": "Command has been queued",
+    "commandSent": "Command sent",
+    "commandQueued": "Command queued",
     "commandUnit": "單位",
     "commandCustom": "自訂命令",
     "commandDeviceIdentification": "設備識別號碼",
@@ -266,6 +268,7 @@
     "commandAlarmDisarm": "解除警報",
     "commandSetTimezone": "設定時區",
     "commandRequestPhoto": "請求照片",
+    "commandPowerOff": "Power Off Device",
     "commandRebootDevice": "重啟設備",
     "commandSendSms": "傳送簡訊",
     "commandSendUssd": "傳送 USSD 簡訊",
@@ -287,13 +290,6 @@
     "commandModePowerSaving": "Modify Power Saving",
     "commandModeDeepSleep": "Modify Deep Sleep",
     "commandMovementAlarm": "Movement Alarm",
-    "commandAlarmBattery": "Battery Alarm",
-    "commandAlarmSos": "SOS Alarm",
-    "commandAlarmRemove": "Remove Alarm",
-    "commandAlarmClock": "Clock Alarm",
-    "commandAlarmSpeed": "超速警報",
-    "commandAlarmFall": "Fail Alarm",
-    "commandAlarmVibration": "Vibration Alarm",
     "commandFrequency": "頻率",
     "commandTimezone": "時區",
     "commandMessage": "訊息",
@@ -305,61 +301,69 @@
     "commandServer": "Server",
     "commandPort": "Port",
     "eventAll": "所有事件",
-    "eventDeviceOnline": "設備上線",
-    "eventDeviceUnknown": "設備狀態未知",
-    "eventDeviceOffline": "設備下線",
-    "eventDeviceMoving": "設備正在移動",
-    "eventDeviceStopped": "設備已停止",
-    "eventDeviceOverspeed": "設備超速",
-    "eventDeviceFuelDrop": "加油",
+    "eventDeviceOnline": "Status online",
+    "eventDeviceUnknown": "Status unknown",
+    "eventDeviceOffline": "Status offline",
+    "eventDeviceMoving": "Device moving",
+    "eventDeviceStopped": "Device stopped",
+    "eventDeviceOverspeed": "Speed limit exceeded",
+    "eventDeviceFuelDrop": "Fuel drop",
     "eventCommandResult": "命令結果",
-    "eventGeofenceEnter": "設備進入地圖圍籬",
-    "eventGeofenceExit": "設備離開地圖圍籬",
-    "eventAlarm": "警報",
-    "eventIgnitionOn": "點火開",
-    "eventIgnitionOff": "點火關",
+    "eventGeofenceEnter": "Geofence entered",
+    "eventGeofenceExit": "Geofence exited",
+    "eventAlarm": "Alarm",
+    "eventIgnitionOn": "Ignition on",
+    "eventIgnitionOff": "Ignition off",
     "eventMaintenance": "需要保養",
     "eventTextMessage": "已接收文字訊息",
-    "eventDriverChanged": "已更換駕駛",
+    "eventDriverChanged": "Driver changed",
     "eventsScrollToLast": "卷軸已拉到底",
-    "alarmSos": "求救警報",
-    "alarmVibration": "振動警報",
-    "alarmMovement": "移動警報",
-    "alarmOverspeed": "超速警報",
-    "alarmFallDown": "墜落警報",
-    "alarmLowBattery": "電池耗盡警報",
-    "alarmLowPower": "電力耗盡警報",
-    "alarmFault": "故障錯誤",
-    "alarmPowerOff": "關機警報",
-    "alarmPowerOn": "開機警報",
-    "alarmDoor": "開門警報",
-    "alarmGeofence": "地圖圍籬警報",
-    "alarmGeofenceEnter": "進入地圖圍籬警報",
-    "alarmGeofenceExit": "離開地圖圍籬警報",
-    "alarmGpsAntennaCut": "GPS 天線脫落警報",
-    "alarmAccident": "事故警報",
-    "alarmTow": "拖吊警報",
-    "alarmIdle": "Idle Alarm",
-    "alarmHardAcceleration": "緊急加速警報",
-    "alarmHardBraking": "Hard Braking Alarm",
-    "alarmFatigueDriving": "疲勞駕駛",
-    "alarmPowerCut": "失去電力警報",
-    "alarmPowerRestored": "電力恢復警報",
-    "alarmJamming": "塞車警報",
-    "alarmTemperature": "溫度異常警報",
-    "alarmParking": "停車警報",
-    "alarmShock": "震動警報",
-    "alarmBonnet": "引擎蓋警報",
-    "alarmFootBrake": "腳煞車警報",
-    "alarmFuelLeak": "Fuel Leak Alarm",
-    "alarmTampering": "舞弊警報",
-    "alarmRemoving": "移除警報",
+    "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": "通知類型",
     "notificationAlways": "All Devices",
     "notificationNotificators": "Channels",
     "notificatorWeb": "Web",
     "notificatorMail": "Mail",
     "notificatorSms": "SMS",
+    "notificatorFirebase": "Mobile",
     "reportRoute": "路線",
     "reportEvents": "事件",
     "reportTrips": "旅程",
@@ -371,6 +375,7 @@
     "reportChartType": "圖表類型",
     "reportShowMarkers": "顯示地標",
     "reportExport": "匯出",
+    "reportEmail": "Email Report",
     "reportPeriod": "Period",
     "reportCustom": "Custom",
     "reportToday": "Today",
@@ -389,6 +394,8 @@
     "reportEndTime": "結束時間",
     "reportEndAddress": "結束地點",
     "reportSpentFuel": "燃油消耗",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "統計",
     "statisticsCaptureTime": "截取時間",
     "statisticsActiveUsers": "活躍用戶量",
@@ -419,6 +426,7 @@
     "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "貨車",
     "categoryVan": "箱型車",
+    "categoryScooter": "Scooter",
     "maintenanceStart": "Start",
     "maintenancePeriod": "Period"
 }
\ No newline at end of file