diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 820dc398eb1f58f52cc32addee4b8e37cd6a0cf8..58ec179b83bd35b8c88e98ab8aefe011277ccf4c 100644
Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ
diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 97df573d9231f1f2b0c14c54660846cee85dc500..823a3b07cf9d76e9b52fb8e22e59aa5a30105e70 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-21 11:01+0800\n"
+"POT-Creation-Date: 2019-05-21 21:09+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -77,14 +77,15 @@ msgstr "运行参数"
 #: applications/templates/applications/user_remote_app_list.html:18
 #: assets/forms/domain.py:15 assets/forms/label.py:13
 #: assets/models/asset.py:279 assets/models/authbook.py:27
-#: assets/templates/assets/admin_user_list.html:28
+#: assets/serializers/admin_user.py:23 assets/serializers/system_user.py:28
+#: assets/templates/assets/admin_user_list.html:49
 #: assets/templates/assets/domain_detail.html:60
 #: assets/templates/assets/domain_list.html:26
 #: assets/templates/assets/label_list.html:16
-#: assets/templates/assets/system_user_list.html:33 audits/models.py:19
+#: assets/templates/assets/system_user_list.html:55 audits/models.py:19
 #: audits/templates/audits/ftp_log_list.html:41
 #: audits/templates/audits/ftp_log_list.html:71
-#: perms/forms/asset_permission.py:46 perms/models/asset_permission.py:55
+#: perms/forms/asset_permission.py:46 perms/models/asset_permission.py:37
 #: perms/templates/perms/asset_permission_create_update.html:45
 #: perms/templates/perms/asset_permission_list.html:56
 #: perms/templates/perms/asset_permission_list.html:125
@@ -112,8 +113,8 @@ msgstr "资产"
 #: assets/models/user.py:247 assets/templates/assets/user_asset_list.html:168
 #: audits/models.py:20 audits/templates/audits/ftp_log_list.html:49
 #: audits/templates/audits/ftp_log_list.html:72
-#: perms/forms/asset_permission.py:52 perms/models/asset_permission.py:57
-#: perms/models/asset_permission.py:112
+#: perms/forms/asset_permission.py:52 perms/models/asset_permission.py:39
+#: perms/models/asset_permission.py:59
 #: perms/templates/perms/asset_permission_detail.html:140
 #: perms/templates/perms/asset_permission_list.html:58
 #: perms/templates/perms/asset_permission_list.html:79
@@ -136,7 +137,7 @@ msgstr "系统用户"
 #: assets/models/cmd_filter.py:20 assets/models/domain.py:20
 #: assets/models/group.py:20 assets/models/label.py:18
 #: assets/templates/assets/admin_user_detail.html:56
-#: assets/templates/assets/admin_user_list.html:26
+#: assets/templates/assets/admin_user_list.html:47
 #: assets/templates/assets/cmd_filter_detail.html:61
 #: assets/templates/assets/cmd_filter_list.html:24
 #: assets/templates/assets/domain_detail.html:56
@@ -144,10 +145,10 @@ msgstr "系统用户"
 #: assets/templates/assets/domain_list.html:25
 #: assets/templates/assets/label_list.html:14
 #: assets/templates/assets/system_user_detail.html:58
-#: assets/templates/assets/system_user_list.html:29 ops/models/adhoc.py:37
+#: assets/templates/assets/system_user_list.html:51 ops/models/adhoc.py:37
 #: ops/templates/ops/task_detail.html:60 ops/templates/ops/task_list.html:27
 #: orgs/models.py:12 perms/models/asset_permission.py:22
-#: perms/models/asset_permission.py:52 perms/models/remote_app_permission.py:33
+#: perms/models/base.py:35
 #: perms/templates/perms/asset_permission_detail.html:62
 #: perms/templates/perms/asset_permission_list.html:53
 #: perms/templates/perms/asset_permission_list.html:72
@@ -167,8 +168,8 @@ msgstr "系统用户"
 #: users/models/user.py:61 users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_detail.html:63
 #: users/templates/users/user_group_detail.html:55
-#: users/templates/users/user_group_list.html:12
-#: users/templates/users/user_list.html:23
+#: users/templates/users/user_group_list.html:35
+#: users/templates/users/user_list.html:35
 #: users/templates/users/user_profile.html:51
 #: users/templates/users/user_pubkey_update.html:53
 #: xpack/plugins/change_auth_plan/forms.py:97
@@ -212,11 +213,11 @@ msgstr "参数"
 #: assets/templates/assets/domain_detail.html:72
 #: assets/templates/assets/system_user_detail.html:100
 #: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:15
-#: perms/models/asset_permission.py:62 perms/models/asset_permission.py:115
-#: perms/models/remote_app_permission.py:40
+#: perms/models/asset_permission.py:62 perms/models/base.py:41
 #: perms/templates/perms/asset_permission_detail.html:98
 #: perms/templates/perms/remote_app_permission_detail.html:90
-#: users/models/user.py:102 users/templates/users/user_detail.html:111
+#: users/models/user.py:102 users/serializers/v1.py:72
+#: users/templates/users/user_detail.html:111
 #: xpack/plugins/change_auth_plan/models.py:103
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113
 #: xpack/plugins/cloud/models.py:55 xpack/plugins/cloud/models.py:127
@@ -227,14 +228,14 @@ msgstr "创建者"
 #: applications/templates/applications/remote_app_detail.html:73
 #: assets/models/asset.py:110 assets/models/cluster.py:26
 #: assets/models/domain.py:23 assets/models/group.py:22
-#: assets/models/label.py:25 assets/templates/assets/admin_user_detail.html:64
+#: assets/models/label.py:25 assets/serializers/admin_user.py:37
+#: assets/templates/assets/admin_user_detail.html:64
 #: assets/templates/assets/cmd_filter_detail.html:69
 #: assets/templates/assets/domain_detail.html:68
 #: assets/templates/assets/system_user_detail.html:96
 #: ops/templates/ops/adhoc_detail.html:90 ops/templates/ops/task_detail.html:64
 #: orgs/models.py:16 perms/models/asset_permission.py:63
-#: perms/models/asset_permission.py:116
-#: perms/models/remote_app_permission.py:41
+#: perms/models/base.py:42
 #: perms/templates/perms/asset_permission_detail.html:94
 #: perms/templates/perms/remote_app_permission_detail.html:86
 #: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17
@@ -256,7 +257,7 @@ msgstr "创建日期"
 #: assets/models/cmd_filter.py:55 assets/models/domain.py:21
 #: assets/models/domain.py:53 assets/models/group.py:23
 #: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:72
-#: assets/templates/assets/admin_user_list.html:32
+#: assets/templates/assets/admin_user_list.html:53
 #: assets/templates/assets/asset_detail.html:136
 #: assets/templates/assets/cmd_filter_detail.html:65
 #: assets/templates/assets/cmd_filter_list.html:27
@@ -265,18 +266,17 @@ msgstr "创建日期"
 #: assets/templates/assets/domain_gateway_list.html:72
 #: assets/templates/assets/domain_list.html:28
 #: assets/templates/assets/system_user_detail.html:104
-#: assets/templates/assets/system_user_list.html:37
+#: assets/templates/assets/system_user_list.html:59
 #: assets/templates/assets/user_asset_list.html:171 ops/models/adhoc.py:43
 #: orgs/models.py:17 perms/models/asset_permission.py:64
-#: perms/models/asset_permission.py:117
-#: perms/models/remote_app_permission.py:42
+#: perms/models/base.py:43
 #: perms/templates/perms/asset_permission_detail.html:102
 #: perms/templates/perms/remote_app_permission_detail.html:94
 #: settings/models.py:34 terminal/models.py:32
 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15
 #: users/models/user.py:94 users/templates/users/user_detail.html:127
 #: users/templates/users/user_group_detail.html:67
-#: users/templates/users/user_group_list.html:14
+#: users/templates/users/user_group_list.html:37
 #: users/templates/users/user_profile.html:134
 #: xpack/plugins/change_auth_plan/models.py:99
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117
@@ -292,7 +292,7 @@ msgid "Comment"
 msgstr "备注"
 
 #: applications/models/remote_app.py:53 perms/forms/remote_app_permission.py:37
-#: perms/models/remote_app_permission.py:36
+#: perms/models/remote_app_permission.py:15
 #: perms/templates/perms/remote_app_permission_create_update.html:48
 #: perms/templates/perms/remote_app_permission_detail.html:27
 #: perms/templates/perms/remote_app_permission_list.html:17
@@ -343,7 +343,7 @@ msgstr "重置"
 #: assets/templates/assets/admin_user_create_update.html:46
 #: assets/templates/assets/asset_bulk_update.html:24
 #: assets/templates/assets/asset_create.html:68
-#: assets/templates/assets/asset_list.html:113
+#: assets/templates/assets/asset_list.html:125
 #: assets/templates/assets/asset_update.html:72
 #: assets/templates/assets/cmd_filter_create_update.html:16
 #: assets/templates/assets/cmd_filter_rule_create_update.html:41
@@ -366,7 +366,7 @@ msgstr "重置"
 #: users/templates/users/_user.html:51
 #: users/templates/users/forgot_password.html:42
 #: users/templates/users/user_bulk_update.html:24
-#: users/templates/users/user_list.html:45
+#: users/templates/users/user_list.html:57
 #: users/templates/users/user_password_update.html:72
 #: users/templates/users/user_profile_update.html:64
 #: users/templates/users/user_pubkey_update.html:77
@@ -404,9 +404,11 @@ msgstr "详情"
 #: applications/templates/applications/remote_app_detail.html:21
 #: applications/templates/applications/remote_app_list.html:56
 #: assets/templates/assets/admin_user_detail.html:24
-#: assets/templates/assets/admin_user_list.html:88
+#: assets/templates/assets/admin_user_list.html:29
+#: assets/templates/assets/admin_user_list.html:111
 #: assets/templates/assets/asset_detail.html:27
-#: assets/templates/assets/asset_list.html:178
+#: assets/templates/assets/asset_list.html:86
+#: assets/templates/assets/asset_list.html:190
 #: assets/templates/assets/cmd_filter_detail.html:29
 #: assets/templates/assets/cmd_filter_list.html:58
 #: assets/templates/assets/cmd_filter_rule_list.html:86
@@ -416,7 +418,8 @@ msgstr "详情"
 #: assets/templates/assets/domain_list.html:54
 #: assets/templates/assets/label_list.html:39
 #: assets/templates/assets/system_user_detail.html:26
-#: assets/templates/assets/system_user_list.html:93 audits/models.py:33
+#: assets/templates/assets/system_user_list.html:33
+#: assets/templates/assets/system_user_list.html:117 audits/models.py:33
 #: perms/templates/perms/asset_permission_detail.html:30
 #: perms/templates/perms/asset_permission_list.html:181
 #: perms/templates/perms/remote_app_permission_detail.html:30
@@ -425,9 +428,11 @@ msgstr "详情"
 #: terminal/templates/terminal/terminal_list.html:72
 #: users/templates/users/user_detail.html:25
 #: users/templates/users/user_group_detail.html:28
-#: users/templates/users/user_group_list.html:45
-#: users/templates/users/user_list.html:83
-#: users/templates/users/user_list.html:86
+#: users/templates/users/user_group_list.html:20
+#: users/templates/users/user_group_list.html:69
+#: users/templates/users/user_list.html:20
+#: users/templates/users/user_list.html:96
+#: users/templates/users/user_list.html:99
 #: users/templates/users/user_profile.html:177
 #: users/templates/users/user_profile.html:187
 #: users/templates/users/user_profile.html:196
@@ -443,9 +448,9 @@ msgstr "更新"
 #: applications/templates/applications/remote_app_detail.html:25
 #: applications/templates/applications/remote_app_list.html:57
 #: assets/templates/assets/admin_user_detail.html:28
-#: assets/templates/assets/admin_user_list.html:89
+#: assets/templates/assets/admin_user_list.html:112
 #: assets/templates/assets/asset_detail.html:31
-#: assets/templates/assets/asset_list.html:179
+#: assets/templates/assets/asset_list.html:191
 #: assets/templates/assets/cmd_filter_detail.html:33
 #: assets/templates/assets/cmd_filter_list.html:59
 #: assets/templates/assets/cmd_filter_rule_list.html:87
@@ -455,7 +460,7 @@ msgstr "更新"
 #: assets/templates/assets/domain_list.html:55
 #: assets/templates/assets/label_list.html:40
 #: assets/templates/assets/system_user_detail.html:30
-#: assets/templates/assets/system_user_list.html:94 audits/models.py:34
+#: assets/templates/assets/system_user_list.html:118 audits/models.py:34
 #: ops/templates/ops/task_list.html:64
 #: perms/templates/perms/asset_permission_detail.html:34
 #: perms/templates/perms/asset_permission_list.html:182
@@ -466,9 +471,9 @@ msgstr "更新"
 #: terminal/templates/terminal/terminal_list.html:74
 #: users/templates/users/user_detail.html:30
 #: users/templates/users/user_group_detail.html:32
-#: users/templates/users/user_group_list.html:47
-#: users/templates/users/user_list.html:91
-#: users/templates/users/user_list.html:95
+#: users/templates/users/user_group_list.html:71
+#: users/templates/users/user_list.html:104
+#: users/templates/users/user_list.html:108
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:33
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:57
 #: xpack/plugins/cloud/templates/cloud/account_detail.html:27
@@ -502,23 +507,23 @@ msgstr "创建远程应用"
 #: applications/templates/applications/user_remote_app_list.html:21
 #: assets/models/cmd_filter.py:54
 #: assets/templates/assets/admin_user_assets.html:52
-#: assets/templates/assets/admin_user_list.html:33
+#: assets/templates/assets/admin_user_list.html:54
 #: assets/templates/assets/asset_asset_user_list.html:48
-#: assets/templates/assets/asset_list.html:96
+#: assets/templates/assets/asset_list.html:108
 #: assets/templates/assets/cmd_filter_list.html:28
 #: assets/templates/assets/cmd_filter_rule_list.html:63
 #: assets/templates/assets/domain_gateway_list.html:73
 #: assets/templates/assets/domain_list.html:29
 #: assets/templates/assets/label_list.html:17
 #: assets/templates/assets/system_user_asset.html:54
-#: assets/templates/assets/system_user_list.html:38
+#: assets/templates/assets/system_user_list.html:60
 #: assets/templates/assets/user_asset_list.html:48 audits/models.py:38
 #: audits/templates/audits/operate_log_list.html:41
 #: audits/templates/audits/operate_log_list.html:67
 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:64
 #: ops/templates/ops/task_history.html:65 ops/templates/ops/task_list.html:34
 #: perms/forms/asset_permission.py:55 perms/models/asset_permission.py:26
-#: perms/models/asset_permission.py:58
+#: perms/models/asset_permission.py:40
 #: perms/templates/perms/asset_permission_create_update.html:50
 #: perms/templates/perms/asset_permission_list.html:60
 #: perms/templates/perms/asset_permission_list.html:134
@@ -527,8 +532,8 @@ msgstr "创建远程应用"
 #: settings/templates/settings/terminal_setting.html:104
 #: terminal/templates/terminal/session_list.html:81
 #: terminal/templates/terminal/terminal_list.html:36
-#: users/templates/users/user_group_list.html:15
-#: users/templates/users/user_list.html:29
+#: users/templates/users/user_group_list.html:38
+#: users/templates/users/user_list.html:41
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:60
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:18
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:20
@@ -551,9 +556,9 @@ msgstr "连接"
 #: assets/templates/assets/system_user_detail.html:22
 #: assets/views/admin_user.py:29 assets/views/admin_user.py:47
 #: assets/views/admin_user.py:63 assets/views/admin_user.py:78
-#: assets/views/admin_user.py:102 assets/views/asset.py:51
-#: assets/views/asset.py:67 assets/views/asset.py:104 assets/views/asset.py:145
-#: assets/views/asset.py:162 assets/views/asset.py:186
+#: assets/views/admin_user.py:102 assets/views/asset.py:53
+#: assets/views/asset.py:69 assets/views/asset.py:106 assets/views/asset.py:147
+#: assets/views/asset.py:164 assets/views/asset.py:188
 #: assets/views/cmd_filter.py:30 assets/views/cmd_filter.py:46
 #: assets/views/cmd_filter.py:62 assets/views/cmd_filter.py:78
 #: assets/views/cmd_filter.py:97 assets/views/cmd_filter.py:130
@@ -584,7 +589,7 @@ msgstr "远程应用详情"
 msgid "My RemoteApp"
 msgstr "我的远程应用"
 
-#: assets/api/asset.py:112
+#: assets/api/asset.py:126
 msgid "Please select assets that need to be updated"
 msgstr "请选择需要更新的资产"
 
@@ -604,7 +609,7 @@ msgstr "测试节点下资产是否可连接: {}"
 #: assets/templates/assets/asset_detail.html:194
 #: assets/templates/assets/asset_detail.html:202
 #: assets/templates/assets/system_user_asset.html:95
-#: perms/models/asset_permission.py:56
+#: perms/models/asset_permission.py:38
 #: xpack/plugins/change_auth_plan/models.py:69
 msgid "Nodes"
 msgstr "节点管理"
@@ -642,7 +647,7 @@ msgstr "网域"
 #: assets/templates/assets/asset_create.html:30
 #: assets/templates/assets/asset_update.html:35
 #: perms/forms/asset_permission.py:49 perms/forms/asset_permission.py:59
-#: perms/models/asset_permission.py:110
+#: perms/models/asset_permission.py:57
 #: perms/templates/perms/asset_permission_list.html:57
 #: perms/templates/perms/asset_permission_list.html:78
 #: perms/templates/perms/asset_permission_list.html:128
@@ -680,37 +685,6 @@ msgstr "如果有多个的互相隔离的网络，设置资产属于的网域，
 msgid "Select assets"
 msgstr "选择资产"
 
-#: assets/forms/domain.py:15 assets/forms/label.py:13
-#: assets/models/asset.py:279 assets/models/authbook.py:27
-#: assets/serializers/admin_user.py:31 assets/serializers/system_user.py:32
-#: assets/templates/assets/admin_user_list.html:49
-#: assets/templates/assets/domain_detail.html:60
-#: assets/templates/assets/domain_list.html:26
-#: assets/templates/assets/label_list.html:16
-#: assets/templates/assets/system_user_list.html:55 audits/models.py:19
-#: audits/templates/audits/ftp_log_list.html:41
-#: audits/templates/audits/ftp_log_list.html:71 perms/forms.py:42
-#: perms/models.py:50
-#: perms/templates/perms/asset_permission_create_update.html:45
-#: perms/templates/perms/asset_permission_list.html:56
-#: perms/templates/perms/asset_permission_list.html:125
-#: terminal/backends/command/models.py:13 terminal/models.py:155
-#: terminal/templates/terminal/command_list.html:40
-#: terminal/templates/terminal/command_list.html:73
-#: terminal/templates/terminal/session_list.html:41
-#: terminal/templates/terminal/session_list.html:72
-#: xpack/plugins/change_auth_plan/forms.py:114
-#: xpack/plugins/change_auth_plan/models.py:409
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:46
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:54
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:13
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:14
-#: xpack/plugins/cloud/models.py:187
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:63
-#: xpack/plugins/orgs/templates/orgs/org_list.html:16
-msgid "Asset"
-msgstr "资产"
-
 #: assets/forms/domain.py:51
 msgid "Password should not contain special characters"
 msgstr "不能包含特殊字符"
@@ -719,60 +693,11 @@ msgstr "不能包含特殊字符"
 msgid "SSH gateway support proxy SSH,RDP,VNC"
 msgstr "SSH网关，支持代理SSH,RDP和VNC"
 
-#: assets/forms/domain.py:73 assets/forms/user.py:84 assets/forms/user.py:146
-#: assets/models/base.py:26 assets/models/cluster.py:18
-#: assets/models/cmd_filter.py:20 assets/models/domain.py:20
-#: assets/models/group.py:20 assets/models/label.py:18
-#: assets/templates/assets/admin_user_detail.html:56
-#: assets/templates/assets/admin_user_list.html:47
-#: assets/templates/assets/cmd_filter_detail.html:61
-#: assets/templates/assets/cmd_filter_list.html:24
-#: assets/templates/assets/domain_detail.html:56
-#: assets/templates/assets/domain_gateway_list.html:67
-#: assets/templates/assets/domain_list.html:25
-#: assets/templates/assets/label_list.html:14
-#: assets/templates/assets/system_user_detail.html:58
-#: assets/templates/assets/system_user_list.html:51 ops/models/adhoc.py:37
-#: ops/templates/ops/task_detail.html:60 ops/templates/ops/task_list.html:27
-#: orgs/models.py:12 perms/models.py:17 perms/models.py:47
-#: perms/templates/perms/asset_permission_detail.html:62
-#: perms/templates/perms/asset_permission_list.html:53
-#: perms/templates/perms/asset_permission_list.html:72
-#: perms/templates/perms/asset_permission_user.html:54 settings/models.py:29
-#: settings/templates/settings/_ldap_list_users_modal.html:38
-#: settings/templates/settings/command_storage_create.html:41
-#: settings/templates/settings/replay_storage_create.html:44
-#: settings/templates/settings/terminal_setting.html:80
-#: settings/templates/settings/terminal_setting.html:102 terminal/models.py:22
-#: terminal/models.py:241 terminal/templates/terminal/terminal_detail.html:43
-#: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
-#: users/models/user.py:61 users/templates/users/_select_user_modal.html:13
-#: users/templates/users/user_detail.html:63
-#: users/templates/users/user_group_detail.html:55
-#: users/templates/users/user_group_list.html:35
-#: users/templates/users/user_list.html:35
-#: users/templates/users/user_profile.html:51
-#: users/templates/users/user_pubkey_update.html:53
-#: xpack/plugins/change_auth_plan/forms.py:97
-#: xpack/plugins/change_auth_plan/models.py:58
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12
-#: xpack/plugins/cloud/models.py:49 xpack/plugins/cloud/models.py:119
-#: xpack/plugins/cloud/templates/cloud/account_detail.html:50
-#: xpack/plugins/cloud/templates/cloud/account_list.html:12
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:53
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:12
-#: xpack/plugins/orgs/templates/orgs/org_detail.html:52
-#: xpack/plugins/orgs/templates/orgs/org_list.html:12
-msgid "Name"
-msgstr "名称"
-
 #: assets/forms/domain.py:74 assets/forms/user.py:85 assets/forms/user.py:147
 #: assets/models/base.py:27
 #: assets/templates/assets/_asset_user_auth_modal.html:15
 #: assets/templates/assets/_asset_user_view_auth_modal.html:31
 #: assets/templates/assets/admin_user_detail.html:60
-
 #: assets/templates/assets/admin_user_list.html:48
 #: assets/templates/assets/asset_asset_user_list.html:44
 #: assets/templates/assets/domain_gateway_list.html:71
@@ -1007,94 +932,19 @@ msgstr "主机名原始"
 msgid "Labels"
 msgstr "标签管理"
 
-#: assets/models/asset.py:109 assets/models/base.py:34
-#: assets/models/cluster.py:28 assets/models/cmd_filter.py:25
-#: assets/models/cmd_filter.py:58 assets/models/group.py:21
-#: assets/templates/assets/admin_user_detail.html:68
-#: assets/templates/assets/asset_detail.html:128
-#: assets/templates/assets/cmd_filter_detail.html:77
-#: assets/templates/assets/domain_detail.html:72
-#: assets/templates/assets/system_user_detail.html:100
-#: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:15 perms/models.py:57
-#: perms/models.py:110 perms/templates/perms/asset_permission_detail.html:98
-#: users/models/user.py:102 users/serializers/v1.py:69
-#: users/templates/users/user_detail.html:111
-#: xpack/plugins/change_auth_plan/models.py:103
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113
-#: xpack/plugins/cloud/models.py:55 xpack/plugins/cloud/models.py:127
-msgid "Created by"
-msgstr "创建者"
-
-#: assets/models/asset.py:110 assets/models/cluster.py:26
-#: assets/models/domain.py:23 assets/models/group.py:22
-#: assets/models/label.py:25 assets/serializers/admin_user.py:23
-#: assets/templates/assets/admin_user_detail.html:64
-#: assets/templates/assets/cmd_filter_detail.html:69
-#: assets/templates/assets/domain_detail.html:68
-#: assets/templates/assets/system_user_detail.html:96
-#: ops/templates/ops/adhoc_detail.html:90 ops/templates/ops/task_detail.html:64
-#: orgs/models.py:16 perms/models.py:58 perms/models.py:111
-#: perms/templates/perms/asset_permission_detail.html:94
-#: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17
-#: users/templates/users/user_group_detail.html:63
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:105
-#: xpack/plugins/cloud/models.py:56 xpack/plugins/cloud/models.py:128
-#: xpack/plugins/cloud/templates/cloud/account_detail.html:66
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:77
-#: xpack/plugins/orgs/templates/orgs/org_detail.html:60
-msgid "Date created"
-msgstr "创建日期"
-
-#: assets/models/asset.py:111 assets/models/base.py:31
-#: assets/models/cluster.py:29 assets/models/cmd_filter.py:22
-#: assets/models/cmd_filter.py:55 assets/models/domain.py:21
-#: assets/models/domain.py:53 assets/models/group.py:23
-#: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:72
-#: assets/templates/assets/admin_user_list.html:53
-#: assets/templates/assets/asset_detail.html:136
-#: assets/templates/assets/cmd_filter_detail.html:65
-#: assets/templates/assets/cmd_filter_list.html:27
-#: assets/templates/assets/cmd_filter_rule_list.html:62
-#: assets/templates/assets/domain_detail.html:76
-#: assets/templates/assets/domain_gateway_list.html:72
-#: assets/templates/assets/domain_list.html:28
-#: assets/templates/assets/system_user_detail.html:104
-#: assets/templates/assets/system_user_list.html:59
-#: assets/templates/assets/user_asset_list.html:171 ops/models/adhoc.py:43
-#: orgs/models.py:17 perms/models.py:59 perms/models.py:112
-#: perms/templates/perms/asset_permission_detail.html:102 settings/models.py:34
-#: terminal/models.py:32 terminal/templates/terminal/terminal_detail.html:63
-#: users/models/group.py:15 users/models/user.py:94
-#: users/templates/users/user_detail.html:127
-#: users/templates/users/user_group_detail.html:67
-#: users/templates/users/user_group_list.html:37
-#: users/templates/users/user_profile.html:134
-#: xpack/plugins/change_auth_plan/models.py:99
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19
-#: xpack/plugins/cloud/models.py:54 xpack/plugins/cloud/models.py:125
-#: xpack/plugins/cloud/templates/cloud/account_detail.html:70
-#: xpack/plugins/cloud/templates/cloud/account_list.html:15
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:69
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:16
-#: xpack/plugins/orgs/templates/orgs/org_detail.html:64
-#: xpack/plugins/orgs/templates/orgs/org_list.html:22
-msgid "Comment"
-msgstr "备注"
-
 #: assets/models/asset.py:117 assets/models/base.py:38
-#: assets/serializers/admin_user.py:29 assets/serializers/system_user.py:22
+#: assets/serializers/admin_user.py:22 assets/serializers/system_user.py:19
 #: assets/templates/assets/admin_user_list.html:51
 #: assets/templates/assets/system_user_list.html:57
 msgid "Unreachable"
 msgstr "不可达"
 
 #: assets/models/asset.py:118 assets/models/base.py:39
-#: assets/serializers/admin_user.py:32 assets/serializers/system_user.py:31
+#: assets/serializers/admin_user.py:24 assets/serializers/system_user.py:27
 #: assets/templates/assets/admin_user_assets.html:51
 #: assets/templates/assets/admin_user_list.html:50
-#: assets/templates/assets/asset_list.html:107
 #: assets/templates/assets/asset_asset_user_list.html:46
+#: assets/templates/assets/asset_list.html:107
 #: assets/templates/assets/system_user_asset.html:53
 #: assets/templates/assets/system_user_list.html:56
 #: users/templates/users/user_group_granted_asset.html:47
@@ -1243,42 +1093,6 @@ msgstr "内容"
 msgid "One line one command"
 msgstr "每行一个命令"
 
-#: assets/models/cmd_filter.py:54
-#: assets/templates/assets/admin_user_assets.html:52
-#: assets/templates/assets/admin_user_list.html:54
-#: assets/templates/assets/asset_list.html:108
-#: assets/templates/assets/asset_asset_user_list.html:48
-#: assets/templates/assets/cmd_filter_list.html:28
-#: assets/templates/assets/cmd_filter_rule_list.html:63
-#: assets/templates/assets/domain_gateway_list.html:73
-#: assets/templates/assets/domain_list.html:29
-#: assets/templates/assets/label_list.html:17
-#: assets/templates/assets/system_user_asset.html:54
-#: assets/templates/assets/system_user_list.html:60
-#: assets/templates/assets/user_asset_list.html:48 audits/models.py:38
-#: audits/templates/audits/operate_log_list.html:41
-#: audits/templates/audits/operate_log_list.html:67
-#: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:64
-#: ops/templates/ops/task_history.html:65 ops/templates/ops/task_list.html:34
-#: perms/forms.py:51 perms/models.py:21 perms/models.py:53
-#: perms/templates/perms/asset_permission_create_update.html:50
-#: perms/templates/perms/asset_permission_list.html:60
-#: perms/templates/perms/asset_permission_list.html:134
-#: settings/templates/settings/terminal_setting.html:82
-#: settings/templates/settings/terminal_setting.html:104
-#: terminal/templates/terminal/session_list.html:81
-#: terminal/templates/terminal/terminal_list.html:36
-#: users/templates/users/user_group_list.html:38
-#: users/templates/users/user_list.html:41
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:60
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:18
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:20
-#: xpack/plugins/cloud/templates/cloud/account_list.html:16
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:18
-#: xpack/plugins/orgs/templates/orgs/org_list.html:23
-msgid "Action"
-msgstr "动作"
-
 #: assets/models/cmd_filter.py:64
 msgid "Command filter rule"
 msgstr "命令过滤规则"
@@ -1308,7 +1122,7 @@ msgstr "默认资产组"
 #: ops/templates/ops/command_execution_list.html:35
 #: ops/templates/ops/command_execution_list.html:60
 #: perms/forms/asset_permission.py:40 perms/forms/remote_app_permission.py:31
-#: perms/models/asset_permission.py:53 perms/models/remote_app_permission.py:34
+#: perms/models/base.py:36
 #: perms/templates/perms/asset_permission_create_update.html:41
 #: perms/templates/perms/asset_permission_list.html:54
 #: perms/templates/perms/asset_permission_list.html:119
@@ -1321,7 +1135,7 @@ msgstr "默认资产组"
 #: terminal/templates/terminal/session_list.html:71 users/forms.py:283
 #: users/models/user.py:36 users/models/user.py:467 users/serializers/v1.py:61
 #: users/templates/users/user_group_detail.html:78
-#: users/templates/users/user_group_list.html:36 users/views/user.py:395
+#: users/templates/users/user_group_list.html:36 users/views/user.py:394
 #: xpack/plugins/orgs/forms.py:26
 #: xpack/plugins/orgs/templates/orgs/org_detail.html:113
 #: xpack/plugins/orgs/templates/orgs/org_list.html:14
@@ -1377,25 +1191,25 @@ msgstr "登录模式"
 msgid "%(value)s is not an even number"
 msgstr "%(value)s is not an even number"
 
-#: assets/serializers/admin_user.py:26
-#: assets/templates/assets/asset_asset_user_list.html:51
+#: assets/serializers/admin_user.py:38
+#: assets/templates/assets/asset_asset_user_list.html:47
 #: assets/templates/assets/cmd_filter_detail.html:73
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:109
 msgid "Date updated"
 msgstr "更新日期"
 
-#: assets/serializers/asset.py:20
-msgid "Org name"
-msgstr "组织名"
-
-#: assets/serializers/asset.py:22
+#: assets/serializers/asset.py:43
 msgid "Hardware info"
 msgstr "硬件信息"
 
-#: assets/serializers/asset.py:25
+#: assets/serializers/asset.py:44
 msgid "Connectivity"
 msgstr "连接"
 
+#: assets/serializers/asset.py:45
+msgid "Org name"
+msgstr "组织名"
+
 #: assets/serializers/asset_user.py:23 users/forms.py:230
 #: users/models/user.py:91 users/templates/users/first_login.html:42
 #: users/templates/users/user_password_update.html:46
@@ -1405,18 +1219,18 @@ msgstr "连接"
 msgid "Public key"
 msgstr "ssh公钥"
 
-#: assets/serializers/system_user.py:19
-msgid "Login mode display"
-msgstr "登录模式显示"
-
-#: assets/serializers/system_user.py:25
+#: assets/serializers/system_user.py:22
 msgid "Unreachable assets"
 msgstr "不可达资产"
 
-#: assets/serializers/system_user.py:29
+#: assets/serializers/system_user.py:25
 msgid "Reachable assets"
 msgstr "可连接资产"
 
+#: assets/serializers/system_user.py:41
+msgid "Login mode display"
+msgstr "登录模式显示"
+
 #: assets/tasks.py:31
 msgid "Asset has been disabled, skipped: {}"
 msgstr "资产或许不支持ansible, 跳过: {}"
@@ -1527,7 +1341,7 @@ msgstr "启用MFA"
 msgid "Import assets"
 msgstr "导入资产"
 
-#: assets/templates/assets/_asset_list_modal.html:7 assets/views/asset.py:52
+#: assets/templates/assets/_asset_list_modal.html:7 assets/views/asset.py:54
 #: templates/_nav.html:22 xpack/plugins/change_auth_plan/views.py:110
 msgid "Asset list"
 msgstr "资产列表"
@@ -1563,11 +1377,11 @@ msgstr "需要二次认证来查看账号信息"
 #: assets/templates/assets/_asset_user_view_auth_modal.html:20
 #: assets/templates/assets/admin_user_detail.html:100
 #: assets/templates/assets/asset_detail.html:211
-#: assets/templates/assets/asset_list.html:637
+#: assets/templates/assets/asset_list.html:700
 #: assets/templates/assets/cmd_filter_detail.html:106
 #: assets/templates/assets/system_user_asset.html:112
 #: assets/templates/assets/system_user_detail.html:182
-#: assets/templates/assets/system_user_list.html:144
+#: assets/templates/assets/system_user_list.html:168
 #: settings/templates/settings/terminal_setting.html:165
 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:108
 #: users/templates/users/user_detail.html:388
@@ -1575,8 +1389,8 @@ msgstr "需要二次认证来查看账号信息"
 #: users/templates/users/user_detail.html:437
 #: users/templates/users/user_detail.html:482
 #: users/templates/users/user_group_create_update.html:32
-#: users/templates/users/user_group_list.html:90
-#: users/templates/users/user_list.html:215
+#: users/templates/users/user_group_list.html:114
+#: users/templates/users/user_list.html:269
 #: users/templates/users/user_profile.html:238
 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:34
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:36
@@ -1645,75 +1459,6 @@ msgstr "自动生成密钥"
 msgid "Other"
 msgstr "其它"
 
-#: assets/templates/assets/_system_user.html:75
-#: assets/templates/assets/admin_user_create_update.html:45
-#: assets/templates/assets/asset_bulk_update.html:23
-#: assets/templates/assets/asset_create.html:67
-#: assets/templates/assets/asset_update.html:71
-#: assets/templates/assets/cmd_filter_create_update.html:15
-#: assets/templates/assets/cmd_filter_rule_create_update.html:40
-#: assets/templates/assets/domain_create_update.html:16
-#: assets/templates/assets/gateway_create_update.html:58
-#: assets/templates/assets/label_create_update.html:18
-#: perms/templates/perms/asset_permission_create_update.html:83
-#: settings/templates/settings/basic_setting.html:61
-#: settings/templates/settings/command_storage_create.html:79
-#: settings/templates/settings/email_setting.html:62
-#: settings/templates/settings/ldap_setting.html:61
-#: settings/templates/settings/replay_storage_create.html:152
-#: settings/templates/settings/security_setting.html:70
-#: settings/templates/settings/terminal_setting.html:68
-#: terminal/templates/terminal/terminal_update.html:45
-#: users/templates/users/_user.html:50
-#: users/templates/users/user_bulk_update.html:23
-#: users/templates/users/user_detail.html:176
-#: users/templates/users/user_password_update.html:71
-#: users/templates/users/user_profile.html:204
-#: users/templates/users/user_profile_update.html:63
-#: users/templates/users/user_pubkey_update.html:70
-#: users/templates/users/user_pubkey_update.html:76
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:71
-#: xpack/plugins/cloud/templates/cloud/account_create_update.html:33
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:35
-#: xpack/plugins/interface/templates/interface/interface.html:72
-msgid "Reset"
-msgstr "重置"
-
-#: assets/templates/assets/_system_user.html:76
-#: assets/templates/assets/admin_user_create_update.html:46
-#: assets/templates/assets/asset_bulk_update.html:24
-#: assets/templates/assets/asset_create.html:68
-#: assets/templates/assets/asset_list.html:125
-#: assets/templates/assets/asset_update.html:72
-#: assets/templates/assets/cmd_filter_create_update.html:16
-#: assets/templates/assets/cmd_filter_rule_create_update.html:41
-#: assets/templates/assets/domain_create_update.html:17
-#: assets/templates/assets/gateway_create_update.html:59
-#: assets/templates/assets/label_create_update.html:19
-#: audits/templates/audits/login_log_list.html:89
-#: perms/templates/perms/asset_permission_create_update.html:84
-#: settings/templates/settings/basic_setting.html:62
-#: settings/templates/settings/command_storage_create.html:80
-#: settings/templates/settings/email_setting.html:63
-#: settings/templates/settings/ldap_setting.html:64
-#: settings/templates/settings/replay_storage_create.html:153
-#: settings/templates/settings/security_setting.html:71
-#: settings/templates/settings/terminal_setting.html:70
-#: terminal/templates/terminal/command_list.html:103
-#: terminal/templates/terminal/session_list.html:126
-#: terminal/templates/terminal/terminal_update.html:46
-#: users/templates/users/_user.html:51
-#: users/templates/users/forgot_password.html:42
-#: users/templates/users/user_bulk_update.html:24
-#: users/templates/users/user_list.html:57
-#: users/templates/users/user_password_update.html:72
-#: users/templates/users/user_profile_update.html:64
-#: users/templates/users/user_pubkey_update.html:77
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:72
-#: xpack/plugins/interface/templates/interface/interface.html:74
-msgid "Submit"
-msgstr "提交"
-
 #: assets/templates/assets/_system_user_import_modal.html:4
 msgid "Import system user"
 msgstr "导入系统用户"
@@ -1725,7 +1470,7 @@ msgstr "更新系统用户"
 
 #: assets/templates/assets/_user_asset_detail_modal.html:11
 #: assets/templates/assets/asset_asset_user_list.html:13
-#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:187
+#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:189
 msgid "Asset detail"
 msgstr "资产详情"
 
@@ -1793,82 +1538,6 @@ msgstr "更新成功"
 msgid "Update failed!"
 msgstr "更新失败"
 
-#: assets/templates/assets/admin_user_detail.html:24
-#: assets/templates/assets/admin_user_list.html:29
-#: assets/templates/assets/admin_user_list.html:111
-#: assets/templates/assets/asset_detail.html:27
-#: assets/templates/assets/asset_list.html:86
-#: assets/templates/assets/asset_list.html:190
-#: assets/templates/assets/cmd_filter_detail.html:29
-#: assets/templates/assets/cmd_filter_list.html:58
-#: assets/templates/assets/cmd_filter_rule_list.html:86
-#: assets/templates/assets/domain_detail.html:24
-#: assets/templates/assets/domain_detail.html:103
-#: assets/templates/assets/domain_gateway_list.html:97
-#: assets/templates/assets/domain_list.html:54
-#: assets/templates/assets/label_list.html:39
-#: assets/templates/assets/system_user_detail.html:26
-#: assets/templates/assets/system_user_list.html:33
-#: assets/templates/assets/system_user_list.html:117 audits/models.py:33
-#: perms/templates/perms/asset_permission_detail.html:30
-#: perms/templates/perms/asset_permission_list.html:181
-#: terminal/templates/terminal/terminal_detail.html:16
-#: terminal/templates/terminal/terminal_list.html:72
-#: users/templates/users/user_detail.html:25
-#: users/templates/users/user_group_detail.html:28
-#: users/templates/users/user_group_list.html:20
-#: users/templates/users/user_group_list.html:69
-#: users/templates/users/user_list.html:20
-#: users/templates/users/user_list.html:96
-#: users/templates/users/user_list.html:99
-#: users/templates/users/user_profile.html:177
-#: users/templates/users/user_profile.html:187
-#: users/templates/users/user_profile.html:196
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:29
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:55
-#: xpack/plugins/cloud/templates/cloud/account_detail.html:23
-#: xpack/plugins/cloud/templates/cloud/account_list.html:39
-#: xpack/plugins/orgs/templates/orgs/org_detail.html:25
-#: xpack/plugins/orgs/templates/orgs/org_list.html:87
-msgid "Update"
-msgstr "更新"
-
-#: assets/templates/assets/admin_user_detail.html:28
-#: assets/templates/assets/admin_user_list.html:112
-#: assets/templates/assets/asset_detail.html:31
-#: assets/templates/assets/asset_list.html:191
-#: assets/templates/assets/cmd_filter_detail.html:33
-#: assets/templates/assets/cmd_filter_list.html:59
-#: assets/templates/assets/cmd_filter_rule_list.html:87
-#: assets/templates/assets/domain_detail.html:28
-#: assets/templates/assets/domain_detail.html:104
-#: assets/templates/assets/domain_gateway_list.html:98
-#: assets/templates/assets/domain_list.html:55
-#: assets/templates/assets/label_list.html:40
-#: assets/templates/assets/system_user_detail.html:30
-#: assets/templates/assets/system_user_list.html:118 audits/models.py:34
-#: ops/templates/ops/task_list.html:64
-#: perms/templates/perms/asset_permission_detail.html:34
-#: perms/templates/perms/asset_permission_list.html:182
-#: settings/templates/settings/terminal_setting.html:90
-#: settings/templates/settings/terminal_setting.html:112
-#: terminal/templates/terminal/terminal_list.html:74
-#: users/templates/users/user_detail.html:30
-#: users/templates/users/user_group_detail.html:32
-#: users/templates/users/user_group_list.html:71
-#: users/templates/users/user_list.html:104
-#: users/templates/users/user_list.html:108
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:33
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:57
-#: xpack/plugins/cloud/templates/cloud/account_detail.html:27
-#: xpack/plugins/cloud/templates/cloud/account_list.html:41
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:30
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:55
-#: xpack/plugins/orgs/templates/orgs/org_detail.html:29
-#: xpack/plugins/orgs/templates/orgs/org_list.html:89
-msgid "Delete"
-msgstr "删除"
-
 #: assets/templates/assets/admin_user_detail.html:83
 msgid "Replace node assets admin user with this"
 msgstr "替换资产的管理员"
@@ -1880,30 +1549,6 @@ msgstr "替换资产的管理员"
 msgid "Select nodes"
 msgstr "选择节点"
 
-#: assets/templates/assets/admin_user_detail.html:100
-#: assets/templates/assets/asset_detail.html:211
-#: assets/templates/assets/asset_list.html:692
-#: assets/templates/assets/cmd_filter_detail.html:106
-#: assets/templates/assets/system_user_asset.html:112
-#: assets/templates/assets/system_user_detail.html:182
-#: assets/templates/assets/system_user_list.html:168
-#: settings/templates/settings/terminal_setting.html:165
-#: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:108
-#: users/templates/users/user_detail.html:388
-#: users/templates/users/user_detail.html:414
-#: users/templates/users/user_detail.html:437
-#: users/templates/users/user_detail.html:482
-#: users/templates/users/user_group_create_update.html:32
-#: users/templates/users/user_group_list.html:114
-#: users/templates/users/user_list.html:260
-#: users/templates/users/user_profile.html:238
-#: xpack/plugins/cloud/templates/cloud/account_create_update.html:34
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:36
-#: xpack/plugins/interface/templates/interface/interface.html:103
-#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33
-msgid "Confirm"
-msgstr "确认"
-
 #: assets/templates/assets/admin_user_list.html:7
 msgid ""
 "Admin users are asset (charged server) on the root, or have NOPASSWD: ALL "
@@ -1962,14 +1607,11 @@ msgstr "比例"
 #: users/templates/users/user_group_list.html:199
 #: users/templates/users/user_list.html:162
 #: users/templates/users/user_list.html:198
-#, fuzzy
-#| msgid "Please Select User"
 msgid "Please select file"
-msgstr "选择用户"
-
+msgstr "选择文件"
 
 #: assets/templates/assets/asset_asset_user_list.html:16
-#: assets/templates/assets/asset_detail.html:23 assets/views/asset.py:68
+#: assets/templates/assets/asset_detail.html:23 assets/views/asset.py:70
 msgid "Asset user list"
 msgstr "资产用户列表"
 
@@ -1981,13 +1623,6 @@ msgstr "资产用户"
 msgid "Password version"
 msgstr "密码版本"
 
-
-#: assets/templates/assets/asset_asset_user_list.html:47
-#: assets/templates/assets/cmd_filter_detail.html:73
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:109
-msgid "Date updated"
-msgstr "更新日期"
-
 #: assets/templates/assets/asset_asset_user_list.html:60
 #: assets/templates/assets/asset_detail.html:148
 #: terminal/templates/terminal/session_detail.html:81
@@ -2024,8 +1659,7 @@ msgstr "创建日期"
 
 #: assets/templates/assets/asset_detail.html:154
 #: assets/templates/assets/user_asset_list.html:46
-#: perms/models/asset_permission.py:59 perms/models/asset_permission.py:113
-#: perms/models/remote_app_permission.py:37
+#: perms/models/asset_permission.py:60 perms/models/base.py:38
 #: perms/templates/perms/asset_permission_create_update.html:55
 #: perms/templates/perms/asset_permission_detail.html:120
 #: perms/templates/perms/remote_app_permission_create_update.html:54
@@ -2056,7 +1690,7 @@ msgstr ""
 "左侧是资产树，右击可以新建、删除、更改树节点，授权资产也是以节点方式组织的，"
 "右侧是属于该节点下的资产"
 
-#: assets/templates/assets/asset_list.html:69 assets/views/asset.py:105
+#: assets/templates/assets/asset_list.html:69 assets/views/asset.py:107
 msgid "Create asset"
 msgstr "创建资产"
 
@@ -2148,22 +1782,22 @@ msgstr "重命名成功"
 msgid "Rename failed, do not change the root node name"
 msgstr "重命名失败，不能更改root节点的名称"
 
-#: assets/templates/assets/asset_list.html:686
+#: assets/templates/assets/asset_list.html:694
 #: assets/templates/assets/system_user_list.html:162
 #: users/templates/users/user_detail.html:382
 #: users/templates/users/user_detail.html:408
 #: users/templates/users/user_detail.html:476
 #: users/templates/users/user_group_list.html:108
-#: users/templates/users/user_list.html:254
+#: users/templates/users/user_list.html:263
 #: xpack/plugins/interface/templates/interface/interface.html:97
 msgid "Are you sure?"
 msgstr "你确认吗?"
 
-#: assets/templates/assets/asset_list.html:687
+#: assets/templates/assets/asset_list.html:695
 msgid "This will delete the selected assets !!!"
 msgstr "删除选择资产"
 
-#: assets/templates/assets/asset_list.html:690
+#: assets/templates/assets/asset_list.html:698
 #: assets/templates/assets/system_user_list.html:166
 #: settings/templates/settings/terminal_setting.html:163
 #: users/templates/users/user_detail.html:386
@@ -2171,22 +1805,22 @@ msgstr "删除选择资产"
 #: users/templates/users/user_detail.html:480
 #: users/templates/users/user_group_create_update.html:31
 #: users/templates/users/user_group_list.html:112
-#: users/templates/users/user_list.html:258
+#: users/templates/users/user_list.html:267
 #: xpack/plugins/interface/templates/interface/interface.html:101
 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:32
 msgid "Cancel"
 msgstr "取消"
 
-#: assets/templates/assets/asset_list.html:696
+#: assets/templates/assets/asset_list.html:711
 msgid "Asset Deleted."
 msgstr "已被删除"
 
-#: assets/templates/assets/asset_list.html:697
-#: assets/templates/assets/asset_list.html:702
+#: assets/templates/assets/asset_list.html:712
+#: assets/templates/assets/asset_list.html:716
 msgid "Asset Delete"
 msgstr "删除"
 
-#: assets/templates/assets/asset_list.html:701
+#: assets/templates/assets/asset_list.html:715
 msgid "Asset Deleting failed."
 msgstr "删除失败"
 
@@ -2399,23 +2033,23 @@ msgstr "管理用户列表"
 msgid "Admin user detail"
 msgstr "管理用户详情"
 
-#: assets/views/asset.py:79 templates/_nav_user.html:4
+#: assets/views/asset.py:81 templates/_nav_user.html:4
 msgid "My assets"
 msgstr "我的资产"
 
-#: assets/views/asset.py:119
+#: assets/views/asset.py:121
 msgid "Bulk update asset success"
 msgstr "批量更新资产成功"
 
-#: assets/views/asset.py:146
+#: assets/views/asset.py:148
 msgid "Bulk update asset"
 msgstr "批量更新资产"
 
-#: assets/views/asset.py:163
+#: assets/views/asset.py:165
 msgid "Update asset"
 msgstr "更新资产"
 
-#: assets/views/asset.py:304
+#: assets/views/asset.py:306
 msgid "already exists"
 msgstr "已经存在"
 
@@ -2605,8 +2239,7 @@ msgstr "登录日期"
 #: ops/templates/ops/adhoc_history.html:52
 #: ops/templates/ops/adhoc_history_detail.html:61
 #: ops/templates/ops/command_execution_list.html:66
-#: ops/templates/ops/task_history.html:58 perms/models/asset_permission.py:60
-#: perms/models/remote_app_permission.py:38
+#: ops/templates/ops/task_history.html:58 perms/models/base.py:39
 #: perms/templates/perms/asset_permission_detail.html:86
 #: perms/templates/perms/remote_app_permission_detail.html:78
 #: terminal/models.py:165 terminal/templates/terminal/session_list.html:78
@@ -2905,8 +2538,8 @@ msgstr "欢迎回来，请输入用户名和密码登录"
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"
 
-#: authentication/views/login.py:172 users/views/user.py:541
-#: users/views/user.py:566
+#: authentication/views/login.py:172 users/views/user.py:540
+#: users/views/user.py:565
 msgid "MFA code invalid, or ntp sync server time"
 msgstr "MFA验证码不正确，或者服务器端时间不对"
 
@@ -3344,8 +2977,7 @@ msgid "Download file"
 msgstr "下载文件"
 
 #: perms/forms/asset_permission.py:43 perms/forms/remote_app_permission.py:34
-#: perms/models/asset_permission.py:54 perms/models/asset_permission.py:111
-#: perms/models/remote_app_permission.py:35
+#: perms/models/asset_permission.py:58 perms/models/base.py:37
 #: perms/templates/perms/asset_permission_list.html:55
 #: perms/templates/perms/asset_permission_list.html:75
 #: perms/templates/perms/asset_permission_list.html:122
@@ -3372,8 +3004,12 @@ msgstr "用户和用户组至少选一个"
 msgid "Asset or group at least one required"
 msgstr "资产和节点至少选一个"
 
-#: perms/models/asset_permission.py:61 perms/models/asset_permission.py:114
-#: perms/models/remote_app_permission.py:39
+#: perms/models/asset_permission.py:44 perms/models/asset_permission.py:70
+#: templates/_nav.html:42
+msgid "Asset permission"
+msgstr "资产授权"
+
+#: perms/models/asset_permission.py:61 perms/models/base.py:40
 #: perms/templates/perms/asset_permission_detail.html:90
 #: perms/templates/perms/remote_app_permission_detail.html:82
 #: users/models/user.py:99 users/templates/users/user_detail.html:107
@@ -3381,12 +3017,7 @@ msgstr "资产和节点至少选一个"
 msgid "Date expired"
 msgstr "失效日期"
 
-#: perms/models/asset_permission.py:70 perms/models/asset_permission.py:123
-#: templates/_nav.html:42
-msgid "Asset permission"
-msgstr "资产授权"
-
-#: perms/models/remote_app_permission.py:48
+#: perms/models/remote_app_permission.py:19
 msgid "RemoteApp permission"
 msgstr "远程应用授权"
 
@@ -3478,9 +3109,9 @@ msgstr "创建授权规则"
 
 #: perms/templates/perms/asset_permission_list.html:59
 #: perms/templates/perms/asset_permission_list.html:73
-#: users/templates/users/user_list.html:40 xpack/plugins/cloud/models.py:53
-#: xpack/plugins/cloud/templates/cloud/account_detail.html:60
 #: perms/templates/perms/remote_app_permission_list.html:18
+#: users/templates/users/user_list.html:40 xpack/plugins/cloud/models.py:53
+#: xpack/plugins/cloud/templates/cloud/account_detail.html:58
 #: xpack/plugins/cloud/templates/cloud/account_list.html:14
 msgid "Validity"
 msgstr "有效"
@@ -4093,7 +3724,7 @@ msgstr "商业支持"
 #: users/templates/users/user_profile.html:17
 #: users/templates/users/user_profile_update.html:37
 #: users/templates/users/user_profile_update.html:57
-#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:377
+#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:376
 msgid "Profile"
 msgstr "个人信息"
 
@@ -4187,13 +3818,13 @@ msgstr ""
 
 #: templates/_nav.html:10 users/views/group.py:27 users/views/group.py:43
 #: users/views/group.py:59 users/views/group.py:75 users/views/group.py:91
-#: users/views/login.py:154 users/views/user.py:68 users/views/user.py:83
-#: users/views/user.py:122 users/views/user.py:203 users/views/user.py:364
-#: users/views/user.py:414 users/views/user.py:454
+#: users/views/login.py:154 users/views/user.py:70 users/views/user.py:85
+#: users/views/user.py:124 users/views/user.py:202 users/views/user.py:363
+#: users/views/user.py:413 users/views/user.py:453
 msgid "Users"
 msgstr "用户管理"
 
-#: templates/_nav.html:13 users/views/user.py:69
+#: templates/_nav.html:13 users/views/user.py:71
 msgid "User list"
 msgstr "用户列表"
 
@@ -4639,11 +4270,11 @@ msgid ""
 "You should use your ssh client tools connect terminal: {} <br /> <br />{}"
 msgstr "你可以使用ssh客户端工具连接终端"
 
-#: users/api/user.py:77 users/api/user.py:88 users/api/user.py:114
+#: users/api/user.py:75 users/api/user.py:86 users/api/user.py:112
 msgid "You do not have permission."
 msgstr "你没有权限"
 
-#: users/api/user.py:218
+#: users/api/user.py:216
 msgid "Could not reset self otp, use profile reset instead"
 msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
 
@@ -4675,7 +4306,7 @@ msgstr "添加到用户组"
 msgid "Public key should not be the same as your old one."
 msgstr "不能和原来的密钥相同"
 
-#: users/forms.py:89 users/forms.py:219 users/serializers/v1.py:53
+#: users/forms.py:89 users/forms.py:219 users/serializers/v1.py:47
 msgid "Not a valid ssh public key"
 msgstr "ssh密钥不合法"
 
@@ -4782,7 +4413,7 @@ msgid "Date password last updated"
 msgstr "最后更新密码日期"
 
 #: users/models/user.py:136 users/templates/users/user_update.html:22
-#: users/views/login.py:47 users/views/login.py:108 users/views/user.py:427
+#: users/views/login.py:47 users/views/login.py:108 users/views/user.py:426
 msgid "User auth from {}, go there change password"
 msgstr "用户认证源来自 {}, 请去相应系统修改密码"
 
@@ -4790,31 +4421,31 @@ msgstr "用户认证源来自 {}, 请去相应系统修改密码"
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
-#: users/serializers/v1.py:17
+#: users/serializers/v1.py:28
 msgid "Groups name"
 msgstr "用户组名"
 
-#: users/serializers/v1.py:20
+#: users/serializers/v1.py:29
 msgid "Source name"
 msgstr "用户来源名"
 
-#: users/serializers/v1.py:23
+#: users/serializers/v1.py:30
 msgid "Is first login"
 msgstr "首次登录"
 
-#: users/serializers/v1.py:25
+#: users/serializers/v1.py:31
 msgid "Role name"
 msgstr "角色名"
 
-#: users/serializers/v1.py:26
+#: users/serializers/v1.py:32
 msgid "Is valid"
 msgstr "账户是否有效"
 
-#: users/serializers/v1.py:27
+#: users/serializers/v1.py:33
 msgid "Is expired"
 msgstr " 是否过期"
 
-#: users/serializers/v1.py:28
+#: users/serializers/v1.py:34
 msgid "Avatar url"
 msgstr "头像路径"
 
@@ -4859,7 +4490,8 @@ msgid "Import user groups"
 msgstr "导入用户组"
 
 #: users/templates/users/_user_groups_update_modal.html:4
-msgid "Update user groups"
+#: users/views/group.py:60
+msgid "Update user group"
 msgstr "更新用户组"
 
 #: users/templates/users/_user_import_modal.html:4
@@ -4867,7 +4499,7 @@ msgid "Import users"
 msgstr "导入用户"
 
 #: users/templates/users/_user_update_modal.html:4
-#: users/templates/users/user_update.html:4 users/views/user.py:123
+#: users/templates/users/user_update.html:4 users/views/user.py:125
 msgid "Update user"
 msgstr "更新用户"
 
@@ -4997,7 +4629,7 @@ msgid "Very strong"
 msgstr "很强"
 
 #: users/templates/users/user_create.html:4
-#: users/templates/users/user_list.html:28 users/views/user.py:83
+#: users/templates/users/user_list.html:28 users/views/user.py:85
 msgid "Create user"
 msgstr "创建用户"
 
@@ -5006,7 +4638,7 @@ msgid "Reset link will be generated and sent to the user. "
 msgstr "生成重置密码连接，通过邮件发送给用户"
 
 #: users/templates/users/user_detail.html:19
-#: users/templates/users/user_granted_asset.html:18 users/views/user.py:204
+#: users/templates/users/user_granted_asset.html:18 users/views/user.py:203
 msgid "User detail"
 msgstr "用户详情"
 
@@ -5139,28 +4771,28 @@ msgstr "用户组删除"
 msgid "UserGroup Deleting failed."
 msgstr "用户组删除失败"
 
-#: users/templates/users/user_list.html:255
+#: users/templates/users/user_list.html:264
 msgid "This will delete the selected users !!!"
 msgstr "删除选中用户 !!!"
 
-#: users/templates/users/user_list.html:264
+#: users/templates/users/user_list.html:280
 msgid "User Deleted."
 msgstr "已被删除"
 
-#: users/templates/users/user_list.html:265
-#: users/templates/users/user_list.html:270
+#: users/templates/users/user_list.html:281
+#: users/templates/users/user_list.html:285
 msgid "User Delete"
 msgstr "删除"
 
-#: users/templates/users/user_list.html:269
+#: users/templates/users/user_list.html:284
 msgid "User Deleting failed."
 msgstr "用户删除失败"
 
-#: users/templates/users/user_list.html:305
+#: users/templates/users/user_list.html:337
 msgid "User is expired"
 msgstr "用户已失效"
 
-#: users/templates/users/user_list.html:308
+#: users/templates/users/user_list.html:340
 msgid "User is inactive"
 msgstr "用户已禁用"
 
@@ -5209,8 +4841,8 @@ msgstr "安装完成后点击下一步进入绑定页面（如已安装，直接
 msgid "Administrator Settings force MFA login"
 msgstr "管理员设置强制使用MFA登录"
 
-#: users/templates/users/user_profile.html:120 users/views/user.py:240
-#: users/views/user.py:294
+#: users/templates/users/user_profile.html:120 users/views/user.py:239
+#: users/views/user.py:293
 msgid "User groups"
 msgstr "用户组"
 
@@ -5451,10 +5083,6 @@ msgstr "密码或密钥不合法"
 msgid "User group list"
 msgstr "用户组列表"
 
-#: users/views/group.py:60
-msgid "Update user group"
-msgstr "更新用户组"
-
 #: users/views/group.py:92
 msgid "User group granted asset"
 msgstr "用户组授权资产"
@@ -5488,7 +5116,7 @@ msgstr "Token错误或失效"
 msgid "Password not same"
 msgstr "密码不一致"
 
-#: users/views/login.py:115 users/views/user.py:137 users/views/user.py:437
+#: users/views/login.py:115 users/views/user.py:139 users/views/user.py:436
 msgid "* Your password does not meet the requirements"
 msgstr "* 您的密码不符合要求"
 
@@ -5496,51 +5124,51 @@ msgstr "* 您的密码不符合要求"
 msgid "First login"
 msgstr "首次登录"
 
-#: users/views/user.py:154
+#: users/views/user.py:156
 msgid "Bulk update user success"
 msgstr "批量更新用户成功"
 
-#: users/views/user.py:184
+#: users/views/user.py:183
 msgid "Bulk update user"
 msgstr "批量更新用户"
 
-#: users/views/user.py:269
+#: users/views/user.py:268
 msgid "Invalid file."
 msgstr "文件不合法"
 
-#: users/views/user.py:365
+#: users/views/user.py:364
 msgid "User granted assets"
 msgstr "用户授权资产"
 
-#: users/views/user.py:396
+#: users/views/user.py:395
 msgid "Profile setting"
 msgstr "个人信息设置"
 
-#: users/views/user.py:415
+#: users/views/user.py:414
 msgid "Password update"
 msgstr "密码更新"
 
-#: users/views/user.py:455
+#: users/views/user.py:454
 msgid "Public key update"
 msgstr "密钥更新"
 
-#: users/views/user.py:496
+#: users/views/user.py:495
 msgid "Password invalid"
 msgstr "用户名或密码无效"
 
-#: users/views/user.py:596
+#: users/views/user.py:595
 msgid "MFA enable success"
 msgstr "MFA 绑定成功"
 
-#: users/views/user.py:597
+#: users/views/user.py:596
 msgid "MFA enable success, return login page"
 msgstr "MFA 绑定成功，返回到登录页面"
 
-#: users/views/user.py:599
+#: users/views/user.py:598
 msgid "MFA disable success"
 msgstr "MFA 解绑成功"
 
-#: users/views/user.py:600
+#: users/views/user.py:599
 msgid "MFA disable success, return login page"
 msgstr "MFA 解绑成功，返回登录页面"
 
@@ -6186,6 +5814,8 @@ msgstr "创建组织"
 msgid "Update org"
 msgstr "更新组织"
 
+#~ msgid "Update user groups"
+#~ msgstr "更新用户组"
 
 #~ msgid "Template"
 #~ msgstr "模板"
@@ -6224,7 +5854,6 @@ msgstr "更新组织"
 #~ msgid "Restore default successfully！"
 #~ msgstr "恢复默认成功！"
 
-
 #~ msgid "Beijing Duizhan Tech, Inc."
 #~ msgstr "北京堆栈科技有限公司"