From 4da8085c03cf0d5036ac76796027461da72cdf4b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 12 May 2020 11:26:21 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ActionsGroup/index.vue         |  4 +-
 src/components/AutoDataTable/index.vue        |  4 +-
 src/components/DataForm/index.vue             |  4 +-
 src/components/DataForm/rules/index.js        |  4 +-
 src/components/DetailCard/index.vue           |  2 +-
 src/components/Dialog/index.vue               |  2 +-
 src/components/DialogAction/index.vue         |  4 +-
 src/components/ListTable/TableAction.vue      |  4 +-
 .../ListTable/formatters/ActionsFormatter.vue |  4 +-
 src/components/QuickActions/index.vue         |  2 +-
 src/components/RelationCard/index.vue         |  4 +-
 src/i18n/langs/cn.old.json                    |  8 +--
 src/i18n/langs/cn/common.json                 |  2 +-
 src/i18n/langs/cn/users.json                  |  6 +-
 src/i18n/langs/en.old.json                    |  6 +-
 src/i18n/langs/en/common.json                 | 41 ++++++++++++-
 src/i18n/langs/en/route.json                  |  4 +-
 src/i18n/langs/en/users.json                  | 39 +++++++-----
 .../components/GenericDetailPage/index.vue    |  4 +-
 .../components/NavHeader/AccountDropdown.vue  |  8 +--
 src/layout/components/NavHeader/index.vue     |  8 +--
 .../DatabaseAppDetail/DatabaseAppDetail.vue   |  8 +--
 .../RemoteAppDetail/RemoteAppDetail.vue       |  8 +--
 src/views/assets/AdminUser/AdminUserList.vue  |  5 +-
 src/views/assets/AssetList.vue                |  1 -
 .../CommandFilterDetail/Rules.vue             |  3 +-
 .../CommandFilter/CommandFilterList.vue       |  1 -
 src/views/assets/Domain/DomainList.vue        |  1 -
 src/views/assets/GatewayList.vue              |  1 -
 src/views/assets/Label/LabelList.vue          |  1 -
 src/views/assets/Platform/PlatformList.vue    |  1 -
 .../SystemUser/SystemUserCreateUpdate.vue     |  2 +-
 .../SystemUser/SystemUserDetail/AssetList.vue |  1 -
 .../assets/SystemUser/SystemUserList.vue      |  5 +-
 .../AdhocDetail/AdhocExecutionHistory.vue     |  1 -
 src/views/jobcenter/TaskDetail/TaskAdhoc.vue  |  6 +-
 src/views/jobcenter/TaskDetail/TaskDetail.vue |  2 +-
 .../jobcenter/TaskDetail/TaskHistory.vue      |  3 -
 src/views/jobcenter/TaskList.vue              |  3 -
 .../AssetPermissionCreateUpdate.vue           |  2 +-
 .../AssetPermissionAsset.vue                  |  2 +-
 .../AssetPermissionDetail.vue                 |  6 +-
 .../AssetPermissionUser.vue                   |  2 +-
 .../DatabaseAppPermissionDatabaseApp.vue      |  2 +-
 .../DatabaseAppPermissionDetail.vue           |  6 +-
 .../DatabaseAppPermissionUser.vue             |  2 +-
 .../RemoteAppPermissionDetail.vue             |  6 +-
 src/views/sessions/SessionOfflineList.vue     |  2 +-
 src/views/sessions/SessionOnlineList.vue      | 61 +++++++++----------
 src/views/settings/Ldap.vue                   |  4 +-
 .../groups/UserGroupDetail/GroupInfo.vue      | 10 +--
 .../users/groups/UserGroupDetail/index.vue    |  2 +-
 src/views/users/users/UserDetail/UserInfo.vue | 26 ++++----
 src/views/users/users/UserDetail/index.vue    | 14 ++---
 src/views/users/users/UserList.vue            |  8 +--
 55 files changed, 198 insertions(+), 174 deletions(-)

diff --git a/src/components/ActionsGroup/index.vue b/src/components/ActionsGroup/index.vue
index 62a2c9c06..1cc955bbf 100644
--- a/src/components/ActionsGroup/index.vue
+++ b/src/components/ActionsGroup/index.vue
@@ -41,7 +41,7 @@ export default {
     moreActionsTitle: {
       type: String,
       default() {
-        return this.$t('common.moreActions')
+        return this.$t('common.actions.MoreActions')
       }
     }
   },
@@ -66,7 +66,7 @@ export default {
       return actions
     },
     iMoreActionsTitle() {
-      return this.moreActionsTitle || this.$t('common.moreActions')
+      return this.moreActionsTitle || this.$t('common.actions.MoreActions')
     }
   },
   mounted() {
diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue
index b648cd9f6..bcaf7f8fd 100644
--- a/src/components/AutoDataTable/index.vue
+++ b/src/components/AutoDataTable/index.vue
@@ -50,7 +50,7 @@ export default {
         case 'actions':
           col = {
             prop: 'id',
-            label: this.$t('common.actions'),
+            label: this.$t('common.table.Actions'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '150px',
@@ -58,7 +58,7 @@ export default {
           }
           break
         case 'is_valid':
-          col.label = this.$t('common.validity')
+          col.label = this.$t('common.table.Validity')
           col.formatter = BooleanFormatter
           col.align = 'center'
           col.width = '80px'
diff --git a/src/components/DataForm/index.vue b/src/components/DataForm/index.vue
index d196f06a6..84402e294 100644
--- a/src/components/DataForm/index.vue
+++ b/src/components/DataForm/index.vue
@@ -14,8 +14,8 @@
 
     <el-form-item>
       <el-button v-for="button in moreButtons" :key="button.title" size="small" v-bind="button" @click="handleClick(button)">{{ button.title }}</el-button>
-      <el-button v-if="defaultButton" size="small" @click="resetForm('form')">{{ $t('common.reset') }}</el-button>
-      <el-button v-if="defaultButton" size="small" type="primary" @click="submitForm('form')">{{ $t('common.submit') }}</el-button>
+      <el-button v-if="defaultButton" size="small" @click="resetForm('form')">{{ $t('common.actions.Reset') }}</el-button>
+      <el-button v-if="defaultButton" size="small" type="primary" @click="submitForm('form')">{{ $t('common.actions.Submit') }}</el-button>
     </el-form-item>
   </ElFormRender>
 </template>
diff --git a/src/components/DataForm/rules/index.js b/src/components/DataForm/rules/index.js
index e5fefb57b..83b98e649 100644
--- a/src/components/DataForm/rules/index.js
+++ b/src/components/DataForm/rules/index.js
@@ -1,11 +1,11 @@
 import i18n from '@/i18n/i18n'
 
 export const Required = {
-  required: true, message: i18n.t('common.' + 'This field is required'), trigger: 'blur'
+  required: true, message: i18n.t('common.fieldRequiredError'), trigger: 'blur'
 }
 
 export const RequiredChange = {
-  required: true, message: i18n.t('common.' + 'This field is required'), trigger: 'change'
+  required: true, message: i18n.t('common.fieldRequiredError'), trigger: 'change'
 }
 
 export default {
diff --git a/src/components/DetailCard/index.vue b/src/components/DetailCard/index.vue
index 5698b6773..f139abc41 100644
--- a/src/components/DetailCard/index.vue
+++ b/src/components/DetailCard/index.vue
@@ -22,7 +22,7 @@ export default {
     title: {
       type: String,
       default() {
-        return this.$t('common.basicInfo')
+        return this.$t('common.tabs.BasicInfo')
       }
     },
     items: {
diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue
index a21a424ed..526855f8d 100644
--- a/src/components/Dialog/index.vue
+++ b/src/components/Dialog/index.vue
@@ -7,7 +7,7 @@
     <slot />
     <div slot="footer" class="dialog-footer">
       <slot name="footer">
-        <el-button size="small" @click="onCancel">{{ $t('common.cancel') }}</el-button>
+        <el-button size="small" @click="onCancel">{{ $t('common.actions.Cancel') }}</el-button>
         <el-button type="primary" size="small" @click="onConfirm">{{ $t('common.confirm') }}</el-button>
       </slot>
     </div>
diff --git a/src/components/DialogAction/index.vue b/src/components/DialogAction/index.vue
index 96faf4af2..bc31a84d0 100644
--- a/src/components/DialogAction/index.vue
+++ b/src/components/DialogAction/index.vue
@@ -13,7 +13,7 @@
       <el-form>
         <el-form-item :label="importTitle" :label-width="'100px'">
           <el-radio v-model="importOption" class="export-item" label="1">{{ this.$t('common.import') }}</el-radio>
-          <el-radio v-model="importOption" class="export-item" label="2">{{ this.$t('common.update') }}</el-radio>
+          <el-radio v-model="importOption" class="export-item" label="2">{{ this.$t('common.actions.Update') }}</el-radio>
         </el-form-item>
       </el-form>
       <div v-if="importOption==='1'" style="margin-bottom:20px;margin-left: 55px;">{{ this.$t('action.downloadTheImportedTemplateOrUseTheExportedCSVFormat') }} <a style="color: #428bca;" :href="downloadImportTempUrl">{{ this.$t('action.DownloadImportTemplate') }}</a></div>
@@ -71,7 +71,7 @@ export default {
       if (this.importOption === '1') {
         return this.$t('common.import')
       } else {
-        return this.$t('common.update')
+        return this.$t('common.actions.Update')
       }
     },
     upLoadUrl() {
diff --git a/src/components/ListTable/TableAction.vue b/src/components/ListTable/TableAction.vue
index 28f70774f..1ada81437 100644
--- a/src/components/ListTable/TableAction.vue
+++ b/src/components/ListTable/TableAction.vue
@@ -102,7 +102,7 @@ export default {
       defaultActions: [
         {
           name: 'actionCreate',
-          title: this.$t('common.create'),
+          title: this.$t('common.actions.Create'),
           type: 'primary',
           has: this.hasCreate,
           can: true,
@@ -111,7 +111,7 @@ export default {
       ],
       defaultMoreActions: [
         {
-          title: this.$t('common.deleteSelected'),
+          title: this.$t('common.actions.deleteSelected'),
           name: 'actionDeleteSelected',
           has: this.hasBulkDelete,
           callback: this.defaultBulkDeleteCallback
diff --git a/src/components/ListTable/formatters/ActionsFormatter.vue b/src/components/ListTable/formatters/ActionsFormatter.vue
index ed2870bd4..dab260a54 100644
--- a/src/components/ListTable/formatters/ActionsFormatter.vue
+++ b/src/components/ListTable/formatters/ActionsFormatter.vue
@@ -71,7 +71,7 @@ export default {
     const defaultActions = [
       {
         name: 'update',
-        title: this.$t('common.update'),
+        title: this.$t('common.actions.Update'),
         type: 'primary',
         has: colActions.hasUpdate,
         can: colActions.canUpdate,
@@ -79,7 +79,7 @@ export default {
       },
       {
         name: 'delete',
-        title: this.$t('common.delete'),
+        title: this.$t('common.actions.Delete'),
         type: 'danger',
         has: colActions.hasDelete,
         can: colActions.canDelete,
diff --git a/src/components/QuickActions/index.vue b/src/components/QuickActions/index.vue
index 0058b5796..8d4a560d7 100644
--- a/src/components/QuickActions/index.vue
+++ b/src/components/QuickActions/index.vue
@@ -23,7 +23,7 @@ export default {
     title: {
       type: String,
       default() {
-        return this.$t('common.quickUpdate')
+        return this.$t('common.QuickUpdate')
       }
     },
     actions: {
diff --git a/src/components/RelationCard/index.vue b/src/components/RelationCard/index.vue
index ee704df32..0076a820e 100644
--- a/src/components/RelationCard/index.vue
+++ b/src/components/RelationCard/index.vue
@@ -8,7 +8,7 @@
       </tr>
       <tr>
         <td colspan="2">
-          <el-button :type="type" size="small" :loading="submitLoading" @click="addObjects">{{ $t('common.add') }}</el-button>
+          <el-button :type="type" size="small" :loading="submitLoading" @click="addObjects">{{ $t('common.actions.Add') }}</el-button>
         </td>
       </tr>
       <template v-if="showHasObjects">
@@ -25,7 +25,7 @@
         <td colspan="2">
           <el-button :type="type" size="small" style="width: 100%" @click="loadMore">
             <i class="fa fa-arrow-down" />
-            {{ $t('common.more') }}
+            {{ $t('common.More') }}
           </el-button>
         </td>
       </tr>
diff --git a/src/i18n/langs/cn.old.json b/src/i18n/langs/cn.old.json
index 4f85176ca..b8bc427c2 100644
--- a/src/i18n/langs/cn.old.json
+++ b/src/i18n/langs/cn.old.json
@@ -55,7 +55,7 @@
     "updateSuccessMsg":"更新成功",
     "updateFailedMsg":"更新失败",
     "disableSelected":"禁用所选",
-    "activeSelected":"激活所选",
+    "activateSelected":"激活所选",
     "deleteWarningMsg":"你确定要删除",
     "rows":"行",
     "basicInfo":"基本信息",
@@ -171,9 +171,9 @@
     "DateJoined": "创建日期",
     "Users": "用户",
     "quickUpdate": {
-      "ResetMFA": "重置MFA",
-      "ResetPasswordMail": "重置密码",
-      "RestSSHKeyMail": "重置密钥",
+      "resetMFA": "重置MFA",
+      "resetPassword": "重置密码",
+      "restSSHKey": "重置密钥",
       "UnblockLogin": "解除登录限制",
       "Messages": {
         "resetPasswordWarningMsg": ""
diff --git a/src/i18n/langs/cn/common.json b/src/i18n/langs/cn/common.json
index 9bd813700..bd65e5f02 100644
--- a/src/i18n/langs/cn/common.json
+++ b/src/i18n/langs/cn/common.json
@@ -41,7 +41,7 @@
   "updateSuccessMsg": "更新成功",
   "updateFailedMsg": "更新失败",
   "disableSelected": "禁用所选",
-  "activeSelected": "激活所选",
+  "activateSelected": "激活所选",
   "deleteWarningMsg": "你确定要删除",
   "rows": "行",
   "basicInfo": "基本信息",
diff --git a/src/i18n/langs/cn/users.json b/src/i18n/langs/cn/users.json
index e75ac3fe7..95d15adc8 100644
--- a/src/i18n/langs/cn/users.json
+++ b/src/i18n/langs/cn/users.json
@@ -14,9 +14,9 @@
   "DateJoined": "创建日期",
   "Users": "用户",
   "quickUpdate": {
-    "ResetMFA": "重置MFA",
-    "ResetPasswordMail": "重置密码",
-    "RestSSHKeyMail": "重置密钥",
+    "resetMFA": "重置MFA",
+    "resetPassword": "重置密码",
+    "restSSHKey": "重置密钥",
     "UnblockLogin": "解除登录限制",
     "Messages": {
       "resetPasswordWarningMsg": ""
diff --git a/src/i18n/langs/en.old.json b/src/i18n/langs/en.old.json
index 3d990a000..f68dcbf24 100644
--- a/src/i18n/langs/en.old.json
+++ b/src/i18n/langs/en.old.json
@@ -88,12 +88,12 @@
     "remote_app_permission": "RemoteApp permission",
     "database_app_granted": "DatabaseApp granted",
     "database_app_permission": "DatabaseApp permission",
-    "resetPublicKeyTitle": "Send reset ssh key mail",
+    "resetSSHKeyTitle": "Send reset ssh key mail",
     "resetPasswordTitle": "Send reset password mail",
     "resetPasswordWarningMsg": "This will reset the user password and send a reset mail",
     "resetPasswordSuccessMsg": "An e-mail has been sent to the user`s mailbox",
-    "resetPublicKeyWarningMsg": "This will reset the user public key and send a reset mail",
-    "resetPublicKeySuccessMsg": "An e-mail has been sent to the user`s mailbox",
+    "resetSSHKeyWarningMsg": "This will reset the user public key and send a reset mail",
+    "resetSSHKeySuccessMsg": "An e-mail has been sent to the user`s mailbox",
     "resetMFATitle": "Reset MFA",
     "unblockSuccessMsg": "Account has unblocked",
     "resetMFAWarningMsg": "This will reset user MFA setting and user need config again",
diff --git a/src/i18n/langs/en/common.json b/src/i18n/langs/en/common.json
index 122c74983..6a8c84e9f 100644
--- a/src/i18n/langs/en/common.json
+++ b/src/i18n/langs/en/common.json
@@ -1,3 +1,42 @@
 {
-  "Other": "Other"
+  "Other": "Other",
+  "fieldRequiredError": "This field is required",
+  "nav": {
+    "Help": "Help",
+    "Docs": "Docs",
+    "Language": "Language",
+    "Support": "Support",
+    "Profile": "Profile",
+    "APIKey": "API Key",
+    "Logout": "Logout",
+    "UserPage": "User page"
+  },
+  "table": {
+    "Validity": "Validity",
+    "Actions": "Actions",
+    "Name": "Name",
+    "CreatedBy": "Created by",
+    "DateCreated": "Date created",
+    "Comment": "Comment"
+  },
+  "actions": {
+    "Update": "Update",
+    "Delete": "Delete",
+    "Reset": "Reset",
+    "Submit": "Submit",
+    "Create": "Create",
+    "MoreActions": "Actions",
+    "deleteSelected": "Delete selected",
+    "disableSelected": "Disable selected",
+    "activateSelected": "Activate selected",
+    "Cancel": "Cancel",
+    "Add": "Add",
+    "Activate": "Activate"
+  },
+  "tabs": {
+    "BasicInfo": "Basic info"
+  },
+  "Members": "Members",
+  "More": "More",
+  "QuickUpdate": "Quick update"
 }
diff --git a/src/i18n/langs/en/route.json b/src/i18n/langs/en/route.json
index 6fdc63e87..464744a9d 100644
--- a/src/i18n/langs/en/route.json
+++ b/src/i18n/langs/en/route.json
@@ -2,9 +2,9 @@
   "Dashboard": "Dashboard",
   "Users": "Users",
   "UserList": "Users",
-  "UserDetail": "Users detail",
+  "UserDetail": "User detail",
   "UserGroupList": "User groups",
-  "UserGroupDetail": "User groups detail",
+  "UserGroupDetail": "User group detail",
   "Assets": "Assets",
   "AssetList": "Assets",
   "DomainList": "Domains",
diff --git a/src/i18n/langs/en/users.json b/src/i18n/langs/en/users.json
index c4a4c55f4..6c56ac1e2 100644
--- a/src/i18n/langs/en/users.json
+++ b/src/i18n/langs/en/users.json
@@ -4,24 +4,33 @@
     "Authentication": "Account",
     "Secure": "Secure"
   },
-  "DateLastLogin": "最后登录日期",
+  "DateLastLogin": "Date last login",
   "MFA": "MFA",
-  "Source": "来源",
-  "DatePasswordUpdated": "改密日期",
-  "Name": "姓名",
-  "Username": "用户名",
+  "Source": "Source",
+  "DatePasswordUpdated": "Date password updated",
+  "Name": "Name",
+  "Username": "Username",
   "Email": "Email",
-  "Role": "角色",
-  "DateExpired": "过期时间",
-  "DateJoined": "创建日期",
-  "Users": "用户",
-  "quickUpdate": {
-    "ResetMFA": "重置MFA",
-    "ResetPasswordMail": "重置密码",
-    "RestSSHKeyMail": "重置密钥",
-    "UnblockLogin": "解除登录限制",
+  "Role": "Role",
+  "DateExpired": "Date expired",
+  "DateJoined": "Date joined",
+  "Users": "Users",
+  "actions": {
+    "resetMFA": "Reset MFA",
+    "resetPassword": "Reset password",
+    "resetSSHKey": "Reset SSH key",
+    "unblockUser": "Unblock login",
+    "Send": "Send",
+    "Unblock": "Unblock",
     "Messages": {
       "resetPasswordWarningMsg": ""
     }
-  }
+  },
+  "UserGroups": "User groups",
+  "GrantedAssets": "Granted assets",
+  "AssetPermissionRules": "Asset permission rules",
+  "GrantedRemoteApps": "Granted remote apps",
+  "RemoteAppPermissionRules": "Remote app permission rules",
+  "GrantedDatabases": "Granted databases",
+  "DatabasePermissionRules": "Database Permission rules"
 }
diff --git a/src/layout/components/GenericDetailPage/index.vue b/src/layout/components/GenericDetailPage/index.vue
index 9da0eaa23..b672323bd 100644
--- a/src/layout/components/GenericDetailPage/index.vue
+++ b/src/layout/components/GenericDetailPage/index.vue
@@ -95,13 +95,13 @@ export default {
       return [
         {
           name: 'update',
-          title: this.$t('common.update'),
+          title: this.$t('common.actions.Update'),
           can: this.validActions.canUpdate,
           callback: this.validActions.updateCallback.bind(this)
         },
         {
           name: 'delete',
-          title: this.$t('common.delete'),
+          title: this.$t('common.actions.Delete'),
           can: this.validActions.canDelete,
           callback: this.validActions.deleteCallback.bind(this)
         }
diff --git a/src/layout/components/NavHeader/AccountDropdown.vue b/src/layout/components/NavHeader/AccountDropdown.vue
index 35b283b66..eebf44a24 100644
--- a/src/layout/components/NavHeader/AccountDropdown.vue
+++ b/src/layout/components/NavHeader/AccountDropdown.vue
@@ -7,10 +7,10 @@
         <i class="el-icon-arrow-down el-icon--right" />
       </span>
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item icon="el-icon-user" command="profile">{{ $t('common.profile') }}</el-dropdown-item>
-        <el-dropdown-item icon="el-icon-guide" command="changePage">{{ $t('common.userPage') }}</el-dropdown-item>
-        <el-dropdown-item icon="el-icon-key" command="apiKey">{{ $t('common.apiKey') }}</el-dropdown-item>
-        <el-dropdown-item divided command="logout">{{ $t('common.logout') }}</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-user" command="profile">{{ $t('common.nav.Profile') }}</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-guide" command="changePage">{{ $t('common.nav.UserPage') }}</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-key" command="apiKey">{{ $t('common.nav.APIKey') }}</el-dropdown-item>
+        <el-dropdown-item divided command="logout">{{ $t('common.nav.Logout') }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
   </div>
diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue
index 057e3a652..5fca21e12 100644
--- a/src/layout/components/NavHeader/index.vue
+++ b/src/layout/components/NavHeader/index.vue
@@ -7,18 +7,18 @@
       <div class="header-item">
         <el-dropdown>
           <span class="el-dropdown-link">
-            {{ $t('common.help') }}<i class="el-icon-arrow-down el-icon--right" />
+            {{ $t('common.nav.Help') }}<i class="el-icon-arrow-down el-icon--right" />
           </span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item icon="el-icon-plus">{{ $t('common.docs') }}</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-circle-plus">{{ $t('common.support') }}</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-plus">{{ $t('common.nav.Docs') }}</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-circle-plus">{{ $t('common.nav.Support') }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
       <div class="header-item">
         <el-dropdown>
           <span class="el-dropdown-link">
-            {{ $t('common.language') }}<i class="el-icon-arrow-down el-icon--right" />
+            {{ $t('common.nav.Language') }}<i class="el-icon-arrow-down el-icon--right" />
           </span>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="changeLangToZH">中文(简体)</el-dropdown-item>
diff --git a/src/views/applications/DatabaseApp/DatabaseAppDetail/DatabaseAppDetail.vue b/src/views/applications/DatabaseApp/DatabaseAppDetail/DatabaseAppDetail.vue
index 1bb204127..ba61d7d5d 100644
--- a/src/views/applications/DatabaseApp/DatabaseAppDetail/DatabaseAppDetail.vue
+++ b/src/views/applications/DatabaseApp/DatabaseAppDetail/DatabaseAppDetail.vue
@@ -28,7 +28,7 @@ export default {
     detailItems() {
       return [
         {
-          key: this.$t('common.name'),
+          key: this.$t('common.table.Name'),
           value: this.object.name
         },
         {
@@ -48,15 +48,15 @@ export default {
           value: this.object.database
         },
         {
-          key: this.$t('common.dateCreated'),
+          key: this.$t('common.table.DateCreated'),
           value: toSafeLocalDateStr(this.object.date_created)
         },
         {
-          key: this.$t('common.createdBy'),
+          key: this.$t('common.table.CreatedBy'),
           value: this.object.created_by
         },
         {
-          key: this.$t('common.comment'),
+          key: this.$t('common.table.Comment'),
           value: this.object.comment
         }
       ]
diff --git a/src/views/applications/RemoteApp/RemoteAppDetail/RemoteAppDetail.vue b/src/views/applications/RemoteApp/RemoteAppDetail/RemoteAppDetail.vue
index f4ac72fb0..9fedafdeb 100644
--- a/src/views/applications/RemoteApp/RemoteAppDetail/RemoteAppDetail.vue
+++ b/src/views/applications/RemoteApp/RemoteAppDetail/RemoteAppDetail.vue
@@ -28,7 +28,7 @@ export default {
     detailItems() {
       return [
         {
-          key: this.$t('common.name'),
+          key: this.$t('common.table.Name'),
           value: this.object.name
         },
         {
@@ -44,15 +44,15 @@ export default {
           value: this.object.path
         },
         {
-          key: this.$t('common.dateCreated'),
+          key: this.$t('common.table.DateCreated'),
           value: toSafeLocalDateStr(this.object.date_created)
         },
         {
-          key: this.$t('common.createdBy'),
+          key: this.$t('common.table.CreatedBy'),
           value: this.object.created_by
         },
         {
-          key: this.$t('common.comment'),
+          key: this.$t('common.table.Comment'),
           value: this.object.comment
         }
       ]
diff --git a/src/views/assets/AdminUser/AdminUserList.vue b/src/views/assets/AdminUser/AdminUserList.vue
index b7d1694b3..33dff6e73 100644
--- a/src/views/assets/AdminUser/AdminUserList.vue
+++ b/src/views/assets/AdminUser/AdminUserList.vue
@@ -17,7 +17,7 @@ export default {
         columns: [
           {
             prop: 'name',
-            label: this.$t('common.name'),
+            label: this.$t('common.table.Name'),
             formatter: DetailFormatter,
             sortable: true,
             route: 'AdminUserDetail'
@@ -33,12 +33,11 @@ export default {
           },
           {
             prop: 'comment',
-            label: this.$t('common.comment'),
+            label: this.$t('common.table.Comment'),
             sortable: 'custom'
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index f368e75f8..d99d00da0 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -58,7 +58,6 @@ export default {
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue b/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue
index e7d985d5f..b846ca124 100644
--- a/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue
+++ b/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue
@@ -44,7 +44,6 @@ export default {
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
@@ -79,7 +78,7 @@ export default {
         extraActions: [
           {
             name: 'actionCreate',
-            title: this.$t('common.Create'),
+            title: this.$t('common.actions.Create'),
             type: 'primary',
             has: this.hasCreate,
             can: true,
diff --git a/src/views/assets/CommandFilter/CommandFilterList.vue b/src/views/assets/CommandFilter/CommandFilterList.vue
index b2167b448..3dfdb7de3 100644
--- a/src/views/assets/CommandFilter/CommandFilterList.vue
+++ b/src/views/assets/CommandFilter/CommandFilterList.vue
@@ -41,7 +41,6 @@ export default {
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
diff --git a/src/views/assets/Domain/DomainList.vue b/src/views/assets/Domain/DomainList.vue
index 5df10d8cf..f1c550418 100644
--- a/src/views/assets/Domain/DomainList.vue
+++ b/src/views/assets/Domain/DomainList.vue
@@ -39,7 +39,6 @@ export default {
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue
index 579473bc8..b29c31f8e 100644
--- a/src/views/assets/GatewayList.vue
+++ b/src/views/assets/GatewayList.vue
@@ -48,7 +48,6 @@ export default {
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
diff --git a/src/views/assets/Label/LabelList.vue b/src/views/assets/Label/LabelList.vue
index bf29f34cc..f25949b70 100644
--- a/src/views/assets/Label/LabelList.vue
+++ b/src/views/assets/Label/LabelList.vue
@@ -31,7 +31,6 @@ export default {
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
diff --git a/src/views/assets/Platform/PlatformList.vue b/src/views/assets/Platform/PlatformList.vue
index 9af418ab5..b04852ef9 100644
--- a/src/views/assets/Platform/PlatformList.vue
+++ b/src/views/assets/Platform/PlatformList.vue
@@ -34,7 +34,6 @@ export default {
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
index 3b663897d..94b1455f8 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
@@ -23,7 +23,7 @@ export default {
 
       },
       fields: [
-        [this.$t('common.basicInfo'), ['name', 'login_mode', 'username', 'username_same_with_user', 'priority', 'protocol']],
+        [this.$t('common.tabs.BasicInfo'), ['name', 'login_mode', 'username', 'username_same_with_user', 'priority', 'protocol']],
         [this.$t('common.Auth'), ['auto_generate_key', 'password', 'auto_push']],
         [this.$t('common.Command filter'), ['cmd_filters']],
         [this.$t('common.Others'), ['sftp_root', 'sudo', 'shell', 'comment']]
diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
index 556257c13..afb94c350 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
@@ -133,7 +133,6 @@ export default {
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: CustomActionsFormatter,
             actions: {
diff --git a/src/views/assets/SystemUser/SystemUserList.vue b/src/views/assets/SystemUser/SystemUserList.vue
index 0fe0de452..4e4080983 100644
--- a/src/views/assets/SystemUser/SystemUserList.vue
+++ b/src/views/assets/SystemUser/SystemUserList.vue
@@ -17,7 +17,7 @@ export default {
         columns: [
           {
             prop: 'name',
-            label: this.$t('common.name'),
+            label: this.$t('common.table.Name'),
             formatter: DetailFormatter,
             sortable: true,
             route: 'SystemUserDetail'
@@ -44,12 +44,11 @@ export default {
           },
           {
             prop: 'comment',
-            label: this.$t('common.comment'),
+            label: this.$t('common.table.Comment'),
             sortable: 'custom'
           },
           {
             prop: 'id',
-            label: this.$t('common.action'),
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
diff --git a/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue b/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue
index c543469aa..d12cd932d 100644
--- a/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue
+++ b/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue
@@ -54,7 +54,6 @@ export default {
           },
           actions: {
             prop: 'id',
-            abel: this.$t('common.action'),
             formatter: ActionsFormatter,
             actions: {
               hasEdit: false,
diff --git a/src/views/jobcenter/TaskDetail/TaskAdhoc.vue b/src/views/jobcenter/TaskDetail/TaskAdhoc.vue
index 9b7521063..5bc78f9ef 100644
--- a/src/views/jobcenter/TaskDetail/TaskAdhoc.vue
+++ b/src/views/jobcenter/TaskDetail/TaskAdhoc.vue
@@ -3,8 +3,8 @@
 </template>
 
 <script>
-import ListTable from '@/components/ListTable'
-import { ActionsFormatter, LengthFormatter } from '@/components/ListTable/formatters/index'
+import { ListTable } from '@/components'
+import { LengthFormatter } from '@/components/ListTable/formatters'
 import { toSafeLocalDateStr } from '@/utils/common'
 export default {
   name: 'TaskAdhoc',
@@ -58,8 +58,6 @@ export default {
           },
           actions: {
             prop: 'id',
-            label: this.$t('common.action'),
-            formatter: ActionsFormatter,
             actions: {
               hasEdit: false,
               hasDelete: false,
diff --git a/src/views/jobcenter/TaskDetail/TaskDetail.vue b/src/views/jobcenter/TaskDetail/TaskDetail.vue
index a4131ca33..d308a9b23 100644
--- a/src/views/jobcenter/TaskDetail/TaskDetail.vue
+++ b/src/views/jobcenter/TaskDetail/TaskDetail.vue
@@ -64,7 +64,7 @@ export default {
           value: this.object.id
         },
         {
-          key: this.$t('common.name'),
+          key: this.$t('common.table.Name'),
           value: this.object.name
         },
         {
diff --git a/src/views/jobcenter/TaskDetail/TaskHistory.vue b/src/views/jobcenter/TaskDetail/TaskHistory.vue
index 7a047edd5..f7bb57d7c 100644
--- a/src/views/jobcenter/TaskDetail/TaskHistory.vue
+++ b/src/views/jobcenter/TaskDetail/TaskHistory.vue
@@ -4,7 +4,6 @@
 
 <script>
 import ListTable from '@/components/ListTable'
-import { ActionsFormatter } from '@/components/ListTable/formatters/index'
 import { toSafeLocalDateStr } from '@/utils/common'
 
 export default {
@@ -60,8 +59,6 @@ export default {
           },
           actions: {
             prop: 'id',
-            abel: this.$t('common.action'),
-            formatter: ActionsFormatter,
             actions: {
               hasEdit: false,
               hasDelete: false,
diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue
index 7d400c3e6..53ee7dd1d 100644
--- a/src/views/jobcenter/TaskList.vue
+++ b/src/views/jobcenter/TaskList.vue
@@ -5,7 +5,6 @@
 <script>
 import { timeOffset, toSafeLocalDateStr } from '@/utils/common'
 import { GenericListPage } from '@/layout/components'
-import { ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -61,8 +60,6 @@ export default {
           },
           actions: {
             prop: 'id',
-            label: this.$t('common.action'),
-            formatter: ActionsFormatter,
             actions: {
               hasUpdate: false,
               extraActions: [
diff --git a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
index f89864e98..b6750080a 100644
--- a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
@@ -21,7 +21,7 @@ export default {
         [this.$t('perms.' + 'Basic'), ['name']],
         [this.$t('perms.' + 'User'), ['users', 'user_groups']],
         [this.$t('perms.' + 'Asset'), ['assets', 'nodes', 'system_users']],
-        [this.$t('common.action'), ['actions']],
+        [this.$t('common.table.Actions'), ['actions']],
         [this.$t('common.Other'), ['is_active', 'date_expired', 'comment']]
       ],
       url: '/api/v1/perms/asset-permissions/',
diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
index 474640acd..7b76788f6 100644
--- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
@@ -45,7 +45,7 @@ export default {
           },
           delete_action: {
             prop: 'asset',
-            label: this.$t('common.action'),
+            label: this.$t('common.table.Actions'),
             align: 'center',
             width: 150,
             objects: this.object.assets,
diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue
index a48e3f7a7..c34e40ad8 100644
--- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue
@@ -30,7 +30,7 @@ export default {
     return {
       quickActions: [
         {
-          title: this.$t('common.active'),
+          title: this.$t('common.actions.Activate'),
           type: 'switcher',
           attrs: {
             model: this.object.is_active
@@ -55,7 +55,7 @@ export default {
     detailCardItems() {
       return [
         {
-          key: this.$t('common.name'),
+          key: this.$t('common.table.Name'),
           value: this.object.name
         },
         {
@@ -96,7 +96,7 @@ export default {
           value: this.object.created_by
         },
         {
-          key: this.$t('common.Comment'),
+          key: this.$t('common.table.Comment'),
           value: 'api没有这个字段'
         }
       ]
diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue
index 25fb914d8..e27776f1d 100644
--- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue
@@ -42,7 +42,7 @@ export default {
           },
           delete_action: {
             prop: 'user',
-            label: this.$t('common.action'),
+            label: this.$t('common.table.Actions'),
             align: 'center',
             width: 150,
             objects: this.object.users,
diff --git a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue
index 12d293a21..8816a1649 100644
--- a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue
+++ b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue
@@ -42,7 +42,7 @@ export default {
           },
           delete_action: {
             prop: 'databaseapp',
-            label: this.$t('common.action'),
+            label: this.$t('common.table.Actions'),
             align: 'center',
             width: 150,
             objects: this.object.database_apps,
diff --git a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue
index 653c94092..b6a4044c9 100644
--- a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue
+++ b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue
@@ -30,7 +30,7 @@ export default {
     return {
       quickActions: [
         {
-          title: this.$t('common.active'),
+          title: this.$t('common.actions.Activate'),
           type: 'switcher',
           attrs: {
             model: this.object.is_active
@@ -55,7 +55,7 @@ export default {
     detailCardItems() {
       return [
         {
-          key: this.$t('common.name'),
+          key: this.$t('common.table.Name'),
           value: this.object.name
         },
         {
@@ -91,7 +91,7 @@ export default {
           value: this.object.created_by
         },
         {
-          key: this.$t('common.Comment'),
+          key: this.$t('common.table.Comment'),
           value: this.object.comment
         }
       ]
diff --git a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue
index 9213542f8..0026d56ee 100644
--- a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue
+++ b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue
@@ -43,7 +43,7 @@ export default {
           },
           delete_action: {
             prop: 'user',
-            label: this.$t('common.action'),
+            label: this.$t('common.table.Actions'),
             align: 'center',
             width: 150,
             objects: this.object.users,
diff --git a/src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue b/src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue
index c66e74f88..5faab5156 100644
--- a/src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue
+++ b/src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue
@@ -30,7 +30,7 @@ export default {
     return {
       quickActions: [
         {
-          title: this.$t('common.active'),
+          title: this.$t('common.actions.Activate'),
           type: 'switcher',
           attrs: {
             model: this.object.is_active
@@ -55,7 +55,7 @@ export default {
     detailCardItems() {
       return [
         {
-          key: this.$t('common.name'),
+          key: this.$t('common.table.Name'),
           value: this.object.name
         },
         {
@@ -91,7 +91,7 @@ export default {
           value: this.object.created_by
         },
         {
-          key: this.$t('common.Comment'),
+          key: this.$t('common.table.Comment'),
           value: this.object.comment
         }
       ]
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index 891728de8..e8c0b6e1f 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -50,7 +50,7 @@ export default {
           },
           actions: {
             prop: 'id',
-            label: this.$t('common.action'),
+            label: this.$t('common.table.Actions'),
             formatter: ActionsFormatter,
             actions: {
               hasEdit: false,
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index c3a275eb5..1cda8beae 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { ActionsFormatter } from '@/components/ListTable/formatters/index'
 import { toSafeLocalDateStr } from '@/utils/common'
 import { terminateSession } from '@/api/sessions'
 
@@ -48,40 +47,36 @@ export default {
           },
           actions: {
             prop: 'id',
-            label: this.$t('common.action'),
-            formatter: ActionsFormatter,
-            actions: {
-              hasEdit: false,
-              hasDelete: false,
-              hasUpdate: false,
-              extraActions: [
-                {
-                  name: 'terminate',
-                  title: this.$t('sessions.terminate'),
-                  type: 'danger',
-                  callback: function({ reload, cellValue, tableData }) {
-                    // 终断 session reload
-                    const data = [cellValue]
-                    terminateSession(data).then(res => {
-                      window.setTimeout(function() {
-                        reload()
-                      }, 50000)
-                    }
-                    )
-                  }
-                },
-                {
-                  name: 'join',
-                  title: this.$t('sessions.join'),
-                  type: 'primary',
-                  callback: function({ cellValue, tableData }) {
-                    // 跳转到luna页面
-                    const joinUrl = '/luna/join/?shareroom=' + cellValue
-                    window.open(joinUrl, 'height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')
+            hasEdit: false,
+            hasDelete: false,
+            hasUpdate: false,
+            extraActions: [
+              {
+                name: 'terminate',
+                title: this.$t('sessions.terminate'),
+                type: 'danger',
+                callback: function({ reload, cellValue, tableData }) {
+                  // 终断 session reload
+                  const data = [cellValue]
+                  terminateSession(data).then(res => {
+                    window.setTimeout(function() {
+                      reload()
+                    }, 50000)
                   }
+                  )
                 }
-              ]
-            }
+              },
+              {
+                name: 'join',
+                title: this.$t('sessions.join'),
+                type: 'primary',
+                callback: function({ cellValue, tableData }) {
+                  // 跳转到luna页面
+                  const joinUrl = '/luna/join/?shareroom=' + cellValue
+                  window.open(joinUrl, 'height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')
+                }
+              }
+            ]
           }
         }
       },
diff --git a/src/views/settings/Ldap.vue b/src/views/settings/Ldap.vue
index aebe6288e..3d9d4c9c7 100644
--- a/src/views/settings/Ldap.vue
+++ b/src/views/settings/Ldap.vue
@@ -42,7 +42,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button @click="dialogVisible = false">{{ $t('common.cancel') }}</el-button>
+        <el-button @click="dialogVisible = false">{{ $t('common.actions.Cancel') }}</el-button>
         <el-button type="primary" @click="testUerLoginClick">{{ $t('common.confirm') }}</el-button>
       </div>
     </el-dialog>
@@ -58,7 +58,7 @@
         @error="handlerListTableXHRError($event)"
       />
       <div slot="footer">
-        <el-button @click="dialogLdapUserImport = false">{{ $t('common.cancel') }}</el-button>
+        <el-button @click="dialogLdapUserImport = false">{{ $t('common.actions.Cancel') }}</el-button>
         <el-button type="primary" @click="importUserClick">{{ $t('common.import') }}</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/users/groups/UserGroupDetail/GroupInfo.vue b/src/views/users/groups/UserGroupDetail/GroupInfo.vue
index 705009217..29143164b 100644
--- a/src/views/users/groups/UserGroupDetail/GroupInfo.vue
+++ b/src/views/users/groups/UserGroupDetail/GroupInfo.vue
@@ -27,7 +27,7 @@ export default {
     return {
       relationConfig: {
         icon: 'fa-user',
-        title: this.$t('common.members'),
+        title: this.$t('common.Members'),
         objectsAjax: {
           url: '/api/v1/users/users/?fields_size=mini&order=name',
           processResults(data) {
@@ -64,19 +64,19 @@ export default {
     detailItems() {
       return [
         {
-          key: this.$t('common.name'),
+          key: this.$t('common.table.Name'),
           value: this.object.name
         },
         {
-          key: this.$t('common.createdBy'),
+          key: this.$t('common.table.CreatedBy'),
           value: this.object.created_by
         },
         {
-          key: this.$t('common.dateCreated'),
+          key: this.$t('common.table.DateCreated'),
           value: this.object.date_created
         },
         {
-          key: this.$t('common.comment'),
+          key: this.$t('common.table.Comment'),
           value: this.object.comment
         }
       ]
diff --git a/src/views/users/groups/UserGroupDetail/index.vue b/src/views/users/groups/UserGroupDetail/index.vue
index 045eb2a80..94ad2f7c3 100644
--- a/src/views/users/groups/UserGroupDetail/index.vue
+++ b/src/views/users/groups/UserGroupDetail/index.vue
@@ -25,7 +25,7 @@ export default {
         activeMenu: 'GroupInfo',
         submenu: [
           {
-            title: this.$t('common.basicInfo'),
+            title: this.$t('common.tabs.BasicInfo'),
             name: 'GroupInfo'
           },
           {
diff --git a/src/views/users/users/UserDetail/UserInfo.vue b/src/views/users/users/UserDetail/UserInfo.vue
index 744ffcf5d..f24ce2a55 100644
--- a/src/views/users/users/UserDetail/UserInfo.vue
+++ b/src/views/users/users/UserDetail/UserInfo.vue
@@ -31,7 +31,7 @@ export default {
     return {
       quickActions: [
         {
-          title: this.$t('common.Active'),
+          title: this.$t('common.actions.Activate'),
           type: 'switcher',
           attrs: {
             model: this.object.is_active
@@ -47,10 +47,10 @@ export default {
           }
         },
         {
-          title: this.$t('users.quickUpdate.ResetMFA'),
+          title: this.$t('users.actions.resetMFA'),
           attrs: {
             type: 'primary',
-            label: this.$t('common.reset')
+            label: this.$t('common.actions.Reset')
           },
           callbacks: {
             click: function() {
@@ -78,10 +78,10 @@ export default {
           }
         },
         {
-          title: this.$t('users.quickUpdate.ResetPassword'),
+          title: this.$t('users.actions.resetPassword'),
           attrs: {
             type: 'primary',
-            label: this.$t('common.send')
+            label: this.$t('users.actions.Send')
           },
           callbacks: {
             click: function() {
@@ -109,14 +109,14 @@ export default {
           }
         },
         {
-          title: this.$t('users.resetPublicKeyTitle'),
+          title: this.$t('users.actions.resetSSHKey'),
           attrs: {
             type: 'primary',
-            label: this.$t('common.send')
+            label: this.$t('users.actions.Send')
           },
           callbacks: {
             click: function() {
-              const warnMsg = vm.$t('users.resetPublicKeyWarningMsg')
+              const warnMsg = vm.$t('users.resetSSHKeyWarningMsg')
               const warnTitle = vm.$t('common.info')
               const url = `/api/v1/users/users/${vm.object.id}/pubkey/reset/`
               const successMsg = vm.$t('users.resetPasswordSuccessMsg')
@@ -140,10 +140,10 @@ export default {
           }
         },
         {
-          title: this.$t('users.unblockUser'),
+          title: this.$t('users.actions.unblockUser'),
           attrs: {
             type: 'primary',
-            label: this.$t('common.unblock'),
+            label: this.$t('users.actions.Unblock'),
             disabled: !this.object.login_blocked
           },
           callbacks: {
@@ -160,7 +160,7 @@ export default {
       ],
       relationConfig: {
         icon: 'fa-user',
-        title: this.$t('users.userGroups'),
+        title: this.$t('users.UserGroups'),
         objectsAjax: {
           url: '/api/v1/users/groups/?fields_size=mini&order=name'
         },
@@ -217,7 +217,7 @@ export default {
           value: this.object.date_expired
         },
         {
-          key: this.$t('common.CreatedBy'),
+          key: this.$t('common.table.CreatedBy'),
           value: this.object.created_by
         },
         {
@@ -233,7 +233,7 @@ export default {
           value: this.object.date_password_last_updated
         },
         {
-          key: this.$t('common.Comment'),
+          key: this.$t('common.table.Comment'),
           value: this.object.comment
         }
       ]
diff --git a/src/views/users/users/UserDetail/index.vue b/src/views/users/users/UserDetail/index.vue
index 29555f3a8..b569c404b 100644
--- a/src/views/users/users/UserDetail/index.vue
+++ b/src/views/users/users/UserDetail/index.vue
@@ -35,31 +35,31 @@ export default {
         activeMenu: 'UserInfo',
         submenu: [
           {
-            title: this.$t('common.basicInfo'),
+            title: this.$t('common.tabs.BasicInfo'),
             name: 'UserInfo'
           },
           {
-            title: this.$t('perms.grantedAssets'),
+            title: this.$t('users.GrantedAssets'),
             name: 'UserGrantedAssets'
           },
           {
-            title: this.$t('perms.assetPermissionRules'),
+            title: this.$t('users.AssetPermissionRules'),
             name: 'UserAssetPermissionRules'
           },
           {
-            title: this.$t('perms.grantedRemoteApps'),
+            title: this.$t('users.GrantedRemoteApps'),
             name: 'UserGrantedRemoteApps'
           },
           {
-            title: this.$t('perms.remoteAppsPermissionRules'),
+            title: this.$t('users.RemoteAppPermissionRules'),
             name: 'UserRemoteAppPermissionRules'
           },
           {
-            title: this.$t('perms.grantedDatabases'),
+            title: this.$t('users.GrantedDatabases'),
             name: 'UserGrantedDatabases'
           },
           {
-            title: this.$t('perms.databasePermissionRules'),
+            title: this.$t('users.DatabasePermissionRules'),
             name: 'UserDatabasePermissionRules'
           }
         ],
diff --git a/src/views/users/users/UserList.vue b/src/views/users/users/UserList.vue
index aa65e9d9f..1a2416d95 100644
--- a/src/views/users/users/UserList.vue
+++ b/src/views/users/users/UserList.vue
@@ -33,16 +33,16 @@ export default {
         extraMoreActions: [
           {
             name: 'disableSelected',
-            title: this.$t('common.disableSelected'),
+            title: this.$t('common.actions.disableSelected'),
             callback: () => {
               console.log('disableSelected')
             }
           },
           {
-            name: 'activeSelected',
-            title: this.$t('common.activeSelected'),
+            name: 'activateSelected',
+            title: this.$t('common.actions.activateSelected'),
             callback: () => {
-              console.log('activeSelected')
+              console.log('activateSelected')
             }
           }
         ]