Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

2021-05-12 14:46:14 +08:00
parent 37694b1739 501321d588
commit 21d3580707
17 changed files with 168 additions and 160 deletions
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -1143,7 +1143,7 @@ const en = {
      create: 'New alert silence',
      edit: 'Edit alert silence',
      time: 'Time',
-      matchers: 'matchers',
+      matchers: 'Matchers',
      remark: 'Description',
      selectTime: 'Please select time',
      selectMather: 'Required',
@@ -1194,7 +1194,7 @@ const en = {
      privProtocol: 'Priv protocol',
      contextName: 'Context name',
      privpin: 'Priv password',
-      alerts: 'Alerts',
+      alerts: 'Alert',
      asset: 'Asset',
      editEndpoint: 'Edit endpoint',
      createEndpoint: 'New endpoint',