From 9cfccf8a1b941090ba281475484f1c9ac4ad5696 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Thu, 19 Dec 2019 16:08:02 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=20(#3552)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 更新翻译（数据库应用） * [Update] 更新翻译（数据库应用）2 * [Update] 更新翻译（数据库应用）3 --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 84035 -> 83884 bytes apps/locale/zh/LC_MESSAGES/django.po | 2342 +++++++++-------- .../templates/terminal/session_detail.html | 8 +- 3 files changed, 1271 insertions(+), 1079 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 95c6818911960ffb212ccb65b4d8975e6b023f01..fe2727f396748968fbe09b6dab432424c7eff6f8 100644 GIT binary patch delta 26196 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 66cfc4e1d..62c79095d 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-09 15:41+0800\n" +"POT-Creation-Date: 2019-12-19 15:50+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -17,81 +17,32 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: applications/const.py:17 -msgid "Browser" -msgstr "浏览器" - -#: applications/const.py:23 -msgid "Database tools" -msgstr "数据库工具" - -#: applications/const.py:29 -msgid "Virtualization tools" -msgstr "虚拟化工具" - -#: applications/const.py:34 +#: applications/const.py:52 msgid "Custom" msgstr "自定义" -#: applications/forms/remote_app.py:21 -msgid "Target URL" -msgstr "目标URL" - -#: applications/forms/remote_app.py:24 applications/forms/remote_app.py:53 -#: applications/forms/remote_app.py:69 -msgid "Login username" -msgstr "登录账号" - -#: applications/forms/remote_app.py:28 applications/forms/remote_app.py:57 -#: applications/forms/remote_app.py:73 -msgid "Login password" -msgstr "登录密码" - -#: applications/forms/remote_app.py:34 -msgid "Database IP" -msgstr "数据库IP" - -#: applications/forms/remote_app.py:37 -msgid "Database name" -msgstr "数据库名" - -#: applications/forms/remote_app.py:40 -msgid "Database username" -msgstr "数据库账号" - -#: applications/forms/remote_app.py:44 -msgid "Database password" -msgstr "数据库密码" - -#: applications/forms/remote_app.py:50 applications/forms/remote_app.py:66 -msgid "Target address" -msgstr "目标地址" - -#: applications/forms/remote_app.py:63 -msgid "Operating parameter" -msgstr "运行参数" - -#: applications/forms/remote_app.py:100 applications/models/remote_app.py:23 +#: applications/forms/remote_app.py:44 applications/models/remote_app.py:23 #: applications/templates/applications/remote_app_detail.html:52 -#: applications/templates/applications/remote_app_list.html:20 +#: 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:330 assets/models/authbook.py:24 +#: assets/models/asset.py:339 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:44 +#: assets/templates/assets/admin_user_list.html:23 +#: assets/templates/assets/asset_list.html:170 #: assets/templates/assets/domain_detail.html:55 #: assets/templates/assets/domain_list.html:22 #: assets/templates/assets/label_list.html:16 -#: assets/templates/assets/system_user_list.html:49 audits/models.py:20 +#: assets/templates/assets/system_user_list.html:28 audits/models.py:20 #: audits/templates/audits/ftp_log_list.html:45 #: audits/templates/audits/ftp_log_list.html:75 -#: perms/forms/asset_permission.py:84 perms/models/asset_permission.py:80 +#: perms/forms/asset_permission.py:89 perms/models/asset_permission.py:80 #: perms/templates/perms/asset_permission_asset.html:53 #: perms/templates/perms/asset_permission_create_update.html:43 -#: perms/templates/perms/asset_permission_list.html:50 -#: perms/templates/perms/asset_permission_list.html:107 -#: terminal/backends/command/models.py:13 terminal/models.py:177 +#: perms/templates/perms/asset_permission_list.html:35 +#: perms/templates/perms/asset_permission_list.html:87 +#: terminal/backends/command/models.py:13 terminal/models.py:178 #: terminal/templates/terminal/command_list.html:30 #: terminal/templates/terminal/command_list.html:66 #: terminal/templates/terminal/session_list.html:26 @@ -100,81 +51,232 @@ msgstr "运行参数" #: users/templates/users/user_asset_permission.html:90 #: 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:42 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:44 #: 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:60 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:63 #: xpack/plugins/orgs/templates/orgs/org_list.html:17 #: xpack/plugins/vault/forms.py:13 xpack/plugins/vault/forms.py:15 msgid "Asset" msgstr "资产" -#: applications/models/remote_app.py:21 +#: applications/forms/remote_app.py:55 +msgid "Target URL" +msgstr "目标URL" + +#: applications/forms/remote_app.py:58 applications/forms/remote_app.py:97 +#: applications/forms/remote_app.py:114 +msgid "Login username" +msgstr "登录账号" + +#: applications/forms/remote_app.py:62 applications/forms/remote_app.py:101 +#: applications/forms/remote_app.py:118 +msgid "Login password" +msgstr "登录密码" + +#: applications/forms/remote_app.py:73 +msgid "Database IP" +msgstr "数据库IP" + +#: applications/forms/remote_app.py:76 +msgid "Database name" +msgstr "数据库名" + +#: applications/forms/remote_app.py:79 +msgid "Database username" +msgstr "数据库账号" + +#: applications/forms/remote_app.py:83 +msgid "Database password" +msgstr "数据库密码" + +#: applications/forms/remote_app.py:94 applications/forms/remote_app.py:111 +msgid "Target address" +msgstr "目标地址" + +#: applications/forms/remote_app.py:108 +msgid "Operating parameter" +msgstr "运行参数" + +#: applications/models/database_app.py:18 applications/models/remote_app.py:21 +#: applications/templates/applications/database_app_detail.html:48 +#: applications/templates/applications/database_app_list.html:24 #: applications/templates/applications/remote_app_detail.html:48 -#: applications/templates/applications/remote_app_list.html:18 +#: applications/templates/applications/remote_app_list.html:26 +#: applications/templates/applications/user_database_app_list.html:16 #: applications/templates/applications/user_remote_app_list.html:16 #: assets/forms/asset.py:21 assets/forms/domain.py:77 assets/forms/user.py:75 -#: assets/forms/user.py:95 assets/models/asset.py:136 assets/models/base.py:28 +#: assets/forms/user.py:95 assets/models/asset.py:144 assets/models/base.py:27 #: assets/models/cluster.py:18 assets/models/cmd_filter.py:21 #: assets/models/domain.py:20 assets/models/group.py:20 -#: assets/models/label.py:18 assets/templates/assets/admin_user_detail.html:51 -#: assets/templates/assets/admin_user_list.html:42 +#: assets/models/label.py:18 assets/templates/assets/_node_detail_modal.html:27 +#: assets/templates/assets/admin_user_detail.html:51 +#: assets/templates/assets/admin_user_list.html:21 #: assets/templates/assets/cmd_filter_detail.html:56 #: assets/templates/assets/cmd_filter_list.html:22 #: assets/templates/assets/domain_detail.html:51 #: assets/templates/assets/domain_gateway_list.html:62 #: assets/templates/assets/domain_list.html:21 #: assets/templates/assets/label_list.html:14 +#: assets/templates/assets/platform_detail.html:43 #: assets/templates/assets/platform_list.html:16 -#: assets/templates/assets/system_user_detail.html:53 -#: assets/templates/assets/system_user_list.html:45 ops/models/adhoc.py:37 +#: assets/templates/assets/system_user_detail.html:55 +#: assets/templates/assets/system_user_list.html:24 ops/models/adhoc.py:40 #: ops/templates/ops/task_detail.html:58 ops/templates/ops/task_list.html:11 #: orgs/models.py:12 perms/models/base.py:48 #: perms/templates/perms/asset_permission_detail.html:57 -#: perms/templates/perms/asset_permission_list.html:47 -#: perms/templates/perms/asset_permission_list.html:203 +#: perms/templates/perms/asset_permission_list.html:32 +#: perms/templates/perms/asset_permission_list.html:183 #: perms/templates/perms/asset_permission_user.html:53 +#: perms/templates/perms/database_app_permission_detail.html:57 +#: perms/templates/perms/database_app_permission_list.html:14 +#: perms/templates/perms/database_app_permission_user.html:53 #: perms/templates/perms/remote_app_permission_detail.html:57 #: perms/templates/perms/remote_app_permission_list.html:14 #: perms/templates/perms/remote_app_permission_remote_app.html:49 #: perms/templates/perms/remote_app_permission_user.html:49 -#: settings/models.py:28 +#: settings/models.py:26 #: settings/templates/settings/_ldap_list_users_modal.html:32 -#: terminal/models.py:26 terminal/models.py:281 terminal/models.py:313 -#: terminal/models.py:350 terminal/templates/terminal/base_storage_list.html:32 +#: terminal/models.py:26 terminal/models.py:282 terminal/models.py:314 +#: terminal/models.py:351 terminal/templates/terminal/base_storage_list.html:32 #: terminal/templates/terminal/terminal_detail.html:43 -#: terminal/templates/terminal/terminal_list.html:30 users/forms.py:162 -#: users/models/group.py:14 users/models/user.py:433 +#: terminal/templates/terminal/terminal_list.html:30 users/forms/profile.py:20 +#: users/models/group.py:15 users/models/user.py:438 #: users/templates/users/_select_user_modal.html:13 #: users/templates/users/user_asset_permission.html:54 #: users/templates/users/user_asset_permission.html:174 #: users/templates/users/user_detail.html:64 #: users/templates/users/user_group_detail.html:50 -#: users/templates/users/user_group_list.html:35 -#: users/templates/users/user_list.html:35 +#: users/templates/users/user_group_list.html:14 +#: users/templates/users/user_list.html:14 #: users/templates/users/user_profile.html:51 #: users/templates/users/user_pubkey_update.html:57 #: 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:59 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12 #: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:144 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:47 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:50 #: xpack/plugins/cloud/templates/cloud/account_list.html:12 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:53 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:56 #: 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:47 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:52 #: xpack/plugins/orgs/templates/orgs/org_list.html:12 msgid "Name" msgstr "名称" +#: applications/models/database_app.py:22 +#: applications/templates/applications/database_app_detail.html:52 +#: applications/templates/applications/database_app_list.html:25 +#: applications/templates/applications/user_database_app_list.html:17 +#: assets/models/cmd_filter.py:51 +#: assets/templates/assets/cmd_filter_rule_list.html:53 +#: audits/templates/audits/login_log_list.html:58 +#: perms/templates/perms/remote_app_permission_remote_app.html:50 +#: terminal/models.py:316 terminal/models.py:353 +#: terminal/templates/terminal/base_storage_list.html:33 +#: tickets/models/ticket.py:43 tickets/templates/tickets/ticket_detail.html:33 +#: tickets/templates/tickets/ticket_list.html:35 +msgid "Type" +msgstr "类型" + +#: applications/models/database_app.py:25 +#: applications/templates/applications/database_app_detail.html:56 +#: applications/templates/applications/database_app_list.html:26 +#: applications/templates/applications/user_database_app_list.html:18 +#: ops/models/adhoc.py:185 templates/index.html:91 +msgid "Host" +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/models/domain.py:50 +#: assets/templates/assets/domain_gateway_list.html:64 +msgid "Port" +msgstr "端口" + +#: applications/models/database_app.py:29 +#: applications/templates/applications/database_app_detail.html:64 +#: applications/templates/applications/database_app_list.html:28 +#: applications/templates/applications/user_database_app_list.html:19 +msgid "Database" +msgstr "数据库" + +# msgid "Date created" +# msgstr "创建日期" +#: applications/models/database_app.py:33 applications/models/remote_app.py:45 +#: applications/templates/applications/database_app_detail.html:76 +#: applications/templates/applications/database_app_list.html:29 +#: applications/templates/applications/remote_app_detail.html:72 +#: 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/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 +#: assets/models/group.py:23 assets/models/label.py:23 +#: assets/templates/assets/admin_user_detail.html:67 +#: assets/templates/assets/admin_user_list.html:24 +#: assets/templates/assets/asset_detail.html:128 +#: assets/templates/assets/cmd_filter_detail.html:60 +#: assets/templates/assets/cmd_filter_list.html:25 +#: assets/templates/assets/cmd_filter_rule_list.html:57 +#: assets/templates/assets/domain_detail.html:71 +#: assets/templates/assets/domain_gateway_list.html:67 +#: assets/templates/assets/domain_list.html:24 +#: assets/templates/assets/platform_detail.html:59 +#: assets/templates/assets/platform_list.html:18 +#: assets/templates/assets/system_user_detail.html:101 +#: assets/templates/assets/system_user_list.html:32 ops/models/adhoc.py:46 +#: orgs/models.py:18 perms/models/base.py:56 +#: perms/templates/perms/asset_permission_detail.html:97 +#: perms/templates/perms/database_app_permission_detail.html:93 +#: perms/templates/perms/remote_app_permission_detail.html:89 +#: settings/models.py:31 terminal/models.py:36 terminal/models.py:321 +#: terminal/models.py:358 terminal/templates/terminal/base_storage_list.html:34 +#: terminal/templates/terminal/terminal_detail.html:63 +#: tickets/templates/tickets/ticket_detail.html:104 users/models/group.py:16 +#: users/models/user.py:471 users/templates/users/user_detail.html:130 +#: 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/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/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_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_list.html:23 +msgid "Comment" +msgstr "备注" + +#: applications/models/database_app.py:41 +#: perms/forms/database_app_permission.py:44 +#: perms/models/database_app_permission.py:17 +#: perms/templates/perms/database_app_permission_create_update.html:46 +#: perms/templates/perms/database_app_permission_database_app.html:23 +#: perms/templates/perms/database_app_permission_database_app.html:53 +#: perms/templates/perms/database_app_permission_detail.html:22 +#: perms/templates/perms/database_app_permission_list.html:17 +#: perms/templates/perms/database_app_permission_user.html:23 +#: templates/_nav.html:64 templates/_nav.html:83 templates/_nav_user.html:21 +msgid "DatabaseApp" +msgstr "数据库应用" + #: applications/models/remote_app.py:28 #: applications/templates/applications/remote_app_detail.html:56 -#: applications/templates/applications/remote_app_list.html:19 +#: applications/templates/applications/remote_app_list.html:27 #: applications/templates/applications/user_remote_app_list.html:17 msgid "App type" msgstr "应用类型" @@ -189,23 +291,25 @@ msgid "Parameters" 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:209 assets/models/base.py:36 +#: assets/models/asset.py:217 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 #: assets/templates/assets/asset_detail.html:120 #: assets/templates/assets/cmd_filter_detail.html:72 #: assets/templates/assets/domain_detail.html:67 -#: assets/templates/assets/system_user_detail.html:95 +#: assets/templates/assets/system_user_detail.html:97 #: common/mixins/models.py:50 ops/templates/ops/adhoc_detail.html:84 #: orgs/models.py:16 perms/models/base.py:54 #: perms/templates/perms/asset_permission_detail.html:93 +#: perms/templates/perms/database_app_permission_detail.html:89 #: perms/templates/perms/remote_app_permission_detail.html:85 -#: users/models/user.py:474 users/serializers/group.py:32 +#: users/models/user.py:479 users/serializers/group.py:32 #: users/templates/users/user_detail.html:112 #: xpack/plugins/change_auth_plan/models.py:109 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:111 +#: 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/gathered_user/models.py:46 msgid "Created by" @@ -214,90 +318,45 @@ msgstr "创建者" # msgid "Created by" # 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:210 assets/models/base.py:34 +#: assets/models/asset.py:218 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 #: assets/templates/assets/cmd_filter_detail.html:64 #: assets/templates/assets/domain_detail.html:63 -#: assets/templates/assets/system_user_detail.html:91 -#: common/mixins/models.py:51 ops/models/adhoc.py:45 +#: assets/templates/assets/system_user_detail.html:93 +#: common/mixins/models.py:51 ops/models/adhoc.py:48 #: ops/templates/ops/adhoc_detail.html:88 ops/templates/ops/task_detail.html:62 #: orgs/models.py:17 perms/models/base.py:55 #: perms/templates/perms/asset_permission_detail.html:89 +#: perms/templates/perms/database_app_permission_detail.html:85 #: perms/templates/perms/remote_app_permission_detail.html:81 #: terminal/templates/terminal/terminal_detail.html:59 -#: tickets/templates/tickets/ticket_detail.html:52 users/models/group.py:17 +#: 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:103 +#: 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:63 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:98 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:55 +#: 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 msgid "Date created" msgstr "创建日期" -# msgid "Date created" -# msgstr "创建日期" -#: applications/models/remote_app.py:45 -#: applications/templates/applications/remote_app_detail.html:72 -#: applications/templates/applications/remote_app_list.html:21 -#: applications/templates/applications/user_remote_app_list.html:19 -#: assets/models/asset.py:141 assets/models/asset.py:211 -#: assets/models/base.py:33 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 -#: assets/models/group.py:23 assets/models/label.py:23 -#: assets/templates/assets/admin_user_detail.html:67 -#: assets/templates/assets/admin_user_list.html:48 -#: assets/templates/assets/asset_detail.html:128 -#: assets/templates/assets/cmd_filter_detail.html:60 -#: assets/templates/assets/cmd_filter_list.html:25 -#: assets/templates/assets/cmd_filter_rule_list.html:57 -#: assets/templates/assets/domain_detail.html:71 -#: assets/templates/assets/domain_gateway_list.html:67 -#: assets/templates/assets/domain_list.html:24 -#: assets/templates/assets/platform_list.html:18 -#: assets/templates/assets/system_user_detail.html:99 -#: assets/templates/assets/system_user_list.html:53 ops/models/adhoc.py:43 -#: orgs/models.py:18 perms/models/base.py:56 -#: perms/templates/perms/asset_permission_detail.html:97 -#: perms/templates/perms/remote_app_permission_detail.html:89 -#: settings/models.py:33 terminal/models.py:36 terminal/models.py:320 -#: terminal/models.py:357 terminal/templates/terminal/base_storage_list.html:34 -#: terminal/templates/terminal/terminal_detail.html:63 -#: tickets/templates/tickets/ticket_detail.html:104 users/models/group.py:15 -#: users/models/user.py:466 users/templates/users/user_detail.html:130 -#: users/templates/users/user_group_detail.html:62 -#: users/templates/users/user_group_list.html:37 -#: 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: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:67 -#: xpack/plugins/cloud/templates/cloud/account_list.html:15 -#: 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:59 -#: xpack/plugins/orgs/templates/orgs/org_list.html:23 -msgid "Comment" -msgstr "备注" - -#: applications/models/remote_app.py:49 perms/forms/remote_app_permission.py:40 +#: applications/models/remote_app.py:49 perms/forms/remote_app_permission.py:46 #: perms/models/remote_app_permission.py:15 #: perms/templates/perms/remote_app_permission_create_update.html:46 #: perms/templates/perms/remote_app_permission_detail.html:22 #: perms/templates/perms/remote_app_permission_list.html:17 #: perms/templates/perms/remote_app_permission_remote_app.html:22 #: perms/templates/perms/remote_app_permission_user.html:22 -#: templates/_nav.html:60 templates/_nav.html:76 templates/_nav_user.html:16 +#: templates/_nav.html:63 templates/_nav.html:80 templates/_nav_user.html:16 msgid "RemoteApp" msgstr "远程应用" -#: applications/templates/applications/remote_app_create_update.html:55 +#: applications/templates/applications/database_app_create_update.html:12 +#: applications/templates/applications/remote_app_create_update.html:12 #: assets/templates/assets/_system_user.html:71 #: assets/templates/assets/admin_user_create_update.html:41 #: assets/templates/assets/asset_bulk_update.html:23 @@ -307,8 +366,9 @@ msgstr "远程应用" #: assets/templates/assets/domain_create_update.html:16 #: assets/templates/assets/gateway_create_update.html:54 #: assets/templates/assets/label_create_update.html:18 -#: assets/templates/assets/platform_create_update.html:16 +#: assets/templates/assets/platform_create_update.html:20 #: perms/templates/perms/asset_permission_create_update.html:81 +#: perms/templates/perms/database_app_permission_create_update.html:82 #: perms/templates/perms/remote_app_permission_create_update.html:82 #: settings/templates/settings/basic_setting.html:45 #: settings/templates/settings/email_content_setting.html:35 @@ -327,30 +387,32 @@ 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:67 -#: 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/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/interface/templates/interface/interface.html:72 -#: xpack/plugins/orgs/templates/orgs/org_create_update.html:29 -#: xpack/plugins/vault/templates/vault/vault_create.html:41 +#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33 +#: xpack/plugins/vault/templates/vault/vault_create.html:45 msgid "Reset" msgstr "重置" -#: applications/templates/applications/remote_app_create_update.html:57 +#: applications/templates/applications/database_app_create_update.html:13 +#: applications/templates/applications/remote_app_create_update.html:14 #: assets/templates/assets/_system_user.html:72 #: assets/templates/assets/admin_user_create_update.html:42 #: assets/templates/assets/asset_bulk_update.html:24 #: assets/templates/assets/asset_create.html:82 -#: assets/templates/assets/asset_list.html:117 +#: assets/templates/assets/asset_list.html:45 #: assets/templates/assets/cmd_filter_create_update.html:16 #: assets/templates/assets/cmd_filter_rule_create_update.html:37 #: assets/templates/assets/domain_create_update.html:17 #: assets/templates/assets/gateway_create_update.html:55 #: assets/templates/assets/label_create_update.html:19 -#: assets/templates/assets/platform_create_update.html:17 +#: assets/templates/assets/platform_create_update.html:21 #: audits/templates/audits/login_log_list.html:95 #: perms/templates/perms/asset_permission_create_update.html:82 +#: perms/templates/perms/database_app_permission_create_update.html:83 #: perms/templates/perms/remote_app_permission_create_update.html:83 #: settings/templates/settings/basic_setting.html:46 #: settings/templates/settings/email_content_setting.html:36 @@ -363,18 +425,19 @@ msgstr "重置" #: terminal/templates/terminal/session_list.html:50 #: terminal/templates/terminal/terminal_update.html:44 #: users/templates/users/_user.html:52 -#: users/templates/users/forgot_password.html:42 +#: users/templates/users/forgot_password.html:29 #: users/templates/users/user_bulk_update.html:24 -#: users/templates/users/user_list.html:57 +#: users/templates/users/user_list.html:40 #: 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:68 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:70 #: xpack/plugins/interface/templates/interface/interface.html:74 -#: xpack/plugins/vault/templates/vault/vault_create.html:42 +#: xpack/plugins/vault/templates/vault/vault_create.html:46 msgid "Submit" msgstr "提交" +#: applications/templates/applications/database_app_detail.html:13 #: applications/templates/applications/remote_app_detail.html:13 #: assets/templates/assets/admin_user_assets.html:13 #: assets/templates/assets/admin_user_detail.html:13 @@ -382,6 +445,7 @@ msgstr "提交" #: assets/templates/assets/cmd_filter_rule_list.html:14 #: assets/templates/assets/domain_detail.html:13 #: assets/templates/assets/domain_gateway_list.html:15 +#: assets/templates/assets/platform_detail.html:13 #: assets/templates/assets/system_user_assets.html:22 #: assets/templates/assets/system_user_detail.html:13 #: ops/templates/ops/adhoc_history.html:128 @@ -390,26 +454,29 @@ msgstr "提交" #: perms/templates/perms/asset_permission_asset.html:14 #: perms/templates/perms/asset_permission_detail.html:13 #: perms/templates/perms/asset_permission_user.html:14 +#: perms/templates/perms/database_app_permission_database_app.html:14 +#: perms/templates/perms/database_app_permission_detail.html:13 +#: perms/templates/perms/database_app_permission_user.html:14 #: 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:13 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:18 +#: 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_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 msgid "Detail" msgstr "详情" +#: applications/templates/applications/database_app_detail.html:16 +#: applications/templates/applications/database_app_list.html:54 #: applications/templates/applications/remote_app_detail.html:16 -#: applications/templates/applications/remote_app_list.html:52 +#: applications/templates/applications/remote_app_list.html:60 #: assets/templates/assets/_asset_user_list.html:75 #: assets/templates/assets/admin_user_detail.html:19 -#: assets/templates/assets/admin_user_list.html:24 -#: assets/templates/assets/admin_user_list.html:72 +#: assets/templates/assets/admin_user_list.html:46 #: assets/templates/assets/asset_detail.html:24 -#: assets/templates/assets/asset_list.html:78 -#: assets/templates/assets/asset_list.html:167 +#: assets/templates/assets/asset_list.html:89 #: assets/templates/assets/cmd_filter_detail.html:24 #: assets/templates/assets/cmd_filter_list.html:56 #: assets/templates/assets/cmd_filter_rule_list.html:81 @@ -418,14 +485,17 @@ msgstr "详情" #: assets/templates/assets/domain_gateway_list.html:92 #: assets/templates/assets/domain_list.html:50 #: assets/templates/assets/label_list.html:39 +#: assets/templates/assets/platform_detail.html:16 #: assets/templates/assets/platform_list.html:40 -#: assets/templates/assets/system_user_detail.html:21 -#: assets/templates/assets/system_user_list.html:27 -#: assets/templates/assets/system_user_list.html:79 audits/models.py:34 +#: assets/templates/assets/system_user_detail.html:23 +#: assets/templates/assets/system_user_list.html:56 audits/models.py:34 #: perms/templates/perms/asset_permission_detail.html:25 -#: perms/templates/perms/asset_permission_list.html:164 +#: perms/templates/perms/asset_permission_list.html:144 +#: perms/templates/perms/database_app_permission_detail.html:25 +#: perms/templates/perms/database_app_permission_list.html:64 #: perms/templates/perms/remote_app_permission_detail.html:25 #: perms/templates/perms/remote_app_permission_list.html:64 +#: templates/_csv_import_export.html:18 templates/_csv_update_modal.html:6 #: terminal/templates/terminal/base_storage_list.html:64 #: terminal/templates/terminal/base_storage_list.html:71 #: terminal/templates/terminal/terminal_detail.html:16 @@ -433,32 +503,32 @@ msgstr "详情" #: users/templates/users/user_asset_permission.html:147 #: users/templates/users/user_detail.html:26 #: users/templates/users/user_group_detail.html:23 -#: users/templates/users/user_group_list.html:20 -#: users/templates/users/user_group_list.html:71 -#: users/templates/users/user_list.html:20 -#: users/templates/users/user_list.html:103 -#: users/templates/users/user_list.html:106 +#: users/templates/users/user_group_list.html:51 +#: users/templates/users/user_list.html:84 +#: users/templates/users/user_list.html:87 #: users/templates/users/user_profile.html:181 #: users/templates/users/user_profile.html:191 #: users/templates/users/user_profile.html:201 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:27 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:29 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:56 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:20 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:23 #: xpack/plugins/cloud/templates/cloud/account_list.html:40 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:26 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:29 #: 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:20 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:25 #: xpack/plugins/orgs/templates/orgs/org_list.html:93 msgid "Update" msgstr "更新" +#: applications/templates/applications/database_app_detail.html:20 +#: applications/templates/applications/database_app_list.html:55 #: applications/templates/applications/remote_app_detail.html:20 -#: applications/templates/applications/remote_app_list.html:53 +#: applications/templates/applications/remote_app_list.html:61 #: assets/templates/assets/admin_user_detail.html:23 -#: assets/templates/assets/admin_user_list.html:73 +#: assets/templates/assets/admin_user_list.html:47 #: assets/templates/assets/asset_detail.html:28 -#: assets/templates/assets/asset_list.html:168 +#: assets/templates/assets/asset_list.html:90 #: assets/templates/assets/cmd_filter_detail.html:28 #: assets/templates/assets/cmd_filter_list.html:57 #: assets/templates/assets/cmd_filter_rule_list.html:82 @@ -468,12 +538,14 @@ msgstr "更新" #: assets/templates/assets/domain_list.html:51 #: assets/templates/assets/label_list.html:40 #: assets/templates/assets/platform_list.html:41 -#: assets/templates/assets/system_user_detail.html:25 -#: assets/templates/assets/system_user_list.html:80 audits/models.py:35 +#: assets/templates/assets/system_user_detail.html:27 +#: assets/templates/assets/system_user_list.html:57 audits/models.py:35 #: authentication/templates/authentication/_access_key_modal.html:65 -#: ops/templates/ops/task_list.html:69 +#: ops/templates/ops/task_list.html:74 #: perms/templates/perms/asset_permission_detail.html:29 -#: perms/templates/perms/asset_permission_list.html:165 +#: perms/templates/perms/asset_permission_list.html:145 +#: perms/templates/perms/database_app_permission_detail.html:29 +#: perms/templates/perms/database_app_permission_list.html:65 #: perms/templates/perms/remote_app_permission_detail.html:29 #: perms/templates/perms/remote_app_permission_list.html:65 #: terminal/templates/terminal/base_storage_list.html:61 @@ -482,63 +554,55 @@ msgstr "更新" #: users/templates/users/user_asset_permission.html:148 #: users/templates/users/user_detail.html:31 #: users/templates/users/user_group_detail.html:27 -#: users/templates/users/user_group_list.html:73 -#: users/templates/users/user_list.html:111 -#: users/templates/users/user_list.html:115 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:31 +#: users/templates/users/user_group_list.html:53 +#: users/templates/users/user_list.html:94 +#: users/templates/users/user_list.html:98 +#: 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:58 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:24 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:27 #: xpack/plugins/cloud/templates/cloud/account_list.html:42 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:30 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:33 #: 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:24 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:29 #: xpack/plugins/orgs/templates/orgs/org_list.html:95 msgid "Delete" msgstr "删除" -#: applications/templates/applications/remote_app_list.html:4 -msgid "" -"Before using this feature, make sure that the application loader has been " -"uploaded to the application server and successfully published as a RemoteApp " -"application" -msgstr "" -"使用此功能前，请确保已将应用加载器上传到应用服务器并成功发布为一个 RemoteApp " -"应用" - -#: applications/templates/applications/remote_app_list.html:5 -msgid "Download application loader" -msgstr "下载应用加载器" - -#: applications/templates/applications/remote_app_list.html:10 -#: applications/views/remote_app.py:48 -msgid "Create RemoteApp" -msgstr "创建远程应用" +#: applications/templates/applications/database_app_list.html:9 +#: applications/views/database_app.py:69 applications/views/database_app.py:84 +msgid "Create DatabaseApp" +msgstr "创建数据库应用" -#: applications/templates/applications/remote_app_list.html:22 +#: applications/templates/applications/database_app_list.html:30 +#: applications/templates/applications/remote_app_list.html:30 +#: applications/templates/applications/user_database_app_list.html:21 #: applications/templates/applications/user_remote_app_list.html:20 #: assets/models/cmd_filter.py:55 #: assets/templates/assets/_asset_user_list.html:25 -#: assets/templates/assets/admin_user_list.html:49 -#: assets/templates/assets/asset_list.html:100 +#: assets/templates/assets/admin_user_list.html:25 +#: assets/templates/assets/asset_list.html:28 #: assets/templates/assets/cmd_filter_list.html:26 #: assets/templates/assets/cmd_filter_rule_list.html:58 #: assets/templates/assets/domain_gateway_list.html:68 #: assets/templates/assets/domain_list.html:25 #: assets/templates/assets/label_list.html:17 #: assets/templates/assets/platform_list.html:19 -#: assets/templates/assets/system_user_list.html:54 audits/models.py:39 +#: assets/templates/assets/system_user_list.html:33 audits/models.py:39 #: audits/templates/audits/operate_log_list.html:45 #: audits/templates/audits/operate_log_list.html:71 #: authentication/templates/authentication/_access_key_modal.html:34 #: ops/templates/ops/adhoc_history.html:57 ops/templates/ops/task_adhoc.html:62 -#: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:18 -#: perms/forms/asset_permission.py:21 +#: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:17 +#: perms/forms/asset_permission.py:20 #: perms/templates/perms/asset_permission_asset.html:54 #: perms/templates/perms/asset_permission_create_update.html:48 -#: perms/templates/perms/asset_permission_list.html:54 -#: perms/templates/perms/asset_permission_list.html:116 +#: perms/templates/perms/asset_permission_list.html:39 +#: perms/templates/perms/asset_permission_list.html:96 #: perms/templates/perms/asset_permission_user.html:54 +#: perms/templates/perms/database_app_permission_database_app.html:54 +#: perms/templates/perms/database_app_permission_list.html:20 +#: perms/templates/perms/database_app_permission_user.html:54 #: perms/templates/perms/remote_app_permission_list.html:20 #: terminal/templates/terminal/base_storage_list.html:35 #: terminal/templates/terminal/session_list.html:34 @@ -547,43 +611,79 @@ msgstr "创建远程应用" #: users/templates/users/_granted_assets.html:34 #: users/templates/users/user_asset_permission.html:61 #: users/templates/users/user_asset_permission.html:99 -#: users/templates/users/user_group_list.html:38 -#: users/templates/users/user_list.html:41 +#: users/templates/users/user_group_list.html:17 +#: users/templates/users/user_list.html:20 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:60 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:18 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:20 #: xpack/plugins/cloud/templates/cloud/account_list.html:16 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:67 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:72 #: 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 msgid "Action" msgstr "动作" +#: applications/templates/applications/remote_app_list.html:4 +msgid "" +"Before using this feature, make sure that the application loader has been " +"uploaded to the application server and successfully published as a RemoteApp " +"application" +msgstr "" +"使用此功能前，请确保已将应用加载器上传到应用服务器并成功发布为一个 RemoteApp " +"应用" + +#: applications/templates/applications/remote_app_list.html:5 +msgid "Download application loader" +msgstr "下载应用加载器" + +#: applications/templates/applications/remote_app_list.html:11 +#: applications/views/remote_app.py:69 +msgid "Create RemoteApp" +msgstr "创建远程应用" + +#: applications/templates/applications/user_database_app_list.html:61 #: applications/templates/applications/user_remote_app_list.html:52 #: perms/models/asset_permission.py:32 msgid "Connect" msgstr "连接" -#: applications/views/remote_app.py:31 applications/views/remote_app.py:47 -#: applications/views/remote_app.py:70 applications/views/remote_app.py:89 -#: templates/_nav.html:57 +#: applications/views/database_app.py:26 users/models/user.py:144 +msgid "Application" +msgstr "应用程序" + +#: applications/views/database_app.py:27 +msgid "DatabaseApp list" +msgstr "数据库应用列表" + +#: applications/views/database_app.py:68 applications/views/database_app.py:83 +#: applications/views/database_app.py:99 applications/views/remote_app.py:28 +#: applications/views/remote_app.py:68 applications/views/remote_app.py:96 +#: applications/views/remote_app.py:112 templates/_nav.html:60 msgid "Applications" msgstr "应用管理" -#: applications/views/remote_app.py:32 +#: applications/views/database_app.py:100 +msgid "DatabaseApp detail" +msgstr "数据库应用详情" + +#: applications/views/database_app.py:112 +msgid "My DatabaseApp" +msgstr "我的数据库应用" + +#: applications/views/remote_app.py:29 msgid "RemoteApp list" msgstr "远程应用列表" -#: applications/views/remote_app.py:71 +#: applications/views/remote_app.py:97 msgid "Update RemoteApp" msgstr "更新远程应用" -#: applications/views/remote_app.py:90 +#: applications/views/remote_app.py:113 msgid "RemoteApp detail" msgstr "远程应用详情" -#: applications/views/remote_app.py:102 +#: applications/views/remote_app.py:125 msgid "My RemoteApp" msgstr "我的远程应用" @@ -611,14 +711,8 @@ msgstr "不能包含特殊字符：[ {} ]" msgid "* The contains characters that are not allowed" msgstr "* 包含不被允许的字符" -#: assets/forms/asset.py:25 assets/models/asset.py:176 -#: assets/models/domain.py:50 -#: assets/templates/assets/domain_gateway_list.html:64 -msgid "Port" -msgstr "端口" - -#: assets/forms/asset.py:56 assets/models/asset.py:180 -#: assets/models/user.py:110 assets/templates/assets/asset_detail.html:186 +#: assets/forms/asset.py:66 assets/models/asset.py:188 +#: 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 @@ -628,39 +722,46 @@ msgstr "端口" msgid "Nodes" msgstr "节点" -#: assets/forms/asset.py:59 assets/forms/asset.py:106 -#: assets/models/asset.py:184 assets/models/cluster.py:19 -#: assets/models/user.py:68 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:65 +#: assets/forms/asset.py:69 assets/models/asset.py:192 +#: 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/orgs/templates/orgs/org_list.html:19 msgid "Admin user" msgstr "管理用户" -#: assets/forms/asset.py:62 assets/forms/asset.py:109 assets/forms/asset.py:149 +#: assets/forms/asset.py:72 assets/forms/asset.py:115 #: assets/templates/assets/asset_create.html:48 #: assets/templates/assets/asset_create.html:50 -#: assets/templates/assets/asset_list.html:85 +#: assets/templates/assets/asset_list.html:13 #: xpack/plugins/orgs/templates/orgs/org_list.html:21 msgid "Label" msgstr "标签" -#: assets/forms/asset.py:65 assets/forms/asset.py:112 -#: assets/models/asset.py:179 assets/models/domain.py:26 -#: assets/models/domain.py:52 assets/templates/assets/asset_detail.html:76 +#: assets/forms/asset.py:75 assets/models/asset.py:187 +#: 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 #: xpack/plugins/orgs/templates/orgs/org_list.html:18 msgid "Domain" msgstr "网域" -#: assets/forms/asset.py:69 assets/forms/asset.py:103 assets/forms/asset.py:116 -#: assets/forms/asset.py:152 assets/models/node.py:462 +#: assets/forms/asset.py:78 assets/models/asset.py:162 +#: assets/models/asset.py:186 assets/serializers/asset.py:70 +#: assets/templates/assets/asset_detail.html:100 +#: assets/templates/assets/user_asset_list.html:78 +msgid "Platform" +msgstr "系统平台" + +#: assets/forms/asset.py:82 assets/forms/asset.py:118 assets/models/node.py:462 #: assets/serializers/system_user.py:44 #: assets/templates/assets/asset_create.html:42 -#: perms/forms/asset_permission.py:87 perms/forms/asset_permission.py:94 -#: perms/templates/perms/asset_permission_list.html:51 -#: perms/templates/perms/asset_permission_list.html:110 -#: perms/templates/perms/asset_permission_list.html:209 +#: perms/forms/asset_permission.py:92 perms/forms/asset_permission.py:99 +#: perms/templates/perms/asset_permission_list.html:36 +#: perms/templates/perms/asset_permission_list.html:90 +#: perms/templates/perms/asset_permission_list.html:189 #: users/templates/users/user_asset_permission.html:58 #: users/templates/users/user_asset_permission.html:93 #: users/templates/users/user_asset_permission.html:178 @@ -668,12 +769,12 @@ msgstr "网域" #: 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:61 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:61 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:64 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:64 msgid "Node" msgstr "节点" -#: assets/forms/asset.py:74 assets/forms/asset.py:121 +#: assets/forms/asset.py:87 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" @@ -681,20 +782,20 @@ msgstr "" "root或其他拥有NOPASSWD: ALL权限的用户, 如果是windows或其它硬件可以随意设置一" "个, 更多信息查看左侧 `管理用户` 菜单" -#: assets/forms/asset.py:77 assets/forms/asset.py:124 +#: assets/forms/asset.py:90 msgid "Windows 2016 RDP protocol is different, If is window 2016, set it" msgstr "Windows 2016的RDP协议与之前不同，如果是请设置" -#: assets/forms/asset.py:78 assets/forms/asset.py:125 +#: assets/forms/asset.py:91 msgid "" "If your have some network not connect with each other, you can set domain" msgstr "如果有多个的互相隔离的网络，设置资产属于的网域，使用网域网关跳转登录" -#: assets/forms/asset.py:132 assets/forms/asset.py:136 -#: assets/forms/domain.py:17 assets/forms/label.py:15 +#: assets/forms/asset.py:98 assets/forms/asset.py:102 assets/forms/domain.py:17 +#: 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:70 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:74 msgid "Select assets" msgstr "选择资产" @@ -711,38 +812,61 @@ msgid "SSH gateway support proxy SSH,RDP,VNC" msgstr "SSH网关，支持代理SSH,RDP和VNC" #: assets/forms/domain.py:78 assets/forms/user.py:76 assets/forms/user.py:96 -#: assets/models/base.py:29 assets/models/gathered_user.py:15 +#: assets/models/base.py:28 assets/models/gathered_user.py:15 #: 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:21 #: assets/templates/assets/admin_user_detail.html:55 -#: assets/templates/assets/admin_user_list.html:43 +#: assets/templates/assets/admin_user_list.html:22 #: assets/templates/assets/domain_gateway_list.html:66 -#: assets/templates/assets/system_user_detail.html:57 -#: assets/templates/assets/system_user_list.html:46 audits/models.py:81 -#: audits/templates/audits/login_log_list.html:57 authentication/forms.py:13 +#: assets/templates/assets/system_user_detail.html:59 +#: assets/templates/assets/system_user_list.html:25 audits/models.py:81 +#: audits/templates/audits/login_log_list.html:57 authentication/forms.py:10 #: authentication/templates/authentication/login.html:58 #: authentication/templates/authentication/xpack_login.html:93 -#: ops/models/adhoc.py:189 perms/templates/perms/asset_permission_list.html:205 +#: ops/models/adhoc.py:187 perms/templates/perms/asset_permission_list.html:185 #: perms/templates/perms/remote_app_permission_user.html:50 -#: settings/templates/settings/_ldap_list_users_modal.html:31 users/forms.py:14 -#: users/forms.py:161 users/models/user.py:431 +#: settings/templates/settings/_ldap_list_users_modal.html:31 +#: users/forms/profile.py:19 users/models/user.py:436 #: users/templates/users/_select_user_modal.html:14 #: users/templates/users/user_detail.html:68 -#: users/templates/users/user_list.html:36 +#: 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:63 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:65 #: 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:69 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:64 msgid "Username" msgstr "用户名" -#: assets/forms/platform.py:19 assets/templates/assets/platform_list.html:17 +#: 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 +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 +msgid "No" +msgstr "否" + +#: assets/forms/platform.py:24 +msgid "RDP security" +msgstr "" + +#: assets/forms/platform.py:28 +msgid "RDP console" +msgstr "" + +#: assets/forms/platform.py:40 assets/templates/assets/platform_detail.html:47 +#: assets/templates/assets/platform_list.html:17 msgid "Base platform" msgstr "基础平台" @@ -750,16 +874,15 @@ msgstr "基础平台" msgid "Password or private key passphrase" msgstr "密码或密钥密码" -#: assets/forms/user.py:27 assets/models/base.py:30 +#: assets/forms/user.py:27 assets/models/base.py:29 #: assets/serializers/asset_user.py:63 #: assets/templates/assets/_asset_user_auth_update_modal.html:21 #: assets/templates/assets/_asset_user_auth_view_modal.html:27 -#: authentication/forms.py:15 +#: authentication/forms.py:12 #: authentication/templates/authentication/login.html:66 #: authentication/templates/authentication/xpack_login.html:101 -#: settings/forms/ldap.py:22 users/forms.py:16 users/forms.py:42 -#: users/templates/users/reset_password.html:53 -#: users/templates/users/user_password_authentication.html:18 +#: settings/forms/ldap.py:22 users/forms/user.py:22 users/forms/user.py:193 +#: users/templates/users/user_password_check.html:13 #: users/templates/users/user_password_update.html:44 #: users/templates/users/user_profile_update.html:41 #: users/templates/users/user_pubkey_update.html:41 @@ -771,7 +894,7 @@ msgstr "密码" #: assets/forms/user.py:30 assets/serializers/asset_user.py:71 #: assets/templates/assets/_asset_user_auth_update_modal.html:27 -#: users/models/user.py:460 +#: users/models/user.py:465 msgid "Private key" msgstr "ssh私钥" @@ -784,8 +907,8 @@ msgid "Password and private key file must be input one" msgstr "密码和私钥, 必须输入一个" #: assets/forms/user.py:98 assets/models/cmd_filter.py:32 -#: assets/models/user.py:118 assets/templates/assets/_system_user.html:62 -#: assets/templates/assets/system_user_detail.html:160 +#: assets/models/user.py:119 assets/templates/assets/_system_user.html:62 +#: assets/templates/assets/system_user_detail.html:164 msgid "Command filter" msgstr "命令过滤器" @@ -811,151 +934,147 @@ msgstr "如果选择手动登录模式，用户名和密码可以不填写" msgid "Use comma split multi command, ex: /bin/whoami,/bin/ifconfig" msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig" -#: assets/models/asset.py:137 +#: assets/models/asset.py:145 msgid "Base" msgstr "基础" -#: assets/models/asset.py:138 +#: assets/models/asset.py:146 assets/templates/assets/platform_detail.html:51 msgid "Charset" msgstr "编码" -#: assets/models/asset.py:139 tickets/models/ticket.py:38 +#: assets/models/asset.py:147 assets/templates/assets/platform_detail.html:55 +#: tickets/models/ticket.py:38 msgid "Meta" msgstr "元数据" -#: assets/models/asset.py:140 +#: assets/models/asset.py:148 msgid "Internal" msgstr "内部的" -#: assets/models/asset.py:171 assets/models/domain.py:49 +#: assets/models/asset.py:179 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 #: assets/templates/assets/asset_detail.html:60 -#: assets/templates/assets/asset_list.html:97 +#: assets/templates/assets/asset_list.html:25 #: assets/templates/assets/domain_gateway_list.html:63 #: assets/templates/assets/user_asset_list.html:76 #: audits/templates/audits/login_log_list.html:60 -#: perms/templates/perms/asset_permission_list.html:207 +#: 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:176 -#: 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:68 +#: 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 msgid "IP" msgstr "IP" -#: assets/models/asset.py:172 assets/serializers/asset_user.py:27 +#: assets/models/asset.py:180 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 #: assets/templates/assets/_asset_user_auth_view_modal.html:15 #: assets/templates/assets/_asset_user_list.html:19 #: assets/templates/assets/asset_detail.html:56 -#: assets/templates/assets/asset_list.html:96 +#: assets/templates/assets/asset_list.html:24 #: assets/templates/assets/user_asset_list.html:75 -#: perms/templates/perms/asset_permission_list.html:208 +#: 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:177 -#: 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:67 +#: 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 msgid "Hostname" msgstr "主机名" -#: assets/models/asset.py:175 assets/models/domain.py:51 -#: assets/models/user.py:113 assets/templates/assets/asset_detail.html:68 +#: assets/models/asset.py:183 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:65 -#: assets/templates/assets/system_user_list.html:47 +#: assets/templates/assets/system_user_detail.html:67 +#: assets/templates/assets/system_user_list.html:26 #: terminal/templates/terminal/session_list.html:29 #: terminal/templates/terminal/session_list.html:73 msgid "Protocol" msgstr "协议" -#: assets/models/asset.py:177 assets/serializers/asset.py:69 +#: assets/models/asset.py:185 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:48 +#: perms/serializers/user_permission.py:59 msgid "Protocols" msgstr "协议组" -#: assets/models/asset.py:178 assets/templates/assets/asset_detail.html:100 -#: assets/templates/assets/user_asset_list.html:78 -msgid "Platform" -msgstr "系统平台" - -#: assets/models/asset.py:181 assets/models/authbook.py:27 +#: assets/models/asset.py:189 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:187 assets/templates/assets/asset_detail.html:64 +#: assets/models/asset.py:195 assets/templates/assets/asset_detail.html:64 msgid "Public IP" msgstr "公网IP" -#: assets/models/asset.py:188 assets/templates/assets/asset_detail.html:116 +#: assets/models/asset.py:196 assets/templates/assets/asset_detail.html:116 msgid "Asset number" msgstr "资产编号" -#: assets/models/asset.py:191 assets/templates/assets/asset_detail.html:80 +#: assets/models/asset.py:199 assets/templates/assets/asset_detail.html:80 msgid "Vendor" msgstr "制造商" -#: assets/models/asset.py:192 assets/templates/assets/asset_detail.html:84 +#: assets/models/asset.py:200 assets/templates/assets/asset_detail.html:84 msgid "Model" msgstr "型号" -#: assets/models/asset.py:193 assets/templates/assets/asset_detail.html:112 +#: assets/models/asset.py:201 assets/templates/assets/asset_detail.html:112 msgid "Serial number" msgstr "序列号" -#: assets/models/asset.py:195 +#: assets/models/asset.py:203 msgid "CPU model" msgstr "CPU型号" -#: assets/models/asset.py:196 -#: xpack/plugins/license/templates/license/license_detail.html:80 +#: assets/models/asset.py:204 +#: xpack/plugins/license/templates/license/license_detail.html:71 msgid "CPU count" msgstr "CPU数量" -#: assets/models/asset.py:197 +#: assets/models/asset.py:205 msgid "CPU cores" msgstr "CPU核数" -#: assets/models/asset.py:198 +#: assets/models/asset.py:206 msgid "CPU vcpus" msgstr "CPU总数" -#: assets/models/asset.py:199 assets/templates/assets/asset_detail.html:92 +#: assets/models/asset.py:207 assets/templates/assets/asset_detail.html:92 msgid "Memory" msgstr "内存" -#: assets/models/asset.py:200 +#: assets/models/asset.py:208 msgid "Disk total" msgstr "硬盘大小" -#: assets/models/asset.py:201 +#: assets/models/asset.py:209 msgid "Disk info" msgstr "硬盘信息" -#: assets/models/asset.py:203 assets/templates/assets/asset_detail.html:104 +#: assets/models/asset.py:211 assets/templates/assets/asset_detail.html:104 msgid "OS" msgstr "操作系统" -#: assets/models/asset.py:204 +#: assets/models/asset.py:212 msgid "OS version" msgstr "系统版本" -#: assets/models/asset.py:205 +#: assets/models/asset.py:213 msgid "OS arch" msgstr "系统架构" -#: assets/models/asset.py:206 +#: assets/models/asset.py:214 msgid "Hostname raw" msgstr "主机名原始" -#: assets/models/asset.py:208 assets/templates/assets/asset_create.html:46 +#: assets/models/asset.py:216 assets/templates/assets/asset_create.html:46 #: assets/templates/assets/asset_detail.html:220 templates/_nav.html:46 msgid "Labels" msgstr "标签管理" @@ -976,21 +1095,21 @@ msgstr "版本" msgid "AuthBook" msgstr "" -#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:100 +#: assets/models/base.py:30 xpack/plugins/change_auth_plan/models.py:100 #: xpack/plugins/change_auth_plan/models.py:271 msgid "SSH private key" msgstr "ssh密钥" -#: assets/models/base.py:32 xpack/plugins/change_auth_plan/models.py:103 +#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:103 #: xpack/plugins/change_auth_plan/models.py:267 msgid "SSH public key" msgstr "ssh公钥" -#: assets/models/base.py:35 assets/models/gathered_user.py:20 +#: 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:46 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:107 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:71 +#: 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 msgid "Date updated" msgstr "更新日期" @@ -1002,7 +1121,7 @@ msgstr "带宽" msgid "Contact" msgstr "联系人" -#: assets/models/cluster.py:22 users/models/user.py:452 +#: assets/models/cluster.py:22 users/models/user.py:457 #: users/templates/users/user_detail.html:77 msgid "Phone" msgstr "手机" @@ -1028,7 +1147,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:14 -#: users/models/user.py:575 +#: users/models/user.py:580 msgid "System" msgstr "系统" @@ -1057,7 +1176,7 @@ msgid "Regex" msgstr "正则表达式" #: assets/models/cmd_filter.py:40 ops/models/command.py:22 -#: ops/templates/ops/command_execution_list.html:67 terminal/models.py:185 +#: ops/templates/ops/command_execution_list.html:67 terminal/models.py:186 #: terminal/templates/terminal/command_list.html:28 #: terminal/templates/terminal/command_list.html:68 #: terminal/templates/terminal/session_detail.html:48 @@ -1077,18 +1196,7 @@ msgstr "允许" msgid "Filter" msgstr "过滤器" -#: assets/models/cmd_filter.py:51 -#: assets/templates/assets/cmd_filter_rule_list.html:53 -#: audits/templates/audits/login_log_list.html:58 -#: perms/templates/perms/remote_app_permission_remote_app.html:50 -#: terminal/models.py:315 terminal/models.py:352 -#: terminal/templates/terminal/base_storage_list.html:33 -#: tickets/models/ticket.py:43 tickets/templates/tickets/ticket_detail.html:33 -#: tickets/templates/tickets/ticket_list.html:35 -msgid "Type" -msgstr "类型" - -#: assets/models/cmd_filter.py:52 assets/models/user.py:112 +#: assets/models/cmd_filter.py:52 assets/models/user.py:113 #: assets/templates/assets/cmd_filter_rule_list.html:55 msgid "Priority" msgstr "优先级" @@ -1119,15 +1227,17 @@ msgid "Gateway" msgstr "网关" #: assets/models/gathered_user.py:16 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:70 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:67 msgid "Present" msgstr "存在" #: assets/models/gathered_user.py:17 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:65 msgid "Date last login" msgstr "最后登录日期" #: assets/models/gathered_user.py:18 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:66 msgid "IP last login" msgstr "最后登录IP" @@ -1152,35 +1262,37 @@ msgstr "默认资产组" #: audits/templates/audits/password_change_log_list.html:54 #: authentication/models.py:43 ops/templates/ops/command_execution_list.html:41 #: ops/templates/ops/command_execution_list.html:66 -#: perms/forms/asset_permission.py:78 perms/forms/remote_app_permission.py:34 -#: perms/models/base.py:49 +#: perms/forms/asset_permission.py:83 perms/forms/database_app_permission.py:38 +#: perms/forms/remote_app_permission.py:40 perms/models/base.py:49 #: perms/templates/perms/asset_permission_create_update.html:39 -#: perms/templates/perms/asset_permission_list.html:48 -#: perms/templates/perms/asset_permission_list.html:101 +#: perms/templates/perms/asset_permission_list.html:33 +#: perms/templates/perms/asset_permission_list.html:81 +#: perms/templates/perms/database_app_permission_create_update.html:41 +#: perms/templates/perms/database_app_permission_list.html:15 #: perms/templates/perms/remote_app_permission_create_update.html:41 #: perms/templates/perms/remote_app_permission_list.html:15 #: templates/index.html:87 terminal/backends/command/models.py:12 -#: terminal/models.py:175 terminal/templates/terminal/command_list.html:29 +#: terminal/models.py:176 terminal/templates/terminal/command_list.html:29 #: terminal/templates/terminal/command_list.html:65 #: terminal/templates/terminal/session_list.html:25 #: terminal/templates/terminal/session_list.html:69 tickets/models/ticket.py:33 #: tickets/models/ticket.py:128 tickets/templates/tickets/ticket_detail.html:32 #: tickets/templates/tickets/ticket_list.html:34 -#: tickets/templates/tickets/ticket_list.html:103 users/forms.py:339 -#: users/models/user.py:148 users/models/user.py:164 users/models/user.py:563 -#: users/serializers/group.py:21 +#: tickets/templates/tickets/ticket_list.html:103 users/forms/group.py:15 +#: users/models/user.py:143 users/models/user.py:159 users/models/user.py:568 +#: users/serializers/group.py:20 #: users/templates/users/user_asset_permission.html:55 #: users/templates/users/user_asset_permission.html:84 #: users/templates/users/user_group_detail.html:73 -#: users/templates/users/user_group_list.html:36 users/views/profile.py:68 +#: users/templates/users/user_group_list.html:15 users/views/profile.py:68 #: xpack/plugins/orgs/forms.py:28 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:108 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:113 #: xpack/plugins/orgs/templates/orgs/org_list.html:15 msgid "User" msgstr "用户" #: assets/models/label.py:19 assets/models/node.py:453 -#: assets/templates/assets/label_list.html:15 settings/models.py:29 +#: assets/templates/assets/label_list.html:15 settings/models.py:27 msgid "Value" msgstr "值" @@ -1204,22 +1316,22 @@ msgstr "空" msgid "favorite" msgstr "收藏夹" -#: assets/models/node.py:452 +#: assets/models/node.py:452 assets/templates/assets/_node_detail_modal.html:39 msgid "Key" msgstr "键" -#: assets/models/user.py:106 +#: assets/models/user.py:107 msgid "Automatic login" msgstr "自动登录" -#: assets/models/user.py:107 +#: assets/models/user.py:108 msgid "Manually login" msgstr "手动登录" -#: assets/models/user.py:111 +#: assets/models/user.py:112 #: assets/templates/assets/_asset_group_bulk_update_modal.html:11 #: assets/templates/assets/system_user_assets.html:26 -#: assets/templates/assets/system_user_detail.html:17 +#: assets/templates/assets/system_user_detail.html:18 #: assets/views/admin_user.py:30 assets/views/admin_user.py:49 #: assets/views/admin_user.py:67 assets/views/admin_user.py:84 #: assets/views/admin_user.py:108 assets/views/asset.py:37 @@ -1233,46 +1345,51 @@ msgstr "手动登录" #: assets/views/domain.py:81 assets/views/domain.py:107 #: assets/views/domain.py:136 assets/views/domain.py:157 #: assets/views/label.py:27 assets/views/label.py:45 assets/views/label.py:73 -#: assets/views/platform.py:17 assets/views/platform.py:32 -#: assets/views/platform.py:47 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 +#: assets/views/platform.py:22 assets/views/platform.py:38 +#: 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 msgid "Assets" msgstr "资产管理" -#: assets/models/user.py:114 assets/templates/assets/_system_user.html:55 -#: assets/templates/assets/system_user_detail.html:117 +#: assets/models/user.py:115 assets/templates/assets/_system_user.html:55 +#: assets/templates/assets/system_user_detail.html:119 #: assets/templates/assets/system_user_update.html:10 msgid "Auto push" msgstr "自动推送" -#: assets/models/user.py:115 assets/templates/assets/system_user_detail.html:69 +#: assets/models/user.py:116 assets/templates/assets/system_user_detail.html:71 msgid "Sudo" msgstr "Sudo" -#: assets/models/user.py:116 assets/templates/assets/system_user_detail.html:74 +#: assets/models/user.py:117 assets/templates/assets/system_user_detail.html:76 msgid "Shell" msgstr "Shell" -#: assets/models/user.py:117 assets/templates/assets/system_user_detail.html:61 -#: assets/templates/assets/system_user_list.html:48 +#: assets/models/user.py:118 assets/templates/assets/system_user_detail.html:63 +#: assets/templates/assets/system_user_list.html:27 msgid "Login mode" msgstr "登录模式" -#: assets/models/user.py:166 assets/templates/assets/user_asset_list.html:79 -#: audits/models.py:21 audits/templates/audits/ftp_log_list.html:53 +#: assets/models/user.py:179 assets/templates/assets/system_user_list.html:74 +#: assets/templates/assets/user_asset_list.html:79 audits/models.py:21 +#: audits/templates/audits/ftp_log_list.html:53 #: audits/templates/audits/ftp_log_list.html:76 -#: perms/forms/asset_permission.py:90 perms/forms/remote_app_permission.py:43 -#: perms/models/asset_permission.py:82 perms/models/remote_app_permission.py:16 +#: perms/forms/asset_permission.py:95 perms/forms/remote_app_permission.py:49 +#: perms/models/asset_permission.py:82 +#: perms/models/database_app_permission.py:21 +#: perms/models/remote_app_permission.py:16 #: perms/templates/perms/asset_permission_asset.html:124 -#: perms/templates/perms/asset_permission_list.html:52 -#: perms/templates/perms/asset_permission_list.html:113 -#: perms/templates/perms/asset_permission_list.html:210 +#: perms/templates/perms/asset_permission_list.html:37 +#: perms/templates/perms/asset_permission_list.html:93 +#: perms/templates/perms/asset_permission_list.html:190 +#: perms/templates/perms/database_app_permission_database_app.html:94 +#: perms/templates/perms/database_app_permission_list.html:18 #: perms/templates/perms/remote_app_permission_detail.html:126 #: perms/templates/perms/remote_app_permission_list.html:18 #: templates/_nav.html:45 terminal/backends/command/models.py:14 -#: terminal/models.py:179 terminal/templates/terminal/command_list.html:31 +#: terminal/models.py:180 terminal/templates/terminal/command_list.html:31 #: terminal/templates/terminal/command_list.html:67 #: terminal/templates/terminal/session_list.html:27 #: terminal/templates/terminal/session_list.html:71 @@ -1294,7 +1411,7 @@ msgid "Unreachable" msgstr "不可达" #: assets/models/utils.py:44 assets/tasks/const.py:85 -#: assets/templates/assets/asset_list.html:99 +#: assets/templates/assets/asset_list.html:27 msgid "Reachable" msgstr "可连接" @@ -1303,25 +1420,25 @@ msgstr "可连接" msgid "Unknown" msgstr "未知" -#: assets/serializers/asset.py:26 +#: assets/serializers/asset.py:27 msgid "Protocol format should {}/{}" msgstr "协议格式 {}/{}" -#: assets/serializers/asset.py:43 +#: assets/serializers/asset.py:44 msgid "Protocol duplicate: {}" msgstr "协议重复: {}" -#: assets/serializers/asset.py:70 assets/serializers/asset.py:155 +#: assets/serializers/asset.py:73 assets/serializers/asset.py:162 #: assets/serializers/asset_user.py:29 #: assets/templates/assets/_asset_user_list.html:23 msgid "Connectivity" msgstr "连接" -#: assets/serializers/asset.py:96 +#: assets/serializers/asset.py:99 msgid "Hardware info" msgstr "硬件信息" -#: assets/serializers/asset.py:97 orgs/mixins/serializers.py:27 +#: assets/serializers/asset.py:100 orgs/mixins/serializers.py:27 msgid "Org name" msgstr "组织名称" @@ -1329,8 +1446,8 @@ msgstr "组织名称" msgid "Backend" msgstr "后端" -#: assets/serializers/asset_user.py:67 users/forms.py:282 -#: users/models/user.py:463 users/templates/users/first_login.html:42 +#: assets/serializers/asset_user.py:67 users/forms/profile.py:148 +#: users/models/user.py:468 users/templates/users/first_login.html:42 #: users/templates/users/user_password_update.html:49 #: users/templates/users/user_profile.html:69 #: users/templates/users/user_profile_update.html:46 @@ -1455,15 +1572,6 @@ msgstr "没有匹配到资产，结束任务" msgid "No assets matched related system user protocol, stop task" msgstr "没有匹配到与系统用户协议相关的资产，结束任务" -#: assets/templates/assets/_admin_user_import_modal.html:4 -msgid "Import admin user" -msgstr "导入管理用户" - -#: assets/templates/assets/_admin_user_update_modal.html:4 -#: assets/views/admin_user.py:68 -msgid "Update admin user" -msgstr "更新管理用户" - #: assets/templates/assets/_asset_group_bulk_update_modal.html:5 msgid "Update asset group" msgstr "更新用户组" @@ -1479,6 +1587,7 @@ msgstr "选择资产" #: assets/templates/assets/_asset_group_bulk_update_modal.html:21 #: assets/templates/assets/cmd_filter_detail.html:84 #: assets/templates/assets/cmd_filter_list.html:24 +#: perms/forms/database_app_permission.py:47 msgid "System users" msgstr "系统用户" @@ -1490,10 +1599,6 @@ msgstr "选择系统用户" msgid "Enable-MFA" msgstr "启用MFA" -#: assets/templates/assets/_asset_import_modal.html:4 -msgid "Import assets" -msgstr "导入资产" - #: assets/templates/assets/_asset_list_modal.html:7 assets/views/asset.py:38 #: templates/_nav.html:42 xpack/plugins/change_auth_plan/views.py:118 msgid "Asset list" @@ -1501,11 +1606,11 @@ msgstr "资产列表" #: assets/templates/assets/_asset_list_modal.html:33 #: assets/templates/assets/_node_tree.html:39 -#: ops/templates/ops/command_execution_create.html:67 -#: ops/templates/ops/command_execution_create.html:124 +#: ops/templates/ops/command_execution_create.html:62 +#: 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:62 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:66 msgid "Loading" msgstr "加载中" @@ -1525,8 +1630,8 @@ msgstr "请输入密码" #: assets/templates/assets/_asset_user_auth_update_modal.html:68 #: assets/templates/assets/asset_detail.html:300 #: users/templates/users/user_asset_permission.html:193 -#: users/templates/users/user_detail.html:373 -#: users/templates/users/user_detail.html:400 +#: users/templates/users/user_detail.html:371 +#: users/templates/users/user_detail.html:398 #: xpack/plugins/interface/views.py:35 msgid "Update successfully!" msgstr "更新成功" @@ -1536,6 +1641,7 @@ msgid "Asset user auth" msgstr "资产用户信息" #: assets/templates/assets/_asset_user_auth_view_modal.html:54 +#: assets/templates/assets/_node_detail_modal.html:56 #: authentication/templates/authentication/login_wait_confirm.html:114 msgid "Copy success" msgstr "复制成功" @@ -1545,6 +1651,7 @@ msgid "Get auth info error" msgstr "获取认证信息错误" #: assets/templates/assets/_asset_user_auth_view_modal.html:97 +#: assets/templates/assets/_node_detail_modal.html:67 #: assets/templates/assets/_user_asset_detail_modal.html:23 #: authentication/templates/authentication/_access_key_modal.html:142 #: authentication/templates/authentication/_mfa_confirm_modal.html:53 @@ -1565,7 +1672,7 @@ msgid "Datetime" msgstr "日期" #: assets/templates/assets/_asset_user_list.html:41 -#: assets/templates/assets/asset_list.html:137 +#: assets/templates/assets/asset_list.html:59 msgid "Test datetime: " msgstr "测试日期: " @@ -1578,14 +1685,14 @@ msgstr "查看" #: assets/templates/assets/asset_asset_user_list.html:57 #: assets/templates/assets/asset_detail.html:174 #: assets/templates/assets/system_user_assets.html:67 -#: assets/templates/assets/system_user_detail.html:146 +#: assets/templates/assets/system_user_detail.html:149 #: terminal/templates/terminal/base_storage_list.html:73 msgid "Test" msgstr "测试" #: assets/templates/assets/_asset_user_list.html:77 #: assets/templates/assets/system_user_assets.html:76 -#: assets/templates/assets/system_user_detail.html:137 +#: assets/templates/assets/system_user_detail.html:139 msgid "Push" msgstr "推送" @@ -1601,6 +1708,27 @@ msgstr "SSH端口" msgid "If use nat, set the ssh real port" msgstr "如果使用了nat端口映射，请设置为ssh真实监听的端口" +#: assets/templates/assets/_node_detail_modal.html:11 +#: assets/templates/assets/asset_list.html:124 +msgid "Node detail" +msgstr "节点详情" + +#: assets/templates/assets/_node_detail_modal.html:18 +#: audits/templates/audits/login_log_list.html:56 +#: authentication/templates/authentication/_access_key_modal.html:30 +#: ops/templates/ops/adhoc_detail.html:47 +#: 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 +msgid "ID" +msgstr "ID" + +#: assets/templates/assets/_node_detail_modal.html:33 +msgid "Full name" +msgstr "全称" + #: assets/templates/assets/_node_tree.html:49 msgid "Add node" msgstr "新建节点" @@ -1633,10 +1761,11 @@ msgstr "重命名成功" #: assets/templates/assets/asset_create.html:16 #: assets/templates/assets/gateway_create_update.html:33 #: 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:39 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:23 -#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:23 +#: 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 msgid "Basic" msgstr "基本" @@ -1655,23 +1784,15 @@ msgstr "自动生成密钥" #: assets/templates/assets/asset_create.html:74 #: assets/templates/assets/gateway_create_update.html:49 #: perms/templates/perms/asset_permission_create_update.html:51 +#: 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:63 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:44 -#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:35 +#: 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 msgid "Other" msgstr "其它" -#: assets/templates/assets/_system_user_import_modal.html:4 -msgid "Import system user" -msgstr "导入系统用户" - -#: assets/templates/assets/_system_user_update_modal.html:4 -#: assets/views/system_user.py:64 -msgid "Update system user" -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:18 assets/views/asset.py:200 @@ -1685,14 +1806,15 @@ 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:27 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:31 msgid "Asset list of " msgstr "资产列表" #: assets/templates/assets/admin_user_assets.html:47 #: assets/templates/assets/system_user_assets.html:58 -#: assets/templates/assets/system_user_detail.html:111 +#: assets/templates/assets/system_user_detail.html:113 #: perms/templates/perms/asset_permission_detail.html:109 +#: perms/templates/perms/database_app_permission_detail.html:105 #: perms/templates/perms/remote_app_permission_detail.html:101 msgid "Quick update" msgstr "快速更新" @@ -1710,33 +1832,31 @@ 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:95 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:99 #: xpack/plugins/gathered_user/forms.py:36 msgid "Select nodes" msgstr "选择节点" #: assets/templates/assets/admin_user_detail.html:95 #: assets/templates/assets/asset_detail.html:200 -#: assets/templates/assets/asset_list.html:424 +#: assets/templates/assets/asset_list.html:258 #: assets/templates/assets/cmd_filter_detail.html:101 #: assets/templates/assets/system_user_assets.html:101 -#: assets/templates/assets/system_user_detail.html:177 -#: assets/templates/assets/system_user_list.html:133 +#: assets/templates/assets/system_user_detail.html:181 #: authentication/templates/authentication/_mfa_confirm_modal.html:20 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112 #: users/templates/users/user_detail.html:277 -#: users/templates/users/user_detail.html:454 -#: users/templates/users/user_detail.html:480 -#: users/templates/users/user_detail.html:503 -#: users/templates/users/user_detail.html:548 +#: users/templates/users/user_detail.html:432 +#: users/templates/users/user_detail.html:458 +#: users/templates/users/user_detail.html:481 +#: users/templates/users/user_detail.html:526 #: users/templates/users/user_group_create_update.html:28 -#: users/templates/users/user_group_list.html:120 -#: users/templates/users/user_list.html:256 -#: 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 +#: 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/interface/templates/interface/interface.html:103 -#: xpack/plugins/orgs/templates/orgs/org_create_update.html:30 +#: xpack/plugins/orgs/templates/orgs/org_create_update.html:34 msgid "Confirm" msgstr "确认" @@ -1753,47 +1873,11 @@ msgid "" "assets hardware information`, etc. " msgstr "Jumpserver 使用该用户来 `推送系统用户`、`获取资产硬件信息` 等。" -#: assets/templates/assets/admin_user_list.html:14 -#: assets/templates/assets/asset_list.html:68 -#: assets/templates/assets/system_user_list.html:17 -#: audits/templates/audits/login_log_list.html:91 -#: users/templates/users/user_group_list.html:10 -#: users/templates/users/user_list.html:10 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:54 -#: xpack/plugins/vault/templates/vault/vault.html:53 -msgid "Export" -msgstr "导出" - -#: assets/templates/assets/admin_user_list.html:19 -#: assets/templates/assets/asset_list.html:73 -#: assets/templates/assets/system_user_list.html:22 -#: settings/templates/settings/_ldap_list_users_modal.html:172 -#: users/templates/users/user_group_list.html:15 -#: users/templates/users/user_list.html:15 -#: xpack/plugins/license/templates/license/license_detail.html:110 -#: xpack/plugins/vault/templates/vault/vault.html:58 -msgid "Import" -msgstr "导入" - -#: assets/templates/assets/admin_user_list.html:34 +#: assets/templates/assets/admin_user_list.html:13 #: assets/views/admin_user.py:50 msgid "Create admin user" msgstr "创建管理用户" -#: assets/templates/assets/admin_user_list.html:123 -#: assets/templates/assets/admin_user_list.html:154 -#: assets/templates/assets/asset_list.html:304 -#: assets/templates/assets/asset_list.html:341 -#: assets/templates/assets/system_user_list.html:186 -#: assets/templates/assets/system_user_list.html:217 -#: users/templates/users/user_group_list.html:164 -#: users/templates/users/user_group_list.html:195 -#: users/templates/users/user_list.html:165 -#: users/templates/users/user_list.html:197 -#: xpack/plugins/vault/templates/vault/vault.html:222 -msgid "Please select file" -msgstr "选择文件" - #: assets/templates/assets/asset_asset_user_list.html:16 #: assets/templates/assets/asset_detail.html:21 assets/views/asset.py:55 msgid "Asset user list" @@ -1808,9 +1892,9 @@ msgstr "资产用户" #: terminal/templates/terminal/session_detail.html:85 #: users/templates/users/user_detail.html:141 #: users/templates/users/user_profile.html:150 -#: 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:102 +#: 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/license/templates/license/license_detail.html:93 msgid "Quick modify" msgstr "快速修改" @@ -1843,6 +1927,8 @@ msgstr "创建日期" #: perms/models/base.py:51 #: perms/templates/perms/asset_permission_create_update.html:53 #: perms/templates/perms/asset_permission_detail.html:115 +#: perms/templates/perms/database_app_permission_create_update.html:53 +#: perms/templates/perms/database_app_permission_detail.html:111 #: perms/templates/perms/remote_app_permission_create_update.html:53 #: perms/templates/perms/remote_app_permission_detail.html:107 #: terminal/templates/terminal/terminal_list.html:35 @@ -1861,7 +1947,7 @@ msgstr "更新硬件信息" msgid "Refresh" msgstr "刷新" -#: assets/templates/assets/asset_list.html:9 +#: assets/templates/assets/asset_list.html:6 msgid "" "The left side is the asset tree, right click to create, delete, and change " "the tree node, authorization asset is also organized as a node, and the " @@ -1870,98 +1956,94 @@ msgstr "" "左侧是资产树，右击可以新建、删除、更改树节点，授权资产也是以节点方式组织的，" "右侧是属于该节点下的资产" -#: assets/templates/assets/asset_list.html:61 assets/views/asset.py:104 +#: assets/templates/assets/asset_list.html:10 assets/views/asset.py:104 msgid "Create asset" msgstr "创建资产" -#: assets/templates/assets/asset_list.html:98 +#: assets/templates/assets/asset_list.html:26 msgid "Hardware" msgstr "硬件" -#: assets/templates/assets/asset_list.html:109 -#: users/templates/users/user_list.html:50 +#: assets/templates/assets/asset_list.html:37 +#: users/templates/users/user_list.html:30 msgid "Delete selected" msgstr "批量删除" -#: assets/templates/assets/asset_list.html:110 -#: users/templates/users/user_list.html:51 +#: assets/templates/assets/asset_list.html:38 +#: users/templates/users/user_list.html:34 msgid "Update selected" msgstr "批量更新" -#: assets/templates/assets/asset_list.html:111 +#: assets/templates/assets/asset_list.html:39 msgid "Remove from this node" msgstr "从节点移除" -#: assets/templates/assets/asset_list.html:112 -#: users/templates/users/user_list.html:52 +#: assets/templates/assets/asset_list.html:40 +#: users/templates/users/user_list.html:35 msgid "Deactive selected" msgstr "禁用所选" -#: assets/templates/assets/asset_list.html:113 -#: users/templates/users/user_list.html:53 +#: assets/templates/assets/asset_list.html:41 +#: users/templates/users/user_list.html:36 msgid "Active selected" msgstr "激活所选" -#: assets/templates/assets/asset_list.html:193 +#: assets/templates/assets/asset_list.html:115 msgid "Add assets to node" msgstr "添加资产到节点" -#: assets/templates/assets/asset_list.html:194 +#: assets/templates/assets/asset_list.html:116 msgid "Move assets to node" msgstr "移动资产到节点" -#: assets/templates/assets/asset_list.html:196 +#: assets/templates/assets/asset_list.html:118 msgid "Refresh node hardware info" msgstr "更新节点资产硬件信息" -#: assets/templates/assets/asset_list.html:197 +#: assets/templates/assets/asset_list.html:119 msgid "Test node connective" msgstr "测试节点资产可连接性" -#: assets/templates/assets/asset_list.html:199 +#: assets/templates/assets/asset_list.html:121 msgid "Display only current node assets" msgstr "仅显示当前节点资产" -#: assets/templates/assets/asset_list.html:200 +#: assets/templates/assets/asset_list.html:122 msgid "Displays all child node assets" msgstr "显示所有子节点资产" -#: assets/templates/assets/asset_list.html:418 -#: assets/templates/assets/system_user_list.html:127 -#: users/templates/users/user_detail.html:448 -#: users/templates/users/user_detail.html:474 -#: users/templates/users/user_detail.html:542 -#: users/templates/users/user_group_list.html:114 -#: users/templates/users/user_list.html:250 +#: assets/templates/assets/asset_list.html:252 +#: users/templates/users/user_detail.html:426 +#: users/templates/users/user_detail.html:452 +#: users/templates/users/user_detail.html:520 +#: users/templates/users/user_list.html:178 #: xpack/plugins/interface/templates/interface/interface.html:97 msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:419 +#: assets/templates/assets/asset_list.html:253 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:422 -#: assets/templates/assets/system_user_list.html:131 -#: users/templates/users/user_detail.html:452 -#: users/templates/users/user_detail.html:478 -#: users/templates/users/user_detail.html:546 -#: users/templates/users/user_group_list.html:118 -#: users/templates/users/user_list.html:254 +#: assets/templates/assets/asset_list.html:256 +#: users/templates/users/user_detail.html:430 +#: users/templates/users/user_detail.html:456 +#: users/templates/users/user_detail.html:524 +#: users/templates/users/user_list.html:182 #: xpack/plugins/interface/templates/interface/interface.html:101 msgid "Cancel" msgstr "取消" -#: assets/templates/assets/asset_list.html:433 +#: assets/templates/assets/asset_list.html:267 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:434 -#: assets/templates/assets/asset_list.html:442 +#: assets/templates/assets/asset_list.html:268 +#: assets/templates/assets/asset_list.html:276 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:441 +#: assets/templates/assets/asset_list.html:275 msgid "Asset Deleting failed." msgstr "删除失败" @@ -2074,7 +2156,7 @@ msgstr "创建网域" msgid "Create label" msgstr "创建标签" -#: assets/templates/assets/platform_list.html:8 assets/views/platform.py:33 +#: assets/templates/assets/platform_list.html:8 assets/views/platform.py:39 msgid "Create platform" msgstr "创建系统平台" @@ -2083,12 +2165,12 @@ msgid "Assets of " msgstr "资产" #: assets/templates/assets/system_user_assets.html:64 -#: assets/templates/assets/system_user_detail.html:143 +#: assets/templates/assets/system_user_detail.html:146 msgid "Test assets connective" msgstr "测试资产可连接性" #: assets/templates/assets/system_user_assets.html:73 -#: assets/templates/assets/system_user_detail.html:134 +#: assets/templates/assets/system_user_detail.html:136 msgid "Push system user now" msgstr "立刻推送系统" @@ -2096,15 +2178,15 @@ msgstr "立刻推送系统" msgid "Add to node" msgstr "添加到节点" -#: assets/templates/assets/system_user_detail.html:80 +#: assets/templates/assets/system_user_detail.html:82 msgid "Home" msgstr "家目录" -#: assets/templates/assets/system_user_detail.html:86 +#: assets/templates/assets/system_user_detail.html:88 msgid "Uid" msgstr "Uid" -#: assets/templates/assets/system_user_detail.html:168 +#: assets/templates/assets/system_user_detail.html:172 msgid "Binding command filters" msgstr "绑定命令过滤器" @@ -2136,32 +2218,19 @@ msgstr "" "系统用户创建时，如果选择了自动推送，Jumpserver 会使用 Ansible 自动推送系统用" "户到资产中，如果资产（交换机）不支持 Ansible，请手动填写账号密码。" -#: assets/templates/assets/system_user_list.html:37 +#: assets/templates/assets/system_user_list.html:16 #: assets/views/system_user.py:47 msgid "Create system user" msgstr "创建系统用户" -#: assets/templates/assets/system_user_list.html:128 -msgid "This will delete the selected System Users !!!" -msgstr "删除选择系统用户" - -#: assets/templates/assets/system_user_list.html:137 -msgid "System Users Deleted." -msgstr "已被删除" - -#: assets/templates/assets/system_user_list.html:138 -#: assets/templates/assets/system_user_list.html:143 -msgid "System Users Delete" -msgstr "删除系统用户" - -#: assets/templates/assets/system_user_list.html:142 -msgid "System Users Deleting failed." -msgstr "系统用户删除失败" - #: assets/views/admin_user.py:31 msgid "Admin user list" msgstr "管理用户列表" +#: assets/views/admin_user.py:68 +msgid "Update admin user" +msgstr "更新管理用户" + #: assets/views/admin_user.py:85 assets/views/admin_user.py:109 msgid "Admin user detail" msgstr "管理用户详情" @@ -2234,18 +2303,26 @@ msgstr "提示: 请避免使用内部预留标签名: {}" msgid "Update label" msgstr "更新标签" -#: assets/views/platform.py:18 +#: assets/views/platform.py:23 templates/_nav.html:49 msgid "Platform list" msgstr "平台列表" -#: assets/views/platform.py:48 +#: assets/views/platform.py:56 msgid "Update platform" msgstr "更新系统平台" +#: assets/views/platform.py:72 +msgid "Platform detail" +msgstr "平台详情" + #: assets/views/system_user.py:30 msgid "System user list" msgstr "系统用户列表" +#: assets/views/system_user.py:64 +msgid "Update system user" +msgstr "更新系统用户" + #: assets/views/system_user.py:80 msgid "System user detail" msgstr "系统用户详情" @@ -2262,7 +2339,7 @@ msgstr "系统用户资产" #: audits/templates/audits/ftp_log_list.html:77 #: audits/templates/audits/operate_log_list.html:74 #: audits/templates/audits/password_change_log_list.html:56 -#: terminal/models.py:182 terminal/templates/terminal/session_list.html:28 +#: terminal/models.py:183 terminal/templates/terminal/session_list.html:28 #: terminal/templates/terminal/session_list.html:72 #: terminal/templates/terminal/terminal_detail.html:47 msgid "Remote addr" @@ -2280,8 +2357,8 @@ msgstr "文件名" #: audits/models.py:24 audits/models.py:77 #: audits/templates/audits/ftp_log_list.html:80 #: ops/templates/ops/command_execution_list.html:71 -#: ops/templates/ops/task_list.html:15 -#: users/templates/users/user_detail.html:524 +#: ops/templates/ops/task_list.html:14 +#: users/templates/users/user_detail.html:502 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:14 #: xpack/plugins/cloud/api.py:61 msgid "Success" @@ -2289,7 +2366,7 @@ msgstr "成功" #: audits/models.py:33 #: authentication/templates/authentication/_access_key_modal.html:22 -#: xpack/plugins/vault/templates/vault/vault.html:44 +#: xpack/plugins/vault/templates/vault/vault.html:38 msgid "Create" msgstr "创建" @@ -2310,7 +2387,7 @@ msgstr "修改者" msgid "Disabled" msgstr "禁用" -#: audits/models.py:72 settings/models.py:32 +#: audits/models.py:72 settings/models.py:30 #: users/templates/users/user_detail.html:97 msgid "Enabled" msgstr "启用" @@ -2342,7 +2419,7 @@ msgstr "Agent" #: audits/models.py:86 audits/templates/audits/login_log_list.html:62 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms.py:194 users/models/user.py:455 +#: users/forms/profile.py:52 users/models/user.py:460 #: users/templates/users/first_login.html:45 msgid "MFA" msgstr "MFA" @@ -2351,7 +2428,7 @@ msgstr "MFA" #: xpack/plugins/change_auth_plan/models.py:423 #: 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:64 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69 msgid "Reason" msgstr "原因" @@ -2360,8 +2437,8 @@ msgstr "原因" #: 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:65 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65 msgid "Status" msgstr "状态" @@ -2375,18 +2452,20 @@ msgstr "登录日期" #: ops/templates/ops/command_execution_list.html:72 #: ops/templates/ops/task_history.html:56 perms/models/base.py:52 #: perms/templates/perms/asset_permission_detail.html:81 +#: perms/templates/perms/database_app_permission_detail.html:77 #: perms/templates/perms/remote_app_permission_detail.html:73 -#: terminal/models.py:188 terminal/templates/terminal/session_list.html:32 +#: 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/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:143 +#: xpack/plugins/gathered_user/models.py:140 msgid "Date start" msgstr "开始日期" #: audits/templates/audits/login_log_list.html:34 #: perms/templates/perms/asset_permission_user.html:74 +#: perms/templates/perms/database_app_permission_user.html:74 #: perms/templates/perms/remote_app_permission_user.html:83 msgid "Select user" msgstr "选择用户" @@ -2398,22 +2477,11 @@ 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:47 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:45 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:52 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48 msgid "Search" msgstr "搜索" -#: audits/templates/audits/login_log_list.html:56 -#: authentication/templates/authentication/_access_key_modal.html:30 -#: ops/templates/ops/adhoc_detail.html:47 -#: 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:59 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:57 -msgid "ID" -msgstr "ID" - #: audits/templates/audits/login_log_list.html:59 msgid "UA" msgstr "Agent" @@ -2424,28 +2492,35 @@ msgstr "城市" #: audits/templates/audits/login_log_list.html:65 #: authentication/templates/authentication/_access_key_modal.html:33 -#: ops/templates/ops/task_list.html:16 +#: ops/templates/ops/task_list.html:15 msgid "Date" 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 +msgid "Export" +msgstr "导出" + #: audits/views.py:86 audits/views.py:130 audits/views.py:167 -#: audits/views.py:212 audits/views.py:244 templates/_nav.html:137 +#: audits/views.py:212 audits/views.py:244 templates/_nav.html:144 msgid "Audits" msgstr "日志审计" -#: audits/views.py:87 templates/_nav.html:141 +#: audits/views.py:87 templates/_nav.html:148 msgid "FTP log" msgstr "FTP日志" -#: audits/views.py:131 templates/_nav.html:142 +#: audits/views.py:131 templates/_nav.html:149 msgid "Operate log" msgstr "操作日志" -#: audits/views.py:168 templates/_nav.html:143 +#: audits/views.py:168 templates/_nav.html:150 msgid "Password change log" msgstr "改密日志" -#: audits/views.py:213 templates/_nav.html:140 +#: audits/views.py:213 templates/_nav.html:147 msgid "Login log" msgstr "登录日志" @@ -2548,8 +2623,8 @@ msgid "" "after {} minutes)" msgstr "账号已被锁定（请联系管理员解锁 或 {}分钟后重试）" -#: authentication/errors.py:46 users/views/profile.py:211 -#: users/views/profile.py:236 +#: authentication/errors.py:46 users/views/profile.py:204 +#: users/views/profile.py:229 msgid "MFA code invalid, or ntp sync server time" msgstr "MFA验证码不正确，或者服务器端时间不对" @@ -2569,7 +2644,7 @@ msgstr "等待登录复核处理" msgid "Login confirm ticket was {}" msgstr "登录复核 {}" -#: authentication/forms.py:32 users/forms.py:22 +#: authentication/forms.py:29 users/forms/user.py:199 msgid "MFA code" msgstr "MFA 验证码" @@ -2608,14 +2683,14 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:355 users/templates/users/user_profile.html:94 +#: users/models/user.py:360 users/templates/users/user_profile.html:94 #: users/templates/users/user_profile.html:163 #: users/templates/users/user_profile.html:166 msgid "Disable" msgstr "禁用" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/models/user.py:356 users/templates/users/user_profile.html:92 +#: users/models/user.py:361 users/templates/users/user_profile.html:92 #: users/templates/users/user_profile.html:170 msgid "Enable" msgstr "启用" @@ -2634,7 +2709,6 @@ msgstr "代码错误" #: authentication/templates/authentication/login.html:27 #: authentication/templates/authentication/login_otp.html:27 -#: users/templates/users/reset_password.html:25 #: xpack/plugins/interface/models.py:36 msgid "Welcome to the Jumpserver open source fortress" msgstr "欢迎使用Jumpserver开源堡垒机" @@ -2689,8 +2763,8 @@ msgstr "验证码错误" #: authentication/templates/authentication/login.html:87 #: authentication/templates/authentication/xpack_login.html:116 -#: users/templates/users/forgot_password.html:10 -#: users/templates/users/forgot_password.html:25 +#: users/templates/users/forgot_password.html:12 +#: users/templates/users/forgot_password.html:13 msgid "Forgot password" msgstr "忘记密码" @@ -2709,29 +2783,29 @@ msgid "MFA certification" msgstr "MFA认证" #: authentication/templates/authentication/login_otp.html:51 -#: users/templates/users/user_otp_authentication.html:11 +#: users/templates/users/user_disable_mfa.html:11 msgid "" "The account protection has been opened, please complete the following " "operations according to the prompts" msgstr "账号保护已开启，请根据提示完成以下操作" #: authentication/templates/authentication/login_otp.html:55 -#: users/templates/users/user_otp_authentication.html:13 +#: users/templates/users/user_disable_mfa.html:13 msgid "Open Authenticator and enter the 6-bit dynamic code" msgstr "请打开手机Google Authenticator应用，输入6位动态码" #: authentication/templates/authentication/login_otp.html:65 -#: users/templates/users/user_otp_authentication.html:23 +#: users/templates/users/user_disable_mfa.html:23 #: users/templates/users/user_otp_enable_bind.html:26 msgid "Six figures" msgstr "6位数字" #: authentication/templates/authentication/login_otp.html:67 #: users/templates/users/first_login.html:108 -#: users/templates/users/user_otp_authentication.html:26 +#: users/templates/users/user_disable_mfa.html:26 #: users/templates/users/user_otp_enable_bind.html:29 #: users/templates/users/user_otp_enable_install_app.html:26 -#: users/templates/users/user_password_authentication.html:21 +#: users/templates/users/user_password_check.html:16 msgid "Next" msgstr "下一步" @@ -2744,7 +2818,7 @@ msgid "Copy link" msgstr "复制链接" #: authentication/templates/authentication/login_wait_confirm.html:52 -#: templates/flash_message_standalone.html:47 +#: templates/flash_message_standalone.html:34 msgid "Return" msgstr "返回" @@ -2786,11 +2860,11 @@ msgstr "%(name)s 创建成功" msgid "%(name)s was updated successfully" msgstr "%(name)s 更新成功" -#: common/fields/form.py:34 +#: common/fields/form.py:33 msgid "Not a valid json" msgstr "不是合法json" -#: common/fields/form.py:36 +#: common/fields/form.py:35 msgid "Not a string type" msgstr "不是字符类型" @@ -2818,7 +2892,7 @@ msgstr "" msgid "Marshal data to text field" msgstr "" -#: common/fields/model.py:123 +#: common/fields/model.py:133 msgid "Encrypt field using Secret Key" msgstr "" @@ -2831,10 +2905,8 @@ msgid "discard time" msgstr "" #: common/utils/ipip/utils.py:15 -#, fuzzy -#| msgid "Invalid file." msgid "Invalid ip" -msgstr "文件不合法" +msgstr "无效IP" #: common/validators.py:11 msgid "Special char not allowed" @@ -2883,111 +2955,108 @@ msgstr "等待任务开始" msgid "Not has host {} permission" msgstr "没有该主机 {} 权限" -#: ops/models/adhoc.py:38 +#: ops/models/adhoc.py:41 msgid "Interval" msgstr "间隔" -#: ops/models/adhoc.py:38 settings/forms/terminal.py:34 +#: ops/models/adhoc.py:41 settings/forms/terminal.py:34 msgid "Units: seconds" msgstr "单位: 秒" -#: ops/models/adhoc.py:39 +#: ops/models/adhoc.py:42 msgid "Crontab" msgstr "Crontab" -#: ops/models/adhoc.py:39 +#: ops/models/adhoc.py:42 msgid "5 * * * *" msgstr "5 * * * *" -#: ops/models/adhoc.py:41 +#: ops/models/adhoc.py:44 msgid "Callback" msgstr "回调" -#: ops/models/adhoc.py:183 ops/templates/ops/adhoc_detail.html:112 +#: ops/models/adhoc.py:182 ops/templates/ops/adhoc_detail.html:112 msgid "Tasks" msgstr "任务" -#: ops/models/adhoc.py:184 ops/templates/ops/adhoc_detail.html:55 +#: ops/models/adhoc.py:183 ops/templates/ops/adhoc_detail.html:55 #: ops/templates/ops/task_adhoc.html:58 msgid "Pattern" msgstr "模式" -#: ops/models/adhoc.py:185 ops/templates/ops/adhoc_detail.html:59 +#: ops/models/adhoc.py:184 ops/templates/ops/adhoc_detail.html:59 msgid "Options" msgstr "选项" -#: ops/models/adhoc.py:186 ops/templates/ops/adhoc_detail.html:51 -#: ops/templates/ops/command_execution_list.html:65 -#: ops/templates/ops/task_adhoc.html:57 ops/templates/ops/task_list.html:14 -#: terminal/forms/storage.py:152 -msgid "Hosts" -msgstr "主机" - -#: ops/models/adhoc.py:187 templates/index.html:91 -msgid "Host" -msgstr "主机" - -#: ops/models/adhoc.py:188 +#: ops/models/adhoc.py:186 msgid "Run as admin" msgstr "再次执行" -#: ops/models/adhoc.py:190 ops/templates/ops/adhoc_detail.html:80 +#: ops/models/adhoc.py:188 ops/templates/ops/adhoc_detail.html:80 #: ops/templates/ops/task_adhoc.html:60 msgid "Become" msgstr "Become" -#: ops/models/adhoc.py:191 users/templates/users/user_group_detail.html:54 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:59 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:51 +#: 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 msgid "Create by" msgstr "创建者" -#: ops/models/adhoc.py:254 -msgid "{} Start task: {}" -msgstr "{} 任务开始: {}" +#: ops/models/adhoc.py:270 +msgid "Task display" +msgstr "任务展示" -#: ops/models/adhoc.py:263 -msgid "{} Task finish" -msgstr "{} 任务结束" +#: ops/models/adhoc.py:271 +msgid "Host amount" +msgstr "主机数量" -#: ops/models/adhoc.py:360 +#: ops/models/adhoc.py:273 msgid "Start time" msgstr "开始时间" -#: ops/models/adhoc.py:361 +#: ops/models/adhoc.py:274 msgid "End time" msgstr "完成时间" -#: ops/models/adhoc.py:362 ops/templates/ops/adhoc_history.html:55 -#: ops/templates/ops/task_history.html:61 ops/templates/ops/task_list.html:17 +#: 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/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:146 +#: xpack/plugins/gathered_user/models.py:143 msgid "Time" msgstr "时间" -#: ops/models/adhoc.py:363 ops/templates/ops/adhoc_detail.html:104 +#: ops/models/adhoc.py:276 ops/templates/ops/adhoc_detail.html:104 #: ops/templates/ops/adhoc_history.html:53 #: ops/templates/ops/adhoc_history_detail.html:67 #: ops/templates/ops/task_detail.html:82 ops/templates/ops/task_history.html:59 msgid "Is finished" msgstr "是否完成" -#: ops/models/adhoc.py:364 ops/templates/ops/adhoc_history.html:54 +#: ops/models/adhoc.py:277 ops/templates/ops/adhoc_history.html:54 #: ops/templates/ops/task_history.html:60 msgid "Is success" msgstr "是否成功" -#: ops/models/adhoc.py:365 +#: ops/models/adhoc.py:278 msgid "Adhoc raw result" msgstr "结果" -#: ops/models/adhoc.py:366 +#: ops/models/adhoc.py:279 msgid "Adhoc result summary" msgstr "汇总" +#: ops/models/adhoc.py:323 +msgid "{} Start task: {}" +msgstr "{} 任务开始: {}" + +#: ops/models/adhoc.py:332 +msgid "{} Task finish" +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 @@ -3007,10 +3076,8 @@ msgid "Task end" msgstr "任务结束" #: ops/tasks.py:63 -#, fuzzy -#| msgid "Sync task history" msgid "Clean task history period" -msgstr "同步历史列表" +msgstr "定期清除任务历史" #: ops/tasks.py:76 msgid "Clean celery log period" @@ -3026,6 +3093,13 @@ msgstr "版本详情" msgid "Version run history" msgstr "执行历史" +#: ops/templates/ops/adhoc_detail.html:51 +#: ops/templates/ops/command_execution_list.html:65 +#: ops/templates/ops/task_adhoc.html:57 ops/templates/ops/task_list.html:13 +#: terminal/forms/storage.py:152 +msgid "Hosts" +msgstr "主机" + #: ops/templates/ops/adhoc_detail.html:70 #: ops/templates/ops/adhoc_detail.html:75 #: ops/templates/ops/command_execution_list.html:68 @@ -3051,24 +3125,24 @@ msgstr "运行时间" #: ops/templates/ops/adhoc_detail.html:108 #: ops/templates/ops/adhoc_history_detail.html:71 -#: ops/templates/ops/task_detail.html:86 +#: ops/templates/ops/task_detail.html:92 msgid "Is success " msgstr "成功" #: ops/templates/ops/adhoc_detail.html:129 -#: ops/templates/ops/task_detail.html:107 +#: ops/templates/ops/task_detail.html:119 msgid "Last run failed hosts" msgstr "最后运行失败主机" #: ops/templates/ops/adhoc_detail.html:149 #: ops/templates/ops/adhoc_detail.html:174 -#: ops/templates/ops/task_detail.html:127 -#: ops/templates/ops/task_detail.html:152 +#: ops/templates/ops/task_detail.html:139 +#: ops/templates/ops/task_detail.html:164 msgid "No hosts" msgstr "没有主机" #: ops/templates/ops/adhoc_detail.html:159 -#: ops/templates/ops/task_detail.html:137 +#: ops/templates/ops/task_detail.html:149 msgid "Last run success hosts" msgstr "最后运行成功主机" @@ -3122,39 +3196,39 @@ msgstr "成功资产" msgid "Task log" msgstr "任务列表" -#: ops/templates/ops/command_execution_create.html:106 +#: ops/templates/ops/command_execution_create.html:93 #: terminal/templates/terminal/session_detail.html:95 #: terminal/templates/terminal/session_detail.html:104 msgid "Go" msgstr "" -#: ops/templates/ops/command_execution_create.html:191 +#: ops/templates/ops/command_execution_create.html:185 msgid "Selected assets" msgstr "已选择资产" -#: ops/templates/ops/command_execution_create.html:194 +#: ops/templates/ops/command_execution_create.html:188 msgid "In total" msgstr "总共" -#: ops/templates/ops/command_execution_create.html:231 +#: ops/templates/ops/command_execution_create.html:225 msgid "" "Select the left asset, select the running system user, execute command in " "batch" msgstr "选择左侧资产, 选择运行的系统用户，批量执行命令" -#: ops/templates/ops/command_execution_create.html:275 +#: ops/templates/ops/command_execution_create.html:269 msgid "Unselected assets" msgstr "没有选中资产" -#: ops/templates/ops/command_execution_create.html:279 +#: ops/templates/ops/command_execution_create.html:273 msgid "No input command" msgstr "没有输入命令" -#: ops/templates/ops/command_execution_create.html:283 +#: ops/templates/ops/command_execution_create.html:277 msgid "No system user was selected" msgstr "没有选择系统用户" -#: ops/templates/ops/command_execution_create.html:293 +#: ops/templates/ops/command_execution_create.html:287 msgid "Pending" msgstr "等待" @@ -3190,24 +3264,20 @@ msgstr "版本" msgid "Total versions" msgstr "版本数量" -#: ops/templates/ops/task_detail.html:90 +#: ops/templates/ops/task_detail.html:102 msgid "Contents" msgstr "内容" -#: ops/templates/ops/task_list.html:13 -msgid "Versions" -msgstr "版本" - -#: ops/templates/ops/task_list.html:68 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:135 +#: 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_list.html:54 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:138 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:141 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:55 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:44 msgid "Run" msgstr "执行" -#: ops/templates/ops/task_list.html:108 +#: ops/templates/ops/task_list.html:114 msgid "Task start: " msgstr "任务开始: " @@ -3225,7 +3295,7 @@ msgstr "" msgid "Ops" msgstr "作业中心" -#: ops/views/adhoc.py:32 templates/_nav.html:115 +#: ops/views/adhoc.py:32 templates/_nav.html:122 #: xpack/plugins/gathered_user/views.py:35 msgid "Task list" msgstr "任务列表" @@ -3238,7 +3308,7 @@ msgstr "执行历史" msgid "Command execution list" msgstr "命令执行列表" -#: ops/views/command.py:80 templates/_nav_user.html:26 +#: ops/views/command.py:80 templates/_nav_user.html:31 msgid "Command execution" msgstr "命令执行" @@ -3254,32 +3324,34 @@ msgstr "未分组" msgid "Empty" msgstr "空" -#: perms/forms/asset_permission.py:24 +#: perms/forms/asset_permission.py:23 msgid "" "Tips: The RDP protocol does not support separate controls for uploading or " "downloading files" msgstr "提示：RDP 协议不支持单独控制上传或下载文件" -#: perms/forms/asset_permission.py:81 perms/forms/remote_app_permission.py:37 -#: perms/models/base.py:50 perms/templates/perms/asset_permission_list.html:49 -#: perms/templates/perms/asset_permission_list.html:104 -#: perms/templates/perms/asset_permission_list.html:206 +#: perms/forms/asset_permission.py:86 perms/forms/database_app_permission.py:41 +#: perms/forms/remote_app_permission.py:43 perms/models/base.py:50 +#: perms/templates/perms/asset_permission_list.html:34 +#: perms/templates/perms/asset_permission_list.html:84 +#: perms/templates/perms/asset_permission_list.html:186 +#: perms/templates/perms/database_app_permission_list.html:16 #: perms/templates/perms/remote_app_permission_list.html:16 -#: templates/_nav.html:21 users/forms.py:313 users/models/group.py:26 -#: users/models/user.py:439 users/templates/users/_select_user_modal.html:16 +#: templates/_nav.html:21 users/forms/user.py:168 users/models/group.py:31 +#: users/models/user.py:444 users/templates/users/_select_user_modal.html:16 #: users/templates/users/user_asset_permission.html:56 #: users/templates/users/user_asset_permission.html:87 #: users/templates/users/user_detail.html:222 -#: users/templates/users/user_list.html:38 +#: users/templates/users/user_list.html:17 #: xpack/plugins/orgs/templates/orgs/org_list.html:16 msgid "User group" msgstr "用户组" -#: perms/forms/asset_permission.py:103 perms/forms/remote_app_permission.py:53 +#: perms/forms/asset_permission.py:108 msgid "User or group at least one required" msgstr "用户和用户组至少选一个" -#: perms/forms/asset_permission.py:112 +#: perms/forms/asset_permission.py:117 msgid "Asset or group at least one required" msgstr "资产和节点至少选一个" @@ -3303,7 +3375,7 @@ msgstr "上传下载" msgid "Actions" msgstr "动作" -#: perms/models/asset_permission.py:87 templates/_nav.html:72 +#: perms/models/asset_permission.py:87 templates/_nav.html:76 #: tickets/templates/tickets/ticket_list.html:22 #: users/templates/users/user_asset_permission.html:23 #: users/templates/users/user_detail.html:23 @@ -3313,12 +3385,17 @@ msgstr "资产授权" #: perms/models/base.py:53 #: perms/templates/perms/asset_permission_detail.html:85 +#: perms/templates/perms/database_app_permission_detail.html:81 #: perms/templates/perms/remote_app_permission_detail.html:77 -#: users/models/user.py:471 users/templates/users/user_detail.html:108 +#: users/models/user.py:476 users/templates/users/user_detail.html:108 #: users/templates/users/user_profile.html:120 msgid "Date expired" msgstr "失效日期" +#: perms/models/database_app_permission.py:26 +msgid "DatabaseApp permission" +msgstr "数据库应用授权" + #: perms/models/remote_app_permission.py:20 msgid "RemoteApp permission" msgstr "远程应用授权" @@ -3326,6 +3403,9 @@ msgstr "远程应用授权" #: perms/templates/perms/asset_permission_asset.html:18 #: perms/templates/perms/asset_permission_detail.html:17 #: perms/templates/perms/asset_permission_user.html:18 +#: perms/templates/perms/database_app_permission_database_app.html:18 +#: perms/templates/perms/database_app_permission_detail.html:17 +#: perms/templates/perms/database_app_permission_user.html:18 #: perms/templates/perms/remote_app_permission_detail.html:17 #: perms/templates/perms/remote_app_permission_remote_app.html:17 #: perms/templates/perms/remote_app_permission_user.html:17 @@ -3335,8 +3415,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:16 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:21 +#: 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_execution_list.html:20 msgid "Assets and node" msgstr "资产或节点" @@ -3349,14 +3429,18 @@ msgstr "添加资产" #: perms/templates/perms/asset_permission_asset.html:141 #: perms/templates/perms/asset_permission_user.html:80 #: perms/templates/perms/asset_permission_user.html:108 +#: perms/templates/perms/database_app_permission_database_app.html:83 +#: perms/templates/perms/database_app_permission_database_app.html:111 +#: perms/templates/perms/database_app_permission_user.html:80 +#: perms/templates/perms/database_app_permission_user.html:108 #: perms/templates/perms/remote_app_permission_detail.html:143 #: perms/templates/perms/remote_app_permission_remote_app.html:92 #: 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:76 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:88 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:125 +#: 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 msgid "Add" msgstr "添加" @@ -3366,33 +3450,37 @@ msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:105 #: users/templates/users/user_detail.html:239 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:101 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:105 msgid "Join" msgstr "加入" #: perms/templates/perms/asset_permission_asset.html:132 +#: perms/templates/perms/database_app_permission_database_app.html:102 #: perms/templates/perms/remote_app_permission_detail.html:134 msgid "Select system users" msgstr "选择系统用户" #: perms/templates/perms/asset_permission_create_update.html:59 +#: perms/templates/perms/database_app_permission_create_update.html:59 #: perms/templates/perms/remote_app_permission_create_update.html:59 msgid "Validity period" msgstr "有效期" #: perms/templates/perms/asset_permission_detail.html:61 +#: perms/templates/perms/database_app_permission_detail.html:61 #: perms/templates/perms/remote_app_permission_detail.html:61 -#: xpack/plugins/license/templates/license/license_detail.html:76 +#: xpack/plugins/license/templates/license/license_detail.html:67 msgid "User count" msgstr "用户数量" #: perms/templates/perms/asset_permission_detail.html:65 +#: perms/templates/perms/database_app_permission_detail.html:65 #: perms/templates/perms/remote_app_permission_detail.html:65 msgid "User group count" msgstr "用户组数量" #: perms/templates/perms/asset_permission_detail.html:69 -#: xpack/plugins/license/templates/license/license_detail.html:72 +#: xpack/plugins/license/templates/license/license_detail.html:63 msgid "Asset count" msgstr "资产数量" @@ -3401,49 +3489,53 @@ msgid "Node count" msgstr "节点数量" #: perms/templates/perms/asset_permission_detail.html:77 +#: perms/templates/perms/database_app_permission_detail.html:73 msgid "System user count" msgstr "系统用户数量" -#: perms/templates/perms/asset_permission_list.html:36 +#: perms/templates/perms/asset_permission_list.html:21 +#: perms/templates/perms/database_app_permission_list.html:6 #: perms/templates/perms/remote_app_permission_list.html:6 msgid "Create permission" msgstr "创建授权规则" -#: perms/templates/perms/asset_permission_list.html:40 +#: perms/templates/perms/asset_permission_list.html:25 msgid "Refresh permission cache" msgstr "刷新授权缓存" -#: perms/templates/perms/asset_permission_list.html:53 -#: perms/templates/perms/asset_permission_list.html:204 +#: perms/templates/perms/asset_permission_list.html:38 +#: perms/templates/perms/asset_permission_list.html:184 +#: perms/templates/perms/database_app_permission_list.html:19 #: perms/templates/perms/remote_app_permission_list.html:19 #: users/templates/users/user_asset_permission.html:60 #: users/templates/users/user_asset_permission.html:175 -#: users/templates/users/user_list.html:40 xpack/plugins/cloud/models.py:74 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:55 +#: users/templates/users/user_list.html:19 xpack/plugins/cloud/models.py:74 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:58 #: xpack/plugins/cloud/templates/cloud/account_list.html:14 msgid "Validity" msgstr "有效" -#: perms/templates/perms/asset_permission_list.html:211 +#: perms/templates/perms/asset_permission_list.html:191 #: users/templates/users/user_asset_permission.html:180 msgid "Inherit" msgstr "继承" -#: perms/templates/perms/asset_permission_list.html:212 +#: perms/templates/perms/asset_permission_list.html:192 #: users/templates/users/user_asset_permission.html:181 msgid "Include" msgstr "包含" -#: perms/templates/perms/asset_permission_list.html:213 +#: perms/templates/perms/asset_permission_list.html:193 #: users/templates/users/user_asset_permission.html:182 msgid "Exclude" msgstr "不包含" -#: perms/templates/perms/asset_permission_list.html:231 +#: perms/templates/perms/asset_permission_list.html:211 msgid "Refresh success" msgstr "刷新成功" #: perms/templates/perms/asset_permission_user.html:31 +#: perms/templates/perms/database_app_permission_user.html:31 #: perms/templates/perms/remote_app_permission_user.html:30 msgid "User list of " msgstr "用户列表" @@ -3457,10 +3549,35 @@ msgid "Add user group to asset permission" msgstr "添加用户组" #: perms/templates/perms/asset_permission_user.html:99 +#: perms/templates/perms/database_app_permission_user.html:99 #: perms/templates/perms/remote_app_permission_user.html:111 msgid "Select user groups" msgstr "选择用户组" +#: perms/templates/perms/database_app_permission_database_app.html:31 +msgid "DatabaseApp list of " +msgstr "数据库应用列表" + +#: perms/templates/perms/database_app_permission_database_app.html:66 +msgid "Add DatabaseApp to this permission" +msgstr "添加数据库应用" + +#: perms/templates/perms/database_app_permission_database_app.html:74 +msgid "Select DatabaseApp" +msgstr "选择数据库应用" + +#: perms/templates/perms/database_app_permission_detail.html:69 +msgid "DatabaseApp count" +msgstr "数据库应用数量" + +#: perms/templates/perms/database_app_permission_user.html:66 +msgid "Add user to permission" +msgstr "添加用户" + +#: perms/templates/perms/database_app_permission_user.html:91 +msgid "Add user group to permission" +msgstr "添加用户组" + #: perms/templates/perms/remote_app_permission_detail.html:69 msgid "RemoteApp count" msgstr "远程应用数量" @@ -3487,13 +3604,19 @@ msgstr "添加用户组" #: perms/views/asset_permission.py:33 perms/views/asset_permission.py:65 #: perms/views/asset_permission.py:82 perms/views/asset_permission.py:99 -#: perms/views/asset_permission.py:136 perms/views/asset_permission.py:166 +#: perms/views/asset_permission.py:136 perms/views/asset_permission.py:169 +#: perms/views/database_app_permission.py:33 +#: perms/views/database_app_permission.py:48 +#: perms/views/database_app_permission.py:64 +#: perms/views/database_app_permission.py:79 +#: perms/views/database_app_permission.py:108 +#: perms/views/database_app_permission.py:143 #: perms/views/remote_app_permission.py:33 #: perms/views/remote_app_permission.py:49 #: perms/views/remote_app_permission.py:66 -#: perms/views/remote_app_permission.py:81 -#: perms/views/remote_app_permission.py:115 -#: perms/views/remote_app_permission.py:148 templates/_nav.html:69 +#: perms/views/remote_app_permission.py:84 +#: perms/views/remote_app_permission.py:116 +#: perms/views/remote_app_permission.py:149 templates/_nav.html:73 #: xpack/plugins/orgs/templates/orgs/org_list.html:22 msgid "Perms" msgstr "权限管理" @@ -3518,10 +3641,34 @@ msgstr "资产授权详情" msgid "Asset permission user list" msgstr "资产授权用户列表" -#: perms/views/asset_permission.py:168 +#: perms/views/asset_permission.py:171 msgid "Asset permission asset list" msgstr "资产授权资产列表" +#: perms/views/database_app_permission.py:34 +msgid "DatabaseApp permission list" +msgstr "数据库应用授权列表" + +#: perms/views/database_app_permission.py:49 +msgid "Create DatabaseApp permission" +msgstr "创建数据库应用授权规则" + +#: perms/views/database_app_permission.py:65 +msgid "Update DatabaseApp permission" +msgstr "更新数据库应用授权规则" + +#: perms/views/database_app_permission.py:80 +msgid "DatabaseApp permission detail" +msgstr "数据库应用授权详情" + +#: perms/views/database_app_permission.py:109 +msgid "DatabaseApp permission user list" +msgstr "数据库应用授权用户列表" + +#: perms/views/database_app_permission.py:149 +msgid "DatabaseApp permission DatabaseApp list" +msgstr "数据库应用授权数据库应用列表" + #: perms/views/remote_app_permission.py:34 msgid "RemoteApp permission list" msgstr "远程应用授权列表" @@ -3534,15 +3681,15 @@ msgstr "创建远程应用授权规则" msgid "Update RemoteApp permission" msgstr "更新远程应用授权规则" -#: perms/views/remote_app_permission.py:82 +#: perms/views/remote_app_permission.py:85 msgid "RemoteApp permission detail" msgstr "远程应用授权详情" -#: perms/views/remote_app_permission.py:116 +#: perms/views/remote_app_permission.py:117 msgid "RemoteApp permission user list" msgstr "远程应用授权用户列表" -#: perms/views/remote_app_permission.py:149 +#: perms/views/remote_app_permission.py:150 msgid "RemoteApp permission RemoteApp list" msgstr "远程应用授权远程应用列表" @@ -3871,7 +4018,7 @@ msgid "ex: Last\\s*login|success|成功" msgstr "" "登录telnet服务器成功后的提示正则表达式，如: Last\\s*login|success|成功 " -#: settings/models.py:97 users/templates/users/reset_password.html:68 +#: settings/models.py:95 users/templates/users/reset_password.html:29 #: users/templates/users/user_profile.html:20 msgid "Setting" msgstr "设置" @@ -3889,7 +4036,8 @@ msgid "Refresh cache" msgstr "刷新缓存" #: settings/templates/settings/_ldap_list_users_modal.html:33 -#: users/models/user.py:435 users/templates/users/user_detail.html:72 +#: users/forms/profile.py:89 users/models/user.py:440 +#: users/templates/users/user_detail.html:72 #: users/templates/users/user_profile.html:59 msgid "Email" msgstr "邮件" @@ -3903,6 +4051,13 @@ msgid "" "User is not currently selected, please check the user you want to import" 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 "导入" + #: settings/templates/settings/_setting_tabs.html:4 #: settings/templates/settings/terminal_setting.html:31 settings/views.py:20 msgid "Basic setting" @@ -3955,7 +4110,7 @@ msgstr "这里" #: settings/views.py:19 settings/views.py:46 settings/views.py:73 #: settings/views.py:105 settings/views.py:134 settings/views.py:161 -#: templates/_nav.html:178 +#: templates/_nav.html:185 msgid "Settings" msgstr "系统设置" @@ -3964,11 +4119,37 @@ msgstr "系统设置" msgid "Update setting successfully" msgstr "更新设置成功" +#: templates/_csv_import_modal.html:12 templates/_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 +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 +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 +msgid "Download the update template" +msgstr "下载更新模版" + #: templates/_header_bar.html:12 msgid "Help" msgstr "帮助" -#: templates/_header_bar.html:19 users/templates/users/_base_otp.html:29 +#: templates/_header_bar.html:19 templates/_without_nav_base.html:27 msgid "Docs" msgstr "文档" @@ -3977,7 +4158,7 @@ msgid "Commercial support" msgstr "商业支持" #: templates/_header_bar.html:70 templates/_nav.html:30 -#: templates/_nav_user.html:32 users/forms.py:173 +#: templates/_nav_user.html:37 users/forms/profile.py:31 #: users/templates/users/_user.html:44 #: users/templates/users/first_login.html:39 #: users/templates/users/user_password_update.html:40 @@ -4004,18 +4185,6 @@ msgstr "" msgid "Logout" msgstr "注销登录" -#: templates/_import_modal.html:12 -msgid "Download the imported template or use the exported CSV file format" -msgstr "下载导入的模板或使用导出的csv格式" - -#: templates/_import_modal.html:13 -msgid "Download the import template" -msgstr "下载导入模版" - -#: templates/_import_modal.html:17 templates/_update_modal.html:17 -msgid "Select the CSV file to import" -msgstr "请选择csv文件导入" - #: templates/_message.html:6 msgid "" "\n" @@ -4091,7 +4260,7 @@ msgstr "" #: templates/_nav.html:17 users/views/group.py:28 users/views/group.py:45 #: users/views/group.py:63 users/views/group.py:82 users/views/group.py:99 -#: users/views/login.py:153 users/views/profile.py:88 +#: users/views/login.py:158 users/views/profile.py:88 #: users/views/profile.py:123 users/views/user.py:48 users/views/user.py:65 #: users/views/user.py:109 users/views/user.py:176 users/views/user.py:204 #: users/views/user.py:218 @@ -4106,65 +4275,65 @@ msgstr "用户列表" msgid "Command filters" msgstr "命令过滤" -#: templates/_nav.html:88 terminal/views/command.py:21 +#: templates/_nav.html:95 terminal/views/command.py:21 #: terminal/views/session.py:43 terminal/views/session.py:54 #: terminal/views/session.py:78 terminal/views/terminal.py:32 #: terminal/views/terminal.py:48 terminal/views/terminal.py:61 msgid "Sessions" msgstr "会话管理" -#: templates/_nav.html:91 +#: templates/_nav.html:98 msgid "Session online" msgstr "在线会话" -#: templates/_nav.html:92 terminal/views/session.py:55 +#: templates/_nav.html:99 terminal/views/session.py:55 msgid "Session offline" msgstr "历史会话" -#: templates/_nav.html:93 +#: templates/_nav.html:100 msgid "Commands" msgstr "命令记录" -#: templates/_nav.html:96 templates/_nav_user.html:37 +#: templates/_nav.html:103 templates/_nav_user.html:42 msgid "Web terminal" msgstr "Web终端" -#: templates/_nav.html:97 templates/_nav_user.html:42 +#: templates/_nav.html:104 templates/_nav_user.html:47 msgid "File manager" msgstr "文件管理" -#: templates/_nav.html:101 terminal/views/storage.py:27 +#: templates/_nav.html:108 terminal/views/storage.py:27 #: terminal/views/storage.py:42 terminal/views/storage.py:96 #: terminal/views/storage.py:120 terminal/views/storage.py:149 #: terminal/views/storage.py:175 msgid "Terminal" msgstr "终端管理" -#: templates/_nav.html:112 +#: templates/_nav.html:119 msgid "Job Center" msgstr "作业中心" -#: templates/_nav.html:116 templates/_nav.html:144 +#: templates/_nav.html:123 templates/_nav.html:151 msgid "Batch command" msgstr "批量命令" -#: templates/_nav.html:118 +#: templates/_nav.html:125 msgid "Task monitor" msgstr "任务监控" -#: templates/_nav.html:128 tickets/views.py:19 tickets/views.py:37 +#: templates/_nav.html:135 tickets/views.py:19 tickets/views.py:37 msgid "Tickets" msgstr "工单管理" -#: templates/_nav.html:154 +#: templates/_nav.html:161 msgid "XPack" msgstr "" -#: templates/_nav.html:162 xpack/plugins/cloud/views.py:28 +#: templates/_nav.html:169 xpack/plugins/cloud/views.py:28 msgid "Account list" msgstr "账户列表" -#: templates/_nav.html:163 +#: templates/_nav.html:170 msgid "Sync instance" msgstr "同步实例" @@ -4177,19 +4346,15 @@ msgid "" "Displays the results of items _START_ to _END_; A total of _TOTAL_ entries" msgstr "显示第 _START_ 至 _END_ 项结果; 总共 _TOTAL_ 项" -#: templates/_update_modal.html:12 -msgid "Download the update template or use the exported CSV file format" -msgstr "下载更新的模板或使用导出的csv格式" - -#: templates/_update_modal.html:13 -msgid "Download the update template" -msgstr "下载更新模版" - +#: templates/_without_nav_base.html:25 +msgid "Home page" +msgstr "首页" + #: templates/captcha/image.html:3 msgid "Play CAPTCHA as audio file" msgstr "语言播放验证码" -#: templates/captcha/text_field.html:4 +#: templates/captcha/text_field.html:4 users/forms/profile.py:90 msgid "Captcha" msgstr "验证码" @@ -4429,8 +4594,8 @@ msgid "" msgstr "" #: terminal/forms/storage.py:143 xpack/plugins/cloud/models.py:304 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:106 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:59 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:109 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62 msgid "Region" msgstr "地域" @@ -4512,15 +4677,15 @@ msgstr "线程数" msgid "Boot Time" msgstr "运行时间" -#: terminal/models.py:184 terminal/templates/terminal/session_list.html:135 +#: terminal/models.py:185 terminal/templates/terminal/session_list.html:135 msgid "Replay" msgstr "回放" -#: terminal/models.py:189 +#: terminal/models.py:190 msgid "Date end" msgstr "结束日期" -#: terminal/models.py:282 +#: terminal/models.py:283 msgid "Args" msgstr "参数" @@ -4568,6 +4733,10 @@ msgstr "监控" msgid "Terminate session" msgstr "终止会话" +#: terminal/templates/terminal/session_detail.html:144 +msgid "Terminate success" +msgstr "终断成功" + #: terminal/templates/terminal/session_list.html:30 msgid "Login from" msgstr "登录来源" @@ -4824,71 +4993,16 @@ msgstr "工单列表" msgid "Ticket detail" msgstr "工单详情" -#: users/api/user.py:174 +#: users/api/user.py:177 msgid "Could not reset self otp, use profile reset instead" msgstr "不能再该页面重置MFA, 请去个人信息页面重置" -#: users/forms.py:47 users/models/user.py:443 -#: users/templates/users/_select_user_modal.html:15 -#: users/templates/users/user_detail.html:88 -#: users/templates/users/user_list.html:37 -#: users/templates/users/user_profile.html:55 -msgid "Role" -msgstr "角色" - -#: users/forms.py:51 users/models/user.py:478 -#: users/templates/users/user_detail.html:104 -#: users/templates/users/user_list.html:39 -#: users/templates/users/user_profile.html:102 -msgid "Source" -msgstr "用户来源" - -#: users/forms.py:54 users/forms.py:252 -#: users/templates/users/user_update.html:30 -msgid "ssh public key" -msgstr "ssh公钥" - -#: users/forms.py:55 users/forms.py:253 -msgid "ssh-rsa AAAA..." -msgstr "" - -#: users/forms.py:56 -msgid "Paste user id_rsa.pub here." -msgstr "复制用户公钥到这里" - -#: users/forms.py:71 users/templates/users/user_detail.html:230 -msgid "Join user groups" -msgstr "添加到用户组" - -#: users/forms.py:106 users/forms.py:267 -msgid "Public key should not be the same as your old one." -msgstr "不能和原来的密钥相同" - -#: users/forms.py:110 users/forms.py:271 users/serializers/user.py:122 -msgid "Not a valid ssh public key" -msgstr "ssh密钥不合法" - -#: users/forms.py:123 users/views/login.py:114 users/views/profile.py:105 -msgid "* Your password does not meet the requirements" -msgstr "* 您的密码不符合要求" - -#: users/forms.py:144 -msgid "Reset link will be generated and sent to the user" -msgstr "生成重置密码链接，通过邮件发送给用户" - -#: users/forms.py:145 -msgid "Set password" -msgstr "设置密码" - -#: users/forms.py:152 xpack/plugins/change_auth_plan/models.py:89 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:47 -#: 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" -msgstr "密码策略" +#: users/forms/group.py:19 users/forms/user.py:143 users/forms/user.py:148 +#: xpack/plugins/orgs/forms.py:18 +msgid "Select users" +msgstr "选择用户" -#: users/forms.py:179 +#: users/forms/profile.py:37 msgid "" "When enabled, you will enter the MFA binding process the next time you log " "in. you can also directly bind in \"personal information -> quick " @@ -4897,11 +5011,11 @@ msgstr "" "启用之后您将会在下次登录时进入MFA绑定流程；您也可以在（个人信息->快速修改->更" "改MFA设置）中直接绑定！" -#: users/forms.py:189 +#: users/forms/profile.py:47 msgid "* Enable MFA authentication to make the account more secure." msgstr "* 启用MFA认证，使账号更加安全。" -#: users/forms.py:199 +#: users/forms/profile.py:57 msgid "" "In order to protect you and your company, please keep your account, password " "and key sensitive information properly. (for example: setting complex " @@ -4910,92 +5024,139 @@ msgstr "" "为了保护您和公司的安全，请妥善保管您的账户、密码和密钥等重要敏感信息；（如：" "设置复杂密码，启用MFA认证）" -#: users/forms.py:206 users/templates/users/first_login.html:48 +#: users/forms/profile.py:64 users/templates/users/first_login.html:48 #: users/templates/users/first_login.html:110 #: users/templates/users/first_login.html:139 msgid "Finish" msgstr "完成" -#: users/forms.py:212 -msgid "Old password" -msgstr "原来密码" - -#: users/forms.py:217 +#: users/forms/profile.py:71 msgid "New password" msgstr "新密码" -#: users/forms.py:222 +#: users/forms/profile.py:76 msgid "Confirm password" msgstr "确认密码" -#: users/forms.py:232 -msgid "Old password error" -msgstr "原来密码错误" - -#: users/forms.py:240 +#: users/forms/profile.py:84 msgid "Password does not match" msgstr "密码不一致" -#: users/forms.py:250 +#: users/forms/profile.py:96 +msgid "Old password" +msgstr "原来密码" + +#: users/forms/profile.py:106 +msgid "Old password error" +msgstr "原来密码错误" + +#: users/forms/profile.py:116 msgid "Automatically configure and download the SSH key" msgstr "自动配置并下载SSH密钥" -#: users/forms.py:254 +#: users/forms/profile.py:118 users/forms/user.py:34 +#: users/templates/users/user_update.html:30 +msgid "ssh public key" +msgstr "ssh公钥" + +#: users/forms/profile.py:119 users/forms/user.py:35 +msgid "ssh-rsa AAAA..." +msgstr "" + +#: users/forms/profile.py:120 msgid "Paste your id_rsa.pub here." msgstr "复制你的公钥到这里" -#: users/forms.py:288 users/forms.py:293 users/forms.py:343 -#: xpack/plugins/orgs/forms.py:18 -msgid "Select users" -msgstr "选择用户" +#: users/forms/profile.py:133 users/forms/user.py:86 +msgid "Public key should not be the same as your old one." +msgstr "不能和原来的密钥相同" -#: users/models/user.py:51 users/templates/users/user_update.html:22 -#: users/views/login.py:46 users/views/login.py:107 -msgid "User auth from {}, go there change password" -msgstr "用户认证源来自 {}, 请去相应系统修改密码" +#: users/forms/profile.py:137 users/forms/user.py:90 +#: users/serializers/user.py:122 +msgid "Not a valid ssh public key" +msgstr "ssh密钥不合法" + +#: users/forms/user.py:27 users/models/user.py:448 +#: users/templates/users/_select_user_modal.html:15 +#: users/templates/users/user_detail.html:88 +#: users/templates/users/user_list.html:16 +#: users/templates/users/user_profile.html:55 +msgid "Role" +msgstr "角色" + +#: users/forms/user.py:31 users/models/user.py:483 +#: users/templates/users/user_detail.html:104 +#: users/templates/users/user_list.html:18 +#: users/templates/users/user_profile.html:102 +msgid "Source" +msgstr "用户来源" + +#: users/forms/user.py:36 +msgid "Paste user id_rsa.pub here." +msgstr "复制用户公钥到这里" + +#: users/forms/user.py:51 users/templates/users/user_detail.html:230 +msgid "Join user groups" +msgstr "添加到用户组" -#: users/models/user.py:147 users/models/user.py:571 +#: users/forms/user.py:103 users/views/login.py:119 users/views/profile.py:105 +msgid "* Your password does not meet the requirements" +msgstr "* 您的密码不符合要求" + +#: users/forms/user.py:124 +msgid "Reset link will be generated and sent to the user" +msgstr "生成重置密码链接，通过邮件发送给用户" + +#: users/forms/user.py:125 +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 +#: 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" +msgstr "密码策略" + +#: users/models/user.py:142 users/models/user.py:576 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:149 -msgid "Application" -msgstr "应用程序" - -#: users/models/user.py:150 xpack/plugins/orgs/forms.py:30 +#: users/models/user.py:145 xpack/plugins/orgs/forms.py:30 #: xpack/plugins/orgs/templates/orgs/org_list.html:14 msgid "Auditor" msgstr "审计员" -#: users/models/user.py:160 +#: users/models/user.py:155 msgid "Org admin" msgstr "组织管理员" -#: users/models/user.py:162 +#: users/models/user.py:157 msgid "Org auditor" msgstr "组织审计员" -#: users/models/user.py:357 users/templates/users/user_profile.html:90 +#: users/models/user.py:362 users/templates/users/user_profile.html:90 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:423 +#: users/models/user.py:428 msgid "Local" msgstr "数据库" -#: users/models/user.py:446 +#: users/models/user.py:451 msgid "Avatar" msgstr "头像" -#: users/models/user.py:449 users/templates/users/user_detail.html:83 +#: users/models/user.py:454 users/templates/users/user_detail.html:83 msgid "Wechat" msgstr "微信" -#: users/models/user.py:482 +#: users/models/user.py:487 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:574 +#: users/models/user.py:579 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -5043,23 +5204,19 @@ msgstr "角色名" msgid "name not unique" msgstr "名称重复" -#: users/templates/users/_base_otp.html:27 -msgid "Home page" -msgstr "首页" - -#: users/templates/users/_base_otp.html:44 +#: users/templates/users/_base_otp.html:14 msgid "Security token validation" msgstr "安全令牌验证" -#: users/templates/users/_base_otp.html:44 users/templates/users/_user.html:13 +#: 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:57 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:60 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:13 msgid "Account" msgstr "账户" -#: users/templates/users/_base_otp.html:44 +#: users/templates/users/_base_otp.html:14 msgid "Follow these steps to complete the binding operation" msgstr "请按照以下步骤完成绑定操作" @@ -5075,24 +5232,6 @@ msgstr "资产数量" msgid "Security and Role" msgstr "角色安全" -#: users/templates/users/_user_groups_import_modal.html:4 -msgid "Import user groups" -msgstr "导入用户组" - -#: users/templates/users/_user_groups_update_modal.html:4 -#: users/views/group.py:64 -msgid "Update user group" -msgstr "更新用户组" - -#: users/templates/users/_user_import_modal.html:4 -msgid "Import users" -msgstr "导入用户" - -#: users/templates/users/_user_update_modal.html:4 -#: users/templates/users/user_update.html:4 users/views/user.py:110 -msgid "Update user" -msgstr "更新用户" - #: users/templates/users/_user_update_pk_modal.html:4 msgid "Update User SSH Public Key" msgstr "更新ssh密钥" @@ -5131,100 +5270,66 @@ msgstr "向导" msgid " for more information" msgstr "获取更多信息" -#: users/templates/users/forgot_password.html:31 +#: users/templates/users/forgot_password.html:20 msgid "Input your email, that will send a mail to your" msgstr "输入您的邮箱, 将会发一封重置邮件到您的邮箱中" -#: users/templates/users/reset_password.html:28 -msgid "" -"Jumpserver is an open source desktop system developed using Python and " -"Django that helps Internet businesses with efficient users, assets, " -"permissions, and audit management" -msgstr "" -"Jumpserver是一款使用Python, Django开发的开源跳板机系统, 助力互联网企业高效 用" -"户、资产、权限、审计 管理" - -#: users/templates/users/reset_password.html:32 -msgid "" -"We are from all over the world, we have great admiration and worship for the " -"spirit of open source, we have endless pursuit for perfection, neatness and " -"elegance" -msgstr "" -"我们自五湖四海，我们对开源精神无比敬仰和崇拜，我们对完美、整洁、优雅 无止境的" -"追求" - -#: users/templates/users/reset_password.html:36 -msgid "" -"We focus on automatic operation and maintenance, and strive to build an easy-" -"to-use, stable, safe and automatic board hopping machine, which is our " -"unremitting pursuit and power" -msgstr "" -"专注自动化运维，努力打造 易用、稳定、安全、自动化 的跳板机, 这是我们的不懈的" -"追求和动力" - -#: users/templates/users/reset_password.html:40 -msgid "Always young, always with tears in my eyes. Stay foolish Stay hungry" -msgstr "永远年轻，永远热泪盈眶 stay foolish stay hungry" - -#: users/templates/users/reset_password.html:46 -#: users/templates/users/user_detail.html:439 users/utils.py:83 +#: users/templates/users/reset_password.html:5 +#: users/templates/users/reset_password.html:6 +#: users/templates/users/user_detail.html:417 users/utils.py:83 msgid "Reset password" msgstr "重置密码" -#: users/templates/users/reset_password.html:59 +#: users/templates/users/reset_password.html:23 #: users/templates/users/user_create.html:13 #: users/templates/users/user_password_update.html:65 #: users/templates/users/user_update.html:13 msgid "Your password must satisfy" msgstr "您的密码必须满足：" -#: users/templates/users/reset_password.html:60 +#: users/templates/users/reset_password.html:24 #: users/templates/users/user_create.html:14 #: users/templates/users/user_password_update.html:66 #: users/templates/users/user_update.html:14 msgid "Password strength" msgstr "密码强度：" -#: users/templates/users/reset_password.html:66 -msgid "Password again" -msgstr "再次输入密码" - -#: users/templates/users/reset_password.html:105 +#: users/templates/users/reset_password.html:48 #: users/templates/users/user_create.html:33 #: users/templates/users/user_password_update.html:103 #: users/templates/users/user_update.html:55 msgid "Very weak" msgstr "很弱" -#: users/templates/users/reset_password.html:106 +#: users/templates/users/reset_password.html:49 #: users/templates/users/user_create.html:34 #: users/templates/users/user_password_update.html:104 #: users/templates/users/user_update.html:56 msgid "Weak" msgstr "弱" -#: users/templates/users/reset_password.html:107 +#: users/templates/users/reset_password.html:50 #: users/templates/users/user_create.html:35 #: users/templates/users/user_password_update.html:105 #: users/templates/users/user_update.html:57 msgid "Normal" msgstr "正常" -#: users/templates/users/reset_password.html:108 +#: users/templates/users/reset_password.html:51 #: users/templates/users/user_create.html:36 #: users/templates/users/user_password_update.html:106 #: users/templates/users/user_update.html:58 msgid "Medium" msgstr "一般" -#: users/templates/users/reset_password.html:109 +#: users/templates/users/reset_password.html:52 #: users/templates/users/user_create.html:37 #: users/templates/users/user_password_update.html:107 #: users/templates/users/user_update.html:59 msgid "Strong" msgstr "强" -#: users/templates/users/reset_password.html:110 +#: users/templates/users/reset_password.html:53 #: users/templates/users/user_create.html:38 #: users/templates/users/user_password_update.html:108 #: users/templates/users/user_update.html:60 @@ -5246,7 +5351,7 @@ msgid "Asset granted" msgstr "授权的资产" #: users/templates/users/user_create.html:4 -#: users/templates/users/user_list.html:28 users/views/user.py:66 +#: users/templates/users/user_list.html:7 users/views/user.py:66 msgid "Create user" msgstr "创建用户" @@ -5286,7 +5391,7 @@ msgid "Send reset ssh key mail" msgstr "发送重置密钥邮件" #: users/templates/users/user_detail.html:206 -#: users/templates/users/user_detail.html:527 +#: users/templates/users/user_detail.html:505 msgid "Unblock user" msgstr "解除登录限制" @@ -5294,49 +5399,58 @@ msgstr "解除登录限制" msgid "Unblock" msgstr "解除" -#: users/templates/users/user_detail.html:382 +#: users/templates/users/user_detail.html:380 msgid "Goto profile page enable MFA" msgstr "请去个人信息页面启用自己的MFA" -#: users/templates/users/user_detail.html:438 +#: users/templates/users/user_detail.html:416 msgid "An e-mail has been sent to the user`s mailbox." msgstr "已发送邮件到用户邮箱" -#: users/templates/users/user_detail.html:449 +#: users/templates/users/user_detail.html:427 msgid "This will reset the user password and send a reset mail" msgstr "将失效用户当前密码，并发送重设密码邮件到用户邮箱" -#: users/templates/users/user_detail.html:464 +#: users/templates/users/user_detail.html:442 msgid "" "The reset-ssh-public-key E-mail has been sent successfully. Please inform " "the user to update his new ssh public key." msgstr "重设密钥邮件将会发送到用户邮箱" -#: users/templates/users/user_detail.html:465 +#: users/templates/users/user_detail.html:443 msgid "Reset SSH public key" msgstr "重置SSH密钥" -#: users/templates/users/user_detail.html:475 +#: users/templates/users/user_detail.html:453 msgid "This will reset the user public key and send a reset mail" msgstr "将会失效用户当前密钥，并发送重置邮件到用户邮箱" -#: users/templates/users/user_detail.html:493 +#: users/templates/users/user_detail.html:471 msgid "Successfully updated the SSH public key." msgstr "更新ssh密钥成功" -#: users/templates/users/user_detail.html:494 -#: users/templates/users/user_detail.html:498 +#: users/templates/users/user_detail.html:472 +#: users/templates/users/user_detail.html:476 msgid "User SSH public key update" msgstr "ssh密钥" -#: users/templates/users/user_detail.html:543 +#: users/templates/users/user_detail.html:521 msgid "After unlocking the user, the user can log in normally." msgstr "解除用户登录限制后，此用户即可正常登录" -#: users/templates/users/user_detail.html:557 +#: users/templates/users/user_detail.html:535 msgid "Reset user MFA success" msgstr "重置用户MFA成功" +#: users/templates/users/user_disable_mfa.html:6 +#: users/templates/users/user_password_check.html:6 +msgid "Authenticate" +msgstr "验证身份" + +#: users/templates/users/user_disable_mfa.html:32 +msgid "Unbind" +msgstr "解绑 MFA" + #: users/templates/users/user_group_detail.html:17 #: users/templates/users/user_group_granted_asset.html:18 #: users/views/group.py:83 @@ -5344,65 +5458,69 @@ msgid "User group detail" msgstr "用户组详情" #: users/templates/users/user_group_detail.html:81 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:116 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:121 msgid "Add user" msgstr "添加用户" -#: users/templates/users/user_group_list.html:28 users/views/group.py:46 +#: users/templates/users/user_group_list.html:7 users/views/group.py:46 msgid "Create user group" msgstr "创建用户组" -#: users/templates/users/user_group_list.html:115 -msgid "This will delete the selected groups !!!" -msgstr "删除选择组" - -#: users/templates/users/user_group_list.html:124 -msgid "UserGroups Deleted." -msgstr "用户组删除" +#: users/templates/users/user_group_list.html:90 +#: users/templates/users/user_list.html:135 +#: users/templates/users/user_profile.html:124 +msgid "User groups" +msgstr "用户组" -#: users/templates/users/user_group_list.html:125 -#: users/templates/users/user_group_list.html:130 -msgid "UserGroups Delete" -msgstr "用户组删除" +#: users/templates/users/user_list.html:32 +msgid "Remove selected" +msgstr "批量移除" -#: users/templates/users/user_group_list.html:129 -msgid "UserGroup Deleting failed." -msgstr "用户组删除失败" +#: users/templates/users/user_list.html:106 +#: users/templates/users/user_list.html:110 +msgid "Remove" +msgstr "移除" -#: users/templates/users/user_list.html:251 +#: users/templates/users/user_list.html:179 msgid "This will delete the selected users !!!" msgstr "删除选中用户 !!!" -#: users/templates/users/user_list.html:262 -msgid "User Deleted." -msgstr "已被删除" +#: users/templates/users/user_list.html:190 +msgid "User Deleting failed." +msgstr "用户删除失败" -#: users/templates/users/user_list.html:263 -#: users/templates/users/user_list.html:267 +#: users/templates/users/user_list.html:191 msgid "User Delete" msgstr "删除" +#: users/templates/users/user_list.html:213 +msgid "This will remove the selected users !!" +msgstr "移除选中用户 !!!" + +#: users/templates/users/user_list.html:215 +msgid "User Removing failed." +msgstr "用户移除失败" + +#: users/templates/users/user_list.html:216 +msgid "User Remove" +msgstr "移除" + +#: users/templates/users/user_list.html:265 +msgid "Are you sure about removing it?" +msgstr "您确定移除吗?" + #: users/templates/users/user_list.html:266 -msgid "User Deleting failed." -msgstr "用户删除失败" +msgid "Remove the success" +msgstr "移除成功" -#: users/templates/users/user_list.html:327 +#: users/templates/users/user_list.html:271 msgid "User is expired" msgstr "用户已失效" -#: users/templates/users/user_list.html:330 +#: users/templates/users/user_list.html:274 msgid "User is inactive" msgstr "用户已禁用" -#: users/templates/users/user_otp_authentication.html:6 -#: users/templates/users/user_password_authentication.html:6 -msgid "Authenticate" -msgstr "验证身份" - -#: users/templates/users/user_otp_authentication.html:32 -msgid "Unbind" -msgstr "解绑 MFA" - #: users/templates/users/user_otp_enable_bind.html:6 msgid "Bind" msgstr "绑定 MFA" @@ -5439,10 +5557,6 @@ msgstr "安装完成后点击下一步进入绑定页面（如已安装，直接 msgid "Administrator Settings force MFA login" msgstr "管理员设置强制使用MFA登录" -#: users/templates/users/user_profile.html:124 -msgid "User groups" -msgstr "用户组" - #: users/templates/users/user_profile.html:156 msgid "Set MFA" msgstr "设置MFA" @@ -5485,6 +5599,15 @@ msgid "" "corresponding private key." msgstr "新的公钥已设置成功，请下载对应的私钥" +#: users/templates/users/user_update.html:4 users/views/user.py:110 +msgid "Update user" +msgstr "更新用户" + +#: users/templates/users/user_update.html:22 users/views/login.py:48 +#: users/views/login.py:113 +msgid "User auth from {}, go there change password" +msgstr "用户认证源来自 {}, 请去相应系统修改密码" + # msgid "Update user" # msgstr "更新用户" #: users/utils.py:24 @@ -5691,40 +5814,40 @@ msgstr "" msgid "User group list" msgstr "用户组列表" +#: users/views/group.py:64 +msgid "Update user group" +msgstr "更新用户组" + #: users/views/group.py:100 msgid "User group granted asset" msgstr "用户组授权资产" -#: users/views/login.py:43 +#: users/views/login.py:45 msgid "Email address invalid, please input again" msgstr "邮箱地址错误，重新输入" -#: users/views/login.py:59 +#: users/views/login.py:61 msgid "Send reset password message" msgstr "发送重置密码邮件" -#: users/views/login.py:60 +#: users/views/login.py:62 msgid "Send reset password mail success, login your mail box and follow it " msgstr "" "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)" -#: users/views/login.py:73 +#: users/views/login.py:75 msgid "Reset password success" msgstr "重置密码成功" -#: users/views/login.py:74 +#: users/views/login.py:76 msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" -#: users/views/login.py:89 users/views/login.py:105 +#: users/views/login.py:100 users/views/login.py:110 msgid "Token invalid or expired" msgstr "Token错误或失效" -#: users/views/login.py:101 -msgid "Password not same" -msgstr "密码不一致" - -#: users/views/login.py:153 +#: users/views/login.py:158 msgid "First login" msgstr "首次登录" @@ -5740,23 +5863,23 @@ msgstr "密码更新" msgid "Public key update" msgstr "密钥更新" -#: users/views/profile.py:166 +#: users/views/profile.py:152 msgid "Password invalid" msgstr "用户名或密码无效" -#: users/views/profile.py:266 +#: users/views/profile.py:256 msgid "MFA enable success" msgstr "MFA 绑定成功" -#: users/views/profile.py:267 +#: users/views/profile.py:257 msgid "MFA enable success, return login page" msgstr "MFA 绑定成功，返回到登录页面" -#: users/views/profile.py:269 +#: users/views/profile.py:259 msgid "MFA disable success" msgstr "MFA 解绑成功" -#: users/views/profile.py:270 +#: users/views/profile.py:260 msgid "MFA disable success, return login page" msgstr "MFA 解绑成功，返回登录页面" @@ -5777,16 +5900,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:56 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:79 +#: 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_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:37 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:69 +#: 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_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:28 +#: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:32 msgid "Periodic perform" msgstr "定时执行" @@ -5842,9 +5965,9 @@ 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:98 +#: 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:88 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:91 #: xpack/plugins/gathered_user/models.py:35 #: xpack/plugins/gathered_user/models.py:72 msgid "Cycle perform" @@ -5852,16 +5975,16 @@ 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:90 +#: 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:80 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83 #: 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:72 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:74 msgid "Password rules" msgstr "密码规则" @@ -5915,46 +6038,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:19 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:24 +#: 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_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:62 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:66 msgid "Add asset to this plan" msgstr "添加资产" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:87 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:91 msgid "Add node to this plan" msgstr "添加节点" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:8 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:11 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:74 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:76 msgid "Length" msgstr "长度" -#: 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 "是" - -#: 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 "否" - -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:132 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:134 msgid "Run plan manually" msgstr "手动执行计划" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:176 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:178 #: 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" @@ -5965,7 +6078,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:84 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:89 msgid "Log" msgstr "日志" @@ -6044,7 +6157,7 @@ msgid "Unavailable" msgstr "无效" #: xpack/plugins/cloud/models.py:63 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:51 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:54 #: xpack/plugins/cloud/templates/cloud/account_list.html:13 msgid "Provider" msgstr "云服务商" @@ -6058,7 +6171,7 @@ msgid "Access key secret" msgstr "" #: xpack/plugins/cloud/models.py:88 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:26 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:30 msgid "Cloud account" msgstr "云账号" @@ -6071,7 +6184,7 @@ msgid "Instances" msgstr "实例" #: xpack/plugins/cloud/models.py:176 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:94 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:97 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:17 msgid "Date last sync" msgstr "最后同步日期" @@ -6089,8 +6202,8 @@ 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:66 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:63 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:71 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:66 msgid "Date sync" msgstr "同步日期" @@ -6107,8 +6220,8 @@ msgid "Sync instance task history" msgstr "同步实例任务历史" #: xpack/plugins/cloud/models.py:301 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:114 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:58 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:117 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:61 msgid "Instance" msgstr "实例" @@ -6128,7 +6241,7 @@ msgstr "AWS (国际)" msgid "Qcloud" msgstr "腾讯云" -#: xpack/plugins/cloud/templates/cloud/account_detail.html:17 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:20 #: xpack/plugins/cloud/views.py:79 msgid "Account detail" msgstr "账户详情" @@ -6138,61 +6251,61 @@ msgstr "账户详情" msgid "Create account" msgstr "创建账户" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:29 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:33 msgid "Region & Instance" msgstr "地域 & 实例" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:33 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:37 msgid "Node & AdminUser" msgstr "节点 & 管理用户" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:63 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:67 msgid "Load failed" msgstr "加载失败" -#: 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/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/views.py:144 msgid "Sync task detail" msgstr "同步任务详情" -#: 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/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/views.py:160 msgid "Sync task history" msgstr "同步历史列表" -#: 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/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/views.py:212 msgid "Sync instance list" msgstr "同步实例列表" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:135 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:138 msgid "Run task manually" msgstr "手动执行任务" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:178 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:181 #: 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:60 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:65 msgid "Total count" msgstr "总数" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:61 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:66 msgid "Succeed count" msgstr "成功" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:62 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:67 msgid "Failed count" msgstr "失败" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:63 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:68 msgid "Exist count" msgstr "存在" @@ -6240,19 +6353,19 @@ msgid "Periodic" msgstr "定时执行" #: xpack/plugins/gathered_user/models.py:57 -#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:43 +#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:38 msgid "Gather user task" msgstr "收集用户任务" -#: xpack/plugins/gathered_user/models.py:140 +#: xpack/plugins/gathered_user/models.py:137 msgid "Task" msgstr "任务" -#: xpack/plugins/gathered_user/models.py:152 +#: xpack/plugins/gathered_user/models.py:149 msgid "gather user task execution" msgstr "收集用户执行" -#: xpack/plugins/gathered_user/models.py:158 +#: xpack/plugins/gathered_user/models.py:155 msgid "Assets is empty, please change nodes" msgstr "资产为空，请更改节点" @@ -6350,8 +6463,8 @@ msgid "It is already in the default setting state!" msgstr "当前已经是初始化状态！" #: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:94 -#: xpack/plugins/license/templates/license/license_detail.html:50 -#: xpack/plugins/license/templates/license/license_detail.html:55 +#: xpack/plugins/license/templates/license/license_detail.html:41 +#: xpack/plugins/license/templates/license/license_detail.html:46 #: xpack/plugins/license/views.py:32 msgid "License" msgstr "许可证" @@ -6365,7 +6478,7 @@ msgid "Enterprise edition" msgstr "企业版" #: xpack/plugins/license/templates/license/_license_import_modal.html:4 -#: xpack/plugins/license/templates/license/license_detail.html:108 +#: xpack/plugins/license/templates/license/license_detail.html:99 msgid "Import license" msgstr "导入许可证" @@ -6373,64 +6486,64 @@ msgstr "导入许可证" msgid "License file" msgstr "许可证文件" -#: xpack/plugins/license/templates/license/license_detail.html:12 +#: xpack/plugins/license/templates/license/license_detail.html:11 msgid "Please Import License" msgstr "请导入许可证" -#: xpack/plugins/license/templates/license/license_detail.html:17 -#: xpack/plugins/license/templates/license/license_detail.html:56 +#: xpack/plugins/license/templates/license/license_detail.html:13 +#: xpack/plugins/license/templates/license/license_detail.html:47 msgid "License has expired" msgstr "许可证已经过期" -#: xpack/plugins/license/templates/license/license_detail.html:22 +#: xpack/plugins/license/templates/license/license_detail.html:15 msgid "The license will at " msgstr "许可证将在 " -#: xpack/plugins/license/templates/license/license_detail.html:22 +#: xpack/plugins/license/templates/license/license_detail.html:15 msgid " expired." msgstr " 过期。" -#: xpack/plugins/license/templates/license/license_detail.html:37 +#: xpack/plugins/license/templates/license/license_detail.html:28 #: xpack/plugins/license/views.py:33 msgid "License detail" msgstr "许可证详情" -#: xpack/plugins/license/templates/license/license_detail.html:51 +#: xpack/plugins/license/templates/license/license_detail.html:42 msgid "No license" msgstr "暂无许可证" -#: xpack/plugins/license/templates/license/license_detail.html:60 +#: xpack/plugins/license/templates/license/license_detail.html:51 msgid "Subscription ID" msgstr "订阅授权ID" -#: xpack/plugins/license/templates/license/license_detail.html:64 +#: xpack/plugins/license/templates/license/license_detail.html:55 msgid "Corporation" msgstr "公司" -#: xpack/plugins/license/templates/license/license_detail.html:68 +#: xpack/plugins/license/templates/license/license_detail.html:59 msgid "Expired" msgstr "过期时间" -#: xpack/plugins/license/templates/license/license_detail.html:73 -#: xpack/plugins/license/templates/license/license_detail.html:77 -#: xpack/plugins/license/templates/license/license_detail.html:81 -#: xpack/plugins/license/templates/license/license_detail.html:85 +#: xpack/plugins/license/templates/license/license_detail.html:64 +#: xpack/plugins/license/templates/license/license_detail.html:68 +#: xpack/plugins/license/templates/license/license_detail.html:72 +#: xpack/plugins/license/templates/license/license_detail.html:76 msgid "Unlimited" msgstr "无限制" -#: xpack/plugins/license/templates/license/license_detail.html:84 +#: xpack/plugins/license/templates/license/license_detail.html:75 msgid "Concurrent connections" msgstr "并发连接" -#: xpack/plugins/license/templates/license/license_detail.html:89 +#: xpack/plugins/license/templates/license/license_detail.html:80 msgid "Edition" msgstr "版本" -#: xpack/plugins/license/templates/license/license_detail.html:115 +#: xpack/plugins/license/templates/license/license_detail.html:106 msgid "Technology consulting" msgstr "技术咨询" -#: xpack/plugins/license/templates/license/license_detail.html:118 +#: xpack/plugins/license/templates/license/license_detail.html:109 msgid "Consult" msgstr "咨询" @@ -6447,7 +6560,7 @@ msgid "Select auditor" msgstr "选择审计员" #: xpack/plugins/orgs/forms.py:29 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:71 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:76 #: xpack/plugins/orgs/templates/orgs/org_list.html:13 msgid "Admin" msgstr "管理员" @@ -6458,12 +6571,12 @@ msgstr "管理员" msgid "Organizations" msgstr "组织管理" -#: xpack/plugins/orgs/templates/orgs/org_detail.html:17 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:22 #: xpack/plugins/orgs/views.py:80 msgid "Org detail" msgstr "组织详情" -#: xpack/plugins/orgs/templates/orgs/org_detail.html:79 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:84 msgid "Add admin" msgstr "添加管理员" @@ -6500,10 +6613,89 @@ msgstr "密码匣子" msgid "vault create" msgstr "创建" -#, fuzzy -#~| msgid "Platform list" -#~ msgid "Platform create" -#~ msgstr "平台列表" +#~ msgid "Browser" +#~ msgstr "浏览器" + +#~ msgid "Virtualization tools" +#~ msgstr "虚拟化工具" + +#~ msgid "Import admin user" +#~ msgstr "导入管理用户" + +#~ msgid "Import assets" +#~ msgstr "导入资产" + +#~ msgid "Import system user" +#~ msgstr "导入系统用户" + +#~ msgid "This will delete the selected System Users !!!" +#~ msgstr "删除选择系统用户" + +#~ msgid "System Users Deleted." +#~ msgstr "已被删除" + +#~ msgid "System Users Delete" +#~ msgstr "删除系统用户" + +#~ msgid "System Users Deleting failed." +#~ msgstr "系统用户删除失败" + +#~ msgid "Versions" +#~ msgstr "版本" + +#~ msgid "Import user groups" +#~ msgstr "导入用户组" + +#~ msgid "Import users" +#~ msgstr "导入用户" + +#~ msgid "" +#~ "Jumpserver is an open source desktop system developed using Python and " +#~ "Django that helps Internet businesses with efficient users, assets, " +#~ "permissions, and audit management" +#~ msgstr "" +#~ "Jumpserver是一款使用Python, Django开发的开源跳板机系统, 助力互联网企业高" +#~ "效 用户、资产、权限、审计 管理" + +#~ msgid "" +#~ "We are from all over the world, we have great admiration and worship for " +#~ "the spirit of open source, we have endless pursuit for perfection, " +#~ "neatness and elegance" +#~ msgstr "" +#~ "我们自五湖四海，我们对开源精神无比敬仰和崇拜，我们对完美、整洁、优雅 无止" +#~ "境的追求" + +#~ msgid "" +#~ "We focus on automatic operation and maintenance, and strive to build an " +#~ "easy-to-use, stable, safe and automatic board hopping machine, which is " +#~ "our unremitting pursuit and power" +#~ msgstr "" +#~ "专注自动化运维，努力打造 易用、稳定、安全、自动化 的跳板机, 这是我们的不懈" +#~ "的追求和动力" + +#~ msgid "Always young, always with tears in my eyes. Stay foolish Stay hungry" +#~ msgstr "永远年轻，永远热泪盈眶 stay foolish stay hungry" + +#~ msgid "Password again" +#~ msgstr "再次输入密码" + +#~ msgid "This will delete the selected groups !!!" +#~ msgstr "删除选择组" + +#~ msgid "UserGroups Deleted." +#~ msgstr "用户组删除" + +#~ msgid "UserGroups Delete" +#~ msgstr "用户组删除" + +#~ msgid "UserGroup Deleting failed." +#~ msgstr "用户组删除失败" + +#~ msgid "User Deleted." +#~ msgstr "已被删除" + +#~ msgid "Password not same" +#~ msgstr "密码不一致" #, fuzzy #~| msgid "Password update" @@ -6563,9 +6755,6 @@ msgstr "创建" #~ msgid "Delete failed" #~ msgstr "删除失败" -#~ msgid "Are you sure about deleting it?" -#~ msgstr "您确定删除吗?" - #~ msgid "The connection fails" #~ msgstr "连接失败" @@ -6595,9 +6784,6 @@ msgstr "创建" #~ msgid "Approve selected" #~ msgstr "同意所选" -#~ msgid "Reject selected" -#~ msgstr "拒绝所选" - #~ msgid "" #~ "\n" #~ "
\n" diff --git a/apps/terminal/templates/terminal/session_detail.html b/apps/terminal/templates/terminal/session_detail.html index 37f256d70..ea5ba9b00 100644 --- a/apps/terminal/templates/terminal/session_detail.html +++ b/apps/terminal/templates/terminal/session_detail.html @@ -136,7 +136,13 @@ $ {{ command.input }} }, 300) } var the_url = "{% url 'api-terminal:tasks-list' %}"; - requestApi({url: the_url, method: 'POST', body: JSON.stringify(data), success: success, success_message: 'Terminate success'}); + requestApi({ + url: the_url, + method: 'POST', + body: JSON.stringify(data), + success: success, + success_message: "{% trans 'Terminate success'%}" + }); } $(document).ready(function () { $('.footable').footable();