Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	nezha-fronted/config/index.js
#	nezha-fronted/src/components/common/language/cn.js
#	nezha-fronted/src/http.js

nezha-fronted/src/components/common/language/en.js

@@ -3,7 +3,14 @@ const en = {
   overall:{
     dashboard:'dashboard',
     project:'project',
-    asset:'asset'
+    asset:'asset',
+    create: 'Create',
+    edit: 'Edit',
+    delete: 'Delete',
+    esc: 'Esc',
+    cancel: 'Cancel',
+    save: 'Save',
+    search: 'Search'
   },
   asset:{
     tableTitle: {
@@ -29,7 +36,24 @@ const en = {
       alarm: 'Alarm',
     },
   },
+  config: {
+    account: {
+      //列表表头
+      account: "Account",
+      language: "Language",
+      receiver: "Receiver",
+      createTime: "Create Time",
+      enable: "Enable",
+      option: "Option",
+
+      //侧滑框
+      accountId: "Accound ID",
+      createAccount: "Create Account",
+      editAccount: "Edit Account",
+      notCurrentlySupport: 'Not currently supported'
+    }
+  },
   ...enLocale
 }
 
-export default en;
+export default en;