From 08fb8f5d9227264e3b4fe87428f98e1cce7b061b Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Mon, 30 Dec 2019 12:27:14 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97title=E6=96=87=E6=A1=88=EF=BC=9A=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/audits/operate_log_list.html | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 84180 -> 84172 bytes apps/locale/zh/LC_MESSAGES/django.po | 548 +++++++++--------- 3 files changed, 283 insertions(+), 267 deletions(-) diff --git a/apps/audits/templates/audits/operate_log_list.html b/apps/audits/templates/audits/operate_log_list.html index d4d2eeb7f..fdc03ce35 100644 --- a/apps/audits/templates/audits/operate_log_list.html +++ b/apps/audits/templates/audits/operate_log_list.html @@ -67,7 +67,7 @@ {% endblock %} {% block table_head %} - {% trans 'User' %} + {% trans 'Handlers' %} {% trans 'Action' %} {% trans 'Resource Type' %} {% trans 'Resource' %} diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 80319de2eaabcfcdc74daaf8d1f6d477de20b2a8..8538bed11c2795287d8ccd739603948827e65737 100644 GIT binary patch delta 20050 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 delta 20057 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 0525b84d3..6f4adc328 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-12-20 15:57+0800\n" +"POT-Creation-Date: 2019-12-30 12:26+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -26,7 +26,7 @@ msgstr "自定义" #: applications/templates/applications/remote_app_list.html:28 #: applications/templates/applications/user_remote_app_list.html:18 #: assets/forms/domain.py:15 assets/forms/label.py:13 -#: assets/models/asset.py:339 assets/models/authbook.py:24 +#: assets/models/asset.py:342 assets/models/authbook.py:24 #: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:32 #: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:45 #: assets/templates/assets/admin_user_list.html:23 @@ -51,13 +51,13 @@ msgstr "自定义" #: users/templates/users/user_asset_permission.html:70 #: users/templates/users/user_granted_remote_app.html:36 #: xpack/plugins/change_auth_plan/forms.py:73 -#: xpack/plugins/change_auth_plan/models.py:419 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:44 +#: xpack/plugins/change_auth_plan/models.py:418 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:40 #: 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:307 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:63 +#: xpack/plugins/cloud/models.py:306 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:60 #: xpack/plugins/orgs/templates/orgs/org_list.html:17 #: xpack/plugins/vault/forms.py:13 xpack/plugins/vault/forms.py:15 msgid "Asset" @@ -159,17 +159,17 @@ msgstr "运行参数" #: users/templates/users/user_pubkey_update.html:57 #: users/templates/users/user_remote_app_permission.html:36 #: xpack/plugins/change_auth_plan/forms.py:56 -#: xpack/plugins/change_auth_plan/models.py:64 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61 +#: xpack/plugins/change_auth_plan/models.py:63 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:59 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12 -#: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:144 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:50 +#: xpack/plugins/cloud/models.py:58 xpack/plugins/cloud/models.py:143 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:47 #: xpack/plugins/cloud/templates/cloud/account_list.html:12 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:56 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:53 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:12 #: xpack/plugins/gathered_user/models.py:28 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:16 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:52 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:47 #: xpack/plugins/orgs/templates/orgs/org_list.html:12 msgid "Name" msgstr "名称" @@ -202,7 +202,7 @@ msgstr "主机" #: applications/models/database_app.py:27 #: applications/templates/applications/database_app_detail.html:60 #: applications/templates/applications/database_app_list.html:27 -#: assets/forms/asset.py:25 assets/models/asset.py:184 +#: assets/forms/asset.py:25 assets/models/asset.py:190 #: assets/models/domain.py:50 #: assets/templates/assets/domain_gateway_list.html:64 msgid "Port" @@ -225,7 +225,7 @@ msgstr "数据库" #: applications/templates/applications/remote_app_list.html:29 #: applications/templates/applications/user_database_app_list.html:20 #: applications/templates/applications/user_remote_app_list.html:19 -#: assets/models/asset.py:149 assets/models/asset.py:219 +#: assets/models/asset.py:149 assets/models/asset.py:225 #: assets/models/base.py:32 assets/models/cluster.py:29 #: assets/models/cmd_filter.py:23 assets/models/cmd_filter.py:56 #: assets/models/domain.py:21 assets/models/domain.py:53 @@ -257,16 +257,16 @@ msgstr "数据库" #: users/templates/users/user_group_detail.html:62 #: users/templates/users/user_group_list.html:16 #: users/templates/users/user_profile.html:138 -#: xpack/plugins/change_auth_plan/models.py:105 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117 +#: xpack/plugins/change_auth_plan/models.py:104 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:115 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19 -#: xpack/plugins/cloud/models.py:77 xpack/plugins/cloud/models.py:173 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:70 +#: xpack/plugins/cloud/models.py:76 xpack/plugins/cloud/models.py:172 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:67 #: xpack/plugins/cloud/templates/cloud/account_list.html:15 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:105 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:102 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:18 #: xpack/plugins/gathered_user/models.py:42 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:64 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:59 #: xpack/plugins/orgs/templates/orgs/org_list.html:23 msgid "Comment" msgstr "备注" @@ -306,7 +306,7 @@ msgstr "参数" #: applications/models/remote_app.py:39 #: applications/templates/applications/database_app_detail.html:72 #: applications/templates/applications/remote_app_detail.html:68 -#: assets/models/asset.py:217 assets/models/base.py:35 +#: assets/models/asset.py:223 assets/models/base.py:35 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:26 #: assets/models/cmd_filter.py:59 assets/models/group.py:21 #: assets/templates/assets/admin_user_detail.html:63 @@ -321,9 +321,9 @@ msgstr "参数" #: perms/templates/perms/remote_app_permission_detail.html:85 #: users/models/user.py:479 users/serializers/group.py:32 #: users/templates/users/user_detail.html:97 -#: xpack/plugins/change_auth_plan/models.py:109 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113 -#: xpack/plugins/cloud/models.py:80 xpack/plugins/cloud/models.py:179 +#: xpack/plugins/change_auth_plan/models.py:108 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:111 +#: xpack/plugins/cloud/models.py:79 xpack/plugins/cloud/models.py:178 #: xpack/plugins/gathered_user/models.py:46 msgid "Created by" msgstr "创建者" @@ -333,7 +333,7 @@ msgstr "创建者" #: applications/models/remote_app.py:42 #: applications/templates/applications/database_app_detail.html:68 #: applications/templates/applications/remote_app_detail.html:64 -#: assets/models/asset.py:218 assets/models/base.py:33 +#: assets/models/asset.py:224 assets/models/base.py:33 #: assets/models/cluster.py:26 assets/models/domain.py:23 #: assets/models/gathered_user.py:19 assets/models/group.py:22 #: assets/models/label.py:25 assets/templates/assets/admin_user_detail.html:59 @@ -349,11 +349,11 @@ msgstr "创建者" #: terminal/templates/terminal/terminal_detail.html:59 #: tickets/templates/tickets/ticket_detail.html:52 users/models/group.py:18 #: users/templates/users/user_group_detail.html:58 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:105 -#: xpack/plugins/cloud/models.py:83 xpack/plugins/cloud/models.py:182 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:66 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:101 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:60 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:103 +#: xpack/plugins/cloud/models.py:82 xpack/plugins/cloud/models.py:181 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:63 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:98 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:55 msgid "Date created" msgstr "创建日期" @@ -402,13 +402,13 @@ msgstr "远程应用" #: users/templates/users/user_profile_update.html:67 #: users/templates/users/user_pubkey_update.html:74 #: users/templates/users/user_pubkey_update.html:80 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:69 -#: xpack/plugins/cloud/templates/cloud/account_create_update.html:33 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:53 -#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:44 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:65 +#: xpack/plugins/cloud/templates/cloud/account_create_update.html:29 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:49 +#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:40 #: xpack/plugins/interface/templates/interface/interface.html:72 -#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33 -#: xpack/plugins/vault/templates/vault/vault_create.html:45 +#: xpack/plugins/orgs/templates/orgs/org_create_update.html:29 +#: xpack/plugins/vault/templates/vault/vault_create.html:41 msgid "Reset" msgstr "重置" @@ -446,9 +446,9 @@ msgstr "重置" #: users/templates/users/user_password_update.html:76 #: users/templates/users/user_profile_update.html:68 #: users/templates/users/user_pubkey_update.html:81 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:70 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:66 #: xpack/plugins/interface/templates/interface/interface.html:74 -#: xpack/plugins/vault/templates/vault/vault_create.html:46 +#: xpack/plugins/vault/templates/vault/vault_create.html:42 msgid "Submit" msgstr "提交" @@ -475,8 +475,8 @@ msgstr "提交" #: perms/templates/perms/remote_app_permission_detail.html:13 #: perms/templates/perms/remote_app_permission_remote_app.html:13 #: perms/templates/perms/remote_app_permission_user.html:13 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:17 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:20 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:13 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:18 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:17 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:106 #: xpack/plugins/change_auth_plan/views.py:91 @@ -526,14 +526,14 @@ msgstr "详情" #: users/templates/users/user_profile.html:191 #: users/templates/users/user_profile.html:201 #: users/templates/users/user_remote_app_permission.html:110 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:29 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:27 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:56 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:23 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:20 #: xpack/plugins/cloud/templates/cloud/account_list.html:40 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:29 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:26 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:57 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:46 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:25 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:20 #: xpack/plugins/orgs/templates/orgs/org_list.html:93 msgid "Update" msgstr "更新" @@ -576,14 +576,14 @@ msgstr "更新" #: users/templates/users/user_list.html:94 #: users/templates/users/user_list.html:98 #: users/templates/users/user_remote_app_permission.html:111 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:33 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:31 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:58 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:27 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:24 #: xpack/plugins/cloud/templates/cloud/account_list.html:42 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:33 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:30 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:58 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:47 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:29 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:24 #: xpack/plugins/orgs/templates/orgs/org_list.html:95 msgid "Delete" msgstr "删除" @@ -638,7 +638,7 @@ msgstr "创建数据库应用" #: 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_history.html:72 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:67 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:19 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:20 #: xpack/plugins/orgs/templates/orgs/org_list.html:24 @@ -732,23 +732,23 @@ msgstr "不能包含特殊字符：[ {} ]" msgid "* The contains characters that are not allowed" msgstr "* 包含不被允许的字符" -#: assets/forms/asset.py:66 assets/models/asset.py:188 +#: assets/forms/asset.py:66 assets/models/asset.py:194 #: assets/models/user.py:111 assets/templates/assets/asset_detail.html:186 #: assets/templates/assets/asset_detail.html:194 #: assets/templates/assets/system_user_assets.html:87 #: perms/models/asset_permission.py:81 -#: xpack/plugins/change_auth_plan/models.py:75 +#: xpack/plugins/change_auth_plan/models.py:74 #: xpack/plugins/gathered_user/models.py:31 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:17 msgid "Nodes" msgstr "节点" -#: assets/forms/asset.py:69 assets/models/asset.py:192 +#: assets/forms/asset.py:69 assets/models/asset.py:198 #: assets/models/cluster.py:19 assets/models/user.py:67 #: assets/templates/assets/admin_user_list.html:62 #: assets/templates/assets/asset_detail.html:72 templates/_nav.html:44 -#: xpack/plugins/cloud/models.py:161 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:68 +#: xpack/plugins/cloud/models.py:160 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:65 #: xpack/plugins/orgs/templates/orgs/org_list.html:19 msgid "Admin user" msgstr "管理用户" @@ -761,7 +761,7 @@ msgstr "管理用户" msgid "Label" msgstr "标签" -#: assets/forms/asset.py:75 assets/models/asset.py:187 +#: assets/forms/asset.py:75 assets/models/asset.py:193 #: assets/models/domain.py:26 assets/models/domain.py:52 #: assets/templates/assets/asset_detail.html:76 #: assets/templates/assets/user_asset_list.html:80 @@ -769,8 +769,8 @@ msgstr "标签" msgid "Domain" msgstr "网域" -#: assets/forms/asset.py:78 assets/models/asset.py:162 -#: assets/models/asset.py:186 assets/serializers/asset.py:70 +#: assets/forms/asset.py:78 assets/models/asset.py:168 +#: assets/models/asset.py:192 assets/serializers/asset.py:70 #: assets/templates/assets/asset_detail.html:100 #: assets/templates/assets/user_asset_list.html:78 msgid "Platform" @@ -789,9 +789,9 @@ msgstr "系统平台" #: xpack/plugins/change_auth_plan/forms.py:74 #: 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:157 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:64 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:64 +#: xpack/plugins/cloud/models.py:156 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:61 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:61 msgid "Node" msgstr "节点" @@ -816,7 +816,7 @@ msgstr "如果有多个的互相隔离的网络，设置资产属于的网域， #: assets/forms/label.py:15 #: perms/templates/perms/asset_permission_asset.html:74 #: xpack/plugins/change_auth_plan/forms.py:64 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:74 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:70 msgid "Select assets" msgstr "选择资产" @@ -854,27 +854,28 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: users/templates/users/user_list.html:15 #: users/templates/users/user_profile.html:47 #: xpack/plugins/change_auth_plan/forms.py:58 -#: xpack/plugins/change_auth_plan/models.py:66 -#: xpack/plugins/change_auth_plan/models.py:415 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:65 +#: xpack/plugins/change_auth_plan/models.py:65 +#: xpack/plugins/change_auth_plan/models.py:414 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:63 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:53 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:12 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:13 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:64 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:25 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:75 msgid "Username" msgstr "用户名" #: assets/forms/platform.py:20 ops/templates/ops/task_detail.html:85 #: ops/templates/ops/task_detail.html:95 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:84 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:75 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:82 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:72 msgid "Yes" msgstr "是" #: assets/forms/platform.py:21 ops/templates/ops/task_detail.html:87 #: ops/templates/ops/task_detail.html:97 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:86 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:77 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:84 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:74 msgid "No" msgstr "否" @@ -908,8 +909,8 @@ msgstr "密码或密钥密码" #: users/templates/users/user_profile_update.html:41 #: users/templates/users/user_pubkey_update.html:41 #: users/templates/users/user_update.html:20 -#: xpack/plugins/change_auth_plan/models.py:96 -#: xpack/plugins/change_auth_plan/models.py:264 +#: xpack/plugins/change_auth_plan/models.py:95 +#: xpack/plugins/change_auth_plan/models.py:263 msgid "Password" msgstr "密码" @@ -972,7 +973,7 @@ msgstr "元数据" msgid "Internal" msgstr "内部的" -#: assets/models/asset.py:179 assets/models/domain.py:49 +#: assets/models/asset.py:185 assets/models/domain.py:49 #: assets/serializers/asset_user.py:28 #: assets/templates/assets/_asset_list_modal.html:47 #: assets/templates/assets/_asset_user_list.html:20 @@ -984,12 +985,13 @@ msgstr "内部的" #: perms/templates/perms/asset_permission_list.html:187 #: settings/forms/terminal.py:16 users/templates/users/_granted_assets.html:31 #: users/templates/users/user_asset_permission.html:156 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:54 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:63 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:50 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:24 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:74 msgid "IP" msgstr "IP" -#: assets/models/asset.py:180 assets/serializers/asset_user.py:27 +#: assets/models/asset.py:186 assets/serializers/asset_user.py:27 #: assets/serializers/gathered_user.py:20 #: assets/templates/assets/_asset_list_modal.html:46 #: assets/templates/assets/_asset_user_auth_update_modal.html:9 @@ -1001,12 +1003,13 @@ msgstr "IP" #: perms/templates/perms/asset_permission_list.html:188 #: settings/forms/terminal.py:15 users/templates/users/_granted_assets.html:30 #: users/templates/users/user_asset_permission.html:157 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:53 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:62 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:49 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:23 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:73 msgid "Hostname" msgstr "主机名" -#: assets/models/asset.py:183 assets/models/domain.py:51 +#: assets/models/asset.py:189 assets/models/domain.py:51 #: assets/models/user.py:114 assets/templates/assets/asset_detail.html:68 #: assets/templates/assets/domain_gateway_list.html:65 #: assets/templates/assets/system_user_detail.html:67 @@ -1016,86 +1019,86 @@ msgstr "主机名" msgid "Protocol" msgstr "协议" -#: assets/models/asset.py:185 assets/serializers/asset.py:72 +#: assets/models/asset.py:191 assets/serializers/asset.py:72 #: assets/templates/assets/asset_create.html:24 #: assets/templates/assets/user_asset_list.html:77 #: perms/serializers/user_permission.py:59 msgid "Protocols" msgstr "协议组" -#: assets/models/asset.py:189 assets/models/authbook.py:27 +#: assets/models/asset.py:195 assets/models/authbook.py:27 #: assets/models/cmd_filter.py:22 assets/models/domain.py:54 #: assets/models/label.py:22 assets/templates/assets/asset_detail.html:108 #: authentication/models.py:45 msgid "Is active" msgstr "激活" -#: assets/models/asset.py:195 assets/templates/assets/asset_detail.html:64 +#: assets/models/asset.py:201 assets/templates/assets/asset_detail.html:64 msgid "Public IP" msgstr "公网IP" -#: assets/models/asset.py:196 assets/templates/assets/asset_detail.html:116 +#: assets/models/asset.py:202 assets/templates/assets/asset_detail.html:116 msgid "Asset number" msgstr "资产编号" -#: assets/models/asset.py:199 assets/templates/assets/asset_detail.html:80 +#: assets/models/asset.py:205 assets/templates/assets/asset_detail.html:80 msgid "Vendor" msgstr "制造商" -#: assets/models/asset.py:200 assets/templates/assets/asset_detail.html:84 +#: assets/models/asset.py:206 assets/templates/assets/asset_detail.html:84 msgid "Model" msgstr "型号" -#: assets/models/asset.py:201 assets/templates/assets/asset_detail.html:112 +#: assets/models/asset.py:207 assets/templates/assets/asset_detail.html:112 msgid "Serial number" msgstr "序列号" -#: assets/models/asset.py:203 +#: assets/models/asset.py:209 msgid "CPU model" msgstr "CPU型号" -#: assets/models/asset.py:204 +#: assets/models/asset.py:210 #: xpack/plugins/license/templates/license/license_detail.html:71 msgid "CPU count" msgstr "CPU数量" -#: assets/models/asset.py:205 +#: assets/models/asset.py:211 msgid "CPU cores" msgstr "CPU核数" -#: assets/models/asset.py:206 +#: assets/models/asset.py:212 msgid "CPU vcpus" msgstr "CPU总数" -#: assets/models/asset.py:207 assets/templates/assets/asset_detail.html:92 +#: assets/models/asset.py:213 assets/templates/assets/asset_detail.html:92 msgid "Memory" msgstr "内存" -#: assets/models/asset.py:208 +#: assets/models/asset.py:214 msgid "Disk total" msgstr "硬盘大小" -#: assets/models/asset.py:209 +#: assets/models/asset.py:215 msgid "Disk info" msgstr "硬盘信息" -#: assets/models/asset.py:211 assets/templates/assets/asset_detail.html:104 +#: assets/models/asset.py:217 assets/templates/assets/asset_detail.html:104 msgid "OS" msgstr "操作系统" -#: assets/models/asset.py:212 +#: assets/models/asset.py:218 msgid "OS version" msgstr "系统版本" -#: assets/models/asset.py:213 +#: assets/models/asset.py:219 msgid "OS arch" msgstr "系统架构" -#: assets/models/asset.py:214 +#: assets/models/asset.py:220 msgid "Hostname raw" msgstr "主机名原始" -#: assets/models/asset.py:216 assets/templates/assets/asset_create.html:46 +#: assets/models/asset.py:222 assets/templates/assets/asset_create.html:46 #: assets/templates/assets/asset_detail.html:220 templates/_nav.html:46 msgid "Labels" msgstr "标签管理" @@ -1116,21 +1119,22 @@ msgstr "版本" msgid "AuthBook" msgstr "" -#: assets/models/base.py:30 xpack/plugins/change_auth_plan/models.py:100 -#: xpack/plugins/change_auth_plan/models.py:271 +#: assets/models/base.py:30 xpack/plugins/change_auth_plan/models.py:99 +#: xpack/plugins/change_auth_plan/models.py:270 msgid "SSH private key" msgstr "ssh密钥" -#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:103 -#: xpack/plugins/change_auth_plan/models.py:267 +#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:102 +#: xpack/plugins/change_auth_plan/models.py:266 msgid "SSH public key" msgstr "ssh公钥" #: assets/models/base.py:34 assets/models/gathered_user.py:20 #: assets/templates/assets/cmd_filter_detail.html:68 common/mixins/models.py:52 #: ops/models/adhoc.py:49 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:109 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:68 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:107 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:27 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:79 msgid "Date updated" msgstr "更新日期" @@ -1248,17 +1252,18 @@ msgid "Gateway" msgstr "网关" #: assets/models/gathered_user.py:16 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:67 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:26 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:78 msgid "Present" msgstr "存在" #: assets/models/gathered_user.py:17 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:65 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:76 msgid "Date last login" msgstr "最后登录日期" #: assets/models/gathered_user.py:18 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:66 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:77 msgid "IP last login" msgstr "最后登录IP" @@ -1278,7 +1283,6 @@ msgstr "默认资产组" #: audits/models.py:51 audits/templates/audits/ftp_log_list.html:37 #: audits/templates/audits/ftp_log_list.html:74 #: audits/templates/audits/operate_log_list.html:37 -#: audits/templates/audits/operate_log_list.html:70 #: audits/templates/audits/password_change_log_list.html:37 #: audits/templates/audits/password_change_log_list.html:54 #: authentication/models.py:43 ops/templates/ops/command_execution_list.html:41 @@ -1311,7 +1315,7 @@ msgstr "默认资产组" #: users/templates/users/user_remote_app_permission.html:37 #: users/templates/users/user_remote_app_permission.html:58 #: users/views/profile.py:68 xpack/plugins/orgs/forms.py:28 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:113 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:108 #: xpack/plugins/orgs/templates/orgs/org_list.html:15 msgid "User" msgstr "用户" @@ -1374,7 +1378,7 @@ msgstr "手动登录" #: assets/views/platform.py:55 assets/views/platform.py:71 #: assets/views/system_user.py:29 assets/views/system_user.py:46 #: assets/views/system_user.py:63 assets/views/system_user.py:79 -#: templates/_nav.html:39 xpack/plugins/change_auth_plan/models.py:71 +#: templates/_nav.html:39 xpack/plugins/change_auth_plan/models.py:70 msgid "Assets" msgstr "资产管理" @@ -1531,7 +1535,7 @@ msgstr "测试资产可连接性: {}" #: assets/tasks/asset_user_connectivity.py:27 #: assets/tasks/push_system_user.py:130 -#: xpack/plugins/change_auth_plan/models.py:528 +#: xpack/plugins/change_auth_plan/models.py:527 msgid "The asset {} system platform {} does not support run Ansible tasks" msgstr "资产 {} 系统平台 {} 不支持运行 Ansible 任务" @@ -1639,14 +1643,10 @@ msgstr "资产列表" #: ops/templates/ops/command_execution_create.html:112 #: settings/templates/settings/_ldap_list_users_modal.html:41 #: users/templates/users/_granted_assets.html:7 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:66 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:62 msgid "Loading" msgstr "加载中" -#: assets/templates/assets/_asset_update_modal.html:4 -msgid "Update assets" -msgstr "更新资产" - #: assets/templates/assets/_asset_user_auth_update_modal.html:4 msgid "Update asset user auth" msgstr "更新资产用户认证信息" @@ -1748,8 +1748,8 @@ msgstr "节点详情" #: ops/templates/ops/adhoc_history_detail.html:47 #: ops/templates/ops/task_detail.html:54 #: terminal/templates/terminal/session_list.html:24 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:64 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:60 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:59 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:57 msgid "ID" msgstr "ID" @@ -1781,7 +1781,7 @@ msgstr "存在子节点，不能删除" msgid "Have assets, cancel" msgstr "存在资产，不能删除" -#: assets/templates/assets/_node_tree.html:254 +#: assets/templates/assets/_node_tree.html:255 msgid "Rename success" msgstr "重命名成功" @@ -1791,9 +1791,9 @@ msgstr "重命名成功" #: perms/templates/perms/asset_permission_create_update.html:36 #: perms/templates/perms/database_app_permission_create_update.html:37 #: perms/templates/perms/remote_app_permission_create_update.html:37 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:41 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:27 -#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:27 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:37 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:23 +#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:23 msgid "Basic" msgstr "基本" @@ -1815,9 +1815,9 @@ msgstr "自动生成密钥" #: perms/templates/perms/database_app_permission_create_update.html:51 #: perms/templates/perms/remote_app_permission_create_update.html:51 #: terminal/templates/terminal/terminal_update.html:38 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:65 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:48 -#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:39 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:61 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:44 +#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:35 msgid "Other" msgstr "其它" @@ -1834,7 +1834,7 @@ msgstr "资产列表" #: assets/templates/assets/admin_user_assets.html:24 #: perms/templates/perms/asset_permission_asset.html:31 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:31 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:27 msgid "Asset list of " msgstr "资产列表" @@ -1860,7 +1860,7 @@ msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:86 #: perms/templates/perms/asset_permission_asset.html:99 #: xpack/plugins/change_auth_plan/forms.py:68 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:99 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:95 #: xpack/plugins/gathered_user/forms.py:36 msgid "Select nodes" msgstr "选择节点" @@ -1880,11 +1880,11 @@ msgstr "选择节点" #: users/templates/users/user_detail.html:511 #: users/templates/users/user_group_create_update.html:28 #: users/templates/users/user_list.html:184 -#: xpack/plugins/cloud/templates/cloud/account_create_update.html:34 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:54 -#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:45 +#: xpack/plugins/cloud/templates/cloud/account_create_update.html:30 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:50 +#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:41 #: xpack/plugins/interface/templates/interface/interface.html:103 -#: xpack/plugins/orgs/templates/orgs/org_create_update.html:34 +#: xpack/plugins/orgs/templates/orgs/org_create_update.html:30 msgid "Confirm" msgstr "确认" @@ -1920,8 +1920,8 @@ msgstr "资产用户" #: terminal/templates/terminal/session_detail.html:85 #: users/templates/users/user_detail.html:126 #: users/templates/users/user_profile.html:150 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:128 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:132 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:126 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:129 #: xpack/plugins/license/templates/license/license_detail.html:93 msgid "Quick modify" msgstr "快速修改" @@ -2394,7 +2394,7 @@ msgstr "成功" #: audits/models.py:33 #: authentication/templates/authentication/_access_key_modal.html:22 -#: xpack/plugins/vault/templates/vault/vault.html:38 +#: xpack/plugins/vault/templates/vault/vault.html:8 msgid "Create" msgstr "创建" @@ -2424,8 +2424,8 @@ msgstr "启用" msgid "-" msgstr "" -#: audits/models.py:78 xpack/plugins/cloud/models.py:264 -#: xpack/plugins/cloud/models.py:287 +#: audits/models.py:78 xpack/plugins/cloud/models.py:263 +#: xpack/plugins/cloud/models.py:286 msgid "Failed" msgstr "失败" @@ -2453,10 +2453,10 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:87 audits/templates/audits/login_log_list.html:63 -#: xpack/plugins/change_auth_plan/models.py:423 +#: xpack/plugins/change_auth_plan/models.py:422 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:15 -#: xpack/plugins/cloud/models.py:278 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69 +#: xpack/plugins/cloud/models.py:277 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:64 msgid "Reason" msgstr "原因" @@ -2464,9 +2464,9 @@ msgstr "原因" #: tickets/templates/tickets/ticket_detail.html:34 #: tickets/templates/tickets/ticket_list.html:36 #: tickets/templates/tickets/ticket_list.html:104 -#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/models.py:310 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65 +#: xpack/plugins/cloud/models.py:274 xpack/plugins/cloud/models.py:309 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:65 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62 msgid "Status" msgstr "状态" @@ -2483,8 +2483,8 @@ msgstr "登录日期" #: perms/templates/perms/database_app_permission_detail.html:77 #: perms/templates/perms/remote_app_permission_detail.html:73 #: terminal/models.py:189 terminal/templates/terminal/session_list.html:32 -#: xpack/plugins/change_auth_plan/models.py:250 -#: xpack/plugins/change_auth_plan/models.py:426 +#: xpack/plugins/change_auth_plan/models.py:249 +#: xpack/plugins/change_auth_plan/models.py:425 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:59 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:17 #: xpack/plugins/gathered_user/models.py:140 @@ -2505,8 +2505,8 @@ msgstr "选择用户" #: ops/templates/ops/command_execution_list.html:49 #: ops/templates/ops/command_execution_list.html:54 #: templates/_base_list.html:37 templates/_user_profile.html:23 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:52 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:47 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:45 msgid "Search" msgstr "搜索" @@ -2526,11 +2526,14 @@ msgstr "日期" #: audits/templates/audits/login_log_list.html:91 #: templates/_csv_import_export.html:8 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:49 -#: xpack/plugins/vault/templates/vault/vault.html:47 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:60 msgid "Export" msgstr "导出" +#: audits/templates/audits/operate_log_list.html:70 +msgid "Handlers" +msgstr "操作者" + #: audits/views.py:86 audits/views.py:130 audits/views.py:167 #: audits/views.py:212 audits/views.py:244 templates/_nav.html:144 msgid "Audits" @@ -3026,8 +3029,8 @@ msgid "Become" msgstr "Become" #: ops/models/adhoc.py:189 users/templates/users/user_group_detail.html:54 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:62 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:56 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:59 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:51 msgid "Create by" msgstr "创建者" @@ -3049,8 +3052,8 @@ msgstr "完成时间" #: ops/models/adhoc.py:275 ops/templates/ops/adhoc_history.html:55 #: ops/templates/ops/task_history.html:61 ops/templates/ops/task_list.html:16 -#: xpack/plugins/change_auth_plan/models.py:253 -#: xpack/plugins/change_auth_plan/models.py:429 +#: xpack/plugins/change_auth_plan/models.py:252 +#: xpack/plugins/change_auth_plan/models.py:428 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:58 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:16 #: xpack/plugins/gathered_user/models.py:143 @@ -3087,7 +3090,7 @@ msgstr "{} 任务结束" #: ops/models/command.py:23 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:56 -#: xpack/plugins/cloud/models.py:273 +#: xpack/plugins/cloud/models.py:272 msgid "Result" msgstr "结果" @@ -3095,11 +3098,11 @@ msgstr "结果" msgid "Task start" msgstr "任务开始" -#: ops/models/command.py:75 +#: ops/models/command.py:80 msgid "Command `{}` is forbidden ........" msgstr "命令 `{}` 不允许被执行 ......." -#: ops/models/command.py:81 +#: ops/models/command.py:86 msgid "Task end" msgstr "任务结束" @@ -3297,9 +3300,9 @@ msgid "Contents" msgstr "内容" #: ops/templates/ops/task_list.html:73 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:137 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:135 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:54 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:141 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:138 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:55 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:44 msgid "Run" @@ -3450,8 +3453,8 @@ msgstr "用户或用户组" #: perms/templates/perms/asset_permission_asset.html:23 #: perms/templates/perms/asset_permission_detail.html:22 #: perms/templates/perms/asset_permission_user.html:23 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:20 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:23 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:16 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:21 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:20 msgid "Assets and node" msgstr "资产或节点" @@ -3473,9 +3476,9 @@ msgstr "添加资产" #: perms/templates/perms/remote_app_permission_user.html:92 #: perms/templates/perms/remote_app_permission_user.html:120 #: users/templates/users/user_group_detail.html:87 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:80 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:93 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:130 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:76 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:88 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:125 msgid "Add" msgstr "添加" @@ -3485,7 +3488,7 @@ msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:105 #: users/templates/users/user_detail.html:226 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:105 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:101 msgid "Join" msgstr "加入" @@ -3547,8 +3550,8 @@ msgstr "刷新授权缓存" #: users/templates/users/user_database_app_permission.html:41 #: users/templates/users/user_list.html:19 #: users/templates/users/user_remote_app_permission.html:41 -#: xpack/plugins/cloud/models.py:74 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:58 +#: xpack/plugins/cloud/models.py:73 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:55 #: xpack/plugins/cloud/templates/cloud/account_list.html:14 msgid "Validity" msgstr "有效" @@ -4092,7 +4095,6 @@ msgstr "当前无勾选用户，请勾选你想要导入的用户" #: settings/templates/settings/_ldap_list_users_modal.html:172 #: templates/_csv_import_export.html:13 templates/_csv_import_modal.html:5 #: xpack/plugins/license/templates/license/license_detail.html:101 -#: xpack/plugins/vault/templates/vault/vault.html:52 msgid "Import" msgstr "导入" @@ -4157,29 +4159,27 @@ msgstr "系统设置" msgid "Update setting successfully" msgstr "更新设置成功" -#: templates/_csv_import_modal.html:12 templates/_import_modal.html:12 +#: templates/_csv_import_modal.html:12 msgid "Download the imported template or use the exported CSV file format" msgstr "下载导入的模板或使用导出的csv格式" -#: templates/_csv_import_modal.html:13 templates/_import_modal.html:13 +#: templates/_csv_import_modal.html:13 msgid "Download the import template" msgstr "下载导入模版" #: templates/_csv_import_modal.html:17 templates/_csv_update_modal.html:17 -#: templates/_import_modal.html:17 templates/_update_modal.html:17 msgid "Select the CSV file to import" msgstr "请选择csv文件导入" #: templates/_csv_import_modal.html:39 templates/_csv_update_modal.html:42 -#: xpack/plugins/vault/templates/vault/vault.html:200 msgid "Please select file" msgstr "选择文件" -#: templates/_csv_update_modal.html:12 templates/_update_modal.html:12 +#: templates/_csv_update_modal.html:12 msgid "Download the update template or use the exported CSV file format" msgstr "下载更新的模板或使用导出的csv格式" -#: templates/_csv_update_modal.html:13 templates/_update_modal.html:13 +#: templates/_csv_update_modal.html:13 msgid "Download the update template" msgstr "下载更新模版" @@ -4632,9 +4632,9 @@ msgid "" " " msgstr "" -#: terminal/forms/storage.py:143 xpack/plugins/cloud/models.py:304 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:109 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62 +#: terminal/forms/storage.py:143 xpack/plugins/cloud/models.py:303 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:106 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:59 msgid "Region" msgstr "地域" @@ -5150,9 +5150,9 @@ msgstr "生成重置密码链接，通过邮件发送给用户" msgid "Set password" msgstr "设置密码" -#: users/forms/user.py:132 xpack/plugins/change_auth_plan/models.py:89 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:49 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:69 +#: users/forms/user.py:132 xpack/plugins/change_auth_plan/models.py:88 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:45 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:67 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:16 msgid "Password strategy" @@ -5249,8 +5249,8 @@ msgstr "安全令牌验证" #: users/templates/users/_base_otp.html:14 users/templates/users/_user.html:13 #: users/templates/users/user_profile_update.html:55 -#: xpack/plugins/cloud/models.py:147 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:60 +#: xpack/plugins/cloud/models.py:146 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:57 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:13 msgid "Account" msgstr "账户" @@ -5506,7 +5506,7 @@ msgid "User group detail" msgstr "用户组详情" #: users/templates/users/user_group_detail.html:81 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:121 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:116 msgid "Add user" msgstr "添加用户" @@ -5956,16 +5956,16 @@ msgid "Password length" msgstr "密码长度" #: xpack/plugins/change_auth_plan/forms.py:75 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:58 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:81 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:54 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:79 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:17 #: xpack/plugins/cloud/forms.py:33 xpack/plugins/cloud/forms.py:87 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:41 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:72 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:37 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:69 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:16 #: xpack/plugins/gathered_user/forms.py:13 #: xpack/plugins/gathered_user/forms.py:41 -#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:32 +#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:28 msgid "Periodic perform" msgstr "定时执行" @@ -5995,8 +5995,8 @@ msgstr "" "具）
注意： 如果同时设置了定期执行和周期执行，优先使用定期执行" #: xpack/plugins/change_auth_plan/meta.py:9 -#: xpack/plugins/change_auth_plan/models.py:117 -#: xpack/plugins/change_auth_plan/models.py:257 +#: xpack/plugins/change_auth_plan/models.py:116 +#: xpack/plugins/change_auth_plan/models.py:256 #: xpack/plugins/change_auth_plan/views.py:33 #: xpack/plugins/change_auth_plan/views.py:50 #: xpack/plugins/change_auth_plan/views.py:74 @@ -6007,69 +6007,69 @@ msgstr "" msgid "Change auth plan" msgstr "改密计划" -#: xpack/plugins/change_auth_plan/models.py:58 +#: xpack/plugins/change_auth_plan/models.py:57 msgid "Custom password" msgstr "自定义密码" -#: xpack/plugins/change_auth_plan/models.py:59 +#: xpack/plugins/change_auth_plan/models.py:58 msgid "All assets use the same random password" msgstr "所有资产使用相同的随机密码" -#: xpack/plugins/change_auth_plan/models.py:60 +#: xpack/plugins/change_auth_plan/models.py:59 msgid "All assets use different random password" msgstr "所有资产使用不同的随机密码" -#: xpack/plugins/change_auth_plan/models.py:79 -#: xpack/plugins/change_auth_plan/models.py:148 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:100 -#: xpack/plugins/cloud/models.py:165 xpack/plugins/cloud/models.py:219 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:91 +#: xpack/plugins/change_auth_plan/models.py:78 +#: xpack/plugins/change_auth_plan/models.py:147 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:98 +#: xpack/plugins/cloud/models.py:164 xpack/plugins/cloud/models.py:218 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:88 #: xpack/plugins/gathered_user/models.py:35 #: xpack/plugins/gathered_user/models.py:72 msgid "Cycle perform" msgstr "周期执行" -#: xpack/plugins/change_auth_plan/models.py:84 -#: xpack/plugins/change_auth_plan/models.py:146 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:92 -#: xpack/plugins/cloud/models.py:170 xpack/plugins/cloud/models.py:217 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83 +#: xpack/plugins/change_auth_plan/models.py:83 +#: xpack/plugins/change_auth_plan/models.py:145 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:90 +#: xpack/plugins/cloud/models.py:169 xpack/plugins/cloud/models.py:216 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:80 #: xpack/plugins/gathered_user/models.py:40 #: xpack/plugins/gathered_user/models.py:70 msgid "Regularly perform" msgstr "定期执行" -#: xpack/plugins/change_auth_plan/models.py:93 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:74 +#: xpack/plugins/change_auth_plan/models.py:92 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:72 msgid "Password rules" msgstr "密码规则" -#: xpack/plugins/change_auth_plan/models.py:213 +#: xpack/plugins/change_auth_plan/models.py:212 msgid "* For security, do not change {} user's password" msgstr "* 为了安全，禁止更改 {} 用户的密码" -#: xpack/plugins/change_auth_plan/models.py:217 +#: xpack/plugins/change_auth_plan/models.py:216 msgid "Assets is empty, please add the asset" msgstr "资产为空，请添加资产" -#: xpack/plugins/change_auth_plan/models.py:261 +#: xpack/plugins/change_auth_plan/models.py:260 msgid "Change auth plan snapshot" msgstr "改密计划快照" -#: xpack/plugins/change_auth_plan/models.py:276 -#: xpack/plugins/change_auth_plan/models.py:433 +#: xpack/plugins/change_auth_plan/models.py:275 +#: xpack/plugins/change_auth_plan/models.py:432 msgid "Change auth plan execution" msgstr "改密计划执行" -#: xpack/plugins/change_auth_plan/models.py:442 +#: xpack/plugins/change_auth_plan/models.py:441 msgid "Change auth plan execution subtask" msgstr "改密计划执行子任务" -#: xpack/plugins/change_auth_plan/models.py:460 +#: xpack/plugins/change_auth_plan/models.py:459 msgid "Authentication failed" msgstr "认证失败" -#: xpack/plugins/change_auth_plan/models.py:462 +#: xpack/plugins/change_auth_plan/models.py:461 msgid "Connection timeout" msgstr "连接超时" @@ -6094,36 +6094,36 @@ msgstr "* 密码长度范围 6-30 位" msgid "* Please enter a valid crontab expression" msgstr "* 请输入有效的 crontab 表达式" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:23 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:26 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:19 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:24 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:23 #: xpack/plugins/change_auth_plan/views.py:133 msgid "Plan execution list" msgstr "执行列表" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:66 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:62 msgid "Add asset to this plan" msgstr "添加资产" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:91 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:87 msgid "Add node to this plan" msgstr "添加节点" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:11 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:7 msgid "" "When the user password on the asset is changed, the action is performed " "using the admin user associated with the asset" msgstr "更改资产上的用户密码时，将会使用与该资产关联的管理用户进行操作" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:76 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:74 msgid "Length" msgstr "长度" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:134 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:132 msgid "Run plan manually" msgstr "手动执行计划" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:178 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:176 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:102 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:90 msgid "Execute failed" @@ -6134,7 +6134,7 @@ msgid "Execution list of plan" msgstr "执行列表" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:104 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:89 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:84 msgid "Log" msgstr "日志" @@ -6204,80 +6204,80 @@ msgstr "选择管理员" msgid "Cloud center" msgstr "云管中心" -#: xpack/plugins/cloud/models.py:53 +#: xpack/plugins/cloud/models.py:52 msgid "Available" msgstr "有效" -#: xpack/plugins/cloud/models.py:54 +#: xpack/plugins/cloud/models.py:53 msgid "Unavailable" msgstr "无效" -#: xpack/plugins/cloud/models.py:63 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:54 +#: xpack/plugins/cloud/models.py:62 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:51 #: xpack/plugins/cloud/templates/cloud/account_list.html:13 msgid "Provider" msgstr "云服务商" -#: xpack/plugins/cloud/models.py:66 +#: xpack/plugins/cloud/models.py:65 msgid "Access key id" msgstr "" -#: xpack/plugins/cloud/models.py:70 +#: xpack/plugins/cloud/models.py:69 msgid "Access key secret" msgstr "" -#: xpack/plugins/cloud/models.py:88 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:30 +#: xpack/plugins/cloud/models.py:87 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:26 msgid "Cloud account" msgstr "云账号" -#: xpack/plugins/cloud/models.py:150 +#: xpack/plugins/cloud/models.py:149 msgid "Regions" msgstr "地域" -#: xpack/plugins/cloud/models.py:153 +#: xpack/plugins/cloud/models.py:152 msgid "Instances" msgstr "实例" -#: xpack/plugins/cloud/models.py:176 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:97 +#: xpack/plugins/cloud/models.py:175 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:94 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:17 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:187 xpack/plugins/cloud/models.py:271 +#: xpack/plugins/cloud/models.py:186 xpack/plugins/cloud/models.py:270 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:265 xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/models.py:264 xpack/plugins/cloud/models.py:287 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/models.py:266 +#: xpack/plugins/cloud/models.py:265 msgid "Partial succeed" msgstr "" -#: xpack/plugins/cloud/models.py:281 xpack/plugins/cloud/models.py:313 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:71 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:66 +#: xpack/plugins/cloud/models.py:280 xpack/plugins/cloud/models.py:312 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:66 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:63 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:289 +#: xpack/plugins/cloud/models.py:288 msgid "Exist" msgstr "存在" -#: xpack/plugins/cloud/models.py:294 +#: xpack/plugins/cloud/models.py:293 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:298 +#: xpack/plugins/cloud/models.py:297 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:301 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:117 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:61 +#: xpack/plugins/cloud/models.py:300 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:114 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:58 msgid "Instance" msgstr "实例" @@ -6297,7 +6297,7 @@ msgstr "AWS (国际)" msgid "Qcloud" msgstr "腾讯云" -#: xpack/plugins/cloud/templates/cloud/account_detail.html:20 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:17 #: xpack/plugins/cloud/views.py:79 msgid "Account detail" msgstr "账户详情" @@ -6307,61 +6307,61 @@ msgstr "账户详情" msgid "Create account" msgstr "创建账户" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:33 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:29 msgid "Region & Instance" msgstr "地域 & 实例" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:37 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:33 msgid "Node & AdminUser" msgstr "节点 & 管理用户" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:67 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:63 msgid "Load failed" msgstr "加载失败" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:20 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:25 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:21 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:17 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:20 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:18 #: xpack/plugins/cloud/views.py:144 msgid "Sync task detail" msgstr "同步任务详情" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:23 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:28 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:24 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:20 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:23 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:21 #: xpack/plugins/cloud/views.py:160 msgid "Sync task history" msgstr "同步历史列表" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:26 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:31 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:27 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:23 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:26 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:24 #: xpack/plugins/cloud/views.py:212 msgid "Sync instance list" msgstr "同步实例列表" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:138 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:135 msgid "Run task manually" msgstr "手动执行任务" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:181 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:178 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:99 msgid "Sync success" msgstr "同步成功" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:65 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:60 msgid "Total count" msgstr "总数" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:66 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:61 msgid "Succeed count" msgstr "成功" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:67 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:62 msgid "Failed count" msgstr "失败" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:68 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:63 msgid "Exist count" msgstr "存在" @@ -6409,7 +6409,8 @@ msgid "Periodic" msgstr "定时执行" #: xpack/plugins/gathered_user/models.py:57 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:38 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:13 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:49 msgid "Gather user task" msgstr "收集用户任务" @@ -6425,6 +6426,12 @@ msgstr "收集用户执行" msgid "Assets is empty, please change nodes" msgstr "资产为空，请更改节点" +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:224 +#, fuzzy +#| msgid "Asset users of" +msgid "Asset user" +msgstr "资产用户" + #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:7 #: xpack/plugins/gathered_user/views.py:50 msgid "Create task" @@ -6616,7 +6623,7 @@ msgid "Select auditor" msgstr "选择审计员" #: xpack/plugins/orgs/forms.py:29 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:76 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:71 #: xpack/plugins/orgs/templates/orgs/org_list.html:13 msgid "Admin" msgstr "管理员" @@ -6627,12 +6634,12 @@ msgstr "管理员" msgid "Organizations" msgstr "组织管理" -#: xpack/plugins/orgs/templates/orgs/org_detail.html:22 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:17 #: xpack/plugins/orgs/views.py:80 msgid "Org detail" msgstr "组织详情" -#: xpack/plugins/orgs/templates/orgs/org_detail.html:84 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:79 msgid "Add admin" msgstr "添加管理员" @@ -6661,6 +6668,12 @@ msgstr "密码匣子" msgid "Import vault" msgstr "导入密码" +#: xpack/plugins/vault/templates/vault/vault.html:66 +#, fuzzy +#| msgid "Vault" +msgid "vault" +msgstr "密码匣子" + #: xpack/plugins/vault/views.py:24 msgid "vault list" msgstr "密码匣子" @@ -6669,6 +6682,9 @@ msgstr "密码匣子" msgid "vault create" msgstr "创建" +#~ msgid "Update assets" +#~ msgstr "更新资产" + #~ msgid "Browser" #~ msgstr "浏览器"