From b9b8c35a81d66f411d86abea6b35693348af05d6 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Wed, 26 Dec 2018 12:57:59 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E9=80=89=E6=8B=A9vnc=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E7=AB=AF=E5=8F=A35901=20(#2276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 修改创建资产选择vnc协议，默认端口5901

* [update] 修改创建命令/录像存储时账户无效的提示信息
---
 .../assets/templates/assets/asset_create.html |   5 +-
 apps/common/api.py                            |  12 +-
 apps/locale/zh/LC_MESSAGES/django.mo          | Bin 60091 -> 60289 bytes
 apps/locale/zh/LC_MESSAGES/django.po          | 241 +++++++++---------
 4 files changed, 137 insertions(+), 121 deletions(-)

diff --git a/apps/assets/templates/assets/asset_create.html b/apps/assets/templates/assets/asset_create.html
index 40af1b5f3..7a32264cc 100644
--- a/apps/assets/templates/assets/asset_create.html
+++ b/apps/assets/templates/assets/asset_create.html
@@ -95,9 +95,12 @@ $(document).ready(function () {
         if(protocol === 'rdp'){
             port = 3389;
         }
-        if(protocol === 'telnet (beta)'){
+        else if(protocol === 'telnet (beta)'){
             port = 23;
         }
+        else if(protocol === 'vnc'){
+            port = 5901;
+        }
         $("#id_port").val(port);
     });
 })
diff --git a/apps/common/api.py b/apps/common/api.py
index d0512ebca..4aa8f82ce 100644
--- a/apps/common/api.py
+++ b/apps/common/api.py
@@ -104,7 +104,11 @@ class ReplayStorageCreateAPI(APIView):
         data = {storage_name: storage_data}
 
         if not self.is_valid(storage_data):
-            return Response({"error": _("Error: Account invalid")}, status=401)
+            return Response({
+                "error": _("Error: Account invalid (Please make sure the "
+                           "information such as Access key or Secret key is correct)")},
+                status=401
+            )
 
         Setting.save_storage('TERMINAL_REPLAY_STORAGE', data)
         return Response({"msg": _('Create succeed')}, status=200)
@@ -136,7 +140,11 @@ class CommandStorageCreateAPI(APIView):
         storage_name = storage_data.pop('NAME')
         data = {storage_name: storage_data}
         if not self.is_valid(storage_data):
-            return Response({"error": _("Error: Account invalid")}, status=401)
+            return Response(
+                {"error": _("Error: Account invalid (Please make sure the "
+                            "information such as Access key or Secret key is correct)")},
+                status=401
+            )
 
         Setting.save_storage('TERMINAL_COMMAND_STORAGE', data)
         return Response({"msg": _('Create succeed')}, status=200)
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 154e0a5218e6421c986d725a9a4742b67bf7a5a6..a5a414c63b909c7501e047a31f208e278346cc0e 100644
GIT binary patch
delta 17863
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
B1GxYI

delta 17624
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
bm&;HlDSw%Yl@cm$$T%}+)P~+$!xH`v|LB^Z

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 667dc3922..ecd343f82 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: 2018-12-19 18:28+0800\n"
+"POT-Creation-Date: 2018-12-26 11:39+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"
@@ -32,8 +32,8 @@ msgstr "测试节点下资产是否可连接: {}"
 msgid "Nodes"
 msgstr "节点管理"
 
-#: assets/forms/asset.py:30 assets/forms/asset.py:69 assets/forms/asset.py:112
-#: assets/forms/asset.py:116 assets/models/asset.py:84
+#: assets/forms/asset.py:30 assets/forms/asset.py:66 assets/forms/asset.py:105
+#: assets/forms/asset.py:109 assets/models/asset.py:84
 #: assets/models/cluster.py:19 assets/models/user.py:91
 #: assets/templates/assets/asset_detail.html:77 templates/_nav.html:24
 #: xpack/plugins/cloud/models.py:124
@@ -42,7 +42,7 @@ msgstr "节点管理"
 msgid "Admin user"
 msgstr "管理用户"
 
-#: assets/forms/asset.py:33 assets/forms/asset.py:72 assets/forms/asset.py:128
+#: assets/forms/asset.py:33 assets/forms/asset.py:69 assets/forms/asset.py:121
 #: assets/templates/assets/asset_create.html:36
 #: assets/templates/assets/asset_create.html:38
 #: assets/templates/assets/asset_list.html:81
@@ -53,7 +53,7 @@ msgstr "管理用户"
 msgid "Label"
 msgstr "标签"
 
-#: assets/forms/asset.py:37 assets/forms/asset.py:76 assets/models/asset.py:79
+#: assets/forms/asset.py:37 assets/forms/asset.py:73 assets/models/asset.py:79
 #: assets/models/domain.py:26 assets/models/domain.py:52
 #: assets/templates/assets/asset_detail.html:81
 #: assets/templates/assets/user_asset_list.html:157
@@ -61,11 +61,11 @@ msgstr "标签"
 msgid "Domain"
 msgstr "网域"
 
-#: assets/forms/asset.py:41 assets/forms/asset.py:66 assets/forms/asset.py:80
-#: assets/forms/asset.py:131 assets/models/node.py:31
+#: assets/forms/asset.py:41 assets/forms/asset.py:63 assets/forms/asset.py:77
+#: assets/forms/asset.py:124 assets/models/node.py:31
 #: assets/templates/assets/asset_create.html:30
-#: assets/templates/assets/asset_update.html:35 perms/forms.py:37
-#: perms/forms.py:44 perms/models.py:79
+#: assets/templates/assets/asset_update.html:35 perms/forms.py:45
+#: perms/forms.py:52 perms/models.py:79
 #: perms/templates/perms/asset_permission_list.html:57
 #: perms/templates/perms/asset_permission_list.html:117
 #: xpack/plugins/cloud/models.py:123
@@ -74,7 +74,7 @@ msgstr "网域"
 msgid "Node"
 msgstr "节点"
 
-#: assets/forms/asset.py:48 assets/forms/asset.py:88
+#: assets/forms/asset.py:45 assets/forms/asset.py:81
 msgid ""
 "root or other NOPASSWD sudo privilege user existed in asset,If asset is "
 "windows or other set any one, more see admin user left menu"
@@ -82,28 +82,28 @@ msgstr ""
 "root或其他拥有NOPASSWD: ALL权限的用户, 如果是windows或其它硬件可以随意设置一"
 "个, 更多信息查看左侧 `管理用户` 菜单"
 
-#: assets/forms/asset.py:51 assets/forms/asset.py:91
+#: assets/forms/asset.py:48 assets/forms/asset.py:84
 msgid "Windows 2016 RDP protocol is different, If is window 2016, set it"
 msgstr "Windows 2016的RDP协议与之前不同，如果是请设置"
 
-#: assets/forms/asset.py:52 assets/forms/asset.py:92
+#: assets/forms/asset.py:49 assets/forms/asset.py:85
 msgid ""
 "If your have some network not connect with each other, you can set domain"
 msgstr "如果有多个的互相隔离的网络，设置资产属于的网域，使用网域网关跳转登录"
 
-#: assets/forms/asset.py:99 assets/forms/asset.py:103 assets/forms/domain.py:17
+#: assets/forms/asset.py:92 assets/forms/asset.py:96 assets/forms/domain.py:17
 #: assets/forms/label.py:15
 #: perms/templates/perms/asset_permission_asset.html:88
 msgid "Select assets"
 msgstr "选择资产"
 
-#: assets/forms/asset.py:108 assets/models/asset.py:77
+#: assets/forms/asset.py:101 assets/models/asset.py:77
 #: assets/models/domain.py:50 assets/templates/assets/admin_user_assets.html:50
 #: assets/templates/assets/asset_detail.html:69
 #: assets/templates/assets/domain_gateway_list.html:58
 #: assets/templates/assets/system_user_asset.html:52
 #: assets/templates/assets/user_asset_list.html:152
-#: common/templates/common/replay_storage_create.html:60
+#: common/templates/common/replay_storage_create.html:59
 msgid "Port"
 msgstr "端口"
 
@@ -114,7 +114,7 @@ msgstr "端口"
 #: assets/templates/assets/label_list.html:16
 #: assets/templates/assets/system_user_list.html:33 audits/models.py:18
 #: audits/templates/audits/ftp_log_list.html:41
-#: audits/templates/audits/ftp_log_list.html:71 perms/forms.py:34
+#: audits/templates/audits/ftp_log_list.html:71 perms/forms.py:42
 #: perms/models.py:31
 #: perms/templates/perms/asset_permission_create_update.html:40
 #: perms/templates/perms/asset_permission_list.html:56
@@ -130,11 +130,11 @@ msgstr "端口"
 msgid "Asset"
 msgstr "资产"
 
-#: assets/forms/domain.py:46
+#: assets/forms/domain.py:51
 msgid "Password should not contain special characters"
 msgstr "不能包含特殊字符"
 
-#: assets/forms/domain.py:63 assets/forms/user.py:80 assets/forms/user.py:146
+#: assets/forms/domain.py:70 assets/forms/user.py:80 assets/forms/user.py:142
 #: assets/models/base.py:22 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
@@ -176,7 +176,7 @@ msgstr "不能包含特殊字符"
 msgid "Name"
 msgstr "名称"
 
-#: assets/forms/domain.py:64 assets/forms/user.py:81 assets/forms/user.py:147
+#: assets/forms/domain.py:71 assets/forms/user.py:81 assets/forms/user.py:143
 #: assets/models/base.py:23 assets/templates/assets/admin_user_detail.html:60
 #: assets/templates/assets/admin_user_list.html:27
 #: assets/templates/assets/domain_gateway_list.html:60
@@ -221,21 +221,21 @@ msgstr "ssh密钥不合法"
 msgid "Password and private key file must be input one"
 msgstr "密码和私钥, 必须输入一个"
 
-#: assets/forms/user.py:134
+#: assets/forms/user.py:130
 msgid "* Automatic login mode must fill in the username."
 msgstr "自动登录模式，必须填写用户名"
 
-#: assets/forms/user.py:149 assets/models/user.py:141
+#: assets/forms/user.py:145 assets/models/user.py:141
 #: assets/templates/assets/_system_user.html:66
 #: assets/templates/assets/system_user_detail.html:165
 msgid "Command filter"
 msgstr "命令过滤器"
 
-#: assets/forms/user.py:154
+#: assets/forms/user.py:149
 msgid "Auto push system user to asset"
 msgstr "自动推送系统用户到资产"
 
-#: assets/forms/user.py:155
+#: assets/forms/user.py:150
 msgid ""
 "1-100, High level will be using login asset as default, if user was granted "
 "more than 2 system user"
@@ -243,7 +243,7 @@ msgstr ""
 "1-100, 1最低优先级，100最高优先级。授权多个用户时，高优先级的系统用户将会作为"
 "默认登录用户"
 
-#: assets/forms/user.py:157
+#: assets/forms/user.py:152
 msgid ""
 "If you choose manual login mode, you do not need to fill in the username and "
 "password."
@@ -628,7 +628,7 @@ msgstr "默认资产组"
 #: audits/templates/audits/password_change_log_list.html:33
 #: audits/templates/audits/password_change_log_list.html:50
 #: ops/templates/ops/command_execution_list.html:34
-#: ops/templates/ops/command_execution_list.html:59 perms/forms.py:28
+#: ops/templates/ops/command_execution_list.html:59 perms/forms.py:36
 #: perms/models.py:29
 #: perms/templates/perms/asset_permission_create_update.html:36
 #: perms/templates/perms/asset_permission_list.html:54
@@ -637,7 +637,7 @@ msgstr "默认资产组"
 #: terminal/templates/terminal/command_list.html:32
 #: terminal/templates/terminal/command_list.html:72
 #: terminal/templates/terminal/session_list.html:33
-#: terminal/templates/terminal/session_list.html:71 users/forms.py:314
+#: terminal/templates/terminal/session_list.html:71 users/forms.py:303
 #: users/models/user.py:33 users/models/user.py:420
 #: users/templates/users/user_group_detail.html:78
 #: users/templates/users/user_group_list.html:13 users/views/user.py:386
@@ -715,7 +715,7 @@ msgstr "登录模式"
 
 #: assets/models/user.py:247 assets/templates/assets/user_asset_list.html:156
 #: audits/models.py:19 audits/templates/audits/ftp_log_list.html:49
-#: audits/templates/audits/ftp_log_list.html:72 perms/forms.py:40
+#: audits/templates/audits/ftp_log_list.html:72 perms/forms.py:48
 #: perms/models.py:33 perms/models.py:81
 #: perms/templates/perms/asset_permission_detail.html:140
 #: perms/templates/perms/asset_permission_list.html:58
@@ -734,68 +734,68 @@ msgstr "系统用户"
 msgid "%(value)s is not an even number"
 msgstr "%(value)s is not an even number"
 
-#: assets/tasks.py:33
+#: assets/tasks.py:31
 msgid "Asset has been disabled, skipped: {}"
 msgstr "资产或许不支持ansible, 跳过: {}"
 
-#: assets/tasks.py:37
+#: assets/tasks.py:35
 msgid "Asset may not be support ansible, skipped: {}"
 msgstr "资产或许不支持ansible, 跳过: {}"
 
-#: assets/tasks.py:42
+#: assets/tasks.py:40
 msgid "No assets matched, stop task"
 msgstr "没有匹配到资产，结束任务"
 
-#: assets/tasks.py:67
+#: assets/tasks.py:65
 msgid "Get asset info failed: {}"
 msgstr "获取资产信息失败：{}"
 
-#: assets/tasks.py:117
+#: assets/tasks.py:115
 msgid "Update some assets hardware info"
 msgstr "更新资产硬件信息"
 
-#: assets/tasks.py:136
+#: assets/tasks.py:134
 msgid "Update asset hardware info: {}"
 msgstr "更新资产硬件信息: {}"
 
-#: assets/tasks.py:161
+#: assets/tasks.py:159
 msgid "Test assets connectivity"
 msgstr "测试资产可连接性"
 
-#: assets/tasks.py:185
+#: assets/tasks.py:183
 msgid "Test assets connectivity: {}"
 msgstr "测试资产可连接性: {}"
 
-#: assets/tasks.py:218
+#: assets/tasks.py:222
 msgid "Test admin user connectivity period: {}"
 msgstr "定期测试管理账号可连接性: {}"
 
-#: assets/tasks.py:224
+#: assets/tasks.py:228
 msgid "Test admin user connectivity: {}"
 msgstr "测试管理行号可连接性: {}"
 
-#: assets/tasks.py:262
+#: assets/tasks.py:266
 msgid "Test system user connectivity: {}"
 msgstr "测试系统用户可连接性: {}"
 
-#: assets/tasks.py:269
+#: assets/tasks.py:273
 msgid "Test system user connectivity: {} => {}"
 msgstr "测试系统用户可连接性: {} => {}"
 
-#: assets/tasks.py:282
+#: assets/tasks.py:286
 msgid "Test system user connectivity period: {}"
 msgstr "定期测试系统用户可连接性: {}"
 
-#: assets/tasks.py:354
+#: assets/tasks.py:358
 msgid ""
 "Push system user task skip, auto push not enable or protocol is not ssh: {}"
 msgstr "推送系统用户任务跳过，自动推送没有打开，或协议不是ssh: {}"
 
-#: assets/tasks.py:374 assets/tasks.py:388
+#: assets/tasks.py:378 assets/tasks.py:392
 msgid "Push system users to assets: {}"
 msgstr "推送系统用户到入资产: {}"
 
-#: assets/tasks.py:380
+#: assets/tasks.py:384
 msgid "Push system users to asset: {} => {}"
 msgstr "推送系统用户到入资产: {} => {}"
 
@@ -894,10 +894,10 @@ msgstr "其它"
 #: assets/templates/assets/gateway_create_update.html:58
 #: assets/templates/assets/label_create_update.html:18
 #: common/templates/common/basic_setting.html:61
-#: common/templates/common/command_storage_create.html:80
+#: common/templates/common/command_storage_create.html:79
 #: common/templates/common/email_setting.html:62
 #: common/templates/common/ldap_setting.html:62
-#: common/templates/common/replay_storage_create.html:139
+#: common/templates/common/replay_storage_create.html:138
 #: common/templates/common/security_setting.html:70
 #: common/templates/common/terminal_setting.html:68
 #: perms/templates/perms/asset_permission_create_update.html:75
@@ -927,10 +927,10 @@ msgstr "重置"
 #: assets/templates/assets/gateway_create_update.html:59
 #: assets/templates/assets/label_create_update.html:19
 #: common/templates/common/basic_setting.html:62
-#: common/templates/common/command_storage_create.html:81
+#: common/templates/common/command_storage_create.html:80
 #: common/templates/common/email_setting.html:63
 #: common/templates/common/ldap_setting.html:63
-#: common/templates/common/replay_storage_create.html:140
+#: common/templates/common/replay_storage_create.html:139
 #: common/templates/common/security_setting.html:71
 #: common/templates/common/terminal_setting.html:70
 #: perms/templates/perms/asset_permission_create_update.html:76
@@ -1738,7 +1738,7 @@ msgstr "Agent"
 msgid "City"
 msgstr "城市"
 
-#: audits/templates/audits/login_log_list.html:54 users/forms.py:172
+#: audits/templates/audits/login_log_list.html:54 users/forms.py:162
 #: users/models/authentication.py:82 users/models/user.py:75
 #: users/templates/users/first_login.html:45
 msgid "MFA"
@@ -1812,15 +1812,17 @@ msgstr "在ou:{}中没有匹配条目"
 msgid "Match {} s users"
 msgstr "匹配 {} 个用户"
 
-#: common/api.py:107 common/api.py:139
-msgid "Error: Account invalid"
-msgstr ""
+#: common/api.py:108 common/api.py:144
+msgid ""
+"Error: Account invalid (Please make sure the information such as Access key "
+"or Secret key is correct)"
+msgstr "错误：账户无效 （请确保 Access key 或 Secret key 等信息正确）"
 
-#: common/api.py:110 common/api.py:142
+#: common/api.py:114 common/api.py:150
 msgid "Create succeed"
 msgstr "创建成功"
 
-#: common/api.py:128 common/api.py:162
+#: common/api.py:132 common/api.py:170
 #: common/templates/common/terminal_setting.html:151
 msgid "Delete succeed"
 msgstr "删除成功"
@@ -1964,23 +1966,23 @@ msgstr "密钥认证"
 msgid "Heartbeat interval"
 msgstr "心跳间隔"
 
-#: common/forms.py:148 ops/models/adhoc.py:38
+#: common/forms.py:149 ops/models/adhoc.py:38
 msgid "Units: seconds"
 msgstr "单位: 秒"
 
-#: common/forms.py:151
+#: common/forms.py:152
 msgid "List sort by"
 msgstr "资产列表排序"
 
-#: common/forms.py:154
+#: common/forms.py:155
 msgid "List page size"
 msgstr "资产分页每页数量"
 
-#: common/forms.py:157
+#: common/forms.py:158
 msgid "Session keep duration"
 msgstr "会话保留时长"
 
-#: common/forms.py:158
+#: common/forms.py:159
 msgid ""
 "Units: days, Session, record, command will be delete if more than duration, "
 "only in database"
@@ -1998,35 +2000,35 @@ msgid ""
 "for all users, including administrators)"
 msgstr "开启后，用户登录必须使用MFA二次认证（对所有用户有效，包括管理员）"
 
-#: common/forms.py:180
+#: common/forms.py:179
 msgid "Limit the number of login failures"
 msgstr "限制登录失败次数"
 
-#: common/forms.py:185
+#: common/forms.py:183
 msgid "No logon interval"
 msgstr "禁止登录时间间隔"
 
-#: common/forms.py:187
+#: common/forms.py:185
 msgid ""
 "Tip: (unit/minute) if the user has failed to log in for a limited number of "
 "times, no login is allowed during this time interval."
 msgstr ""
 "提示：（单位：分）当用户登录失败次数达到限制后，那么在此时间间隔内禁止登录"
 
-#: common/forms.py:194
+#: common/forms.py:191
 msgid "Connection max idle time"
 msgstr "SSH最大空闲时间"
 
-#: common/forms.py:196
+#: common/forms.py:193
 msgid ""
 "If idle time more than it, disconnect connection(only ssh now) Unit: minute"
 msgstr "提示：（单位：分）如果超过该配置没有操作，连接会被断开（仅ssh）"
 
-#: common/forms.py:202
+#: common/forms.py:199
 msgid "Password expiration time"
 msgstr "密码过期时间"
 
-#: common/forms.py:205
+#: common/forms.py:202
 msgid ""
 "Tip: (unit: day) If the user does not update the password during the time, "
 "the user password will expire failure;The password expiration reminder mail "
@@ -2036,45 +2038,45 @@ msgstr ""
 "提示：（单位：天）如果用户在此期间没有更新密码，用户密码将过期失效； 密码过期"
 "提醒邮件将在密码过期前5天内由系统（每天）自动发送给用户"
 
-#: common/forms.py:214
+#: common/forms.py:211
 msgid "Password minimum length"
 msgstr "密码最小长度 "
 
-#: common/forms.py:220
+#: common/forms.py:215
 msgid "Must contain capital letters"
 msgstr "必须包含大写字母"
 
-#: common/forms.py:222
+#: common/forms.py:217
 msgid ""
 "After opening, the user password changes and resets must contain uppercase "
 "letters"
 msgstr "开启后，用户密码修改、重置必须包含大写字母"
 
-#: common/forms.py:228
+#: common/forms.py:222
 msgid "Must contain lowercase letters"
 msgstr "必须包含小写字母"
 
-#: common/forms.py:229
+#: common/forms.py:223
 msgid ""
 "After opening, the user password changes and resets must contain lowercase "
 "letters"
 msgstr "开启后，用户密码修改、重置必须包含小写字母"
 
-#: common/forms.py:235
+#: common/forms.py:228
 msgid "Must contain numeric characters"
 msgstr "必须包含数字字符"
 
-#: common/forms.py:236
+#: common/forms.py:229
 msgid ""
 "After opening, the user password changes and resets must contain numeric "
 "characters"
 msgstr "开启后，用户密码修改、重置必须包含数字字符"
 
-#: common/forms.py:242
+#: common/forms.py:234
 msgid "Must contain special characters"
 msgstr "必须包含特殊字符"
 
-#: common/forms.py:243
+#: common/forms.py:235
 msgid ""
 "After opening, the user password changes and resets must contain special "
 "characters"
@@ -2135,63 +2137,63 @@ msgstr "终端设置"
 msgid "Security setting"
 msgstr "安全设置"
 
-#: common/templates/common/command_storage_create.html:50
+#: common/templates/common/command_storage_create.html:49
 #: ops/models/adhoc.py:161 ops/templates/ops/adhoc_detail.html:53
 #: ops/templates/ops/command_execution_list.html:58
 #: ops/templates/ops/task_adhoc.html:59 ops/templates/ops/task_list.html:38
 msgid "Hosts"
 msgstr "主机"
 
-#: common/templates/common/command_storage_create.html:53
+#: common/templates/common/command_storage_create.html:52
 msgid "Tips: If there are multiple hosts, separate them with a comma (,)"
 msgstr "提示: 如果有多台主机，请使用逗号 ( , ) 进行分割"
 
-#: common/templates/common/command_storage_create.html:64
+#: common/templates/common/command_storage_create.html:63
 msgid "Index"
 msgstr "索引"
 
-#: common/templates/common/command_storage_create.html:71
+#: common/templates/common/command_storage_create.html:70
 msgid "Doc type"
 msgstr "文档类型"
 
-#: common/templates/common/replay_storage_create.html:53
+#: common/templates/common/replay_storage_create.html:52
 #: ops/models/adhoc.py:162 templates/index.html:91
 msgid "Host"
 msgstr "主机"
 
-#: common/templates/common/replay_storage_create.html:67
+#: common/templates/common/replay_storage_create.html:66
 msgid "Bucket"
 msgstr "桶名称"
 
-#: common/templates/common/replay_storage_create.html:74
+#: common/templates/common/replay_storage_create.html:73
 msgid "Access key"
 msgstr ""
 
-#: common/templates/common/replay_storage_create.html:81
+#: common/templates/common/replay_storage_create.html:80
 msgid "Secret key"
 msgstr ""
 
-#: common/templates/common/replay_storage_create.html:88
+#: common/templates/common/replay_storage_create.html:87
 msgid "Container name"
 msgstr "容器名称"
 
-#: common/templates/common/replay_storage_create.html:95
+#: common/templates/common/replay_storage_create.html:94
 msgid "Account name"
 msgstr "账户名称"
 
-#: common/templates/common/replay_storage_create.html:102
+#: common/templates/common/replay_storage_create.html:101
 msgid "Account key"
 msgstr "账户密钥"
 
-#: common/templates/common/replay_storage_create.html:109
+#: common/templates/common/replay_storage_create.html:108
 msgid "Endpoint"
 msgstr "端点"
 
-#: common/templates/common/replay_storage_create.html:116
+#: common/templates/common/replay_storage_create.html:115
 msgid "Endpoint suffix"
 msgstr "端点后缀"
 
-#: common/templates/common/replay_storage_create.html:130
+#: common/templates/common/replay_storage_create.html:129
 #: xpack/plugins/cloud/models.py:186
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:64
@@ -2313,36 +2315,36 @@ msgstr "Become"
 msgid "Create by"
 msgstr "创建者"
 
-#: ops/models/adhoc.py:321
+#: ops/models/adhoc.py:324
 msgid "Start time"
 msgstr "开始时间"
 
-#: ops/models/adhoc.py:322
+#: ops/models/adhoc.py:325
 msgid "End time"
 msgstr "完成时间"
 
-#: ops/models/adhoc.py:323 ops/templates/ops/adhoc_history.html:57
+#: ops/models/adhoc.py:326 ops/templates/ops/adhoc_history.html:57
 #: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:41
 msgid "Time"
 msgstr "时间"
 
-#: ops/models/adhoc.py:324 ops/templates/ops/adhoc_detail.html:106
+#: ops/models/adhoc.py:327 ops/templates/ops/adhoc_detail.html:106
 #: ops/templates/ops/adhoc_history.html:55
 #: ops/templates/ops/adhoc_history_detail.html:69
 #: ops/templates/ops/task_detail.html:84 ops/templates/ops/task_history.html:61
 msgid "Is finished"
 msgstr "是否完成"
 
-#: ops/models/adhoc.py:325 ops/templates/ops/adhoc_history.html:56
+#: ops/models/adhoc.py:328 ops/templates/ops/adhoc_history.html:56
 #: ops/templates/ops/task_history.html:62
 msgid "Is success"
 msgstr "是否成功"
 
-#: ops/models/adhoc.py:326
+#: ops/models/adhoc.py:329
 msgid "Adhoc raw result"
 msgstr "结果"
 
-#: ops/models/adhoc.py:327
+#: ops/models/adhoc.py:330
 msgid "Adhoc result summary"
 msgstr "汇总"
 
@@ -2553,10 +2555,10 @@ msgstr "命令执行"
 msgid "Organization"
 msgstr "组织管理"
 
-#: perms/forms.py:31 perms/models.py:30 perms/models.py:80
+#: perms/forms.py:39 perms/models.py:30 perms/models.py:80
 #: perms/templates/perms/asset_permission_list.html:55
 #: perms/templates/perms/asset_permission_list.html:111 templates/_nav.html:14
-#: users/forms.py:284 users/models/group.py:26 users/models/user.py:59
+#: users/forms.py:273 users/models/group.py:26 users/models/user.py:59
 #: users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_detail.html:211
 #: users/templates/users/user_list.html:26
@@ -2564,11 +2566,11 @@ msgstr "组织管理"
 msgid "User group"
 msgstr "用户组"
 
-#: perms/forms.py:53
+#: perms/forms.py:61
 msgid "User or group at least one required"
 msgstr "用户和用户组至少选一个"
 
-#: perms/forms.py:62
+#: perms/forms.py:70
 msgid "Asset or group at least one required"
 msgstr "资产和节点至少选一个"
 
@@ -2698,7 +2700,7 @@ msgstr "文档"
 msgid "Commercial support"
 msgstr "商业支持"
 
-#: templates/_header_bar.html:89 templates/_nav_user.html:14 users/forms.py:151
+#: templates/_header_bar.html:89 templates/_nav_user.html:14 users/forms.py:141
 #: users/templates/users/_user.html:43
 #: users/templates/users/first_login.html:39
 #: users/templates/users/user_password_update.html:40
@@ -3319,11 +3321,11 @@ msgstr "MFA 验证码"
 msgid "Role"
 msgstr "角色"
 
-#: users/forms.py:55 users/forms.py:230
+#: users/forms.py:55 users/forms.py:220
 msgid "ssh public key"
 msgstr "ssh公钥"
 
-#: users/forms.py:56 users/forms.py:231
+#: users/forms.py:56 users/forms.py:221
 msgid "ssh-rsa AAAA..."
 msgstr ""
 
@@ -3331,19 +3333,19 @@ msgstr ""
 msgid "Paste user id_rsa.pub here."
 msgstr "复制用户公钥到这里"
 
-#: users/forms.py:76 users/templates/users/user_detail.html:219
+#: users/forms.py:71 users/templates/users/user_detail.html:219
 msgid "Join user groups"
 msgstr "添加到用户组"
 
-#: users/forms.py:110 users/forms.py:245
+#: users/forms.py:105 users/forms.py:235
 msgid "Public key should not be the same as your old one."
 msgstr "不能和原来的密钥相同"
 
-#: users/forms.py:114 users/forms.py:249 users/serializers/v1.py:38
+#: users/forms.py:109 users/forms.py:239 users/serializers/v1.py:38
 msgid "Not a valid ssh public key"
 msgstr "ssh密钥不合法"
 
-#: users/forms.py:157
+#: users/forms.py:147
 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 "
@@ -3352,11 +3354,11 @@ msgstr ""
 "提示：启用之后您将会在下次登录时进入MFA绑定流程；您也可以在（个人信息->快速修"
 "改->更改MFA设置）中直接绑定!"
 
-#: users/forms.py:167
+#: users/forms.py:157
 msgid "* Enable MFA authentication to make the account more secure."
 msgstr "* 启用MFA认证，使账号更加安全."
 
-#: users/forms.py:177
+#: users/forms.py:167
 msgid ""
 "In order to protect you and your company, please keep your account, password "
 "and key sensitive information properly. (for example: setting complex "
@@ -3365,41 +3367,41 @@ msgstr ""
 "为了保护您和公司的安全，请妥善保管您的账户、密码和密钥等重要敏感信息；（如："
 "设置复杂密码，启用MFA认证）"
 
-#: users/forms.py:184 users/templates/users/first_login.html:48
+#: users/forms.py:174 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:190
+#: users/forms.py:180
 msgid "Old password"
 msgstr "原来密码"
 
-#: users/forms.py:195
+#: users/forms.py:185
 msgid "New password"
 msgstr "新密码"
 
-#: users/forms.py:200
+#: users/forms.py:190
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: users/forms.py:210
+#: users/forms.py:200
 msgid "Old password error"
 msgstr "原来密码错误"
 
-#: users/forms.py:218
+#: users/forms.py:208
 msgid "Password does not match"
 msgstr "密码不一致"
 
-#: users/forms.py:228
+#: users/forms.py:218
 msgid "Automatically configure and download the SSH key"
 msgstr "自动配置并下载SSH密钥"
 
-#: users/forms.py:232
+#: users/forms.py:222
 msgid "Paste your id_rsa.pub here."
 msgstr "复制你的公钥到这里"
 
-#: users/forms.py:260 users/models/user.py:83
+#: users/forms.py:250 users/models/user.py:83
 #: users/templates/users/first_login.html:42
 #: users/templates/users/user_password_update.html:46
 #: users/templates/users/user_profile.html:68
@@ -3408,7 +3410,7 @@ msgstr "复制你的公钥到这里"
 msgid "Public key"
 msgstr "ssh公钥"
 
-#: users/forms.py:267 users/forms.py:272 users/forms.py:318
+#: users/forms.py:256 users/forms.py:261 users/forms.py:307
 #: xpack/plugins/orgs/forms.py:30
 msgid "Select users"
 msgstr "选择用户"
@@ -4623,6 +4625,9 @@ msgstr "创建组织"
 msgid "Update org"
 msgstr "更新组织"
 
+#~ msgid "Error: Account invalid"
+#~ msgstr "错误: 账户无效"
+
 #~ msgid "Asset has been disabled, skip: {}"
 #~ msgstr "资产被禁用，跳过：{}"