From 18f8864720c003bdb95c9212260c552a96209f1c Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 14 Nov 2019 19:35:44 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20public=20config=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 84580 -> 84558 bytes apps/locale/zh/LC_MESSAGES/django.po | 283 +++++++++++++-------------- apps/settings/api.py | 3 +- apps/settings/forms.py | 2 +- 4 files changed, 144 insertions(+), 144 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index d5225f406774ca2d4319ee463b3b466bc79c53aa..720b8a9cf7f6eba4de797be1da3858b34eddb9e4 100644 GIT binary patch delta 14790 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 2e7d867c4..cfc940bec 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-11-14 11:36+0800\n" +"POT-Creation-Date: 2019-11-14 19:29+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -73,17 +73,17 @@ msgstr "运行参数" #: applications/forms/remote_app.py:100 applications/models/remote_app.py:23 #: applications/templates/applications/remote_app_detail.html:57 -#: applications/templates/applications/remote_app_list.html:22 +#: applications/templates/applications/remote_app_list.html:20 #: applications/templates/applications/user_remote_app_list.html:18 #: assets/forms/domain.py:15 assets/forms/label.py:13 #: assets/models/asset.py:295 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:37 -#: assets/templates/assets/admin_user_list.html:46 +#: assets/templates/assets/admin_user_list.html:44 #: assets/templates/assets/domain_detail.html:60 -#: assets/templates/assets/domain_list.html:26 +#: assets/templates/assets/domain_list.html:22 #: assets/templates/assets/label_list.html:16 -#: assets/templates/assets/system_user_list.html:51 audits/models.py:20 +#: assets/templates/assets/system_user_list.html:49 audits/models.py:20 #: audits/templates/audits/ftp_log_list.html:44 #: audits/templates/audits/ftp_log_list.html:74 #: perms/forms/asset_permission.py:84 perms/models/asset_permission.py:80 @@ -96,8 +96,8 @@ msgstr "运行参数" #: terminal/templates/terminal/session_list.html:28 #: terminal/templates/terminal/session_list.html:72 #: xpack/plugins/change_auth_plan/forms.py:73 -#: xpack/plugins/change_auth_plan/models.py:412 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:46 +#: xpack/plugins/change_auth_plan/models.py:419 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:44 #: xpack/plugins/change_auth_plan/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 @@ -110,22 +110,22 @@ msgstr "资产" #: applications/models/remote_app.py:21 #: applications/templates/applications/remote_app_detail.html:53 -#: applications/templates/applications/remote_app_list.html:20 +#: applications/templates/applications/remote_app_list.html:18 #: 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/base.py:28 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:56 -#: assets/templates/assets/admin_user_list.html:44 +#: assets/templates/assets/admin_user_list.html:42 #: assets/templates/assets/cmd_filter_detail.html:61 -#: assets/templates/assets/cmd_filter_list.html:24 +#: assets/templates/assets/cmd_filter_list.html:22 #: 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/domain_list.html:21 #: assets/templates/assets/label_list.html:14 #: assets/templates/assets/system_user_detail.html:58 -#: assets/templates/assets/system_user_list.html:47 ops/models/adhoc.py:37 +#: assets/templates/assets/system_user_list.html:45 ops/models/adhoc.py:37 #: ops/templates/ops/task_detail.html:60 ops/templates/ops/task_list.html:11 #: orgs/models.py:12 perms/models/base.py:48 #: perms/templates/perms/asset_permission_detail.html:62 @@ -152,7 +152,7 @@ msgstr "资产" #: 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:63 +#: xpack/plugins/change_auth_plan/models.py:64 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12 #: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:144 @@ -169,7 +169,7 @@ msgstr "名称" #: applications/models/remote_app.py:28 #: applications/templates/applications/remote_app_detail.html:61 -#: applications/templates/applications/remote_app_list.html:21 +#: applications/templates/applications/remote_app_list.html:19 #: applications/templates/applications/user_remote_app_list.html:17 msgid "App type" msgstr "应用类型" @@ -199,7 +199,7 @@ msgstr "参数" #: perms/templates/perms/remote_app_permission_detail.html:90 #: users/models/user.py:451 users/serializers/group.py:32 #: users/templates/users/user_detail.html:112 -#: xpack/plugins/change_auth_plan/models.py:108 +#: xpack/plugins/change_auth_plan/models.py:109 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113 #: xpack/plugins/cloud/models.py:80 xpack/plugins/cloud/models.py:179 #: xpack/plugins/gathered_user/models.py:46 @@ -237,23 +237,23 @@ msgstr "创建日期" # msgstr "创建日期" #: applications/models/remote_app.py:45 #: applications/templates/applications/remote_app_detail.html:77 -#: applications/templates/applications/remote_app_list.html:23 +#: applications/templates/applications/remote_app_list.html:21 #: applications/templates/applications/user_remote_app_list.html:19 #: assets/models/asset.py:176 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:72 -#: assets/templates/assets/admin_user_list.html:50 +#: assets/templates/assets/admin_user_list.html:48 #: assets/templates/assets/asset_detail.html:130 #: assets/templates/assets/cmd_filter_detail.html:65 -#: assets/templates/assets/cmd_filter_list.html:27 +#: assets/templates/assets/cmd_filter_list.html:25 #: 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/domain_list.html:24 #: assets/templates/assets/system_user_detail.html:104 -#: assets/templates/assets/system_user_list.html:55 ops/models/adhoc.py:43 +#: 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:102 #: perms/templates/perms/remote_app_permission_detail.html:94 @@ -264,7 +264,7 @@ msgstr "创建日期" #: users/templates/users/user_group_detail.html:67 #: users/templates/users/user_group_list.html:37 #: users/templates/users/user_profile.html:138 -#: xpack/plugins/change_auth_plan/models.py:104 +#: 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 @@ -319,7 +319,7 @@ 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:71 +#: 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 @@ -362,7 +362,7 @@ msgstr "重置" #: users/templates/users/user_password_update.html:76 #: users/templates/users/user_profile_update.html:68 #: users/templates/users/user_pubkey_update.html:81 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:72 +#: 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:46 msgid "Submit" @@ -395,25 +395,25 @@ msgid "Detail" msgstr "详情" #: applications/templates/applications/remote_app_detail.html:21 -#: applications/templates/applications/remote_app_list.html:54 +#: applications/templates/applications/remote_app_list.html:52 #: assets/templates/assets/_asset_user_list.html:75 #: assets/templates/assets/admin_user_detail.html:24 -#: assets/templates/assets/admin_user_list.html:26 -#: assets/templates/assets/admin_user_list.html:74 +#: assets/templates/assets/admin_user_list.html:24 +#: assets/templates/assets/admin_user_list.html:72 #: assets/templates/assets/asset_detail.html:26 #: assets/templates/assets/asset_list.html:78 #: assets/templates/assets/asset_list.html:167 #: assets/templates/assets/cmd_filter_detail.html:29 -#: assets/templates/assets/cmd_filter_list.html:58 +#: assets/templates/assets/cmd_filter_list.html:56 #: 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/domain_list.html:50 #: assets/templates/assets/label_list.html:39 #: assets/templates/assets/system_user_detail.html:26 -#: assets/templates/assets/system_user_list.html:29 -#: assets/templates/assets/system_user_list.html:81 audits/models.py:34 +#: assets/templates/assets/system_user_list.html:27 +#: assets/templates/assets/system_user_list.html:79 audits/models.py:34 #: perms/templates/perms/asset_permission_detail.html:30 #: perms/templates/perms/asset_permission_list.html:178 #: perms/templates/perms/remote_app_permission_detail.html:30 @@ -443,21 +443,21 @@ msgid "Update" msgstr "更新" #: applications/templates/applications/remote_app_detail.html:25 -#: applications/templates/applications/remote_app_list.html:55 +#: applications/templates/applications/remote_app_list.html:53 #: assets/templates/assets/admin_user_detail.html:28 -#: assets/templates/assets/admin_user_list.html:75 +#: assets/templates/assets/admin_user_list.html:73 #: assets/templates/assets/asset_detail.html:30 #: assets/templates/assets/asset_list.html:168 #: assets/templates/assets/cmd_filter_detail.html:33 -#: assets/templates/assets/cmd_filter_list.html:59 +#: assets/templates/assets/cmd_filter_list.html:57 #: 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/domain_list.html:51 #: assets/templates/assets/label_list.html:40 #: assets/templates/assets/system_user_detail.html:30 -#: assets/templates/assets/system_user_list.html:82 audits/models.py:35 +#: assets/templates/assets/system_user_list.html:80 audits/models.py:35 #: authentication/templates/authentication/_access_key_modal.html:65 #: ops/templates/ops/task_list.html:69 #: perms/templates/perms/asset_permission_detail.html:34 @@ -484,7 +484,7 @@ msgstr "更新" msgid "Delete" msgstr "删除" -#: applications/templates/applications/remote_app_list.html:5 +#: 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 " @@ -493,27 +493,27 @@ msgstr "" "使用此功能前，请确保已将应用加载器上传到应用服务器并成功发布为一个 RemoteApp " "应用" -#: applications/templates/applications/remote_app_list.html:6 +#: applications/templates/applications/remote_app_list.html:5 msgid "Download application loader" msgstr "下载应用加载器" -#: applications/templates/applications/remote_app_list.html:12 +#: applications/templates/applications/remote_app_list.html:10 #: applications/views/remote_app.py:48 msgid "Create RemoteApp" msgstr "创建远程应用" -#: applications/templates/applications/remote_app_list.html:24 +#: applications/templates/applications/remote_app_list.html:22 #: 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:51 +#: assets/templates/assets/admin_user_list.html:49 #: assets/templates/assets/asset_list.html:100 -#: assets/templates/assets/cmd_filter_list.html:28 +#: assets/templates/assets/cmd_filter_list.html:26 #: 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/domain_list.html:25 #: assets/templates/assets/label_list.html:17 -#: assets/templates/assets/system_user_list.html:56 audits/models.py:39 +#: assets/templates/assets/system_user_list.html:54 audits/models.py:39 #: audits/templates/audits/operate_log_list.html:47 #: audits/templates/audits/operate_log_list.html:73 #: authentication/templates/authentication/_access_key_modal.html:34 @@ -607,7 +607,7 @@ msgstr "端口" #: assets/templates/assets/asset_detail.html:196 #: assets/templates/assets/system_user_assets.html:83 #: perms/models/asset_permission.py:81 -#: xpack/plugins/change_auth_plan/models.py:74 +#: xpack/plugins/change_auth_plan/models.py:75 #: xpack/plugins/gathered_user/models.py:31 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:17 msgid "Nodes" @@ -698,10 +698,10 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: 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:60 -#: assets/templates/assets/admin_user_list.html:45 +#: assets/templates/assets/admin_user_list.html:43 #: assets/templates/assets/domain_gateway_list.html:71 #: assets/templates/assets/system_user_detail.html:62 -#: assets/templates/assets/system_user_list.html:48 audits/models.py:81 +#: assets/templates/assets/system_user_list.html:46 audits/models.py:81 #: audits/templates/audits/login_log_list.html:57 authentication/forms.py:13 #: authentication/templates/authentication/login.html:58 #: authentication/templates/authentication/xpack_login.html:93 @@ -714,8 +714,8 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: users/templates/users/user_list.html:36 #: users/templates/users/user_profile.html:47 #: xpack/plugins/change_auth_plan/forms.py:58 -#: xpack/plugins/change_auth_plan/models.py:65 -#: xpack/plugins/change_auth_plan/models.py:408 +#: xpack/plugins/change_auth_plan/models.py:66 +#: xpack/plugins/change_auth_plan/models.py:415 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:65 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:53 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:12 @@ -742,8 +742,8 @@ msgstr "密码或密钥密码" #: users/templates/users/user_profile_update.html:41 #: users/templates/users/user_pubkey_update.html:41 #: users/templates/users/user_update.html:20 -#: xpack/plugins/change_auth_plan/models.py:95 -#: xpack/plugins/change_auth_plan/models.py:263 +#: xpack/plugins/change_auth_plan/models.py:96 +#: xpack/plugins/change_auth_plan/models.py:264 msgid "Password" msgstr "密码" @@ -826,7 +826,7 @@ msgstr "主机名" #: assets/models/user.py:113 assets/templates/assets/asset_detail.html:70 #: assets/templates/assets/domain_gateway_list.html:70 #: assets/templates/assets/system_user_detail.html:70 -#: assets/templates/assets/system_user_list.html:49 +#: assets/templates/assets/system_user_list.html:47 #: terminal/templates/terminal/session_list.html:31 #: terminal/templates/terminal/session_list.html:75 msgid "Protocol" @@ -937,13 +937,13 @@ msgstr "版本" msgid "AuthBook" msgstr "" -#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:99 -#: xpack/plugins/change_auth_plan/models.py:270 +#: assets/models/base.py:31 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:102 -#: xpack/plugins/change_auth_plan/models.py:266 +#: assets/models/base.py:32 xpack/plugins/change_auth_plan/models.py:103 +#: xpack/plugins/change_auth_plan/models.py:267 msgid "SSH public key" msgstr "ssh公钥" @@ -1076,7 +1076,7 @@ msgstr "命令过滤规则" #: assets/models/domain.py:61 assets/templates/assets/domain_detail.html:21 #: assets/templates/assets/domain_detail.html:64 #: assets/templates/assets/domain_gateway_list.html:26 -#: assets/templates/assets/domain_list.html:27 +#: assets/templates/assets/domain_list.html:23 msgid "Gateway" msgstr "网关" @@ -1198,7 +1198,7 @@ msgstr "手动登录" #: assets/views/label.py:27 assets/views/label.py:45 assets/views/label.py:73 #: 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:70 +#: templates/_nav.html:39 xpack/plugins/change_auth_plan/models.py:71 msgid "Assets" msgstr "资产管理" @@ -1217,7 +1217,7 @@ msgid "Shell" msgstr "Shell" #: assets/models/user.py:117 assets/templates/assets/system_user_detail.html:66 -#: assets/templates/assets/system_user_list.html:50 +#: assets/templates/assets/system_user_list.html:48 msgid "Login mode" msgstr "登录模式" @@ -1343,7 +1343,7 @@ msgstr "测试资产可连接性: {}" #: assets/tasks/asset_user_connectivity.py:27 #: assets/tasks/push_system_user.py:130 -#: xpack/plugins/change_auth_plan/models.py:521 +#: xpack/plugins/change_auth_plan/models.py:528 msgid "The asset {} system platform {} does not support run Ansible tasks" msgstr "资产 {} 系统平台 {} 不支持运行 Ansible 任务" @@ -1436,7 +1436,7 @@ msgstr "选择资产" #: assets/templates/assets/_asset_group_bulk_update_modal.html:21 #: assets/templates/assets/cmd_filter_detail.html:89 -#: assets/templates/assets/cmd_filter_list.html:26 +#: assets/templates/assets/cmd_filter_list.html:24 msgid "System users" msgstr "系统用户" @@ -1590,7 +1590,7 @@ msgstr "重命名成功" #: assets/templates/assets/gateway_create_update.html:37 #: perms/templates/perms/asset_permission_create_update.html:38 #: perms/templates/perms/remote_app_permission_create_update.html:39 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:43 +#: 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" @@ -1613,7 +1613,7 @@ msgstr "自动生成密钥" #: perms/templates/perms/asset_permission_create_update.html:53 #: perms/templates/perms/remote_app_permission_create_update.html:53 #: terminal/templates/terminal/terminal_update.html:40 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:67 +#: 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" @@ -1673,11 +1673,11 @@ msgstr "选择节点" #: assets/templates/assets/admin_user_detail.html:100 #: assets/templates/assets/asset_detail.html:202 -#: assets/templates/assets/asset_list.html:423 +#: assets/templates/assets/asset_list.html:427 #: assets/templates/assets/cmd_filter_detail.html:106 #: assets/templates/assets/system_user_assets.html:97 #: assets/templates/assets/system_user_detail.html:182 -#: assets/templates/assets/system_user_list.html:135 +#: assets/templates/assets/system_user_list.html:133 #: authentication/templates/authentication/_mfa_confirm_modal.html:20 #: settings/templates/settings/terminal_setting.html:168 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112 @@ -1697,22 +1697,22 @@ msgstr "选择节点" msgid "Confirm" msgstr "确认" -#: assets/templates/assets/admin_user_list.html:5 +#: assets/templates/assets/admin_user_list.html:4 msgid "" "Admin users are asset (charged server) on the root, or have NOPASSWD: ALL " "sudo permissions users, " msgstr "" "管理用户是资产（被控服务器）上的 root，或拥有 NOPASSWD: ALL sudo 权限的用户，" -#: assets/templates/assets/admin_user_list.html:6 +#: assets/templates/assets/admin_user_list.html:5 msgid "" "Jumpserver users of the system using the user to `push system user`, `get " "assets hardware information`, etc. " msgstr "Jumpserver 使用该用户来 `推送系统用户`、`获取资产硬件信息` 等。" -#: assets/templates/assets/admin_user_list.html:16 +#: assets/templates/assets/admin_user_list.html:14 #: assets/templates/assets/asset_list.html:68 -#: assets/templates/assets/system_user_list.html:19 +#: 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 @@ -1721,9 +1721,9 @@ msgstr "Jumpserver 使用该用户来 `推送系统用户`、`获取资产硬件 msgid "Export" msgstr "导出" -#: assets/templates/assets/admin_user_list.html:21 +#: assets/templates/assets/admin_user_list.html:19 #: assets/templates/assets/asset_list.html:73 -#: assets/templates/assets/system_user_list.html:24 +#: 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 @@ -1732,17 +1732,17 @@ msgstr "导出" msgid "Import" msgstr "导入" -#: assets/templates/assets/admin_user_list.html:36 +#: assets/templates/assets/admin_user_list.html:34 #: assets/views/admin_user.py:50 msgid "Create admin user" msgstr "创建管理用户" -#: assets/templates/assets/admin_user_list.html:125 -#: assets/templates/assets/admin_user_list.html:156 +#: 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:188 -#: assets/templates/assets/system_user_list.html:219 +#: 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 @@ -1818,7 +1818,7 @@ msgstr "更新硬件信息" msgid "Refresh" msgstr "刷新" -#: assets/templates/assets/asset_list.html:8 +#: assets/templates/assets/asset_list.html:9 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 " @@ -1883,8 +1883,8 @@ msgstr "仅显示当前节点资产" msgid "Displays all child node assets" msgstr "显示所有子节点资产" -#: assets/templates/assets/asset_list.html:417 -#: assets/templates/assets/system_user_list.html:129 +#: assets/templates/assets/asset_list.html:421 +#: assets/templates/assets/system_user_list.html:127 #: users/templates/users/user_detail.html:441 #: users/templates/users/user_detail.html:467 #: users/templates/users/user_detail.html:535 @@ -1894,12 +1894,12 @@ msgstr "显示所有子节点资产" msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:418 +#: assets/templates/assets/asset_list.html:422 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:421 -#: assets/templates/assets/system_user_list.html:133 +#: assets/templates/assets/asset_list.html:425 +#: assets/templates/assets/system_user_list.html:131 #: settings/templates/settings/terminal_setting.html:166 #: users/templates/users/user_detail.html:445 #: users/templates/users/user_detail.html:471 @@ -1910,16 +1910,16 @@ msgstr "删除选择资产" msgid "Cancel" msgstr "取消" -#: assets/templates/assets/asset_list.html:432 +#: assets/templates/assets/asset_list.html:436 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:433 -#: assets/templates/assets/asset_list.html:441 +#: assets/templates/assets/asset_list.html:437 +#: assets/templates/assets/asset_list.html:445 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:440 +#: assets/templates/assets/asset_list.html:444 msgid "Asset Deleting failed." msgstr "删除失败" @@ -1928,7 +1928,7 @@ msgid "Configuration" msgstr "配置" #: assets/templates/assets/cmd_filter_detail.html:25 -#: assets/templates/assets/cmd_filter_list.html:25 +#: assets/templates/assets/cmd_filter_list.html:23 #: assets/templates/assets/cmd_filter_rule_list.html:23 msgid "Rules" msgstr "规则" @@ -1937,33 +1937,33 @@ msgstr "规则" msgid "Binding to system user" msgstr "绑定到系统用户" -#: assets/templates/assets/cmd_filter_list.html:6 +#: assets/templates/assets/cmd_filter_list.html:5 msgid "" "System user bound some command filter, each command filter has some rules," msgstr "系统用户可以绑定一些命令过滤器，一个过滤器可以定义一些规则" -#: assets/templates/assets/cmd_filter_list.html:7 +#: assets/templates/assets/cmd_filter_list.html:6 msgid "When user login asset with this system user, then run a command," msgstr "当用户使用这个系统用户登录资产，然后执行一个命令" -#: assets/templates/assets/cmd_filter_list.html:8 +#: assets/templates/assets/cmd_filter_list.html:7 msgid "The command will be filter by rules, higher priority rule run first," msgstr "这个命令需要被绑定过滤器的所有规则匹配，高优先级先被匹配，" -#: assets/templates/assets/cmd_filter_list.html:9 +#: assets/templates/assets/cmd_filter_list.html:8 msgid "" "When a rule matched, if rule action is allow, then allow command execute," msgstr "当一个规则匹配到了，如果规则的动作是允许，这个命令会被放行，" -#: assets/templates/assets/cmd_filter_list.html:10 +#: assets/templates/assets/cmd_filter_list.html:9 msgid "else if action is deny, then command with be deny," msgstr "如果规则的动作是禁止，命令将会被禁止执行，" -#: assets/templates/assets/cmd_filter_list.html:11 +#: assets/templates/assets/cmd_filter_list.html:10 msgid "else match next rule, if none matched, allowed" msgstr "否则就匹配下一个规则，如果最后没有匹配到规则，则允许执行" -#: assets/templates/assets/cmd_filter_list.html:16 +#: assets/templates/assets/cmd_filter_list.html:14 #: assets/views/cmd_filter.py:49 msgid "Create command filter" msgstr "创建命令过滤器" @@ -2015,7 +2015,7 @@ msgstr "可连接" msgid "The connection fails" msgstr "连接失败" -#: assets/templates/assets/domain_list.html:9 +#: assets/templates/assets/domain_list.html:6 msgid "" "The domain function is added to address the fact that some environments " "(such as the hybrid cloud) cannot be connected directly by jumping on the " @@ -2024,11 +2024,11 @@ msgstr "" "网域功能是为了解决部分环境（如：混合云）无法直接连接而新增的功能，原理是通过" "网关服务器进行跳转登录。" -#: assets/templates/assets/domain_list.html:11 +#: assets/templates/assets/domain_list.html:8 msgid "JMS => Domain gateway => Target assets" msgstr "JMS => 网域网关 => 目标资产" -#: assets/templates/assets/domain_list.html:17 assets/views/domain.py:48 +#: assets/templates/assets/domain_list.html:13 assets/views/domain.py:48 msgid "Create domain" msgstr "创建网域" @@ -2066,7 +2066,7 @@ msgstr "Uid" msgid "Binding command filters" msgstr "绑定命令过滤器" -#: assets/templates/assets/system_user_list.html:6 +#: assets/templates/assets/system_user_list.html:5 msgid "" "System user is Jumpserver jump login assets used by the users, can be " "understood as the user login assets, such as web, sa, the dba (` ssh " @@ -2077,7 +2077,7 @@ msgstr "" "web，sa，dba（`ssh web@some-host`），而不是使用某个用户的用户名跳转登录服务器" "（`ssh xiaoming@some-host`）；" -#: assets/templates/assets/system_user_list.html:7 +#: assets/templates/assets/system_user_list.html:6 msgid "" "In simple terms, users log into Jumpserver using their own username, and " "Jumpserver uses system users to log into assets. " @@ -2085,7 +2085,7 @@ msgstr "" "简单来说是用户使用自己的用户名登录 Jumpserver，Jumpserver 使用系统用户登录资" "产。" -#: assets/templates/assets/system_user_list.html:8 +#: assets/templates/assets/system_user_list.html:7 msgid "" "When system users are created, if you choose auto push Jumpserver to use " "Ansible push system users into the asset, if the asset (Switch) does not " @@ -2094,25 +2094,25 @@ msgstr "" "系统用户创建时，如果选择了自动推送，Jumpserver 会使用 Ansible 自动推送系统用" "户到资产中，如果资产（交换机）不支持 Ansible，请手动填写账号密码。" -#: assets/templates/assets/system_user_list.html:39 +#: assets/templates/assets/system_user_list.html:37 #: assets/views/system_user.py:47 msgid "Create system user" msgstr "创建系统用户" -#: assets/templates/assets/system_user_list.html:130 +#: assets/templates/assets/system_user_list.html:128 msgid "This will delete the selected System Users !!!" msgstr "删除选择系统用户" -#: assets/templates/assets/system_user_list.html:139 +#: assets/templates/assets/system_user_list.html:137 msgid "System Users Deleted." msgstr "已被删除" -#: assets/templates/assets/system_user_list.html:140 -#: assets/templates/assets/system_user_list.html:145 +#: 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:144 +#: assets/templates/assets/system_user_list.html:142 msgid "System Users Deleting failed." msgstr "系统用户删除失败" @@ -2298,7 +2298,7 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:87 audits/templates/audits/login_log_list.html:63 -#: xpack/plugins/change_auth_plan/models.py:416 +#: 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:69 @@ -2327,8 +2327,8 @@ msgstr "登录日期" #: perms/templates/perms/asset_permission_detail.html:86 #: perms/templates/perms/remote_app_permission_detail.html:78 #: terminal/models.py:167 terminal/templates/terminal/session_list.html:34 -#: xpack/plugins/change_auth_plan/models.py:249 -#: xpack/plugins/change_auth_plan/models.py:419 +#: 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:140 @@ -2347,7 +2347,7 @@ msgstr "选择用户" #: audits/templates/audits/password_change_log_list.html:48 #: ops/templates/ops/command_execution_list.html:46 #: ops/templates/ops/command_execution_list.html:51 -#: templates/_base_list.html:41 +#: templates/_base_list.html:41 templates/_user_profile.html:23 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:52 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48 msgid "Search" @@ -2916,8 +2916,8 @@ msgstr "完成时间" #: ops/models/adhoc.py:362 ops/templates/ops/adhoc_history.html:57 #: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:17 -#: xpack/plugins/change_auth_plan/models.py:252 -#: xpack/plugins/change_auth_plan/models.py:422 +#: 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:143 @@ -3483,25 +3483,25 @@ msgstr "" msgid "Match {} s users" msgstr "匹配 {} 个用户" -#: settings/api.py:224 +#: settings/api.py:226 msgid "Get ldap users is None" msgstr "获取 LDAP 用户为 None" -#: settings/api.py:231 +#: settings/api.py:233 msgid "Imported {} users successfully" msgstr "导入 {} 个用户成功" -#: settings/api.py:262 settings/api.py:298 +#: settings/api.py:264 settings/api.py:300 msgid "" "Error: Account invalid (Please make sure the information such as Access key " "or Secret key is correct)" msgstr "错误：账户无效 （请确保 Access key 或 Secret key 等信息正确）" -#: settings/api.py:268 settings/api.py:304 +#: settings/api.py:270 settings/api.py:306 msgid "Create succeed" msgstr "创建成功" -#: settings/api.py:286 settings/api.py:324 +#: settings/api.py:288 settings/api.py:326 #: settings/templates/settings/terminal_setting.html:154 msgid "Delete succeed" msgstr "删除成功" @@ -3709,12 +3709,11 @@ msgstr "" #: settings/forms.py:220 msgid "Connection max idle time" -msgstr "SSH最大空闲时间" +msgstr "连接最大空闲时间" #: settings/forms.py:222 -msgid "" -"If idle time more than it, disconnect connection(only ssh now) Unit: minute" -msgstr "提示：（单位：分）如果超过该配置没有操作，连接会被断开（仅ssh）" +msgid "If idle time more than it, disconnect connection Unit: minute" +msgstr "提示：如果超过该配置没有操作，连接会被断开 （单位：分）" #: settings/forms.py:228 msgid "Password expiration time" @@ -4842,8 +4841,8 @@ msgstr "生成重置密码链接，通过邮件发送给用户" msgid "Set password" msgstr "设置密码" -#: users/forms.py:152 xpack/plugins/change_auth_plan/models.py:88 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:51 +#: 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: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 @@ -5733,7 +5732,7 @@ 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:60 +#: 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 @@ -5772,8 +5771,8 @@ msgstr "" "具）
注意： 如果同时设置了定期执行和周期执行，优先使用定期执行" #: xpack/plugins/change_auth_plan/meta.py:9 -#: xpack/plugins/change_auth_plan/models.py:116 -#: xpack/plugins/change_auth_plan/models.py:256 +#: xpack/plugins/change_auth_plan/models.py:117 +#: xpack/plugins/change_auth_plan/models.py:257 #: xpack/plugins/change_auth_plan/views.py:33 #: xpack/plugins/change_auth_plan/views.py:50 #: xpack/plugins/change_auth_plan/views.py:74 @@ -5784,20 +5783,20 @@ msgstr "" msgid "Change auth plan" msgstr "改密计划" -#: xpack/plugins/change_auth_plan/models.py:57 +#: xpack/plugins/change_auth_plan/models.py:58 msgid "Custom password" msgstr "自定义密码" -#: xpack/plugins/change_auth_plan/models.py:58 +#: xpack/plugins/change_auth_plan/models.py:59 msgid "All assets use the same random password" msgstr "所有资产使用相同的随机密码" -#: xpack/plugins/change_auth_plan/models.py:59 +#: xpack/plugins/change_auth_plan/models.py:60 msgid "All assets use different random password" msgstr "所有资产使用不同的随机密码" -#: xpack/plugins/change_auth_plan/models.py:78 -#: xpack/plugins/change_auth_plan/models.py:147 +#: xpack/plugins/change_auth_plan/models.py:79 +#: xpack/plugins/change_auth_plan/models.py:148 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:100 #: xpack/plugins/cloud/models.py:165 xpack/plugins/cloud/models.py:219 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:91 @@ -5806,8 +5805,8 @@ msgstr "所有资产使用不同的随机密码" msgid "Cycle perform" msgstr "周期执行" -#: xpack/plugins/change_auth_plan/models.py:83 -#: xpack/plugins/change_auth_plan/models.py:145 +#: xpack/plugins/change_auth_plan/models.py:84 +#: xpack/plugins/change_auth_plan/models.py:146 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:92 #: xpack/plugins/cloud/models.py:170 xpack/plugins/cloud/models.py:217 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83 @@ -5816,37 +5815,37 @@ msgstr "周期执行" msgid "Regularly perform" msgstr "定期执行" -#: xpack/plugins/change_auth_plan/models.py:92 +#: xpack/plugins/change_auth_plan/models.py:93 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:74 msgid "Password rules" msgstr "密码规则" -#: xpack/plugins/change_auth_plan/models.py:212 +#: xpack/plugins/change_auth_plan/models.py:213 msgid "* For security, do not change {} user's password" msgstr "* 为了安全，禁止更改 {} 用户的密码" -#: xpack/plugins/change_auth_plan/models.py:216 +#: xpack/plugins/change_auth_plan/models.py:217 msgid "Assets is empty, please add the asset" msgstr "资产为空，请添加资产" -#: xpack/plugins/change_auth_plan/models.py:260 +#: xpack/plugins/change_auth_plan/models.py:261 msgid "Change auth plan snapshot" msgstr "改密计划快照" -#: xpack/plugins/change_auth_plan/models.py:275 -#: xpack/plugins/change_auth_plan/models.py:426 +#: xpack/plugins/change_auth_plan/models.py:276 +#: xpack/plugins/change_auth_plan/models.py:433 msgid "Change auth plan execution" msgstr "改密计划执行" -#: xpack/plugins/change_auth_plan/models.py:435 +#: xpack/plugins/change_auth_plan/models.py:442 msgid "Change auth plan execution subtask" msgstr "改密计划执行子任务" -#: xpack/plugins/change_auth_plan/models.py:453 +#: xpack/plugins/change_auth_plan/models.py:460 msgid "Authentication failed" msgstr "认证失败" -#: xpack/plugins/change_auth_plan/models.py:455 +#: xpack/plugins/change_auth_plan/models.py:462 msgid "Connection timeout" msgstr "连接超时" @@ -5886,7 +5885,7 @@ msgstr "添加资产" msgid "Add node to this plan" msgstr "添加节点" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:12 +#: 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" diff --git a/apps/settings/api.py b/apps/settings/api.py index 1fce9a44d..1c65dc12c 100644 --- a/apps/settings/api.py +++ b/apps/settings/api.py @@ -334,7 +334,8 @@ class PublicSettingApi(generics.RetrieveAPIView): c = settings.CONFIG instance = { "data": { - "WINDOWS_SKIP_ALL_MANUAL_PASSWORD": c.WINDOWS_SKIP_ALL_MANUAL_PASSWORD + "WINDOWS_SKIP_ALL_MANUAL_PASSWORD": c.WINDOWS_SKIP_ALL_MANUAL_PASSWORD, + "SECURITY_MAX_IDLE_TIME": c.SECURITY_MAX_IDLE_TIME, } } return instance diff --git a/apps/settings/forms.py b/apps/settings/forms.py index 4a115bcac..5b55091cb 100644 --- a/apps/settings/forms.py +++ b/apps/settings/forms.py @@ -219,7 +219,7 @@ class SecuritySettingForm(BaseForm): min_value=1, max_value=99999, required=False, label=_("Connection max idle time"), help_text=_( - 'If idle time more than it, disconnect connection(only ssh now) ' + 'If idle time more than it, disconnect connection ' 'Unit: minute' ), )