From 3eaf4cd1421f1e4d194bbc0589af3d1cd0c47fe5 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Wed, 22 May 2019 10:01:41 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=20(#2714)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 72271 -> 75055 bytes apps/locale/zh/LC_MESSAGES/django.po | 681 ++++++--------------------- 2 files changed, 155 insertions(+), 526 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 820dc398eb1f58f52cc32addee4b8e37cd6a0cf8..58ec179b83bd35b8c88e98ab8aefe011277ccf4c 100644 GIT binary patch delta 24164 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 delta 21658 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 97df573d9..823a3b07c 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-21 11:01+0800\n" +"POT-Creation-Date: 2019-05-21 21:09+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -77,14 +77,15 @@ msgstr "运行参数" #: applications/templates/applications/user_remote_app_list.html:18 #: assets/forms/domain.py:15 assets/forms/label.py:13 #: assets/models/asset.py:279 assets/models/authbook.py:27 -#: assets/templates/assets/admin_user_list.html:28 +#: assets/serializers/admin_user.py:23 assets/serializers/system_user.py:28 +#: assets/templates/assets/admin_user_list.html:49 #: assets/templates/assets/domain_detail.html:60 #: assets/templates/assets/domain_list.html:26 #: assets/templates/assets/label_list.html:16 -#: assets/templates/assets/system_user_list.html:33 audits/models.py:19 +#: assets/templates/assets/system_user_list.html:55 audits/models.py:19 #: audits/templates/audits/ftp_log_list.html:41 #: audits/templates/audits/ftp_log_list.html:71 -#: perms/forms/asset_permission.py:46 perms/models/asset_permission.py:55 +#: perms/forms/asset_permission.py:46 perms/models/asset_permission.py:37 #: perms/templates/perms/asset_permission_create_update.html:45 #: perms/templates/perms/asset_permission_list.html:56 #: perms/templates/perms/asset_permission_list.html:125 @@ -112,8 +113,8 @@ msgstr "资产" #: assets/models/user.py:247 assets/templates/assets/user_asset_list.html:168 #: audits/models.py:20 audits/templates/audits/ftp_log_list.html:49 #: audits/templates/audits/ftp_log_list.html:72 -#: perms/forms/asset_permission.py:52 perms/models/asset_permission.py:57 -#: perms/models/asset_permission.py:112 +#: perms/forms/asset_permission.py:52 perms/models/asset_permission.py:39 +#: perms/models/asset_permission.py:59 #: perms/templates/perms/asset_permission_detail.html:140 #: perms/templates/perms/asset_permission_list.html:58 #: perms/templates/perms/asset_permission_list.html:79 @@ -136,7 +137,7 @@ msgstr "系统用户" #: assets/models/cmd_filter.py:20 assets/models/domain.py:20 #: assets/models/group.py:20 assets/models/label.py:18 #: assets/templates/assets/admin_user_detail.html:56 -#: assets/templates/assets/admin_user_list.html:26 +#: assets/templates/assets/admin_user_list.html:47 #: assets/templates/assets/cmd_filter_detail.html:61 #: assets/templates/assets/cmd_filter_list.html:24 #: assets/templates/assets/domain_detail.html:56 @@ -144,10 +145,10 @@ msgstr "系统用户" #: assets/templates/assets/domain_list.html:25 #: assets/templates/assets/label_list.html:14 #: assets/templates/assets/system_user_detail.html:58 -#: assets/templates/assets/system_user_list.html:29 ops/models/adhoc.py:37 +#: assets/templates/assets/system_user_list.html:51 ops/models/adhoc.py:37 #: ops/templates/ops/task_detail.html:60 ops/templates/ops/task_list.html:27 #: orgs/models.py:12 perms/models/asset_permission.py:22 -#: perms/models/asset_permission.py:52 perms/models/remote_app_permission.py:33 +#: perms/models/base.py:35 #: perms/templates/perms/asset_permission_detail.html:62 #: perms/templates/perms/asset_permission_list.html:53 #: perms/templates/perms/asset_permission_list.html:72 @@ -167,8 +168,8 @@ msgstr "系统用户" #: users/models/user.py:61 users/templates/users/_select_user_modal.html:13 #: users/templates/users/user_detail.html:63 #: users/templates/users/user_group_detail.html:55 -#: users/templates/users/user_group_list.html:12 -#: users/templates/users/user_list.html:23 +#: users/templates/users/user_group_list.html:35 +#: users/templates/users/user_list.html:35 #: users/templates/users/user_profile.html:51 #: users/templates/users/user_pubkey_update.html:53 #: xpack/plugins/change_auth_plan/forms.py:97 @@ -212,11 +213,11 @@ msgstr "参数" #: assets/templates/assets/domain_detail.html:72 #: assets/templates/assets/system_user_detail.html:100 #: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:15 -#: perms/models/asset_permission.py:62 perms/models/asset_permission.py:115 -#: perms/models/remote_app_permission.py:40 +#: perms/models/asset_permission.py:62 perms/models/base.py:41 #: perms/templates/perms/asset_permission_detail.html:98 #: perms/templates/perms/remote_app_permission_detail.html:90 -#: users/models/user.py:102 users/templates/users/user_detail.html:111 +#: users/models/user.py:102 users/serializers/v1.py:72 +#: users/templates/users/user_detail.html:111 #: xpack/plugins/change_auth_plan/models.py:103 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113 #: xpack/plugins/cloud/models.py:55 xpack/plugins/cloud/models.py:127 @@ -227,14 +228,14 @@ msgstr "创建者" #: applications/templates/applications/remote_app_detail.html:73 #: assets/models/asset.py:110 assets/models/cluster.py:26 #: assets/models/domain.py:23 assets/models/group.py:22 -#: assets/models/label.py:25 assets/templates/assets/admin_user_detail.html:64 +#: assets/models/label.py:25 assets/serializers/admin_user.py:37 +#: assets/templates/assets/admin_user_detail.html:64 #: assets/templates/assets/cmd_filter_detail.html:69 #: assets/templates/assets/domain_detail.html:68 #: assets/templates/assets/system_user_detail.html:96 #: ops/templates/ops/adhoc_detail.html:90 ops/templates/ops/task_detail.html:64 #: orgs/models.py:16 perms/models/asset_permission.py:63 -#: perms/models/asset_permission.py:116 -#: perms/models/remote_app_permission.py:41 +#: perms/models/base.py:42 #: perms/templates/perms/asset_permission_detail.html:94 #: perms/templates/perms/remote_app_permission_detail.html:86 #: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17 @@ -256,7 +257,7 @@ msgstr "创建日期" #: assets/models/cmd_filter.py:55 assets/models/domain.py:21 #: assets/models/domain.py:53 assets/models/group.py:23 #: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:72 -#: assets/templates/assets/admin_user_list.html:32 +#: assets/templates/assets/admin_user_list.html:53 #: assets/templates/assets/asset_detail.html:136 #: assets/templates/assets/cmd_filter_detail.html:65 #: assets/templates/assets/cmd_filter_list.html:27 @@ -265,18 +266,17 @@ msgstr "创建日期" #: assets/templates/assets/domain_gateway_list.html:72 #: assets/templates/assets/domain_list.html:28 #: assets/templates/assets/system_user_detail.html:104 -#: assets/templates/assets/system_user_list.html:37 +#: assets/templates/assets/system_user_list.html:59 #: assets/templates/assets/user_asset_list.html:171 ops/models/adhoc.py:43 #: orgs/models.py:17 perms/models/asset_permission.py:64 -#: perms/models/asset_permission.py:117 -#: perms/models/remote_app_permission.py:42 +#: perms/models/base.py:43 #: perms/templates/perms/asset_permission_detail.html:102 #: perms/templates/perms/remote_app_permission_detail.html:94 #: settings/models.py:34 terminal/models.py:32 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15 #: users/models/user.py:94 users/templates/users/user_detail.html:127 #: users/templates/users/user_group_detail.html:67 -#: users/templates/users/user_group_list.html:14 +#: users/templates/users/user_group_list.html:37 #: users/templates/users/user_profile.html:134 #: xpack/plugins/change_auth_plan/models.py:99 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117 @@ -292,7 +292,7 @@ msgid "Comment" msgstr "备注" #: applications/models/remote_app.py:53 perms/forms/remote_app_permission.py:37 -#: perms/models/remote_app_permission.py:36 +#: perms/models/remote_app_permission.py:15 #: perms/templates/perms/remote_app_permission_create_update.html:48 #: perms/templates/perms/remote_app_permission_detail.html:27 #: perms/templates/perms/remote_app_permission_list.html:17 @@ -343,7 +343,7 @@ msgstr "重置" #: assets/templates/assets/admin_user_create_update.html:46 #: assets/templates/assets/asset_bulk_update.html:24 #: assets/templates/assets/asset_create.html:68 -#: assets/templates/assets/asset_list.html:113 +#: assets/templates/assets/asset_list.html:125 #: assets/templates/assets/asset_update.html:72 #: assets/templates/assets/cmd_filter_create_update.html:16 #: assets/templates/assets/cmd_filter_rule_create_update.html:41 @@ -366,7 +366,7 @@ msgstr "重置" #: users/templates/users/_user.html:51 #: users/templates/users/forgot_password.html:42 #: users/templates/users/user_bulk_update.html:24 -#: users/templates/users/user_list.html:45 +#: users/templates/users/user_list.html:57 #: users/templates/users/user_password_update.html:72 #: users/templates/users/user_profile_update.html:64 #: users/templates/users/user_pubkey_update.html:77 @@ -404,9 +404,11 @@ msgstr "详情" #: applications/templates/applications/remote_app_detail.html:21 #: applications/templates/applications/remote_app_list.html:56 #: assets/templates/assets/admin_user_detail.html:24 -#: assets/templates/assets/admin_user_list.html:88 +#: assets/templates/assets/admin_user_list.html:29 +#: assets/templates/assets/admin_user_list.html:111 #: assets/templates/assets/asset_detail.html:27 -#: assets/templates/assets/asset_list.html:178 +#: assets/templates/assets/asset_list.html:86 +#: assets/templates/assets/asset_list.html:190 #: assets/templates/assets/cmd_filter_detail.html:29 #: assets/templates/assets/cmd_filter_list.html:58 #: assets/templates/assets/cmd_filter_rule_list.html:86 @@ -416,7 +418,8 @@ msgstr "详情" #: assets/templates/assets/domain_list.html:54 #: assets/templates/assets/label_list.html:39 #: assets/templates/assets/system_user_detail.html:26 -#: assets/templates/assets/system_user_list.html:93 audits/models.py:33 +#: assets/templates/assets/system_user_list.html:33 +#: assets/templates/assets/system_user_list.html:117 audits/models.py:33 #: perms/templates/perms/asset_permission_detail.html:30 #: perms/templates/perms/asset_permission_list.html:181 #: perms/templates/perms/remote_app_permission_detail.html:30 @@ -425,9 +428,11 @@ msgstr "详情" #: terminal/templates/terminal/terminal_list.html:72 #: users/templates/users/user_detail.html:25 #: users/templates/users/user_group_detail.html:28 -#: users/templates/users/user_group_list.html:45 -#: users/templates/users/user_list.html:83 -#: users/templates/users/user_list.html:86 +#: users/templates/users/user_group_list.html:20 +#: users/templates/users/user_group_list.html:69 +#: users/templates/users/user_list.html:20 +#: users/templates/users/user_list.html:96 +#: users/templates/users/user_list.html:99 #: users/templates/users/user_profile.html:177 #: users/templates/users/user_profile.html:187 #: users/templates/users/user_profile.html:196 @@ -443,9 +448,9 @@ msgstr "更新" #: applications/templates/applications/remote_app_detail.html:25 #: applications/templates/applications/remote_app_list.html:57 #: assets/templates/assets/admin_user_detail.html:28 -#: assets/templates/assets/admin_user_list.html:89 +#: assets/templates/assets/admin_user_list.html:112 #: assets/templates/assets/asset_detail.html:31 -#: assets/templates/assets/asset_list.html:179 +#: assets/templates/assets/asset_list.html:191 #: assets/templates/assets/cmd_filter_detail.html:33 #: assets/templates/assets/cmd_filter_list.html:59 #: assets/templates/assets/cmd_filter_rule_list.html:87 @@ -455,7 +460,7 @@ msgstr "更新" #: assets/templates/assets/domain_list.html:55 #: assets/templates/assets/label_list.html:40 #: assets/templates/assets/system_user_detail.html:30 -#: assets/templates/assets/system_user_list.html:94 audits/models.py:34 +#: assets/templates/assets/system_user_list.html:118 audits/models.py:34 #: ops/templates/ops/task_list.html:64 #: perms/templates/perms/asset_permission_detail.html:34 #: perms/templates/perms/asset_permission_list.html:182 @@ -466,9 +471,9 @@ msgstr "更新" #: terminal/templates/terminal/terminal_list.html:74 #: users/templates/users/user_detail.html:30 #: users/templates/users/user_group_detail.html:32 -#: users/templates/users/user_group_list.html:47 -#: users/templates/users/user_list.html:91 -#: users/templates/users/user_list.html:95 +#: users/templates/users/user_group_list.html:71 +#: users/templates/users/user_list.html:104 +#: users/templates/users/user_list.html:108 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:33 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:57 #: xpack/plugins/cloud/templates/cloud/account_detail.html:27 @@ -502,23 +507,23 @@ msgstr "创建远程应用" #: applications/templates/applications/user_remote_app_list.html:21 #: assets/models/cmd_filter.py:54 #: assets/templates/assets/admin_user_assets.html:52 -#: assets/templates/assets/admin_user_list.html:33 +#: assets/templates/assets/admin_user_list.html:54 #: assets/templates/assets/asset_asset_user_list.html:48 -#: assets/templates/assets/asset_list.html:96 +#: assets/templates/assets/asset_list.html:108 #: assets/templates/assets/cmd_filter_list.html:28 #: assets/templates/assets/cmd_filter_rule_list.html:63 #: assets/templates/assets/domain_gateway_list.html:73 #: assets/templates/assets/domain_list.html:29 #: assets/templates/assets/label_list.html:17 #: assets/templates/assets/system_user_asset.html:54 -#: assets/templates/assets/system_user_list.html:38 +#: assets/templates/assets/system_user_list.html:60 #: assets/templates/assets/user_asset_list.html:48 audits/models.py:38 #: audits/templates/audits/operate_log_list.html:41 #: audits/templates/audits/operate_log_list.html:67 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:64 #: ops/templates/ops/task_history.html:65 ops/templates/ops/task_list.html:34 #: perms/forms/asset_permission.py:55 perms/models/asset_permission.py:26 -#: perms/models/asset_permission.py:58 +#: perms/models/asset_permission.py:40 #: perms/templates/perms/asset_permission_create_update.html:50 #: perms/templates/perms/asset_permission_list.html:60 #: perms/templates/perms/asset_permission_list.html:134 @@ -527,8 +532,8 @@ msgstr "创建远程应用" #: settings/templates/settings/terminal_setting.html:104 #: terminal/templates/terminal/session_list.html:81 #: terminal/templates/terminal/terminal_list.html:36 -#: users/templates/users/user_group_list.html:15 -#: users/templates/users/user_list.html:29 +#: users/templates/users/user_group_list.html:38 +#: users/templates/users/user_list.html:41 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:60 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:18 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:20 @@ -551,9 +556,9 @@ msgstr "连接" #: assets/templates/assets/system_user_detail.html:22 #: assets/views/admin_user.py:29 assets/views/admin_user.py:47 #: assets/views/admin_user.py:63 assets/views/admin_user.py:78 -#: assets/views/admin_user.py:102 assets/views/asset.py:51 -#: assets/views/asset.py:67 assets/views/asset.py:104 assets/views/asset.py:145 -#: assets/views/asset.py:162 assets/views/asset.py:186 +#: assets/views/admin_user.py:102 assets/views/asset.py:53 +#: assets/views/asset.py:69 assets/views/asset.py:106 assets/views/asset.py:147 +#: assets/views/asset.py:164 assets/views/asset.py:188 #: assets/views/cmd_filter.py:30 assets/views/cmd_filter.py:46 #: assets/views/cmd_filter.py:62 assets/views/cmd_filter.py:78 #: assets/views/cmd_filter.py:97 assets/views/cmd_filter.py:130 @@ -584,7 +589,7 @@ msgstr "远程应用详情" msgid "My RemoteApp" msgstr "我的远程应用" -#: assets/api/asset.py:112 +#: assets/api/asset.py:126 msgid "Please select assets that need to be updated" msgstr "请选择需要更新的资产" @@ -604,7 +609,7 @@ msgstr "测试节点下资产是否可连接: {}" #: assets/templates/assets/asset_detail.html:194 #: assets/templates/assets/asset_detail.html:202 #: assets/templates/assets/system_user_asset.html:95 -#: perms/models/asset_permission.py:56 +#: perms/models/asset_permission.py:38 #: xpack/plugins/change_auth_plan/models.py:69 msgid "Nodes" msgstr "节点管理" @@ -642,7 +647,7 @@ msgstr "网域" #: assets/templates/assets/asset_create.html:30 #: assets/templates/assets/asset_update.html:35 #: perms/forms/asset_permission.py:49 perms/forms/asset_permission.py:59 -#: perms/models/asset_permission.py:110 +#: perms/models/asset_permission.py:57 #: perms/templates/perms/asset_permission_list.html:57 #: perms/templates/perms/asset_permission_list.html:78 #: perms/templates/perms/asset_permission_list.html:128 @@ -680,37 +685,6 @@ msgstr "如果有多个的互相隔离的网络，设置资产属于的网域， msgid "Select assets" msgstr "选择资产" -#: assets/forms/domain.py:15 assets/forms/label.py:13 -#: assets/models/asset.py:279 assets/models/authbook.py:27 -#: assets/serializers/admin_user.py:31 assets/serializers/system_user.py:32 -#: assets/templates/assets/admin_user_list.html:49 -#: assets/templates/assets/domain_detail.html:60 -#: assets/templates/assets/domain_list.html:26 -#: assets/templates/assets/label_list.html:16 -#: assets/templates/assets/system_user_list.html:55 audits/models.py:19 -#: audits/templates/audits/ftp_log_list.html:41 -#: audits/templates/audits/ftp_log_list.html:71 perms/forms.py:42 -#: perms/models.py:50 -#: perms/templates/perms/asset_permission_create_update.html:45 -#: perms/templates/perms/asset_permission_list.html:56 -#: perms/templates/perms/asset_permission_list.html:125 -#: terminal/backends/command/models.py:13 terminal/models.py:155 -#: terminal/templates/terminal/command_list.html:40 -#: terminal/templates/terminal/command_list.html:73 -#: terminal/templates/terminal/session_list.html:41 -#: terminal/templates/terminal/session_list.html:72 -#: xpack/plugins/change_auth_plan/forms.py:114 -#: xpack/plugins/change_auth_plan/models.py:409 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:46 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:54 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:13 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:14 -#: xpack/plugins/cloud/models.py:187 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:63 -#: xpack/plugins/orgs/templates/orgs/org_list.html:16 -msgid "Asset" -msgstr "资产" - #: assets/forms/domain.py:51 msgid "Password should not contain special characters" msgstr "不能包含特殊字符" @@ -719,60 +693,11 @@ msgstr "不能包含特殊字符" msgid "SSH gateway support proxy SSH,RDP,VNC" msgstr "SSH网关，支持代理SSH,RDP和VNC" -#: assets/forms/domain.py:73 assets/forms/user.py:84 assets/forms/user.py:146 -#: assets/models/base.py:26 assets/models/cluster.py:18 -#: assets/models/cmd_filter.py:20 assets/models/domain.py:20 -#: assets/models/group.py:20 assets/models/label.py:18 -#: assets/templates/assets/admin_user_detail.html:56 -#: assets/templates/assets/admin_user_list.html:47 -#: assets/templates/assets/cmd_filter_detail.html:61 -#: assets/templates/assets/cmd_filter_list.html:24 -#: assets/templates/assets/domain_detail.html:56 -#: assets/templates/assets/domain_gateway_list.html:67 -#: assets/templates/assets/domain_list.html:25 -#: assets/templates/assets/label_list.html:14 -#: assets/templates/assets/system_user_detail.html:58 -#: assets/templates/assets/system_user_list.html:51 ops/models/adhoc.py:37 -#: ops/templates/ops/task_detail.html:60 ops/templates/ops/task_list.html:27 -#: orgs/models.py:12 perms/models.py:17 perms/models.py:47 -#: perms/templates/perms/asset_permission_detail.html:62 -#: perms/templates/perms/asset_permission_list.html:53 -#: perms/templates/perms/asset_permission_list.html:72 -#: perms/templates/perms/asset_permission_user.html:54 settings/models.py:29 -#: settings/templates/settings/_ldap_list_users_modal.html:38 -#: settings/templates/settings/command_storage_create.html:41 -#: settings/templates/settings/replay_storage_create.html:44 -#: settings/templates/settings/terminal_setting.html:80 -#: settings/templates/settings/terminal_setting.html:102 terminal/models.py:22 -#: terminal/models.py:241 terminal/templates/terminal/terminal_detail.html:43 -#: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14 -#: users/models/user.py:61 users/templates/users/_select_user_modal.html:13 -#: users/templates/users/user_detail.html:63 -#: users/templates/users/user_group_detail.html:55 -#: users/templates/users/user_group_list.html:35 -#: users/templates/users/user_list.html:35 -#: users/templates/users/user_profile.html:51 -#: users/templates/users/user_pubkey_update.html:53 -#: xpack/plugins/change_auth_plan/forms.py:97 -#: xpack/plugins/change_auth_plan/models.py:58 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12 -#: xpack/plugins/cloud/models.py:49 xpack/plugins/cloud/models.py:119 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:50 -#: xpack/plugins/cloud/templates/cloud/account_list.html:12 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:53 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:12 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:52 -#: xpack/plugins/orgs/templates/orgs/org_list.html:12 -msgid "Name" -msgstr "名称" - #: assets/forms/domain.py:74 assets/forms/user.py:85 assets/forms/user.py:147 #: assets/models/base.py:27 #: assets/templates/assets/_asset_user_auth_modal.html:15 #: assets/templates/assets/_asset_user_view_auth_modal.html:31 #: assets/templates/assets/admin_user_detail.html:60 - #: assets/templates/assets/admin_user_list.html:48 #: assets/templates/assets/asset_asset_user_list.html:44 #: assets/templates/assets/domain_gateway_list.html:71 @@ -1007,94 +932,19 @@ msgstr "主机名原始" msgid "Labels" msgstr "标签管理" -#: assets/models/asset.py:109 assets/models/base.py:34 -#: assets/models/cluster.py:28 assets/models/cmd_filter.py:25 -#: assets/models/cmd_filter.py:58 assets/models/group.py:21 -#: assets/templates/assets/admin_user_detail.html:68 -#: assets/templates/assets/asset_detail.html:128 -#: assets/templates/assets/cmd_filter_detail.html:77 -#: assets/templates/assets/domain_detail.html:72 -#: assets/templates/assets/system_user_detail.html:100 -#: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:15 perms/models.py:57 -#: perms/models.py:110 perms/templates/perms/asset_permission_detail.html:98 -#: users/models/user.py:102 users/serializers/v1.py:69 -#: users/templates/users/user_detail.html:111 -#: xpack/plugins/change_auth_plan/models.py:103 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113 -#: xpack/plugins/cloud/models.py:55 xpack/plugins/cloud/models.py:127 -msgid "Created by" -msgstr "创建者" - -#: assets/models/asset.py:110 assets/models/cluster.py:26 -#: assets/models/domain.py:23 assets/models/group.py:22 -#: assets/models/label.py:25 assets/serializers/admin_user.py:23 -#: assets/templates/assets/admin_user_detail.html:64 -#: assets/templates/assets/cmd_filter_detail.html:69 -#: assets/templates/assets/domain_detail.html:68 -#: assets/templates/assets/system_user_detail.html:96 -#: ops/templates/ops/adhoc_detail.html:90 ops/templates/ops/task_detail.html:64 -#: orgs/models.py:16 perms/models.py:58 perms/models.py:111 -#: perms/templates/perms/asset_permission_detail.html:94 -#: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17 -#: users/templates/users/user_group_detail.html:63 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:105 -#: xpack/plugins/cloud/models.py:56 xpack/plugins/cloud/models.py:128 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:66 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:77 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:60 -msgid "Date created" -msgstr "创建日期" - -#: assets/models/asset.py:111 assets/models/base.py:31 -#: assets/models/cluster.py:29 assets/models/cmd_filter.py:22 -#: assets/models/cmd_filter.py:55 assets/models/domain.py:21 -#: assets/models/domain.py:53 assets/models/group.py:23 -#: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:72 -#: assets/templates/assets/admin_user_list.html:53 -#: assets/templates/assets/asset_detail.html:136 -#: assets/templates/assets/cmd_filter_detail.html:65 -#: assets/templates/assets/cmd_filter_list.html:27 -#: assets/templates/assets/cmd_filter_rule_list.html:62 -#: assets/templates/assets/domain_detail.html:76 -#: assets/templates/assets/domain_gateway_list.html:72 -#: assets/templates/assets/domain_list.html:28 -#: assets/templates/assets/system_user_detail.html:104 -#: assets/templates/assets/system_user_list.html:59 -#: assets/templates/assets/user_asset_list.html:171 ops/models/adhoc.py:43 -#: orgs/models.py:17 perms/models.py:59 perms/models.py:112 -#: perms/templates/perms/asset_permission_detail.html:102 settings/models.py:34 -#: terminal/models.py:32 terminal/templates/terminal/terminal_detail.html:63 -#: users/models/group.py:15 users/models/user.py:94 -#: users/templates/users/user_detail.html:127 -#: users/templates/users/user_group_detail.html:67 -#: users/templates/users/user_group_list.html:37 -#: users/templates/users/user_profile.html:134 -#: xpack/plugins/change_auth_plan/models.py:99 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19 -#: xpack/plugins/cloud/models.py:54 xpack/plugins/cloud/models.py:125 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:70 -#: xpack/plugins/cloud/templates/cloud/account_list.html:15 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:69 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:16 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:64 -#: xpack/plugins/orgs/templates/orgs/org_list.html:22 -msgid "Comment" -msgstr "备注" - #: assets/models/asset.py:117 assets/models/base.py:38 -#: assets/serializers/admin_user.py:29 assets/serializers/system_user.py:22 +#: assets/serializers/admin_user.py:22 assets/serializers/system_user.py:19 #: assets/templates/assets/admin_user_list.html:51 #: assets/templates/assets/system_user_list.html:57 msgid "Unreachable" msgstr "不可达" #: assets/models/asset.py:118 assets/models/base.py:39 -#: assets/serializers/admin_user.py:32 assets/serializers/system_user.py:31 +#: assets/serializers/admin_user.py:24 assets/serializers/system_user.py:27 #: assets/templates/assets/admin_user_assets.html:51 #: assets/templates/assets/admin_user_list.html:50 -#: assets/templates/assets/asset_list.html:107 #: assets/templates/assets/asset_asset_user_list.html:46 +#: assets/templates/assets/asset_list.html:107 #: assets/templates/assets/system_user_asset.html:53 #: assets/templates/assets/system_user_list.html:56 #: users/templates/users/user_group_granted_asset.html:47 @@ -1243,42 +1093,6 @@ msgstr "内容" msgid "One line one command" msgstr "每行一个命令" -#: assets/models/cmd_filter.py:54 -#: assets/templates/assets/admin_user_assets.html:52 -#: assets/templates/assets/admin_user_list.html:54 -#: assets/templates/assets/asset_list.html:108 -#: assets/templates/assets/asset_asset_user_list.html:48 -#: assets/templates/assets/cmd_filter_list.html:28 -#: assets/templates/assets/cmd_filter_rule_list.html:63 -#: assets/templates/assets/domain_gateway_list.html:73 -#: assets/templates/assets/domain_list.html:29 -#: assets/templates/assets/label_list.html:17 -#: assets/templates/assets/system_user_asset.html:54 -#: assets/templates/assets/system_user_list.html:60 -#: assets/templates/assets/user_asset_list.html:48 audits/models.py:38 -#: audits/templates/audits/operate_log_list.html:41 -#: audits/templates/audits/operate_log_list.html:67 -#: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:64 -#: ops/templates/ops/task_history.html:65 ops/templates/ops/task_list.html:34 -#: perms/forms.py:51 perms/models.py:21 perms/models.py:53 -#: perms/templates/perms/asset_permission_create_update.html:50 -#: perms/templates/perms/asset_permission_list.html:60 -#: perms/templates/perms/asset_permission_list.html:134 -#: settings/templates/settings/terminal_setting.html:82 -#: settings/templates/settings/terminal_setting.html:104 -#: terminal/templates/terminal/session_list.html:81 -#: terminal/templates/terminal/terminal_list.html:36 -#: users/templates/users/user_group_list.html:38 -#: users/templates/users/user_list.html:41 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:60 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:18 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:20 -#: xpack/plugins/cloud/templates/cloud/account_list.html:16 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:18 -#: xpack/plugins/orgs/templates/orgs/org_list.html:23 -msgid "Action" -msgstr "动作" - #: assets/models/cmd_filter.py:64 msgid "Command filter rule" msgstr "命令过滤规则" @@ -1308,7 +1122,7 @@ msgstr "默认资产组" #: ops/templates/ops/command_execution_list.html:35 #: ops/templates/ops/command_execution_list.html:60 #: perms/forms/asset_permission.py:40 perms/forms/remote_app_permission.py:31 -#: perms/models/asset_permission.py:53 perms/models/remote_app_permission.py:34 +#: perms/models/base.py:36 #: perms/templates/perms/asset_permission_create_update.html:41 #: perms/templates/perms/asset_permission_list.html:54 #: perms/templates/perms/asset_permission_list.html:119 @@ -1321,7 +1135,7 @@ msgstr "默认资产组" #: terminal/templates/terminal/session_list.html:71 users/forms.py:283 #: users/models/user.py:36 users/models/user.py:467 users/serializers/v1.py:61 #: users/templates/users/user_group_detail.html:78 -#: users/templates/users/user_group_list.html:36 users/views/user.py:395 +#: users/templates/users/user_group_list.html:36 users/views/user.py:394 #: xpack/plugins/orgs/forms.py:26 #: xpack/plugins/orgs/templates/orgs/org_detail.html:113 #: xpack/plugins/orgs/templates/orgs/org_list.html:14 @@ -1377,25 +1191,25 @@ msgstr "登录模式" msgid "%(value)s is not an even number" msgstr "%(value)s is not an even number" -#: assets/serializers/admin_user.py:26 -#: assets/templates/assets/asset_asset_user_list.html:51 +#: assets/serializers/admin_user.py:38 +#: assets/templates/assets/asset_asset_user_list.html:47 #: assets/templates/assets/cmd_filter_detail.html:73 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:109 msgid "Date updated" msgstr "更新日期" -#: assets/serializers/asset.py:20 -msgid "Org name" -msgstr "组织名" - -#: assets/serializers/asset.py:22 +#: assets/serializers/asset.py:43 msgid "Hardware info" msgstr "硬件信息" -#: assets/serializers/asset.py:25 +#: assets/serializers/asset.py:44 msgid "Connectivity" msgstr "连接" +#: assets/serializers/asset.py:45 +msgid "Org name" +msgstr "组织名" + #: assets/serializers/asset_user.py:23 users/forms.py:230 #: users/models/user.py:91 users/templates/users/first_login.html:42 #: users/templates/users/user_password_update.html:46 @@ -1405,18 +1219,18 @@ msgstr "连接" msgid "Public key" msgstr "ssh公钥" -#: assets/serializers/system_user.py:19 -msgid "Login mode display" -msgstr "登录模式显示" - -#: assets/serializers/system_user.py:25 +#: assets/serializers/system_user.py:22 msgid "Unreachable assets" msgstr "不可达资产" -#: assets/serializers/system_user.py:29 +#: assets/serializers/system_user.py:25 msgid "Reachable assets" msgstr "可连接资产" +#: assets/serializers/system_user.py:41 +msgid "Login mode display" +msgstr "登录模式显示" + #: assets/tasks.py:31 msgid "Asset has been disabled, skipped: {}" msgstr "资产或许不支持ansible, 跳过: {}" @@ -1527,7 +1341,7 @@ msgstr "启用MFA" msgid "Import assets" msgstr "导入资产" -#: assets/templates/assets/_asset_list_modal.html:7 assets/views/asset.py:52 +#: assets/templates/assets/_asset_list_modal.html:7 assets/views/asset.py:54 #: templates/_nav.html:22 xpack/plugins/change_auth_plan/views.py:110 msgid "Asset list" msgstr "资产列表" @@ -1563,11 +1377,11 @@ msgstr "需要二次认证来查看账号信息" #: assets/templates/assets/_asset_user_view_auth_modal.html:20 #: assets/templates/assets/admin_user_detail.html:100 #: assets/templates/assets/asset_detail.html:211 -#: assets/templates/assets/asset_list.html:637 +#: assets/templates/assets/asset_list.html:700 #: assets/templates/assets/cmd_filter_detail.html:106 #: assets/templates/assets/system_user_asset.html:112 #: assets/templates/assets/system_user_detail.html:182 -#: assets/templates/assets/system_user_list.html:144 +#: assets/templates/assets/system_user_list.html:168 #: settings/templates/settings/terminal_setting.html:165 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:108 #: users/templates/users/user_detail.html:388 @@ -1575,8 +1389,8 @@ msgstr "需要二次认证来查看账号信息" #: users/templates/users/user_detail.html:437 #: users/templates/users/user_detail.html:482 #: users/templates/users/user_group_create_update.html:32 -#: users/templates/users/user_group_list.html:90 -#: users/templates/users/user_list.html:215 +#: users/templates/users/user_group_list.html:114 +#: users/templates/users/user_list.html:269 #: users/templates/users/user_profile.html:238 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:34 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:36 @@ -1645,75 +1459,6 @@ msgstr "自动生成密钥" msgid "Other" msgstr "其它" -#: assets/templates/assets/_system_user.html:75 -#: assets/templates/assets/admin_user_create_update.html:45 -#: assets/templates/assets/asset_bulk_update.html:23 -#: assets/templates/assets/asset_create.html:67 -#: assets/templates/assets/asset_update.html:71 -#: assets/templates/assets/cmd_filter_create_update.html:15 -#: assets/templates/assets/cmd_filter_rule_create_update.html:40 -#: assets/templates/assets/domain_create_update.html:16 -#: assets/templates/assets/gateway_create_update.html:58 -#: assets/templates/assets/label_create_update.html:18 -#: perms/templates/perms/asset_permission_create_update.html:83 -#: settings/templates/settings/basic_setting.html:61 -#: settings/templates/settings/command_storage_create.html:79 -#: settings/templates/settings/email_setting.html:62 -#: settings/templates/settings/ldap_setting.html:61 -#: settings/templates/settings/replay_storage_create.html:152 -#: settings/templates/settings/security_setting.html:70 -#: settings/templates/settings/terminal_setting.html:68 -#: terminal/templates/terminal/terminal_update.html:45 -#: users/templates/users/_user.html:50 -#: users/templates/users/user_bulk_update.html:23 -#: users/templates/users/user_detail.html:176 -#: users/templates/users/user_password_update.html:71 -#: users/templates/users/user_profile.html:204 -#: users/templates/users/user_profile_update.html:63 -#: users/templates/users/user_pubkey_update.html:70 -#: users/templates/users/user_pubkey_update.html:76 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:71 -#: xpack/plugins/cloud/templates/cloud/account_create_update.html:33 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:35 -#: xpack/plugins/interface/templates/interface/interface.html:72 -msgid "Reset" -msgstr "重置" - -#: assets/templates/assets/_system_user.html:76 -#: assets/templates/assets/admin_user_create_update.html:46 -#: assets/templates/assets/asset_bulk_update.html:24 -#: assets/templates/assets/asset_create.html:68 -#: assets/templates/assets/asset_list.html:125 -#: assets/templates/assets/asset_update.html:72 -#: assets/templates/assets/cmd_filter_create_update.html:16 -#: assets/templates/assets/cmd_filter_rule_create_update.html:41 -#: assets/templates/assets/domain_create_update.html:17 -#: assets/templates/assets/gateway_create_update.html:59 -#: assets/templates/assets/label_create_update.html:19 -#: audits/templates/audits/login_log_list.html:89 -#: perms/templates/perms/asset_permission_create_update.html:84 -#: settings/templates/settings/basic_setting.html:62 -#: settings/templates/settings/command_storage_create.html:80 -#: settings/templates/settings/email_setting.html:63 -#: settings/templates/settings/ldap_setting.html:64 -#: settings/templates/settings/replay_storage_create.html:153 -#: settings/templates/settings/security_setting.html:71 -#: settings/templates/settings/terminal_setting.html:70 -#: terminal/templates/terminal/command_list.html:103 -#: terminal/templates/terminal/session_list.html:126 -#: terminal/templates/terminal/terminal_update.html:46 -#: users/templates/users/_user.html:51 -#: users/templates/users/forgot_password.html:42 -#: users/templates/users/user_bulk_update.html:24 -#: users/templates/users/user_list.html:57 -#: users/templates/users/user_password_update.html:72 -#: users/templates/users/user_profile_update.html:64 -#: users/templates/users/user_pubkey_update.html:77 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:72 -#: xpack/plugins/interface/templates/interface/interface.html:74 -msgid "Submit" -msgstr "提交" - #: assets/templates/assets/_system_user_import_modal.html:4 msgid "Import system user" msgstr "导入系统用户" @@ -1725,7 +1470,7 @@ msgstr "更新系统用户" #: assets/templates/assets/_user_asset_detail_modal.html:11 #: assets/templates/assets/asset_asset_user_list.html:13 -#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:187 +#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:189 msgid "Asset detail" msgstr "资产详情" @@ -1793,82 +1538,6 @@ msgstr "更新成功" msgid "Update failed!" msgstr "更新失败" -#: assets/templates/assets/admin_user_detail.html:24 -#: assets/templates/assets/admin_user_list.html:29 -#: assets/templates/assets/admin_user_list.html:111 -#: assets/templates/assets/asset_detail.html:27 -#: assets/templates/assets/asset_list.html:86 -#: assets/templates/assets/asset_list.html:190 -#: assets/templates/assets/cmd_filter_detail.html:29 -#: assets/templates/assets/cmd_filter_list.html:58 -#: assets/templates/assets/cmd_filter_rule_list.html:86 -#: assets/templates/assets/domain_detail.html:24 -#: assets/templates/assets/domain_detail.html:103 -#: assets/templates/assets/domain_gateway_list.html:97 -#: assets/templates/assets/domain_list.html:54 -#: assets/templates/assets/label_list.html:39 -#: assets/templates/assets/system_user_detail.html:26 -#: assets/templates/assets/system_user_list.html:33 -#: assets/templates/assets/system_user_list.html:117 audits/models.py:33 -#: perms/templates/perms/asset_permission_detail.html:30 -#: perms/templates/perms/asset_permission_list.html:181 -#: terminal/templates/terminal/terminal_detail.html:16 -#: terminal/templates/terminal/terminal_list.html:72 -#: users/templates/users/user_detail.html:25 -#: users/templates/users/user_group_detail.html:28 -#: users/templates/users/user_group_list.html:20 -#: users/templates/users/user_group_list.html:69 -#: users/templates/users/user_list.html:20 -#: users/templates/users/user_list.html:96 -#: users/templates/users/user_list.html:99 -#: users/templates/users/user_profile.html:177 -#: users/templates/users/user_profile.html:187 -#: users/templates/users/user_profile.html:196 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:29 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:55 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:23 -#: xpack/plugins/cloud/templates/cloud/account_list.html:39 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:25 -#: xpack/plugins/orgs/templates/orgs/org_list.html:87 -msgid "Update" -msgstr "更新" - -#: assets/templates/assets/admin_user_detail.html:28 -#: assets/templates/assets/admin_user_list.html:112 -#: assets/templates/assets/asset_detail.html:31 -#: assets/templates/assets/asset_list.html:191 -#: assets/templates/assets/cmd_filter_detail.html:33 -#: assets/templates/assets/cmd_filter_list.html:59 -#: assets/templates/assets/cmd_filter_rule_list.html:87 -#: assets/templates/assets/domain_detail.html:28 -#: assets/templates/assets/domain_detail.html:104 -#: assets/templates/assets/domain_gateway_list.html:98 -#: assets/templates/assets/domain_list.html:55 -#: assets/templates/assets/label_list.html:40 -#: assets/templates/assets/system_user_detail.html:30 -#: assets/templates/assets/system_user_list.html:118 audits/models.py:34 -#: ops/templates/ops/task_list.html:64 -#: perms/templates/perms/asset_permission_detail.html:34 -#: perms/templates/perms/asset_permission_list.html:182 -#: settings/templates/settings/terminal_setting.html:90 -#: settings/templates/settings/terminal_setting.html:112 -#: terminal/templates/terminal/terminal_list.html:74 -#: users/templates/users/user_detail.html:30 -#: users/templates/users/user_group_detail.html:32 -#: users/templates/users/user_group_list.html:71 -#: users/templates/users/user_list.html:104 -#: users/templates/users/user_list.html:108 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:33 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:57 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:27 -#: xpack/plugins/cloud/templates/cloud/account_list.html:41 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:30 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:55 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:29 -#: xpack/plugins/orgs/templates/orgs/org_list.html:89 -msgid "Delete" -msgstr "删除" - #: assets/templates/assets/admin_user_detail.html:83 msgid "Replace node assets admin user with this" msgstr "替换资产的管理员" @@ -1880,30 +1549,6 @@ msgstr "替换资产的管理员" msgid "Select nodes" msgstr "选择节点" -#: assets/templates/assets/admin_user_detail.html:100 -#: assets/templates/assets/asset_detail.html:211 -#: assets/templates/assets/asset_list.html:692 -#: assets/templates/assets/cmd_filter_detail.html:106 -#: assets/templates/assets/system_user_asset.html:112 -#: assets/templates/assets/system_user_detail.html:182 -#: assets/templates/assets/system_user_list.html:168 -#: settings/templates/settings/terminal_setting.html:165 -#: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:108 -#: users/templates/users/user_detail.html:388 -#: users/templates/users/user_detail.html:414 -#: users/templates/users/user_detail.html:437 -#: users/templates/users/user_detail.html:482 -#: users/templates/users/user_group_create_update.html:32 -#: users/templates/users/user_group_list.html:114 -#: users/templates/users/user_list.html:260 -#: users/templates/users/user_profile.html:238 -#: xpack/plugins/cloud/templates/cloud/account_create_update.html:34 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:36 -#: xpack/plugins/interface/templates/interface/interface.html:103 -#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33 -msgid "Confirm" -msgstr "确认" - #: assets/templates/assets/admin_user_list.html:7 msgid "" "Admin users are asset (charged server) on the root, or have NOPASSWD: ALL " @@ -1962,14 +1607,11 @@ msgstr "比例" #: users/templates/users/user_group_list.html:199 #: users/templates/users/user_list.html:162 #: users/templates/users/user_list.html:198 -#, fuzzy -#| msgid "Please Select User" msgid "Please select file" -msgstr "选择用户" - +msgstr "选择文件" #: assets/templates/assets/asset_asset_user_list.html:16 -#: assets/templates/assets/asset_detail.html:23 assets/views/asset.py:68 +#: assets/templates/assets/asset_detail.html:23 assets/views/asset.py:70 msgid "Asset user list" msgstr "资产用户列表" @@ -1981,13 +1623,6 @@ msgstr "资产用户" msgid "Password version" msgstr "密码版本" - -#: assets/templates/assets/asset_asset_user_list.html:47 -#: assets/templates/assets/cmd_filter_detail.html:73 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:109 -msgid "Date updated" -msgstr "更新日期" - #: assets/templates/assets/asset_asset_user_list.html:60 #: assets/templates/assets/asset_detail.html:148 #: terminal/templates/terminal/session_detail.html:81 @@ -2024,8 +1659,7 @@ msgstr "创建日期" #: assets/templates/assets/asset_detail.html:154 #: assets/templates/assets/user_asset_list.html:46 -#: perms/models/asset_permission.py:59 perms/models/asset_permission.py:113 -#: perms/models/remote_app_permission.py:37 +#: perms/models/asset_permission.py:60 perms/models/base.py:38 #: perms/templates/perms/asset_permission_create_update.html:55 #: perms/templates/perms/asset_permission_detail.html:120 #: perms/templates/perms/remote_app_permission_create_update.html:54 @@ -2056,7 +1690,7 @@ msgstr "" "左侧是资产树，右击可以新建、删除、更改树节点，授权资产也是以节点方式组织的，" "右侧是属于该节点下的资产" -#: assets/templates/assets/asset_list.html:69 assets/views/asset.py:105 +#: assets/templates/assets/asset_list.html:69 assets/views/asset.py:107 msgid "Create asset" msgstr "创建资产" @@ -2148,22 +1782,22 @@ msgstr "重命名成功" msgid "Rename failed, do not change the root node name" msgstr "重命名失败，不能更改root节点的名称" -#: assets/templates/assets/asset_list.html:686 +#: assets/templates/assets/asset_list.html:694 #: assets/templates/assets/system_user_list.html:162 #: users/templates/users/user_detail.html:382 #: users/templates/users/user_detail.html:408 #: users/templates/users/user_detail.html:476 #: users/templates/users/user_group_list.html:108 -#: users/templates/users/user_list.html:254 +#: users/templates/users/user_list.html:263 #: xpack/plugins/interface/templates/interface/interface.html:97 msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:687 +#: assets/templates/assets/asset_list.html:695 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:690 +#: assets/templates/assets/asset_list.html:698 #: assets/templates/assets/system_user_list.html:166 #: settings/templates/settings/terminal_setting.html:163 #: users/templates/users/user_detail.html:386 @@ -2171,22 +1805,22 @@ msgstr "删除选择资产" #: users/templates/users/user_detail.html:480 #: users/templates/users/user_group_create_update.html:31 #: users/templates/users/user_group_list.html:112 -#: users/templates/users/user_list.html:258 +#: users/templates/users/user_list.html:267 #: xpack/plugins/interface/templates/interface/interface.html:101 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:32 msgid "Cancel" msgstr "取消" -#: assets/templates/assets/asset_list.html:696 +#: assets/templates/assets/asset_list.html:711 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:697 -#: assets/templates/assets/asset_list.html:702 +#: assets/templates/assets/asset_list.html:712 +#: assets/templates/assets/asset_list.html:716 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:701 +#: assets/templates/assets/asset_list.html:715 msgid "Asset Deleting failed." msgstr "删除失败" @@ -2399,23 +2033,23 @@ msgstr "管理用户列表" msgid "Admin user detail" msgstr "管理用户详情" -#: assets/views/asset.py:79 templates/_nav_user.html:4 +#: assets/views/asset.py:81 templates/_nav_user.html:4 msgid "My assets" msgstr "我的资产" -#: assets/views/asset.py:119 +#: assets/views/asset.py:121 msgid "Bulk update asset success" msgstr "批量更新资产成功" -#: assets/views/asset.py:146 +#: assets/views/asset.py:148 msgid "Bulk update asset" msgstr "批量更新资产" -#: assets/views/asset.py:163 +#: assets/views/asset.py:165 msgid "Update asset" msgstr "更新资产" -#: assets/views/asset.py:304 +#: assets/views/asset.py:306 msgid "already exists" msgstr "已经存在" @@ -2605,8 +2239,7 @@ msgstr "登录日期" #: ops/templates/ops/adhoc_history.html:52 #: ops/templates/ops/adhoc_history_detail.html:61 #: ops/templates/ops/command_execution_list.html:66 -#: ops/templates/ops/task_history.html:58 perms/models/asset_permission.py:60 -#: perms/models/remote_app_permission.py:38 +#: ops/templates/ops/task_history.html:58 perms/models/base.py:39 #: perms/templates/perms/asset_permission_detail.html:86 #: perms/templates/perms/remote_app_permission_detail.html:78 #: terminal/models.py:165 terminal/templates/terminal/session_list.html:78 @@ -2905,8 +2538,8 @@ msgstr "欢迎回来，请输入用户名和密码登录" msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" -#: authentication/views/login.py:172 users/views/user.py:541 -#: users/views/user.py:566 +#: authentication/views/login.py:172 users/views/user.py:540 +#: users/views/user.py:565 msgid "MFA code invalid, or ntp sync server time" msgstr "MFA验证码不正确，或者服务器端时间不对" @@ -3344,8 +2977,7 @@ msgid "Download file" msgstr "下载文件" #: perms/forms/asset_permission.py:43 perms/forms/remote_app_permission.py:34 -#: perms/models/asset_permission.py:54 perms/models/asset_permission.py:111 -#: perms/models/remote_app_permission.py:35 +#: perms/models/asset_permission.py:58 perms/models/base.py:37 #: perms/templates/perms/asset_permission_list.html:55 #: perms/templates/perms/asset_permission_list.html:75 #: perms/templates/perms/asset_permission_list.html:122 @@ -3372,8 +3004,12 @@ msgstr "用户和用户组至少选一个" msgid "Asset or group at least one required" msgstr "资产和节点至少选一个" -#: perms/models/asset_permission.py:61 perms/models/asset_permission.py:114 -#: perms/models/remote_app_permission.py:39 +#: perms/models/asset_permission.py:44 perms/models/asset_permission.py:70 +#: templates/_nav.html:42 +msgid "Asset permission" +msgstr "资产授权" + +#: perms/models/asset_permission.py:61 perms/models/base.py:40 #: perms/templates/perms/asset_permission_detail.html:90 #: perms/templates/perms/remote_app_permission_detail.html:82 #: users/models/user.py:99 users/templates/users/user_detail.html:107 @@ -3381,12 +3017,7 @@ msgstr "资产和节点至少选一个" msgid "Date expired" msgstr "失效日期" -#: perms/models/asset_permission.py:70 perms/models/asset_permission.py:123 -#: templates/_nav.html:42 -msgid "Asset permission" -msgstr "资产授权" - -#: perms/models/remote_app_permission.py:48 +#: perms/models/remote_app_permission.py:19 msgid "RemoteApp permission" msgstr "远程应用授权" @@ -3478,9 +3109,9 @@ msgstr "创建授权规则" #: perms/templates/perms/asset_permission_list.html:59 #: perms/templates/perms/asset_permission_list.html:73 -#: users/templates/users/user_list.html:40 xpack/plugins/cloud/models.py:53 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:60 #: perms/templates/perms/remote_app_permission_list.html:18 +#: users/templates/users/user_list.html:40 xpack/plugins/cloud/models.py:53 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:58 #: xpack/plugins/cloud/templates/cloud/account_list.html:14 msgid "Validity" msgstr "有效" @@ -4093,7 +3724,7 @@ msgstr "商业支持" #: users/templates/users/user_profile.html:17 #: users/templates/users/user_profile_update.html:37 #: users/templates/users/user_profile_update.html:57 -#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:377 +#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:376 msgid "Profile" msgstr "个人信息" @@ -4187,13 +3818,13 @@ msgstr "" #: templates/_nav.html:10 users/views/group.py:27 users/views/group.py:43 #: users/views/group.py:59 users/views/group.py:75 users/views/group.py:91 -#: users/views/login.py:154 users/views/user.py:68 users/views/user.py:83 -#: users/views/user.py:122 users/views/user.py:203 users/views/user.py:364 -#: users/views/user.py:414 users/views/user.py:454 +#: users/views/login.py:154 users/views/user.py:70 users/views/user.py:85 +#: users/views/user.py:124 users/views/user.py:202 users/views/user.py:363 +#: users/views/user.py:413 users/views/user.py:453 msgid "Users" msgstr "用户管理" -#: templates/_nav.html:13 users/views/user.py:69 +#: templates/_nav.html:13 users/views/user.py:71 msgid "User list" msgstr "用户列表" @@ -4639,11 +4270,11 @@ msgid "" "You should use your ssh client tools connect terminal: {}

{}" msgstr "你可以使用ssh客户端工具连接终端" -#: users/api/user.py:77 users/api/user.py:88 users/api/user.py:114 +#: users/api/user.py:75 users/api/user.py:86 users/api/user.py:112 msgid "You do not have permission." msgstr "你没有权限" -#: users/api/user.py:218 +#: users/api/user.py:216 msgid "Could not reset self otp, use profile reset instead" msgstr "不能再该页面重置MFA, 请去个人信息页面重置" @@ -4675,7 +4306,7 @@ msgstr "添加到用户组" msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms.py:89 users/forms.py:219 users/serializers/v1.py:53 +#: users/forms.py:89 users/forms.py:219 users/serializers/v1.py:47 msgid "Not a valid ssh public key" msgstr "ssh密钥不合法" @@ -4782,7 +4413,7 @@ msgid "Date password last updated" msgstr "最后更新密码日期" #: users/models/user.py:136 users/templates/users/user_update.html:22 -#: users/views/login.py:47 users/views/login.py:108 users/views/user.py:427 +#: users/views/login.py:47 users/views/login.py:108 users/views/user.py:426 msgid "User auth from {}, go there change password" msgstr "用户认证源来自 {}, 请去相应系统修改密码" @@ -4790,31 +4421,31 @@ msgstr "用户认证源来自 {}, 请去相应系统修改密码" msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" -#: users/serializers/v1.py:17 +#: users/serializers/v1.py:28 msgid "Groups name" msgstr "用户组名" -#: users/serializers/v1.py:20 +#: users/serializers/v1.py:29 msgid "Source name" msgstr "用户来源名" -#: users/serializers/v1.py:23 +#: users/serializers/v1.py:30 msgid "Is first login" msgstr "首次登录" -#: users/serializers/v1.py:25 +#: users/serializers/v1.py:31 msgid "Role name" msgstr "角色名" -#: users/serializers/v1.py:26 +#: users/serializers/v1.py:32 msgid "Is valid" msgstr "账户是否有效" -#: users/serializers/v1.py:27 +#: users/serializers/v1.py:33 msgid "Is expired" msgstr " 是否过期" -#: users/serializers/v1.py:28 +#: users/serializers/v1.py:34 msgid "Avatar url" msgstr "头像路径" @@ -4859,7 +4490,8 @@ msgid "Import user groups" msgstr "导入用户组" #: users/templates/users/_user_groups_update_modal.html:4 -msgid "Update user groups" +#: users/views/group.py:60 +msgid "Update user group" msgstr "更新用户组" #: users/templates/users/_user_import_modal.html:4 @@ -4867,7 +4499,7 @@ msgid "Import users" msgstr "导入用户" #: users/templates/users/_user_update_modal.html:4 -#: users/templates/users/user_update.html:4 users/views/user.py:123 +#: users/templates/users/user_update.html:4 users/views/user.py:125 msgid "Update user" msgstr "更新用户" @@ -4997,7 +4629,7 @@ msgid "Very strong" msgstr "很强" #: users/templates/users/user_create.html:4 -#: users/templates/users/user_list.html:28 users/views/user.py:83 +#: users/templates/users/user_list.html:28 users/views/user.py:85 msgid "Create user" msgstr "创建用户" @@ -5006,7 +4638,7 @@ msgid "Reset link will be generated and sent to the user. " msgstr "生成重置密码连接，通过邮件发送给用户" #: users/templates/users/user_detail.html:19 -#: users/templates/users/user_granted_asset.html:18 users/views/user.py:204 +#: users/templates/users/user_granted_asset.html:18 users/views/user.py:203 msgid "User detail" msgstr "用户详情" @@ -5139,28 +4771,28 @@ msgstr "用户组删除" msgid "UserGroup Deleting failed." msgstr "用户组删除失败" -#: users/templates/users/user_list.html:255 +#: users/templates/users/user_list.html:264 msgid "This will delete the selected users !!!" msgstr "删除选中用户 !!!" -#: users/templates/users/user_list.html:264 +#: users/templates/users/user_list.html:280 msgid "User Deleted." msgstr "已被删除" -#: users/templates/users/user_list.html:265 -#: users/templates/users/user_list.html:270 +#: users/templates/users/user_list.html:281 +#: users/templates/users/user_list.html:285 msgid "User Delete" msgstr "删除" -#: users/templates/users/user_list.html:269 +#: users/templates/users/user_list.html:284 msgid "User Deleting failed." msgstr "用户删除失败" -#: users/templates/users/user_list.html:305 +#: users/templates/users/user_list.html:337 msgid "User is expired" msgstr "用户已失效" -#: users/templates/users/user_list.html:308 +#: users/templates/users/user_list.html:340 msgid "User is inactive" msgstr "用户已禁用" @@ -5209,8 +4841,8 @@ msgstr "安装完成后点击下一步进入绑定页面（如已安装，直接 msgid "Administrator Settings force MFA login" msgstr "管理员设置强制使用MFA登录" -#: users/templates/users/user_profile.html:120 users/views/user.py:240 -#: users/views/user.py:294 +#: users/templates/users/user_profile.html:120 users/views/user.py:239 +#: users/views/user.py:293 msgid "User groups" msgstr "用户组" @@ -5451,10 +5083,6 @@ msgstr "密码或密钥不合法" msgid "User group list" msgstr "用户组列表" -#: users/views/group.py:60 -msgid "Update user group" -msgstr "更新用户组" - #: users/views/group.py:92 msgid "User group granted asset" msgstr "用户组授权资产" @@ -5488,7 +5116,7 @@ msgstr "Token错误或失效" msgid "Password not same" msgstr "密码不一致" -#: users/views/login.py:115 users/views/user.py:137 users/views/user.py:437 +#: users/views/login.py:115 users/views/user.py:139 users/views/user.py:436 msgid "* Your password does not meet the requirements" msgstr "* 您的密码不符合要求" @@ -5496,51 +5124,51 @@ msgstr "* 您的密码不符合要求" msgid "First login" msgstr "首次登录" -#: users/views/user.py:154 +#: users/views/user.py:156 msgid "Bulk update user success" msgstr "批量更新用户成功" -#: users/views/user.py:184 +#: users/views/user.py:183 msgid "Bulk update user" msgstr "批量更新用户" -#: users/views/user.py:269 +#: users/views/user.py:268 msgid "Invalid file." msgstr "文件不合法" -#: users/views/user.py:365 +#: users/views/user.py:364 msgid "User granted assets" msgstr "用户授权资产" -#: users/views/user.py:396 +#: users/views/user.py:395 msgid "Profile setting" msgstr "个人信息设置" -#: users/views/user.py:415 +#: users/views/user.py:414 msgid "Password update" msgstr "密码更新" -#: users/views/user.py:455 +#: users/views/user.py:454 msgid "Public key update" msgstr "密钥更新" -#: users/views/user.py:496 +#: users/views/user.py:495 msgid "Password invalid" msgstr "用户名或密码无效" -#: users/views/user.py:596 +#: users/views/user.py:595 msgid "MFA enable success" msgstr "MFA 绑定成功" -#: users/views/user.py:597 +#: users/views/user.py:596 msgid "MFA enable success, return login page" msgstr "MFA 绑定成功，返回到登录页面" -#: users/views/user.py:599 +#: users/views/user.py:598 msgid "MFA disable success" msgstr "MFA 解绑成功" -#: users/views/user.py:600 +#: users/views/user.py:599 msgid "MFA disable success, return login page" msgstr "MFA 解绑成功，返回登录页面" @@ -6186,6 +5814,8 @@ msgstr "创建组织" msgid "Update org" msgstr "更新组织" +#~ msgid "Update user groups" +#~ msgstr "更新用户组" #~ msgid "Template" #~ msgstr "模板" @@ -6224,7 +5854,6 @@ msgstr "更新组织" #~ msgid "Restore default successfully！" #~ msgstr "恢复默认成功！" - #~ msgid "Beijing Duizhan Tech, Inc." #~ msgstr "北京堆栈科技有限公司"