Resolving conflicts with master

1 files changed, 18 insertions, 0 deletions

diff --git a/web/l10n/zh.json b/web/l10n/zh.json
index 6e0c126..652a47a 100644
--- a/web/l10n/zh.json
+++ b/web/l10n/zh.json
@@ -8,6 +8,8 @@
     "sharedEdit": "编辑",
     "sharedRemove": "删除",
     "sharedRemoveConfirm": "要删除选中项吗？",
+    "sharedYes": "Yes",
+    "sharedNo": "No",
     "sharedKm": "千米",
     "sharedMi": "海里",
     "sharedNmi": "海里",
@@ -63,6 +65,7 @@
     "sharedRequired": "必填",
     "sharedPreferences": "个性化设置",
     "sharedPermissions": "权限",
+    "sharedConnections": "Connections",
     "sharedExtra": "附加",
     "sharedTypeString": "字符串",
     "sharedTypeNumber": "数字",
@@ -73,15 +76,20 @@
     "sharedSavedCommands": "保存指令",
     "sharedNew": "新建",
     "sharedShowAddress": "显示地址",
+    "sharedShowDetails": "More Details",
     "sharedDisabled": "关闭",
     "sharedMaintenance": "维护",
     "sharedDeviceAccumulators": "蓄电池",
     "sharedAlarms": "报警",
+    "sharedLocation": "Location",
+    "sharedImport": "Import",
     "attributeSpeedLimit": "速度限制",
     "attributePolylineDistance": "折线距离",
     "attributeReportIgnoreOdometer": "报告：忽略里程表",
     "attributeWebReportColor": "页面：报告颜色",
     "attributeDevicePassword": "设备密码",
+    "attributeDeviceInactivityStart": "Device Inactivity Start",
+    "attributeDeviceInactivityPeriod": "Device Inactivity Period",
     "attributeProcessingCopyAttributes": "处理中：复制属性",
     "attributeColor": "颜色",
     "attributeWebLiveRouteLength": "页面：活动路径长度",
@@ -106,6 +114,7 @@
     "attributeUiDisableCalendars": "关闭日历",
     "attributeUiDisableMaintenance": "禁止维护",
     "attributeUiHidePositionAttributes": "隐藏位置属性",
+    "attributeNotificationTokens": "Notification Tokens",
     "errorTitle": "错误",
     "errorGeneral": "无效参数",
     "errorConnection": "连接错误",
@@ -229,6 +238,7 @@
     "serverRegistration": "注册",
     "serverReadonly": "只读",
     "serverForceSettings": "强制设置",
+    "serverAnnouncement": "Announcement",
     "mapTitle": "地图",
     "mapLayer": "地图图层",
     "mapCustom": "Custom (XYZ)",
@@ -244,6 +254,9 @@
     "mapYandexMap": "Yandex地图",
     "mapYandexSat": "Yandex卫星地图",
     "mapWikimedia": "维基",
+    "mapMapboxStreets": "Mapbox Streets",
+    "mapMapboxOutdoors": "Mapbox Outdoors",
+    "mapMapboxSatellite": "Mapbox Satellite",
     "mapShapePolygon": "多边形",
     "mapShapeCircle": "圆形",
     "mapShapePolyline": "折线",
@@ -266,6 +279,7 @@
     "commandEngineResume": "引擎启动",
     "commandAlarmArm": "部署报警",
     "commandAlarmDisarm": "解除报警",
+    "commandAlarmDismiss": "Dismiss Alarm",
     "commandSetTimezone": "设置时区",
     "commandRequestPhoto": "请求图片",
     "commandPowerOff": "设备关机",
@@ -304,6 +318,7 @@
     "eventDeviceOnline": "在线状态",
     "eventDeviceUnknown": "未知状态",
     "eventDeviceOffline": "离线状态",
+    "eventDeviceInactive": "Device inactive",
     "eventDeviceMoving": "设备移动中",
     "eventDeviceStopped": "设备已停止",
     "eventDeviceOverspeed": "超速限制",
@@ -365,11 +380,13 @@
     "notificatorSms": "短信",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
+    "reportReplay": "Replay",
     "reportRoute": "轨迹",
     "reportEvents": "事件",
     "reportTrips": "行程",
     "reportStops": "停留点",
     "reportSummary": "概要",
+    "reportDaily": "Daily Summary",
     "reportChart": "图表",
     "reportConfigure": "筛选条件",
     "reportEventTypes": "事件类型",
@@ -390,6 +407,7 @@
     "reportMaximumSpeed": "最大速度",
     "reportEngineHours": "发动机时间",
     "reportDuration": "持续时间",
+    "reportStartDate": "Start Date",
     "reportStartTime": "开始时间",
     "reportStartAddress": "开始地址",
     "reportEndTime": "结束时间",