fix: 解决冲突

2021-08-06 11:47:00 +08:00
parent 783e685f73 23bb1c4fa9
commit 75326ff77e
9 changed files with 69 additions and 45 deletions
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -1358,7 +1358,8 @@ const cn = {
      status: 'Endpoint 状态',
      basicTypeFile: '路径',
      basicTypeJournal: '单位',
-      basicTypeSyslog: '监听地址'
+      basicTypeSyslog: '监听地址',
+      basicAppName: '应用名称'
    },
    metrics: {
      metrics: '指标',
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -1360,7 +1360,8 @@ const en = {
      status: 'Endpoint status',
      basicTypeFile: 'Path',
      basicTypeJournal: 'Unit',
-      basicTypeSyslog: 'Listen address'
+      basicTypeSyslog: 'Listen address',
+      basicAppName: 'App name'
    },
    metrics: {
      metrics: 'Metrics', // "指标"