From 44cd82f3e1ac44eb0a9f731b0c1319350b72f347 Mon Sep 17 00:00:00 2001 From: Bai Date: Thu, 9 Apr 2020 10:59:00 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 88806 -> 89486 bytes apps/locale/zh/LC_MESSAGES/django.po | 303 +++++++++++++------------ apps/locale/zh/LC_MESSAGES/djangojs.mo | Bin 2782 -> 2741 bytes apps/settings/utils/ldap.py | 2 +- 4 files changed, 165 insertions(+), 140 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index b952d9ab4f927284d0409b7b1971b1108d3c5829..274ce66f964c1cf1e845cb993d3681aa6f907a86 100644 GIT binary patch delta 26876 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 I0sp1=Ka+FcS^xk5 delta 26257 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 Q6%FW+Zuh(f0skcWAIX>ro&W#< diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 994ffd5ef..a9f448d44 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: 2020-03-23 03:05+0800\n" +"POT-Creation-Date: 2020-04-09 10:47+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -26,9 +26,9 @@ msgstr "自定义" #: applications/templates/applications/remote_app_list.html:27 #: applications/templates/applications/user_remote_app_list.html:18 #: assets/forms/domain.py:15 assets/forms/label.py:13 -#: assets/models/asset.py:353 assets/models/authbook.py:23 +#: assets/models/asset.py:353 assets/models/authbook.py:25 #: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:32 -#: assets/serializers/asset_user.py:48 assets/serializers/asset_user.py:85 +#: assets/serializers/asset_user.py:47 assets/serializers/asset_user.py:84 #: assets/serializers/system_user.py:44 assets/serializers/system_user.py:176 #: assets/templates/assets/admin_user_list.html:23 #: assets/templates/assets/asset_list.html:170 @@ -53,12 +53,13 @@ msgstr "自定义" #: users/templates/users/user_asset_permission.html:70 #: users/templates/users/user_granted_remote_app.html:36 #: xpack/plugins/change_auth_plan/forms.py:74 -#: xpack/plugins/change_auth_plan/models.py:267 +#: xpack/plugins/change_auth_plan/models.py:265 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:40 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:54 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:13 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:14 -#: xpack/plugins/cloud/models.py:266 +#: xpack/plugins/cloud/models.py:269 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:37 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:47 #: xpack/plugins/orgs/templates/orgs/org_list.html:17 #: xpack/plugins/vault/forms.py:13 xpack/plugins/vault/forms.py:15 @@ -142,8 +143,8 @@ msgstr "运行参数" #: perms/templates/perms/remote_app_permission_user.html:49 #: settings/models.py:26 #: settings/templates/settings/_ldap_list_users_modal.html:32 -#: terminal/models.py:26 terminal/models.py:334 terminal/models.py:366 -#: terminal/models.py:403 terminal/templates/terminal/base_storage_list.html:31 +#: terminal/models.py:26 terminal/models.py:341 terminal/models.py:373 +#: terminal/models.py:410 terminal/templates/terminal/base_storage_list.html:31 #: terminal/templates/terminal/terminal_detail.html:43 #: terminal/templates/terminal/terminal_list.html:30 users/forms/profile.py:20 #: users/models/group.py:15 users/models/user.py:440 @@ -182,7 +183,7 @@ msgstr "名称" #: assets/templates/assets/cmd_filter_rule_list.html:53 #: audits/templates/audits/login_log_list.html:58 #: perms/templates/perms/remote_app_permission_remote_app.html:50 -#: terminal/models.py:368 terminal/models.py:405 +#: terminal/models.py:375 terminal/models.py:412 #: terminal/templates/terminal/base_storage_list.html:32 #: tickets/models/ticket.py:43 tickets/templates/tickets/ticket_detail.html:33 #: tickets/templates/tickets/ticket_list.html:35 @@ -247,8 +248,8 @@ msgstr "数据库" #: perms/templates/perms/asset_permission_detail.html:97 #: perms/templates/perms/database_app_permission_detail.html:93 #: perms/templates/perms/remote_app_permission_detail.html:89 -#: settings/models.py:31 terminal/models.py:36 terminal/models.py:373 -#: terminal/models.py:410 terminal/templates/terminal/base_storage_list.html:33 +#: settings/models.py:31 terminal/models.py:36 terminal/models.py:380 +#: terminal/models.py:417 terminal/templates/terminal/base_storage_list.html:33 #: terminal/templates/terminal/terminal_detail.html:63 #: tickets/templates/tickets/ticket_detail.html:104 users/models/group.py:16 #: users/models/user.py:473 users/templates/users/user_detail.html:115 @@ -257,13 +258,13 @@ msgstr "数据库" #: users/templates/users/user_group_detail.html:62 #: users/templates/users/user_group_list.html:16 #: users/templates/users/user_profile.html:138 -#: xpack/plugins/change_auth_plan/models.py:77 +#: xpack/plugins/change_auth_plan/models.py:75 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:115 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19 -#: xpack/plugins/cloud/models.py:53 xpack/plugins/cloud/models.py:136 +#: xpack/plugins/cloud/models.py:53 xpack/plugins/cloud/models.py:139 #: xpack/plugins/cloud/templates/cloud/account_detail.html:67 #: xpack/plugins/cloud/templates/cloud/account_list.html:15 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:102 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:128 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:18 #: xpack/plugins/gathered_user/models.py:26 #: xpack/plugins/orgs/templates/orgs/org_detail.html:59 @@ -321,9 +322,9 @@ msgstr "参数" #: perms/templates/perms/remote_app_permission_detail.html:85 #: users/models/user.py:481 users/serializers/group.py:32 #: users/templates/users/user_detail.html:97 -#: xpack/plugins/change_auth_plan/models.py:81 +#: xpack/plugins/change_auth_plan/models.py:79 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:111 -#: xpack/plugins/cloud/models.py:56 xpack/plugins/cloud/models.py:142 +#: xpack/plugins/cloud/models.py:56 xpack/plugins/cloud/models.py:145 #: xpack/plugins/gathered_user/models.py:30 msgid "Created by" msgstr "创建者" @@ -350,9 +351,9 @@ msgstr "创建者" #: tickets/templates/tickets/ticket_detail.html:52 users/models/group.py:18 #: users/templates/users/user_group_detail.html:58 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:103 -#: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:145 +#: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:148 #: xpack/plugins/cloud/templates/cloud/account_detail.html:63 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:98 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:108 #: xpack/plugins/orgs/templates/orgs/org_detail.html:55 msgid "Date created" msgstr "创建日期" @@ -405,7 +406,7 @@ msgstr "远程应用" #: users/templates/users/user_pubkey_update.html:80 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:65 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:29 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:49 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:52 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:40 #: xpack/plugins/interface/templates/interface/interface.html:72 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:29 @@ -739,7 +740,7 @@ msgstr "最新版本的不能被删除" #: assets/templates/assets/asset_detail.html:194 #: assets/templates/assets/system_user_assets.html:118 #: perms/models/asset_permission.py:81 -#: xpack/plugins/change_auth_plan/models.py:56 +#: xpack/plugins/change_auth_plan/models.py:54 #: xpack/plugins/gathered_user/models.py:24 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:17 msgid "Nodes" @@ -857,8 +858,8 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: users/templates/users/user_list.html:15 #: users/templates/users/user_profile.html:47 #: xpack/plugins/change_auth_plan/forms.py:59 -#: xpack/plugins/change_auth_plan/models.py:47 -#: xpack/plugins/change_auth_plan/models.py:263 +#: xpack/plugins/change_auth_plan/models.py:45 +#: xpack/plugins/change_auth_plan/models.py:261 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:63 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:53 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:12 @@ -871,6 +872,7 @@ msgstr "用户名" #: ops/templates/ops/task_detail.html:95 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:82 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:72 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:82 msgid "Yes" msgstr "是" @@ -878,6 +880,7 @@ msgstr "是" #: ops/templates/ops/task_detail.html:97 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:84 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:74 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:84 msgid "No" msgstr "否" @@ -899,7 +902,7 @@ msgid "Password or private key passphrase" msgstr "密码或密钥密码" #: assets/forms/user.py:26 assets/models/base.py:234 -#: assets/serializers/asset_user.py:72 +#: assets/serializers/asset_user.py:71 #: assets/templates/assets/_asset_user_auth_update_modal.html:21 #: assets/templates/assets/_asset_user_auth_view_modal.html:27 #: authentication/forms.py:12 @@ -914,13 +917,13 @@ 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:68 -#: xpack/plugins/change_auth_plan/models.py:183 -#: xpack/plugins/change_auth_plan/models.py:270 +#: xpack/plugins/change_auth_plan/models.py:66 +#: xpack/plugins/change_auth_plan/models.py:181 +#: xpack/plugins/change_auth_plan/models.py:268 msgid "Password" msgstr "密码" -#: assets/forms/user.py:29 assets/serializers/asset_user.py:80 +#: assets/forms/user.py:29 assets/serializers/asset_user.py:79 #: assets/templates/assets/_asset_user_auth_update_modal.html:27 #: users/models/user.py:467 msgid "Private key" @@ -993,7 +996,7 @@ msgid "Internal" msgstr "内部的" #: assets/models/asset.py:187 assets/models/domain.py:49 -#: assets/serializers/asset_user.py:47 +#: assets/serializers/asset_user.py:46 #: assets/templates/assets/_asset_list_modal.html:47 #: assets/templates/assets/_asset_user_list.html:20 #: assets/templates/assets/asset_detail.html:60 @@ -1009,7 +1012,7 @@ msgstr "内部的" msgid "IP" msgstr "IP" -#: assets/models/asset.py:188 assets/serializers/asset_user.py:46 +#: assets/models/asset.py:188 assets/serializers/asset_user.py:45 #: assets/serializers/gathered_user.py:20 #: assets/templates/assets/_asset_list_modal.html:46 #: assets/templates/assets/_asset_user_auth_update_modal.html:9 @@ -1120,11 +1123,11 @@ msgstr "主机名原始" msgid "Labels" msgstr "标签管理" -#: assets/models/authbook.py:24 ops/templates/ops/task_detail.html:70 +#: assets/models/authbook.py:26 ops/templates/ops/task_detail.html:70 msgid "Latest version" msgstr "最新版本" -#: assets/models/authbook.py:25 +#: assets/models/authbook.py:27 #: assets/templates/assets/_asset_user_list.html:22 #: ops/templates/ops/adhoc_history.html:56 #: ops/templates/ops/adhoc_history_detail.html:55 @@ -1132,19 +1135,19 @@ msgstr "最新版本" msgid "Version" msgstr "版本" -#: assets/models/authbook.py:34 +#: assets/models/authbook.py:36 msgid "AuthBook" msgstr "" -#: assets/models/base.py:235 xpack/plugins/change_auth_plan/models.py:72 -#: xpack/plugins/change_auth_plan/models.py:190 -#: xpack/plugins/change_auth_plan/models.py:277 +#: assets/models/base.py:235 xpack/plugins/change_auth_plan/models.py:70 +#: xpack/plugins/change_auth_plan/models.py:188 +#: xpack/plugins/change_auth_plan/models.py:275 msgid "SSH private key" msgstr "ssh密钥" -#: assets/models/base.py:236 xpack/plugins/change_auth_plan/models.py:75 -#: xpack/plugins/change_auth_plan/models.py:186 -#: xpack/plugins/change_auth_plan/models.py:273 +#: assets/models/base.py:236 xpack/plugins/change_auth_plan/models.py:73 +#: xpack/plugins/change_auth_plan/models.py:184 +#: xpack/plugins/change_auth_plan/models.py:271 msgid "SSH public key" msgstr "ssh公钥" @@ -1190,7 +1193,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:14 -#: users/models/user.py:595 +#: users/models/user.py:600 msgid "System" msgstr "系统" @@ -1323,7 +1326,7 @@ msgstr "默认资产组" #: tickets/models/ticket.py:128 tickets/templates/tickets/ticket_detail.html:32 #: tickets/templates/tickets/ticket_list.html:34 #: tickets/templates/tickets/ticket_list.html:103 users/forms/group.py:15 -#: users/models/user.py:143 users/models/user.py:159 users/models/user.py:583 +#: users/models/user.py:143 users/models/user.py:159 users/models/user.py:588 #: users/serializers/group.py:20 #: users/templates/users/user_asset_permission.html:38 #: users/templates/users/user_asset_permission.html:64 @@ -1396,7 +1399,7 @@ msgstr "手动登录" #: assets/views/platform.py:58 assets/views/platform.py:74 #: assets/views/system_user.py:30 assets/views/system_user.py:47 #: assets/views/system_user.py:64 assets/views/system_user.py:80 -#: templates/_nav.html:39 xpack/plugins/change_auth_plan/models.py:52 +#: templates/_nav.html:39 xpack/plugins/change_auth_plan/models.py:50 msgid "Assets" msgstr "资产管理" @@ -1512,7 +1515,7 @@ msgstr "组织名称" msgid "Connectivity" msgstr "连接" -#: assets/serializers/asset_user.py:45 +#: assets/serializers/asset_user.py:44 #: assets/templates/assets/_node_detail_modal.html:18 #: audits/templates/audits/login_log_list.html:56 #: authentication/templates/authentication/_access_key_modal.html:30 @@ -1525,11 +1528,11 @@ msgstr "连接" msgid "ID" msgstr "ID" -#: assets/serializers/asset_user.py:49 +#: assets/serializers/asset_user.py:48 msgid "Backend" msgstr "后端" -#: assets/serializers/asset_user.py:76 users/forms/profile.py:148 +#: assets/serializers/asset_user.py:75 users/forms/profile.py:148 #: users/models/user.py:470 users/templates/users/first_login.html:42 #: users/templates/users/user_password_update.html:49 #: users/templates/users/user_profile.html:69 @@ -1724,7 +1727,7 @@ msgstr "资产列表" #: ops/templates/ops/command_execution_create.html:112 #: settings/templates/settings/_ldap_list_users_modal.html:41 #: users/templates/users/_granted_assets.html:7 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:62 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:65 msgid "Loading" msgstr "加载中" @@ -1884,7 +1887,7 @@ msgstr "自动生成密钥" #: perms/templates/perms/remote_app_permission_create_update.html:51 #: terminal/templates/terminal/terminal_update.html:38 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:61 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:44 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:47 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:35 msgid "Other" msgstr "其它" @@ -1953,7 +1956,7 @@ msgstr "选择节点" #: users/templates/users/user_list.html:184 #: users/templates/users/user_password_verify.html:20 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:30 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:50 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:53 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:41 #: xpack/plugins/interface/templates/interface/interface.html:103 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:30 @@ -1993,7 +1996,7 @@ msgstr "资产用户" #: users/templates/users/user_detail.html:126 #: users/templates/users/user_profile.html:150 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:126 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:129 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:139 #: xpack/plugins/license/templates/license/license_detail.html:80 msgid "Quick modify" msgstr "快速修改" @@ -2526,7 +2529,7 @@ msgstr "启用" msgid "-" msgstr "" -#: audits/models.py:78 xpack/plugins/cloud/models.py:201 +#: audits/models.py:78 xpack/plugins/cloud/models.py:204 msgid "Failed" msgstr "失败" @@ -2557,9 +2560,9 @@ msgid "MFA" msgstr "多因子认证" #: audits/models.py:87 audits/templates/audits/login_log_list.html:63 -#: xpack/plugins/change_auth_plan/models.py:287 +#: xpack/plugins/change_auth_plan/models.py:286 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:15 -#: xpack/plugins/cloud/models.py:214 +#: xpack/plugins/cloud/models.py:217 msgid "Reason" msgstr "原因" @@ -2567,7 +2570,7 @@ msgstr "原因" #: tickets/templates/tickets/ticket_detail.html:34 #: tickets/templates/tickets/ticket_list.html:36 #: tickets/templates/tickets/ticket_list.html:104 -#: xpack/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:269 +#: xpack/plugins/cloud/models.py:214 xpack/plugins/cloud/models.py:272 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:50 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48 msgid "Status" @@ -2587,8 +2590,8 @@ msgstr "登录日期" #: perms/templates/perms/remote_app_permission_detail.html:73 #: terminal/models.py:199 terminal/templates/terminal/session_detail.html:72 #: terminal/templates/terminal/session_list.html:32 -#: xpack/plugins/change_auth_plan/models.py:169 -#: xpack/plugins/change_auth_plan/models.py:291 +#: xpack/plugins/change_auth_plan/models.py:167 +#: xpack/plugins/change_auth_plan/models.py:290 #: 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:76 @@ -3003,7 +3006,7 @@ msgstr "字段必须唯一" msgid "

Flow service unavailable, check it

" msgstr "" -#: jumpserver/views/index.py:244 templates/_nav.html:7 +#: jumpserver/views/index.py:257 templates/_nav.html:7 msgid "Dashboard" msgstr "仪表盘" @@ -3040,13 +3043,13 @@ msgstr "没有该主机 {} 权限" #: ops/mixin.py:29 ops/mixin.py:92 ops/mixin.py:162 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:98 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:88 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:98 msgid "Cycle perform" msgstr "周期执行" #: ops/mixin.py:33 ops/mixin.py:90 ops/mixin.py:111 ops/mixin.py:150 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:90 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:80 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:90 msgid "Regularly perform" msgstr "定期执行" @@ -3054,8 +3057,8 @@ msgstr "定期执行" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:54 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:79 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:17 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:37 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:69 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:40 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:79 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:16 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:28 msgid "Periodic perform" @@ -3138,8 +3141,8 @@ msgstr "完成时间" #: ops/models/adhoc.py:238 ops/templates/ops/adhoc_history.html:55 #: ops/templates/ops/task_history.html:61 ops/templates/ops/task_list.html:16 -#: xpack/plugins/change_auth_plan/models.py:172 -#: xpack/plugins/change_auth_plan/models.py:294 +#: xpack/plugins/change_auth_plan/models.py:170 +#: xpack/plugins/change_auth_plan/models.py:293 #: 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:79 @@ -3166,17 +3169,17 @@ msgstr "结果" msgid "Adhoc result summary" msgstr "汇总" -#: ops/models/adhoc.py:282 xpack/plugins/change_auth_plan/utils.py:89 +#: ops/models/adhoc.py:282 xpack/plugins/change_auth_plan/utils.py:137 msgid "{} Start task: {}" msgstr "{} 任务开始: {}" -#: ops/models/adhoc.py:291 xpack/plugins/change_auth_plan/utils.py:101 +#: ops/models/adhoc.py:291 xpack/plugins/change_auth_plan/utils.py:149 msgid "{} Task finish" msgstr "{} 任务结束" #: ops/models/command.py:24 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:56 -#: xpack/plugins/cloud/models.py:209 +#: xpack/plugins/cloud/models.py:212 msgid "Result" msgstr "结果" @@ -3354,7 +3357,7 @@ msgid "Pending" msgstr "等待" #: ops/templates/ops/command_execution_list.html:70 -#: xpack/plugins/change_auth_plan/models.py:259 +#: xpack/plugins/change_auth_plan/models.py:257 msgid "Finished" msgstr "结束" @@ -3394,7 +3397,7 @@ msgstr "内容" #: ops/templates/ops/task_list.html:73 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:135 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:54 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:138 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:148 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:58 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:44 msgid "Run" @@ -3579,6 +3582,7 @@ msgid "Add node to this permission" msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:105 +#: terminal/templates/terminal/session_list.html:149 #: users/templates/users/user_detail.html:226 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:101 msgid "Join" @@ -4252,8 +4256,8 @@ msgid "The port is not the port of the LDAP service: {}" msgstr "端口不是LDAP服务端口: {}" #: settings/utils/ldap.py:393 -msgid "Please enter the certificate: {}" -msgstr "" +msgid "Please add certificate: {}" +msgstr "请添加证书" #: settings/utils/ldap.py:395 settings/utils/ldap.py:422 #: settings/utils/ldap.py:452 settings/utils/ldap.py:480 @@ -4761,6 +4765,22 @@ msgstr "月未登录主机" msgid "Filters" msgstr "过滤" +#: terminal/api/session.py:142 +msgid "Session does not exist: {}" +msgstr "会话不存在: {}" + +#: terminal/api/session.py:145 +msgid "Session is finished or the protocol not supported" +msgstr "会话已经完成或协议不支持" + +#: terminal/api/session.py:150 +msgid "User does not exist: {}" +msgstr "用户不存在: {}" + +#: terminal/api/session.py:154 +msgid "User does not have permission" +msgstr "用户没有权限" + #: terminal/api/storage.py:24 msgid "Deleting the default storage is not allowed" msgstr "不允许删除默认存储配置" @@ -4779,13 +4799,13 @@ msgstr "测试失败: 账户无效" #: terminal/backends/command/models.py:14 #: terminal/templates/terminal/command_list.html:110 -#: terminal/templates/terminal/command_list.html:194 +#: terminal/templates/terminal/command_list.html:205 msgid "Ordinary" msgstr "普通" #: terminal/backends/command/models.py:15 #: terminal/templates/terminal/command_list.html:111 -#: terminal/templates/terminal/command_list.html:191 +#: terminal/templates/terminal/command_list.html:202 msgid "Dangerous" msgstr "危险" @@ -4860,9 +4880,9 @@ msgid "" " " msgstr "" -#: terminal/forms/storage.py:136 xpack/plugins/cloud/models.py:263 +#: terminal/forms/storage.py:136 xpack/plugins/cloud/models.py:266 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:29 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:106 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:112 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:46 msgid "Region" msgstr "地域" @@ -4953,7 +4973,7 @@ msgstr "回放" msgid "Date end" msgstr "结束日期" -#: terminal/models.py:335 +#: terminal/models.py:342 msgid "Args" msgstr "参数" @@ -4961,7 +4981,7 @@ msgstr "参数" msgid "Export command" msgstr "导出命令" -#: terminal/templates/terminal/command_list.html:199 +#: terminal/templates/terminal/command_list.html:210 msgid "Goto" msgstr "转到" @@ -5040,11 +5060,11 @@ msgstr "终断任务已发送，请等待" msgid "Terminate" msgstr "终断" -#: terminal/templates/terminal/session_list.html:174 +#: terminal/templates/terminal/session_list.html:179 msgid "Finish session success" msgstr "标记会话完成成功" -#: terminal/templates/terminal/session_list.html:242 +#: terminal/templates/terminal/session_list.html:247 msgid "Visit doc for replay play offline: " msgstr "访问文档查看如何离线播放: " @@ -5276,7 +5296,7 @@ msgstr "工单列表" msgid "Ticket detail" msgstr "工单详情" -#: users/api/user.py:177 +#: users/api/user.py:116 msgid "Could not reset self otp, use profile reset instead" msgstr "不能在该页面重置多因子认证, 请去个人信息页面重置" @@ -5350,7 +5370,7 @@ msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" #: users/forms/profile.py:137 users/forms/user.py:90 -#: users/serializers/user.py:131 +#: users/serializers/user.py:138 msgid "Not a valid ssh public key" msgstr "ssh密钥不合法" @@ -5390,7 +5410,7 @@ msgstr "生成重置密码链接，通过邮件发送给用户" msgid "Set password" msgstr "设置密码" -#: users/forms/user.py:132 xpack/plugins/change_auth_plan/models.py:61 +#: users/forms/user.py:132 xpack/plugins/change_auth_plan/models.py:59 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:45 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:67 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57 @@ -5398,7 +5418,7 @@ msgstr "设置密码" msgid "Password strategy" msgstr "密码策略" -#: users/models/user.py:142 users/models/user.py:591 +#: users/models/user.py:142 users/models/user.py:596 msgid "Administrator" msgstr "管理员" @@ -5435,7 +5455,7 @@ msgstr "微信" msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:594 +#: users/models/user.py:599 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -5443,39 +5463,39 @@ msgstr "Administrator是初始的超级管理员" msgid "Auditors cannot be join in the user group" msgstr "审计员不能被加入到用户组" -#: users/serializers/user.py:35 +#: users/serializers/user.py:42 msgid "Is first login" msgstr "首次登录" -#: users/serializers/user.py:36 +#: users/serializers/user.py:43 msgid "Is valid" msgstr "账户是否有效" -#: users/serializers/user.py:37 +#: users/serializers/user.py:44 msgid "Is expired" msgstr " 是否过期" -#: users/serializers/user.py:38 +#: users/serializers/user.py:45 msgid "Avatar url" msgstr "头像路径" -#: users/serializers/user.py:46 +#: users/serializers/user.py:53 msgid "Role limit to {}" msgstr "角色只能为 {}" -#: users/serializers/user.py:58 +#: users/serializers/user.py:65 msgid "Password does not match security rules" msgstr "密码不满足安全规则" -#: users/serializers/user.py:116 +#: users/serializers/user.py:123 msgid "Groups name" msgstr "用户组名" -#: users/serializers/user.py:117 +#: users/serializers/user.py:124 msgid "Source name" msgstr "用户来源名" -#: users/serializers/user.py:118 +#: users/serializers/user.py:125 msgid "Role name" msgstr "角色名" @@ -6209,8 +6229,8 @@ msgstr "" "用户不存在，则创建用户。" #: xpack/plugins/change_auth_plan/meta.py:9 -#: xpack/plugins/change_auth_plan/models.py:89 -#: xpack/plugins/change_auth_plan/models.py:176 +#: xpack/plugins/change_auth_plan/models.py:87 +#: xpack/plugins/change_auth_plan/models.py:174 #: xpack/plugins/change_auth_plan/views.py:33 #: xpack/plugins/change_auth_plan/views.py:50 #: xpack/plugins/change_auth_plan/views.py:74 @@ -6221,64 +6241,60 @@ msgstr "" msgid "Change auth plan" msgstr "改密计划" -#: xpack/plugins/change_auth_plan/models.py:41 +#: xpack/plugins/change_auth_plan/models.py:39 msgid "Custom password" msgstr "自定义密码" -#: xpack/plugins/change_auth_plan/models.py:42 +#: xpack/plugins/change_auth_plan/models.py:40 msgid "All assets use the same random password" msgstr "所有资产使用相同的随机密码" -#: xpack/plugins/change_auth_plan/models.py:43 +#: xpack/plugins/change_auth_plan/models.py:41 msgid "All assets use different random password" msgstr "所有资产使用不同的随机密码" -#: xpack/plugins/change_auth_plan/models.py:65 +#: xpack/plugins/change_auth_plan/models.py:63 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:72 msgid "Password rules" msgstr "密码规则" -#: xpack/plugins/change_auth_plan/models.py:180 +#: xpack/plugins/change_auth_plan/models.py:178 msgid "Change auth plan snapshot" msgstr "改密计划快照" -#: xpack/plugins/change_auth_plan/models.py:195 -#: xpack/plugins/change_auth_plan/models.py:281 +#: xpack/plugins/change_auth_plan/models.py:193 +#: xpack/plugins/change_auth_plan/models.py:279 msgid "Change auth plan execution" msgstr "改密计划执行" -#: xpack/plugins/change_auth_plan/models.py:254 +#: xpack/plugins/change_auth_plan/models.py:252 msgid "Ready" msgstr "" -#: xpack/plugins/change_auth_plan/models.py:255 -msgid "check_condition" +#: xpack/plugins/change_auth_plan/models.py:253 +msgid "Preflight check" msgstr "" -#: xpack/plugins/change_auth_plan/models.py:256 +#: xpack/plugins/change_auth_plan/models.py:254 msgid "Change auth" msgstr "" -#: xpack/plugins/change_auth_plan/models.py:257 +#: xpack/plugins/change_auth_plan/models.py:255 msgid "Verify auth" msgstr "" -#: xpack/plugins/change_auth_plan/models.py:258 -msgid "Save auth" +#: xpack/plugins/change_auth_plan/models.py:256 +msgid "Keep auth" msgstr "" -#: xpack/plugins/change_auth_plan/models.py:284 +#: xpack/plugins/change_auth_plan/models.py:283 msgid "Step" msgstr "步骤" -#: xpack/plugins/change_auth_plan/models.py:301 +#: xpack/plugins/change_auth_plan/models.py:300 msgid "Change auth plan task" msgstr "改密计划任务" -#: xpack/plugins/change_auth_plan/serializers.py:58 -msgid "* For security, do not change {}'s password" -msgstr "* 为了安全，不能修改 {} 的密码" - #: xpack/plugins/change_auth_plan/serializers.py:68 msgid "* Please enter custom password" msgstr "* 请输入自定义密码" @@ -6348,13 +6364,17 @@ msgstr "执行失败" msgid "Create plan" msgstr "创建计划" -#: xpack/plugins/change_auth_plan/utils.py:262 -msgid "Failed to connect asset" -msgstr "连接资产失败" +#: xpack/plugins/change_auth_plan/utils.py:437 +msgid "Invalid/incorrect password" +msgstr "无效/错误 密码" -#: xpack/plugins/change_auth_plan/utils.py:264 -msgid "Incorrect password" -msgstr "密码错误" +#: xpack/plugins/change_auth_plan/utils.py:439 +msgid "Failed to connect to the host" +msgstr "连接主机失败" + +#: xpack/plugins/change_auth_plan/utils.py:441 +msgid "Data could not be sent to remote" +msgstr "无法将数据发送到远程" #: xpack/plugins/change_auth_plan/views.py:34 msgid "Plan list" @@ -6396,6 +6416,10 @@ msgstr "选择节点" msgid "Select admins" msgstr "选择管理员" +#: xpack/plugins/cloud/forms.py:85 +msgid "Tips: The asset information is always covered" +msgstr "" + #: xpack/plugins/cloud/meta.py:9 xpack/plugins/cloud/views.py:27 #: xpack/plugins/cloud/views.py:44 xpack/plugins/cloud/views.py:62 #: xpack/plugins/cloud/views.py:78 xpack/plugins/cloud/views.py:92 @@ -6440,48 +6464,52 @@ msgstr "地域" msgid "Instances" msgstr "实例" -#: xpack/plugins/cloud/models.py:139 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:94 +#: xpack/plugins/cloud/models.py:136 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:69 +msgid "Covered always" +msgstr "总是覆盖" + +#: xpack/plugins/cloud/models.py:142 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:104 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:17 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:150 xpack/plugins/cloud/models.py:207 +#: xpack/plugins/cloud/models.py:153 xpack/plugins/cloud/models.py:210 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:202 +#: xpack/plugins/cloud/models.py:205 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/models.py:217 xpack/plugins/cloud/models.py:272 +#: xpack/plugins/cloud/models.py:220 xpack/plugins/cloud/models.py:275 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:51 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:49 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:245 +#: xpack/plugins/cloud/models.py:248 msgid "Unsync" msgstr "未同步" -#: xpack/plugins/cloud/models.py:246 xpack/plugins/cloud/models.py:247 +#: xpack/plugins/cloud/models.py:249 xpack/plugins/cloud/models.py:250 msgid "Synced" msgstr "已同步" -#: xpack/plugins/cloud/models.py:248 +#: xpack/plugins/cloud/models.py:251 msgid "Released" msgstr "已释放" -#: xpack/plugins/cloud/models.py:253 +#: xpack/plugins/cloud/models.py:256 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:257 +#: xpack/plugins/cloud/models.py:260 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:260 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:114 +#: xpack/plugins/cloud/models.py:263 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:45 msgid "Instance" msgstr "实例" @@ -6560,7 +6588,7 @@ msgstr "创建账户" msgid "Node & AdminUser" msgstr "节点 & 管理用户" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:63 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:66 msgid "Load failed" msgstr "加载失败" @@ -6585,11 +6613,11 @@ msgstr "同步历史列表" msgid "Sync instance list" msgstr "同步实例列表" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:135 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:145 msgid "Run task manually" msgstr "手动执行任务" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:178 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:188 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:102 msgid "Sync success" msgstr "同步成功" @@ -6626,7 +6654,7 @@ msgstr "执行次数" msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/utils.py:37 +#: xpack/plugins/cloud/utils.py:38 msgid "Account unavailable" msgstr "账户无效" @@ -6920,6 +6948,9 @@ msgstr "密码匣子" msgid "vault create" msgstr "创建" +#~ msgid "* For security, do not change {}'s password" +#~ msgstr "* 为了安全，不能修改 {} 的密码" + #~ msgid "Assets is empty, please add the asset" #~ msgstr "资产为空，请添加资产" @@ -7294,9 +7325,6 @@ msgstr "创建" #~ msgid "Loading..." #~ msgstr "加载中..." -#~ msgid "You do not have permission." -#~ msgstr "你没有权限" - #~ msgid "Interface" #~ msgstr "界面" @@ -7321,9 +7349,6 @@ msgstr "创建" #~ msgid "Reachable assets" #~ msgstr "可连接资产" -#~ msgid "User does not exist" -#~ msgstr "用户不存在" - #~ msgid "Restore default successfully！" #~ msgstr "恢复默认成功！" diff --git a/apps/locale/zh/LC_MESSAGES/djangojs.mo b/apps/locale/zh/LC_MESSAGES/djangojs.mo index 4bd390695a945e5f13744670c777354e7d85cc70..24e68caf523648ed333a85c565401a6fbac6a37e 100644 GIT binary patch delta 273 zcmXZWKMnyw6oB!!OV;kjzlh1o5`~h4LM73PBe(!}(Cr1pDRc^Aqfprch)$u=XjN*3 zZ+O*j^1hkOdzhoyx11z$L{^?iQ$#iekve8L#2b<%@c&lT2#d_yIKm!IaG`yx{h*%J z3kKY~V*{VQB)`K)2Zm}xA1gRT`_T+zoMRai?BW{jf+s9thIa8Q*3b?A?~U3~2e_n< N!!&kx`Sk6*a$nFs8a@C3 delta 312 zcmXZWzY76j7zgm@kRO*HB}y1940QG0p`77T$Y8xdGq6mDP<9-({S9Y&x7-NWB7 z4omWX-e9|IAI_0m@;>d^`Ub>PEs2^C`;-6a F{Q~9OCL#a; diff --git a/apps/settings/utils/ldap.py b/apps/settings/utils/ldap.py index bfb8754f2..a13dcc063 100644 --- a/apps/settings/utils/ldap.py +++ b/apps/settings/utils/ldap.py @@ -390,7 +390,7 @@ class LDAPTestUtil(object): except LDAPSessionTerminatedByServerError as e: error = _('The port is not the port of the LDAP service: {}'.format(e)) except LDAPSocketReceiveError as e: - error = _('Please enter the certificate: {}'.format(e)) + error = _('Please add certificate: {}'.format(e)) except Exception as e: error = _('Unknown error: {}'.format(e)) else: