Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix

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-07-03 15:31+0800\n"
+"POT-Creation-Date: 2019-07-04 17:13+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"
@@ -91,11 +91,11 @@ msgstr "运行参数"
 #: perms/templates/perms/asset_permission_list.html:48
 #: perms/templates/perms/asset_permission_list.html:117
 #: terminal/backends/command/models.py:13 terminal/models.py:155
-#: terminal/templates/terminal/command_list.html:33
-#: terminal/templates/terminal/command_list.html:59
-#: terminal/templates/terminal/session_list.html:41
+#: terminal/templates/terminal/command_list.html:30
+#: terminal/templates/terminal/command_list.html:66
+#: terminal/templates/terminal/session_list.html:28
 #: terminal/templates/terminal/session_list.html:72
-#: xpack/plugins/change_auth_plan/forms.py:114
+#: xpack/plugins/change_auth_plan/forms.py:115
 #: xpack/plugins/change_auth_plan/models.py:413
 #: 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
@@ -122,9 +122,9 @@ msgstr "资产"
 #: perms/templates/perms/asset_permission_list.html:71
 #: perms/templates/perms/asset_permission_list.html:123 templates/_nav.html:25
 #: terminal/backends/command/models.py:14 terminal/models.py:156
-#: terminal/templates/terminal/command_list.html:34
-#: terminal/templates/terminal/command_list.html:60
-#: terminal/templates/terminal/session_list.html:49
+#: terminal/templates/terminal/command_list.html:31
+#: terminal/templates/terminal/command_list.html:67
+#: terminal/templates/terminal/session_list.html:29
 #: terminal/templates/terminal/session_list.html:73
 #: xpack/plugins/orgs/templates/orgs/org_list.html:19
 msgid "System user"
@@ -135,7 +135,7 @@ msgstr "系统用户"
 #: applications/templates/applications/remote_app_list.html:20
 #: applications/templates/applications/user_remote_app_list.html:16
 #: assets/forms/domain.py:73 assets/forms/user.py:84 assets/forms/user.py:148
-#: assets/models/asset.py:64 assets/models/base.py:27
+#: assets/models/asset.py:64 assets/models/base.py:28
 #: 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
@@ -173,7 +173,7 @@ msgstr "系统用户"
 #: 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/forms.py:98
 #: xpack/plugins/change_auth_plan/models.py:61
 #: 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
@@ -205,7 +205,7 @@ msgstr "参数"
 
 #: applications/models/remote_app.py:43
 #: applications/templates/applications/remote_app_detail.html:77
-#: assets/models/asset.py:124 assets/models/base.py:35
+#: assets/models/asset.py:124 assets/models/base.py:36
 #: 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
@@ -217,7 +217,7 @@ msgstr "参数"
 #: perms/models/asset_permission.py:98 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:105 users/serializers/v1.py:107
+#: users/models/user.py:105 users/serializers/v1.py:116
 #: users/templates/users/user_detail.html:111
 #: xpack/plugins/change_auth_plan/models.py:106
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113
@@ -229,7 +229,7 @@ msgstr "创建者"
 # msgstr "创建者"
 #: applications/models/remote_app.py:46
 #: applications/templates/applications/remote_app_detail.html:73
-#: assets/models/asset.py:125 assets/models/base.py:33
+#: assets/models/asset.py:125 assets/models/base.py:34
 #: 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
@@ -257,7 +257,7 @@ msgstr "创建日期"
 #: applications/templates/applications/remote_app_detail.html:81
 #: applications/templates/applications/remote_app_list.html:24
 #: applications/templates/applications/user_remote_app_list.html:20
-#: assets/models/asset.py:126 assets/models/base.py:32
+#: assets/models/asset.py:126 assets/models/base.py:33
 #: 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
@@ -366,8 +366,8 @@ msgstr "重置"
 #: settings/templates/settings/replay_storage_create.html:153
 #: settings/templates/settings/security_setting.html:74
 #: settings/templates/settings/terminal_setting.html:73
-#: terminal/templates/terminal/command_list.html:50
-#: terminal/templates/terminal/session_list.html:127
+#: terminal/templates/terminal/command_list.html:47
+#: terminal/templates/terminal/session_list.html:52
 #: terminal/templates/terminal/terminal_update.html:46
 #: users/templates/users/_user.html:51
 #: users/templates/users/forgot_password.html:42
@@ -439,6 +439,7 @@ msgstr "详情"
 #: users/templates/users/user_group_list.html:20
 #: users/templates/users/user_group_list.html:70
 #: 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
@@ -479,6 +480,7 @@ msgstr "更新"
 #: users/templates/users/user_detail.html:30
 #: users/templates/users/user_group_detail.html:32
 #: users/templates/users/user_group_list.html:72
+#: 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
@@ -533,7 +535,7 @@ msgstr "创建远程应用"
 #: perms/templates/perms/remote_app_permission_list.html:19
 #: settings/templates/settings/terminal_setting.html:85
 #: settings/templates/settings/terminal_setting.html:107
-#: terminal/templates/terminal/session_list.html:81
+#: terminal/templates/terminal/session_list.html:36
 #: terminal/templates/terminal/terminal_list.html:36
 #: users/templates/users/user_group_list.html:38
 #: users/templates/users/user_list.html:41
@@ -574,12 +576,12 @@ msgstr "远程应用详情"
 msgid "My RemoteApp"
 msgstr "我的远程应用"
 
-#: assets/api/asset.py:50
+#: assets/api/asset.py:51
 #, python-format
 msgid "%(hostname)s was %(action)s successfully"
 msgstr "%(hostname)s %(action)s成功"
 
-#: assets/api/asset.py:129
+#: assets/api/asset.py:125
 msgid "Please select assets that need to be updated"
 msgstr "请选择需要更新的资产"
 
@@ -650,14 +652,14 @@ msgid "Domain"
 msgstr "网域"
 
 #: assets/forms/asset.py:64 assets/forms/asset.py:86 assets/forms/asset.py:99
-#: assets/forms/asset.py:134 assets/models/node.py:248
+#: assets/forms/asset.py:134 assets/models/node.py:249
 #: assets/templates/assets/asset_create.html:42
 #: perms/forms/asset_permission.py:71 perms/forms/asset_permission.py:79
 #: perms/models/asset_permission.py:93
 #: perms/templates/perms/asset_permission_list.html:49
 #: perms/templates/perms/asset_permission_list.html:70
 #: perms/templates/perms/asset_permission_list.html:120
-#: xpack/plugins/change_auth_plan/forms.py:115
+#: xpack/plugins/change_auth_plan/forms.py:116
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:55
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:15
 #: xpack/plugins/cloud/models.py:123
@@ -686,7 +688,7 @@ msgstr "如果有多个的互相隔离的网络，设置资产属于的网域，
 #: assets/forms/asset.py:114 assets/forms/asset.py:118
 #: assets/forms/domain.py:17 assets/forms/label.py:15
 #: perms/templates/perms/asset_permission_asset.html:88
-#: xpack/plugins/change_auth_plan/forms.py:105
+#: xpack/plugins/change_auth_plan/forms.py:106
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:84
 msgid "Select assets"
 msgstr "选择资产"
@@ -704,7 +706,7 @@ msgid "SSH gateway support proxy SSH,RDP,VNC"
 msgstr "SSH网关，支持代理SSH,RDP和VNC"
 
 #: assets/forms/domain.py:74 assets/forms/user.py:85 assets/forms/user.py:149
-#: assets/models/base.py:28
+#: assets/models/base.py:29
 #: assets/templates/assets/_asset_user_auth_update_modal.html:15
 #: assets/templates/assets/_asset_user_auth_view_modal.html:21
 #: assets/templates/assets/_asset_user_list.html:16
@@ -719,12 +721,12 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC"
 #: ops/models/adhoc.py:164 perms/templates/perms/asset_permission_list.html:66
 #: perms/templates/perms/asset_permission_user.html:55
 #: perms/templates/perms/remote_app_permission_user.html:54
-#: settings/templates/settings/_ldap_list_users_modal.html:37 users/forms.py:13
+#: settings/templates/settings/_ldap_list_users_modal.html:37 users/forms.py:14
 #: users/models/user.py:62 users/templates/users/_select_user_modal.html:14
 #: users/templates/users/user_detail.html:67
 #: users/templates/users/user_list.html:36
 #: users/templates/users/user_profile.html:47
-#: xpack/plugins/change_auth_plan/forms.py:99
+#: xpack/plugins/change_auth_plan/forms.py:100
 #: xpack/plugins/change_auth_plan/models.py:63
 #: xpack/plugins/change_auth_plan/models.py:409
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:65
@@ -738,14 +740,14 @@ msgstr "用户名"
 msgid "Password or private key passphrase"
 msgstr "密码或密钥密码"
 
-#: assets/forms/user.py:26 assets/models/base.py:29
+#: assets/forms/user.py:26 assets/models/base.py:30
 #: assets/serializers/asset_user.py:70
 #: assets/templates/assets/_asset_user_auth_update_modal.html:21
 #: assets/templates/assets/_asset_user_auth_view_modal.html:27
 #: authentication/forms.py:13
 #: authentication/templates/authentication/login.html:67
 #: authentication/templates/authentication/new_login.html:93
-#: settings/forms.py:110 users/forms.py:15 users/forms.py:27
+#: settings/forms.py:110 users/forms.py:16 users/forms.py:28
 #: users/templates/users/reset_password.html:53
 #: users/templates/users/user_password_authentication.html:18
 #: users/templates/users/user_password_update.html:43
@@ -852,6 +854,7 @@ msgstr "主机名"
 #: assets/templates/assets/system_user_detail.html:70
 #: assets/templates/assets/system_user_list.html:53
 #: assets/templates/assets/user_asset_list.html:169
+#: terminal/templates/terminal/session_list.html:31
 #: terminal/templates/terminal/session_list.html:75
 msgid "Protocol"
 msgstr "协议"
@@ -955,17 +958,17 @@ msgstr "版本"
 msgid "AuthBook"
 msgstr ""
 
-#: assets/models/base.py:30 xpack/plugins/change_auth_plan/models.py:97
+#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:97
 #: xpack/plugins/change_auth_plan/models.py:271
 msgid "SSH private key"
 msgstr "ssh密钥"
 
-#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:100
+#: assets/models/base.py:32 xpack/plugins/change_auth_plan/models.py:100
 #: xpack/plugins/change_auth_plan/models.py:267
 msgid "SSH public key"
 msgstr "ssh公钥"
 
-#: assets/models/base.py:34 assets/templates/assets/cmd_filter_detail.html:73
+#: assets/models/base.py:35 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 "更新日期"
@@ -1035,10 +1038,10 @@ msgstr "正则表达式"
 
 #: assets/models/cmd_filter.py:39 ops/models/command.py:21
 #: ops/templates/ops/command_execution_list.html:61 terminal/models.py:161
-#: terminal/templates/terminal/command_list.html:31
-#: terminal/templates/terminal/command_list.html:61
+#: terminal/templates/terminal/command_list.html:28
+#: terminal/templates/terminal/command_list.html:68
 #: terminal/templates/terminal/session_detail.html:48
-#: terminal/templates/terminal/session_list.html:77
+#: terminal/templates/terminal/session_list.html:33
 msgid "Command"
 msgstr "命令"
 
@@ -1120,20 +1123,20 @@ msgstr "默认资产组"
 #: perms/templates/perms/remote_app_permission_create_update.html:43
 #: perms/templates/perms/remote_app_permission_list.html:15
 #: templates/index.html:87 terminal/backends/command/models.py:12
-#: terminal/models.py:154 terminal/templates/terminal/command_list.html:32
-#: terminal/templates/terminal/command_list.html:58
-#: terminal/templates/terminal/session_list.html:33
-#: terminal/templates/terminal/session_list.html:71 users/forms.py:301
-#: users/models/user.py:38 users/models/user.py:431 users/serializers/v1.py:96
+#: terminal/models.py:154 terminal/templates/terminal/command_list.html:29
+#: terminal/templates/terminal/command_list.html:65
+#: terminal/templates/terminal/session_list.html:27
+#: terminal/templates/terminal/session_list.html:71 users/forms.py:316
+#: users/models/user.py:38 users/models/user.py:431 users/serializers/v1.py:105
 #: users/templates/users/user_group_detail.html:78
-#: users/templates/users/user_group_list.html:36 users/views/user.py:264
+#: users/templates/users/user_group_list.html:36 users/views/user.py:251
 #: xpack/plugins/orgs/forms.py:26
 #: xpack/plugins/orgs/templates/orgs/org_detail.html:113
 #: xpack/plugins/orgs/templates/orgs/org_list.html:14
 msgid "User"
 msgstr "用户"
 
-#: assets/models/label.py:19 assets/models/node.py:240
+#: assets/models/label.py:19 assets/models/node.py:241
 #: assets/templates/assets/label_list.html:15 settings/models.py:30
 msgid "Value"
 msgstr "值"
@@ -1142,11 +1145,11 @@ msgstr "值"
 msgid "Category"
 msgstr "分类"
 
-#: assets/models/node.py:239
+#: assets/models/node.py:240
 msgid "Key"
 msgstr "键"
 
-#: assets/models/node.py:296
+#: assets/models/node.py:297
 msgid "New node"
 msgstr "新节点"
 
@@ -1166,7 +1169,7 @@ msgstr "手动登录"
 #: assets/views/admin_user.py:66 assets/views/admin_user.py:82
 #: assets/views/admin_user.py:107 assets/views/asset.py:52
 #: assets/views/asset.py:69 assets/views/asset.py:128 assets/views/asset.py:171
-#: assets/views/asset.py:199 assets/views/asset.py:226
+#: assets/views/asset.py:199 assets/views/asset.py:231
 #: assets/views/cmd_filter.py:31 assets/views/cmd_filter.py:48
 #: assets/views/cmd_filter.py:65 assets/views/cmd_filter.py:82
 #: assets/views/cmd_filter.py:102 assets/views/cmd_filter.py:136
@@ -1176,7 +1179,7 @@ msgstr "手动登录"
 #: assets/views/domain.py:133 assets/views/domain.py:153
 #: assets/views/label.py:27 assets/views/label.py:45 assets/views/label.py:72
 #: assets/views/system_user.py:29 assets/views/system_user.py:46
-#: assets/views/system_user.py:63 assets/views/system_user.py:78
+#: assets/views/system_user.py:63 assets/views/system_user.py:79
 #: templates/_nav.html:19 xpack/plugins/change_auth_plan/models.py:68
 msgid "Assets"
 msgstr "资产管理"
@@ -1219,7 +1222,7 @@ msgstr "协议组"
 msgid "Hardware info"
 msgstr "硬件信息"
 
-#: assets/serializers/asset.py:73 orgs/mixins.py:192
+#: assets/serializers/asset.py:73 orgs/mixins/serializers.py:26
 msgid "Org name"
 msgstr "组织名称"
 
@@ -1235,7 +1238,7 @@ msgstr "后端"
 msgid "private key invalid"
 msgstr "密钥不合法"
 
-#: assets/serializers/asset_user.py:74 users/forms.py:248
+#: assets/serializers/asset_user.py:74 users/forms.py:263
 #: users/models/user.py:94 users/templates/users/first_login.html:42
 #: users/templates/users/user_password_update.html:46
 #: users/templates/users/user_profile.html:68
@@ -1390,7 +1393,7 @@ msgid "Update asset user auth"
 msgstr "更新资产用户认证信息"
 
 #: assets/templates/assets/_asset_user_auth_update_modal.html:23
-#: xpack/plugins/change_auth_plan/forms.py:101
+#: xpack/plugins/change_auth_plan/forms.py:102
 msgid "Please input password"
 msgstr "请输入密码"
 
@@ -1426,7 +1429,7 @@ msgstr "关闭"
 #: audits/templates/audits/operate_log_list.html:71
 #: audits/templates/audits/password_change_log_list.html:53
 #: ops/templates/ops/task_adhoc.html:63
-#: terminal/templates/terminal/command_list.html:36
+#: terminal/templates/terminal/command_list.html:33
 #: terminal/templates/terminal/session_detail.html:50
 msgid "Datetime"
 msgstr "日期"
@@ -1536,7 +1539,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:227
+#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:232
 msgid "Asset detail"
 msgstr "资产详情"
 
@@ -1571,7 +1574,7 @@ msgstr "替换资产的管理员"
 
 #: assets/templates/assets/admin_user_detail.html:91
 #: perms/templates/perms/asset_permission_asset.html:116
-#: xpack/plugins/change_auth_plan/forms.py:109
+#: xpack/plugins/change_auth_plan/forms.py:110
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:112
 msgid "Select nodes"
 msgstr "选择节点"
@@ -1582,7 +1585,7 @@ msgstr "选择节点"
 #: assets/templates/assets/cmd_filter_detail.html:106
 #: assets/templates/assets/system_user_assets.html:100
 #: assets/templates/assets/system_user_detail.html:182
-#: assets/templates/assets/system_user_list.html:171
+#: assets/templates/assets/system_user_list.html:172
 #: authentication/templates/authentication/_mfa_confirm_modal.html:20
 #: settings/templates/settings/terminal_setting.html:168
 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:108
@@ -1654,8 +1657,8 @@ msgstr "比例"
 #: assets/templates/assets/admin_user_list.html:196
 #: assets/templates/assets/asset_list.html:268
 #: assets/templates/assets/asset_list.html:305
-#: assets/templates/assets/system_user_list.html:224
-#: assets/templates/assets/system_user_list.html:255
+#: assets/templates/assets/system_user_list.html:225
+#: assets/templates/assets/system_user_list.html:256
 #: users/templates/users/user_group_list.html:163
 #: users/templates/users/user_group_list.html:194
 #: users/templates/users/user_list.html:158
@@ -1797,7 +1800,7 @@ msgid "Displays all child node assets"
 msgstr "显示所有子节点资产"
 
 #: assets/templates/assets/asset_list.html:390
-#: assets/templates/assets/system_user_list.html:165
+#: assets/templates/assets/system_user_list.html:166
 #: users/templates/users/user_detail.html:382
 #: users/templates/users/user_detail.html:408
 #: users/templates/users/user_detail.html:476
@@ -1812,7 +1815,7 @@ msgid "This will delete the selected assets !!!"
 msgstr "删除选择资产"
 
 #: assets/templates/assets/asset_list.html:394
-#: assets/templates/assets/system_user_list.html:169
+#: assets/templates/assets/system_user_list.html:170
 #: settings/templates/settings/terminal_setting.html:166
 #: users/templates/users/user_detail.html:386
 #: users/templates/users/user_detail.html:412
@@ -2014,20 +2017,20 @@ msgstr ""
 msgid "Create system user"
 msgstr "创建系统用户"
 
-#: assets/templates/assets/system_user_list.html:166
+#: assets/templates/assets/system_user_list.html:167
 msgid "This will delete the selected System Users !!!"
 msgstr "删除选择系统用户"
 
-#: assets/templates/assets/system_user_list.html:175
+#: assets/templates/assets/system_user_list.html:176
 msgid "System Users Deleted."
 msgstr "已被删除"
 
-#: assets/templates/assets/system_user_list.html:176
-#: assets/templates/assets/system_user_list.html:181
+#: assets/templates/assets/system_user_list.html:177
+#: assets/templates/assets/system_user_list.html:182
 msgid "System Users Delete"
 msgstr "删除系统用户"
 
-#: assets/templates/assets/system_user_list.html:180
+#: assets/templates/assets/system_user_list.html:181
 msgid "System Users Deleting failed."
 msgstr "系统用户删除失败"
 
@@ -2111,15 +2114,15 @@ msgstr "更新标签"
 msgid "System user list"
 msgstr "系统用户列表"
 
-#: assets/views/system_user.py:79
+#: assets/views/system_user.py:80
 msgid "System user detail"
 msgstr "系统用户详情"
 
-#: assets/views/system_user.py:102
+#: assets/views/system_user.py:106
 msgid "assets"
 msgstr "资产管理"
 
-#: assets/views/system_user.py:103
+#: assets/views/system_user.py:107
 msgid "System user asset"
 msgstr "系统用户资产"
 
@@ -2127,7 +2130,8 @@ msgstr "系统用户资产"
 #: audits/templates/audits/ftp_log_list.html:73
 #: audits/templates/audits/operate_log_list.html:70
 #: audits/templates/audits/password_change_log_list.html:52
-#: terminal/models.py:158 terminal/templates/terminal/session_list.html:74
+#: terminal/models.py:158 terminal/templates/terminal/session_list.html:30
+#: terminal/templates/terminal/session_list.html:74
 #: terminal/templates/terminal/terminal_detail.html:47
 msgid "Remote addr"
 msgstr "远端地址"
@@ -2220,7 +2224,7 @@ msgstr "Agent"
 
 #: audits/models.py:99 audits/templates/audits/login_log_list.html:56
 #: authentication/templates/authentication/_mfa_confirm_modal.html:14
-#: users/forms.py:160 users/models/user.py:86
+#: users/forms.py:175 users/models/user.py:86
 #: users/templates/users/first_login.html:45
 msgid "MFA"
 msgstr "MFA"
@@ -2251,7 +2255,7 @@ msgstr "登录日期"
 #: 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
+#: terminal/models.py:165 terminal/templates/terminal/session_list.html:34
 #: xpack/plugins/change_auth_plan/models.py:250
 #: xpack/plugins/change_auth_plan/models.py:420
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:59
@@ -2273,7 +2277,6 @@ msgstr "选择用户"
 #: ops/templates/ops/command_execution_list.html:48
 #: ops/templates/ops/task_list.html:13 ops/templates/ops/task_list.html:18
 #: templates/_base_list.html:41 templates/_header_bar.html:8
-#: terminal/templates/terminal/session_list.html:61
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:52
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48
 msgid "Search"
@@ -2283,7 +2286,7 @@ msgstr "搜索"
 #: ops/templates/ops/adhoc_detail.html:49
 #: ops/templates/ops/adhoc_history_detail.html:49
 #: ops/templates/ops/task_detail.html:56
-#: terminal/templates/terminal/session_list.html:70
+#: terminal/templates/terminal/session_list.html:26
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:64
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:60
 msgid "ID"
@@ -2411,7 +2414,7 @@ msgstr "请输入正确的用户名和密码. 注意它们是区分大小写."
 msgid "This account is inactive."
 msgstr "此账户无效"
 
-#: authentication/forms.py:37 users/forms.py:21
+#: authentication/forms.py:37 users/forms.py:22
 msgid "MFA code"
 msgstr "MFA 验证码"
 
@@ -2551,8 +2554,8 @@ msgstr "欢迎回来，请输入用户名和密码登录"
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"
 
-#: authentication/views/login.py:172 users/views/user.py:412
-#: users/views/user.py:437
+#: authentication/views/login.py:172 users/views/user.py:399
+#: users/views/user.py:424
 msgid "MFA code invalid, or ntp sync server time"
 msgstr "MFA验证码不正确，或者服务器端时间不对"
 
@@ -2610,16 +2613,16 @@ msgstr ""
 msgid "Encrypt field using Secret Key"
 msgstr ""
 
-#: common/mixins/api.py:60
+#: common/mixins/api.py:62
 #, python-format
 msgid "%(name)s was %(action)s successfully"
 msgstr "%(name)s %(action)s成功"
 
-#: common/mixins/api.py:61
+#: common/mixins/api.py:63
 msgid "create"
 msgstr "创建"
 
-#: common/mixins/api.py:61
+#: common/mixins/api.py:63
 msgid "update"
 msgstr "更新"
 
@@ -2990,7 +2993,7 @@ msgstr "命令执行列表"
 msgid "Command execution"
 msgstr "命令执行"
 
-#: orgs/mixins.py:71 orgs/mixins.py:191 orgs/models.py:27
+#: orgs/mixins/models.py:61 orgs/mixins/serializers.py:25 orgs/models.py:27
 msgid "Organization"
 msgstr "组织"
 
@@ -3000,7 +3003,7 @@ msgstr "组织"
 #: perms/templates/perms/asset_permission_list.html:67
 #: perms/templates/perms/asset_permission_list.html:114
 #: perms/templates/perms/remote_app_permission_list.html:16
-#: templates/_nav.html:14 users/forms.py:271 users/models/group.py:26
+#: templates/_nav.html:14 users/forms.py:286 users/models/group.py:26
 #: users/models/user.py:70 users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_detail.html:213
 #: users/templates/users/user_list.html:38
@@ -3823,14 +3826,14 @@ msgstr "文档"
 msgid "Commercial support"
 msgstr "商业支持"
 
-#: templates/_header_bar.html:89 templates/_nav_user.html:32 users/forms.py:139
+#: templates/_header_bar.html:89 templates/_nav_user.html:32 users/forms.py:154
 #: users/templates/users/_user.html:43
 #: users/templates/users/first_login.html:39
 #: users/templates/users/user_password_update.html:40
 #: 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:245
+#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:232
 msgid "Profile"
 msgstr "个人信息"
 
@@ -3926,8 +3929,8 @@ msgstr ""
 #: templates/_nav.html:10 users/views/group.py:28 users/views/group.py:45
 #: users/views/group.py:62 users/views/group.py:79 users/views/group.py:96
 #: users/views/login.py:154 users/views/user.py:68 users/views/user.py:85
-#: users/views/user.py:129 users/views/user.py:209 users/views/user.py:231
-#: users/views/user.py:283 users/views/user.py:324
+#: users/views/user.py:129 users/views/user.py:196 users/views/user.py:218
+#: users/views/user.py:270 users/views/user.py:311
 msgid "Users"
 msgstr "用户管理"
 
@@ -3940,8 +3943,8 @@ msgid "Command filters"
 msgstr "命令过滤"
 
 #: templates/_nav.html:55 templates/_nav_audits.html:11
-#: terminal/views/command.py:38 terminal/views/session.py:74
-#: terminal/views/session.py:92 terminal/views/session.py:116
+#: terminal/views/command.py:21 terminal/views/session.py:43
+#: terminal/views/session.py:54 terminal/views/session.py:78
 #: terminal/views/terminal.py:31 terminal/views/terminal.py:47
 #: terminal/views/terminal.py:60
 msgid "Sessions"
@@ -3952,7 +3955,7 @@ msgid "Session online"
 msgstr "在线会话"
 
 #: templates/_nav.html:59 templates/_nav_audits.html:15
-#: terminal/views/session.py:93
+#: terminal/views/session.py:55
 msgid "Session offline"
 msgstr "历史会话"
 
@@ -4180,7 +4183,7 @@ msgid "Input"
 msgstr "输入"
 
 #: terminal/backends/command/models.py:17
-#: terminal/templates/terminal/command_list.html:35
+#: terminal/templates/terminal/command_list.html:32
 #: terminal/templates/terminal/terminal_list.html:33
 msgid "Session"
 msgstr "会话"
@@ -4230,7 +4233,7 @@ msgstr "线程数"
 msgid "Boot Time"
 msgstr "运行时间"
 
-#: terminal/models.py:160 terminal/templates/terminal/session_list.html:104
+#: terminal/models.py:160 terminal/templates/terminal/session_list.html:136
 msgid "Replay"
 msgstr "回放"
 
@@ -4246,21 +4249,21 @@ msgstr "结束日期"
 msgid "Args"
 msgstr "参数"
 
-#: terminal/templates/terminal/command_list.html:46
+#: terminal/templates/terminal/command_list.html:43
 msgid "Export command"
 msgstr "导出命令"
 
-#: terminal/templates/terminal/command_list.html:172
+#: terminal/templates/terminal/command_list.html:189
 msgid "Goto"
 msgstr "转到"
 
 #: terminal/templates/terminal/session_detail.html:17
-#: terminal/views/session.py:117
+#: terminal/views/session.py:79
 msgid "Session detail"
 msgstr "会话详情"
 
 #: terminal/templates/terminal/session_detail.html:28
-#: terminal/views/command.py:39
+#: terminal/views/command.py:22
 msgid "Command list"
 msgstr "命令记录列表"
 
@@ -4280,32 +4283,31 @@ msgstr "监控"
 msgid "Terminate session"
 msgstr "终止会话"
 
-#: terminal/templates/terminal/session_list.html:76
+#: terminal/templates/terminal/session_list.html:32
 msgid "Login from"
 msgstr "登录来源"
 
-#: terminal/templates/terminal/session_list.html:80
+#: terminal/templates/terminal/session_list.html:35
 msgid "Duration"
 msgstr "时长"
 
-#: terminal/templates/terminal/session_list.html:107
-#: terminal/templates/terminal/session_list.html:109
-msgid "Terminate"
-msgstr "终断"
-
-#: terminal/templates/terminal/session_list.html:122
+#: terminal/templates/terminal/session_list.html:47
 msgid "Terminate selected"
 msgstr "终断所选"
 
-#: terminal/templates/terminal/session_list.html:123
+#: terminal/templates/terminal/session_list.html:48
 msgid "Confirm finished"
 msgstr "确认已完成"
 
-#: terminal/templates/terminal/session_list.html:144
+#: terminal/templates/terminal/session_list.html:91
 msgid "Terminate task send, waiting ..."
 msgstr "终断任务已发送，请等待"
 
-#: terminal/templates/terminal/session_list.html:157
+#: terminal/templates/terminal/session_list.html:142
+msgid "Terminate"
+msgstr "终断"
+
+#: terminal/templates/terminal/session_list.html:173
 msgid "Finish session success"
 msgstr "标记会话完成成功"
 
@@ -4346,7 +4348,7 @@ msgstr "接受终端注册"
 msgid "Info"
 msgstr "信息"
 
-#: terminal/views/session.py:75
+#: terminal/views/session.py:44
 msgid "Session online list"
 msgstr "在线会话"
 
@@ -4379,7 +4381,7 @@ msgstr "你没有权限"
 msgid "Could not reset self otp, use profile reset instead"
 msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
 
-#: users/forms.py:32 users/models/user.py:74
+#: users/forms.py:33 users/models/user.py:74
 #: users/templates/users/_select_user_modal.html:15
 #: users/templates/users/user_detail.html:87
 #: users/templates/users/user_list.html:37
@@ -4387,39 +4389,43 @@ msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
 msgid "Role"
 msgstr "角色"
 
-#: users/forms.py:35 users/forms.py:218
+#: users/forms.py:36 users/forms.py:233
 msgid "ssh public key"
 msgstr "ssh公钥"
 
-#: users/forms.py:36 users/forms.py:219
+#: users/forms.py:37 users/forms.py:234
 msgid "ssh-rsa AAAA..."
 msgstr ""
 
-#: users/forms.py:37
+#: users/forms.py:38
 msgid "Paste user id_rsa.pub here."
 msgstr "复制用户公钥到这里"
 
-#: users/forms.py:51 users/templates/users/user_detail.html:221
+#: users/forms.py:52 users/templates/users/user_detail.html:221
 msgid "Join user groups"
 msgstr "添加到用户组"
 
-#: users/forms.py:86 users/forms.py:233
+#: users/forms.py:87 users/forms.py:248
 msgid "Public key should not be the same as your old one."
 msgstr "不能和原来的密钥相同"
 
-#: users/forms.py:90 users/forms.py:237 users/serializers/v1.py:82
+#: users/forms.py:91 users/forms.py:252 users/serializers/v1.py:91
 msgid "Not a valid ssh public key"
 msgstr "ssh密钥不合法"
 
-#: users/forms.py:110
+#: users/forms.py:104 users/views/login.py:114 users/views/user.py:293
+msgid "* Your password does not meet the requirements"
+msgstr "* 您的密码不符合要求"
+
+#: users/forms.py:125
 msgid "Reset link will be generated and sent to the user"
 msgstr "生成重置密码链接，通过邮件发送给用户"
 
-#: users/forms.py:111
+#: users/forms.py:126
 msgid "Set password"
 msgstr "设置密码"
 
-#: users/forms.py:118 xpack/plugins/change_auth_plan/models.py:86
+#: users/forms.py:133 xpack/plugins/change_auth_plan/models.py:86
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:51
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:69
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57
@@ -4427,7 +4433,7 @@ msgstr "设置密码"
 msgid "Password strategy"
 msgstr "密码策略"
 
-#: users/forms.py:145
+#: users/forms.py:160
 msgid ""
 "Tip: when enabled, you will enter the MFA binding process the next time you "
 "log in. you can also directly bind in \"personal information -> quick "
@@ -4436,11 +4442,11 @@ msgstr ""
 "提示：启用之后您将会在下次登录时进入MFA绑定流程；您也可以在（个人信息->快速修"
 "改->更改MFA设置）中直接绑定!"
 
-#: users/forms.py:155
+#: users/forms.py:170
 msgid "* Enable MFA authentication to make the account more secure."
 msgstr "* 启用MFA认证，使账号更加安全."
 
-#: users/forms.py:165
+#: users/forms.py:180
 msgid ""
 "In order to protect you and your company, please keep your account, password "
 "and key sensitive information properly. (for example: setting complex "
@@ -4449,41 +4455,41 @@ msgstr ""
 "为了保护您和公司的安全，请妥善保管您的账户、密码和密钥等重要敏感信息；（如："
 "设置复杂密码，启用MFA认证）"
 
-#: users/forms.py:172 users/templates/users/first_login.html:48
+#: users/forms.py:187 users/templates/users/first_login.html:48
 #: users/templates/users/first_login.html:107
 #: users/templates/users/first_login.html:130
 msgid "Finish"
 msgstr "完成"
 
-#: users/forms.py:178
+#: users/forms.py:193
 msgid "Old password"
 msgstr "原来密码"
 
-#: users/forms.py:183
+#: users/forms.py:198
 msgid "New password"
 msgstr "新密码"
 
-#: users/forms.py:188
+#: users/forms.py:203
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: users/forms.py:198
+#: users/forms.py:213
 msgid "Old password error"
 msgstr "原来密码错误"
 
-#: users/forms.py:206
+#: users/forms.py:221
 msgid "Password does not match"
 msgstr "密码不一致"
 
-#: users/forms.py:216
+#: users/forms.py:231
 msgid "Automatically configure and download the SSH key"
 msgstr "自动配置并下载SSH密钥"
 
-#: users/forms.py:220
+#: users/forms.py:235
 msgid "Paste your id_rsa.pub here."
 msgstr "复制你的公钥到这里"
 
-#: users/forms.py:254 users/forms.py:259 users/forms.py:305
+#: users/forms.py:269 users/forms.py:274 users/forms.py:320
 #: xpack/plugins/orgs/forms.py:30
 msgid "Select users"
 msgstr "选择用户"
@@ -4534,7 +4540,7 @@ msgid "Date password last updated"
 msgstr "最后更新密码日期"
 
 #: users/models/user.py:139 users/templates/users/user_update.html:22
-#: users/views/login.py:46 users/views/login.py:107 users/views/user.py:296
+#: users/views/login.py:46 users/views/login.py:107 users/views/user.py:283
 msgid "User auth from {}, go there change password"
 msgstr "用户认证源来自 {}, 请去相应系统修改密码"
 
@@ -4542,39 +4548,39 @@ msgstr "用户认证源来自 {}, 请去相应系统修改密码"
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
-#: users/serializers/v1.py:32
+#: users/serializers/v1.py:41
 msgid "Groups name"
 msgstr "用户组名"
 
-#: users/serializers/v1.py:33
+#: users/serializers/v1.py:42
 msgid "Source name"
 msgstr "用户来源名"
 
-#: users/serializers/v1.py:34
+#: users/serializers/v1.py:43
 msgid "Is first login"
 msgstr "首次登录"
 
-#: users/serializers/v1.py:35
+#: users/serializers/v1.py:44
 msgid "Role name"
 msgstr "角色名"
 
-#: users/serializers/v1.py:36
+#: users/serializers/v1.py:45
 msgid "Is valid"
 msgstr "账户是否有效"
 
-#: users/serializers/v1.py:37
+#: users/serializers/v1.py:46
 msgid "Is expired"
 msgstr " 是否过期"
 
-#: users/serializers/v1.py:38
+#: users/serializers/v1.py:47
 msgid "Avatar url"
 msgstr "头像路径"
 
-#: users/serializers/v1.py:46
+#: users/serializers/v1.py:55
 msgid "Role limit to {}"
 msgstr "角色只能为 {}"
 
-#: users/serializers/v1.py:54
+#: users/serializers/v1.py:63
 msgid "Password does not match security rules"
 msgstr "密码不满足安全规则"
 
@@ -4771,7 +4777,7 @@ msgid "Create user"
 msgstr "创建用户"
 
 #: users/templates/users/user_detail.html:19
-#: users/templates/users/user_granted_asset.html:18 users/views/user.py:210
+#: users/templates/users/user_granted_asset.html:18 users/views/user.py:197
 msgid "User detail"
 msgstr "用户详情"
 
@@ -5246,55 +5252,51 @@ msgstr "Token错误或失效"
 msgid "Password not same"
 msgstr "密码不一致"
 
-#: users/views/login.py:114 users/views/user.py:144 users/views/user.py:306
-msgid "* Your password does not meet the requirements"
-msgstr "* 您的密码不符合要求"
-
 #: users/views/login.py:154
 msgid "First login"
 msgstr "首次登录"
 
-#: users/views/user.py:161
+#: users/views/user.py:148
 msgid "Bulk update user success"
 msgstr "批量更新用户成功"
 
-#: users/views/user.py:189
+#: users/views/user.py:176
 msgid "Bulk update user"
 msgstr "批量更新用户"
 
-#: users/views/user.py:232
+#: users/views/user.py:219
 msgid "User granted assets"
 msgstr "用户授权资产"
 
-#: users/views/user.py:265
+#: users/views/user.py:252
 msgid "Profile setting"
 msgstr "个人信息设置"
 
-#: users/views/user.py:284
+#: users/views/user.py:271
 msgid "Password update"
 msgstr "密码更新"
 
-#: users/views/user.py:325
+#: users/views/user.py:312
 msgid "Public key update"
 msgstr "密钥更新"
 
-#: users/views/user.py:367
+#: users/views/user.py:354
 msgid "Password invalid"
 msgstr "用户名或密码无效"
 
-#: users/views/user.py:467
+#: users/views/user.py:454
 msgid "MFA enable success"
 msgstr "MFA 绑定成功"
 
-#: users/views/user.py:468
+#: users/views/user.py:455
 msgid "MFA enable success, return login page"
 msgstr "MFA 绑定成功，返回到登录页面"
 
-#: users/views/user.py:470
+#: users/views/user.py:457
 msgid "MFA disable success"
 msgstr "MFA 解绑成功"
 
-#: users/views/user.py:471
+#: users/views/user.py:458
 msgid "MFA disable success, return login page"
 msgstr "MFA 解绑成功，返回登录页面"
 
@@ -5303,25 +5305,26 @@ msgid "Password length"
 msgstr "密码长度"
 
 #: xpack/plugins/change_auth_plan/forms.py:45
-msgid "* For security, please do not change root user's password"
-msgstr "* 为了安全，请不要更改root用户的密码"
+#: xpack/plugins/change_auth_plan/models.py:213
+msgid "* For security, do not change {} user's password"
+msgstr "* 为了安全，禁止更改 {} 用户的密码"
 
-#: xpack/plugins/change_auth_plan/forms.py:54
+#: xpack/plugins/change_auth_plan/forms.py:55
 msgid "* Please enter custom password"
 msgstr "* 请输入自定义密码"
 
-#: xpack/plugins/change_auth_plan/forms.py:63
+#: xpack/plugins/change_auth_plan/forms.py:64
 msgid "* Please enter a valid crontab expression"
 msgstr "* 请输入有效的 crontab 表达式"
 
-#: xpack/plugins/change_auth_plan/forms.py:116
+#: xpack/plugins/change_auth_plan/forms.py:117
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:60
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:81
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:17
 msgid "Periodic perform"
 msgstr "定时执行"
 
-#: xpack/plugins/change_auth_plan/forms.py:120
+#: xpack/plugins/change_auth_plan/forms.py:121
 msgid ""
 "Tips: The username of the user on the asset to be modified. if the user "
 "exists, change the password; If the user does not exist, create the user."
@@ -5329,11 +5332,11 @@ msgstr ""
 "提示：用户名为将要修改的资产上的用户的用户名。如果用户存在，则修改密码；如果"
 "用户不存在，则创建用户。"
 
-#: xpack/plugins/change_auth_plan/forms.py:124
+#: xpack/plugins/change_auth_plan/forms.py:125
 msgid "Tips: (Units: hour)"
 msgstr "提示：（单位： 时）"
 
-#: xpack/plugins/change_auth_plan/forms.py:125
+#: xpack/plugins/change_auth_plan/forms.py:126
 msgid ""
 "eg: Every Sunday 03:05 run <5 3 * * 0> <br> Tips: Using 5 digits linux "
 "crontab expressions <min hour day month week> (<a href='https://tool.lu/"
@@ -5386,10 +5389,6 @@ msgstr "定期执行"
 msgid "Password rules"
 msgstr "密码规则"
 
-#: xpack/plugins/change_auth_plan/models.py:213
-msgid "For security, do not change {} user's password"
-msgstr "为了安全，禁止更改 {} 用户的密码"
-
 #: xpack/plugins/change_auth_plan/models.py:217
 msgid "Assets is empty, please add the asset"
 msgstr "资产为空，请添加资产"
@@ -5932,6 +5931,9 @@ msgstr "密码匣子"
 msgid "vault create"
 msgstr "创建"
 
+#~ msgid "* For security, please do not change root user's password"
+#~ msgstr "* 为了安全，请不要更改root用户的密码"
+
 #~ msgid "Interface"
 #~ msgstr "界面"