diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index fe2727f39..80319de2e 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 62c79095d..0525b84d3 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-19 15:50+0800\n" +"POT-Creation-Date: 2019-12-20 15:57+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -47,8 +47,9 @@ msgstr "自定义" #: terminal/templates/terminal/command_list.html:66 #: terminal/templates/terminal/session_list.html:26 #: terminal/templates/terminal/session_list.html:70 -#: users/templates/users/user_asset_permission.html:57 -#: users/templates/users/user_asset_permission.html:90 +#: users/templates/users/user_asset_permission.html:40 +#: users/templates/users/user_asset_permission.html:70 +#: users/templates/users/user_granted_remote_app.html:36 #: xpack/plugins/change_auth_plan/forms.py:73 #: xpack/plugins/change_auth_plan/models.py:419 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:44 @@ -145,14 +146,18 @@ msgstr "运行参数" #: terminal/templates/terminal/terminal_list.html:30 users/forms/profile.py:20 #: users/models/group.py:15 users/models/user.py:438 #: users/templates/users/_select_user_modal.html:13 -#: users/templates/users/user_asset_permission.html:54 -#: users/templates/users/user_asset_permission.html:174 -#: users/templates/users/user_detail.html:64 +#: users/templates/users/user_asset_permission.html:37 +#: users/templates/users/user_asset_permission.html:154 +#: users/templates/users/user_database_app_permission.html:36 +#: users/templates/users/user_detail.html:49 +#: users/templates/users/user_granted_database_app.html:34 +#: users/templates/users/user_granted_remote_app.html:34 #: users/templates/users/user_group_detail.html:50 #: users/templates/users/user_group_list.html:14 #: users/templates/users/user_list.html:14 #: users/templates/users/user_profile.html:51 #: users/templates/users/user_pubkey_update.html:57 +#: users/templates/users/user_remote_app_permission.html:36 #: xpack/plugins/change_auth_plan/forms.py:56 #: xpack/plugins/change_auth_plan/models.py:64 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61 @@ -181,6 +186,7 @@ msgstr "名称" #: terminal/templates/terminal/base_storage_list.html:33 #: tickets/models/ticket.py:43 tickets/templates/tickets/ticket_detail.html:33 #: tickets/templates/tickets/ticket_list.html:35 +#: users/templates/users/user_granted_database_app.html:35 msgid "Type" msgstr "类型" @@ -189,6 +195,7 @@ msgstr "类型" #: applications/templates/applications/database_app_list.html:26 #: applications/templates/applications/user_database_app_list.html:18 #: ops/models/adhoc.py:185 templates/index.html:91 +#: users/templates/users/user_granted_database_app.html:36 msgid "Host" msgstr "主机" @@ -205,6 +212,7 @@ msgstr "端口" #: applications/templates/applications/database_app_detail.html:64 #: applications/templates/applications/database_app_list.html:28 #: applications/templates/applications/user_database_app_list.html:19 +#: users/templates/users/user_granted_database_app.html:37 msgid "Database" msgstr "数据库" @@ -243,7 +251,9 @@ msgstr "数据库" #: terminal/models.py:358 terminal/templates/terminal/base_storage_list.html:34 #: terminal/templates/terminal/terminal_detail.html:63 #: tickets/templates/tickets/ticket_detail.html:104 users/models/group.py:16 -#: users/models/user.py:471 users/templates/users/user_detail.html:130 +#: users/models/user.py:471 users/templates/users/user_detail.html:115 +#: users/templates/users/user_granted_database_app.html:38 +#: users/templates/users/user_granted_remote_app.html:37 #: users/templates/users/user_group_detail.html:62 #: users/templates/users/user_group_list.html:16 #: users/templates/users/user_profile.html:138 @@ -271,6 +281,8 @@ msgstr "备注" #: perms/templates/perms/database_app_permission_list.html:17 #: perms/templates/perms/database_app_permission_user.html:23 #: templates/_nav.html:64 templates/_nav.html:83 templates/_nav_user.html:21 +#: users/templates/users/user_database_app_permission.html:39 +#: users/templates/users/user_database_app_permission.html:64 msgid "DatabaseApp" msgstr "数据库应用" @@ -278,6 +290,7 @@ msgstr "数据库应用" #: applications/templates/applications/remote_app_detail.html:56 #: applications/templates/applications/remote_app_list.html:27 #: applications/templates/applications/user_remote_app_list.html:17 +#: users/templates/users/user_granted_remote_app.html:35 msgid "App type" msgstr "应用类型" @@ -307,7 +320,7 @@ msgstr "参数" #: perms/templates/perms/database_app_permission_detail.html:89 #: perms/templates/perms/remote_app_permission_detail.html:85 #: users/models/user.py:479 users/serializers/group.py:32 -#: users/templates/users/user_detail.html:112 +#: users/templates/users/user_detail.html:97 #: xpack/plugins/change_auth_plan/models.py:109 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113 #: xpack/plugins/cloud/models.py:80 xpack/plugins/cloud/models.py:179 @@ -352,6 +365,8 @@ msgstr "创建日期" #: perms/templates/perms/remote_app_permission_remote_app.html:22 #: perms/templates/perms/remote_app_permission_user.html:22 #: templates/_nav.html:63 templates/_nav.html:80 templates/_nav_user.html:16 +#: users/templates/users/user_remote_app_permission.html:39 +#: users/templates/users/user_remote_app_permission.html:64 msgid "RemoteApp" msgstr "远程应用" @@ -380,7 +395,7 @@ msgstr "远程应用" #: terminal/templates/terminal/terminal_update.html:43 #: users/templates/users/_user.html:51 #: users/templates/users/user_bulk_update.html:23 -#: users/templates/users/user_detail.html:181 +#: users/templates/users/user_detail.html:168 #: users/templates/users/user_group_create_update.html:27 #: users/templates/users/user_password_update.html:75 #: users/templates/users/user_profile.html:209 @@ -500,8 +515,9 @@ msgstr "详情" #: terminal/templates/terminal/base_storage_list.html:71 #: terminal/templates/terminal/terminal_detail.html:16 #: terminal/templates/terminal/terminal_list.html:74 -#: users/templates/users/user_asset_permission.html:147 -#: users/templates/users/user_detail.html:26 +#: users/templates/users/user_asset_permission.html:127 +#: users/templates/users/user_database_app_permission.html:110 +#: users/templates/users/user_detail.html:12 #: users/templates/users/user_group_detail.html:23 #: users/templates/users/user_group_list.html:51 #: users/templates/users/user_list.html:84 @@ -509,6 +525,7 @@ msgstr "详情" #: users/templates/users/user_profile.html:181 #: users/templates/users/user_profile.html:191 #: users/templates/users/user_profile.html:201 +#: users/templates/users/user_remote_app_permission.html:110 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:29 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:56 #: xpack/plugins/cloud/templates/cloud/account_detail.html:23 @@ -551,12 +568,14 @@ msgstr "更新" #: terminal/templates/terminal/base_storage_list.html:61 #: terminal/templates/terminal/base_storage_list.html:68 #: terminal/templates/terminal/terminal_list.html:76 -#: users/templates/users/user_asset_permission.html:148 -#: users/templates/users/user_detail.html:31 +#: users/templates/users/user_asset_permission.html:128 +#: users/templates/users/user_database_app_permission.html:111 +#: users/templates/users/user_detail.html:16 #: users/templates/users/user_group_detail.html:27 #: users/templates/users/user_group_list.html:53 #: users/templates/users/user_list.html:94 #: users/templates/users/user_list.html:98 +#: users/templates/users/user_remote_app_permission.html:111 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:33 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:58 #: xpack/plugins/cloud/templates/cloud/account_detail.html:27 @@ -609,10 +628,12 @@ msgstr "创建数据库应用" #: terminal/templates/terminal/terminal_list.html:37 #: tickets/templates/tickets/ticket_list.html:108 #: users/templates/users/_granted_assets.html:34 -#: users/templates/users/user_asset_permission.html:61 -#: users/templates/users/user_asset_permission.html:99 +#: users/templates/users/user_asset_permission.html:44 +#: users/templates/users/user_asset_permission.html:79 +#: users/templates/users/user_database_app_permission.html:42 #: users/templates/users/user_group_list.html:17 #: users/templates/users/user_list.html:20 +#: users/templates/users/user_remote_app_permission.html:42 #: 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 @@ -762,9 +783,9 @@ msgstr "系统平台" #: perms/templates/perms/asset_permission_list.html:36 #: perms/templates/perms/asset_permission_list.html:90 #: perms/templates/perms/asset_permission_list.html:189 -#: users/templates/users/user_asset_permission.html:58 -#: users/templates/users/user_asset_permission.html:93 -#: users/templates/users/user_asset_permission.html:178 +#: users/templates/users/user_asset_permission.html:41 +#: users/templates/users/user_asset_permission.html:73 +#: users/templates/users/user_asset_permission.html:158 #: xpack/plugins/change_auth_plan/forms.py:74 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:55 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:15 @@ -829,7 +850,7 @@ msgstr "SSH网关,支持代理SSH,RDP和VNC" #: settings/templates/settings/_ldap_list_users_modal.html:31 #: users/forms/profile.py:19 users/models/user.py:436 #: users/templates/users/_select_user_modal.html:14 -#: users/templates/users/user_detail.html:68 +#: users/templates/users/user_detail.html:53 #: users/templates/users/user_list.html:15 #: users/templates/users/user_profile.html:47 #: xpack/plugins/change_auth_plan/forms.py:58 @@ -962,7 +983,7 @@ msgstr "内部的" #: audits/templates/audits/login_log_list.html:60 #: perms/templates/perms/asset_permission_list.html:187 #: settings/forms/terminal.py:16 users/templates/users/_granted_assets.html:31 -#: users/templates/users/user_asset_permission.html:176 +#: users/templates/users/user_asset_permission.html:156 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:54 #: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:63 msgid "IP" @@ -979,7 +1000,7 @@ msgstr "IP" #: assets/templates/assets/user_asset_list.html:75 #: perms/templates/perms/asset_permission_list.html:188 #: settings/forms/terminal.py:15 users/templates/users/_granted_assets.html:30 -#: users/templates/users/user_asset_permission.html:177 +#: users/templates/users/user_asset_permission.html:157 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:53 #: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:62 msgid "Hostname" @@ -1122,7 +1143,7 @@ msgid "Contact" msgstr "联系人" #: assets/models/cluster.py:22 users/models/user.py:457 -#: users/templates/users/user_detail.html:77 +#: users/templates/users/user_detail.html:62 msgid "Phone" msgstr "手机" @@ -1281,11 +1302,15 @@ msgstr "默认资产组" #: tickets/templates/tickets/ticket_list.html:103 users/forms/group.py:15 #: users/models/user.py:143 users/models/user.py:159 users/models/user.py:568 #: users/serializers/group.py:20 -#: users/templates/users/user_asset_permission.html:55 -#: users/templates/users/user_asset_permission.html:84 +#: users/templates/users/user_asset_permission.html:38 +#: users/templates/users/user_asset_permission.html:64 +#: users/templates/users/user_database_app_permission.html:37 +#: users/templates/users/user_database_app_permission.html:58 #: users/templates/users/user_group_detail.html:73 -#: users/templates/users/user_group_list.html:15 users/views/profile.py:68 -#: xpack/plugins/orgs/forms.py:28 +#: users/templates/users/user_group_list.html:15 +#: users/templates/users/user_remote_app_permission.html:37 +#: users/templates/users/user_remote_app_permission.html:58 +#: users/views/profile.py:68 xpack/plugins/orgs/forms.py:28 #: xpack/plugins/orgs/templates/orgs/org_detail.html:113 #: xpack/plugins/orgs/templates/orgs/org_list.html:15 msgid "User" @@ -1394,9 +1419,13 @@ msgstr "登录模式" #: terminal/templates/terminal/session_list.html:27 #: terminal/templates/terminal/session_list.html:71 #: users/templates/users/_granted_assets.html:32 -#: users/templates/users/user_asset_permission.html:59 -#: users/templates/users/user_asset_permission.html:96 -#: users/templates/users/user_asset_permission.html:179 +#: users/templates/users/user_asset_permission.html:42 +#: users/templates/users/user_asset_permission.html:76 +#: users/templates/users/user_asset_permission.html:159 +#: users/templates/users/user_database_app_permission.html:40 +#: users/templates/users/user_database_app_permission.html:67 +#: users/templates/users/user_remote_app_permission.html:40 +#: users/templates/users/user_remote_app_permission.html:67 #: xpack/plugins/orgs/templates/orgs/org_list.html:20 msgid "System user" msgstr "系统用户" @@ -1629,9 +1658,8 @@ msgstr "请输入密码" #: assets/templates/assets/_asset_user_auth_update_modal.html:68 #: assets/templates/assets/asset_detail.html:300 -#: users/templates/users/user_asset_permission.html:193 -#: users/templates/users/user_detail.html:371 -#: users/templates/users/user_detail.html:398 +#: users/templates/users/user_detail.html:356 +#: users/templates/users/user_detail.html:383 #: xpack/plugins/interface/views.py:35 msgid "Update successfully!" msgstr "更新成功" @@ -1845,11 +1873,11 @@ msgstr "选择节点" #: assets/templates/assets/system_user_detail.html:181 #: authentication/templates/authentication/_mfa_confirm_modal.html:20 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112 -#: users/templates/users/user_detail.html:277 -#: users/templates/users/user_detail.html:432 -#: users/templates/users/user_detail.html:458 -#: users/templates/users/user_detail.html:481 -#: users/templates/users/user_detail.html:526 +#: users/templates/users/user_detail.html:264 +#: users/templates/users/user_detail.html:417 +#: users/templates/users/user_detail.html:443 +#: users/templates/users/user_detail.html:466 +#: users/templates/users/user_detail.html:511 #: users/templates/users/user_group_create_update.html:28 #: users/templates/users/user_list.html:184 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:34 @@ -1890,7 +1918,7 @@ msgstr "资产用户" #: assets/templates/assets/asset_asset_user_list.html:47 #: assets/templates/assets/asset_detail.html:140 #: terminal/templates/terminal/session_detail.html:85 -#: users/templates/users/user_detail.html:141 +#: users/templates/users/user_detail.html:126 #: users/templates/users/user_profile.html:150 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:128 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:132 @@ -1917,7 +1945,7 @@ msgid "Disk" msgstr "硬盘" #: assets/templates/assets/asset_detail.html:124 -#: users/templates/users/user_detail.html:116 +#: users/templates/users/user_detail.html:101 #: users/templates/users/user_profile.html:106 msgid "Date joined" msgstr "创建日期" @@ -1933,7 +1961,7 @@ msgstr "创建日期" #: perms/templates/perms/remote_app_permission_detail.html:107 #: terminal/templates/terminal/terminal_list.html:35 #: users/templates/users/_select_user_modal.html:18 -#: users/templates/users/user_detail.html:147 +#: users/templates/users/user_detail.html:132 #: users/templates/users/user_profile.html:63 msgid "Active" msgstr "激活中" @@ -2013,9 +2041,9 @@ msgid "Displays all child node assets" msgstr "显示所有子节点资产" #: assets/templates/assets/asset_list.html:252 -#: users/templates/users/user_detail.html:426 -#: users/templates/users/user_detail.html:452 -#: users/templates/users/user_detail.html:520 +#: users/templates/users/user_detail.html:411 +#: users/templates/users/user_detail.html:437 +#: users/templates/users/user_detail.html:505 #: users/templates/users/user_list.html:178 #: xpack/plugins/interface/templates/interface/interface.html:97 msgid "Are you sure?" @@ -2026,9 +2054,9 @@ msgid "This will delete the selected assets !!!" msgstr "删除选择资产" #: assets/templates/assets/asset_list.html:256 -#: users/templates/users/user_detail.html:430 -#: users/templates/users/user_detail.html:456 -#: users/templates/users/user_detail.html:524 +#: users/templates/users/user_detail.html:415 +#: users/templates/users/user_detail.html:441 +#: users/templates/users/user_detail.html:509 #: users/templates/users/user_list.html:182 #: xpack/plugins/interface/templates/interface/interface.html:101 msgid "Cancel" @@ -2358,7 +2386,7 @@ msgstr "文件名" #: audits/templates/audits/ftp_log_list.html:80 #: ops/templates/ops/command_execution_list.html:71 #: ops/templates/ops/task_list.html:14 -#: users/templates/users/user_detail.html:502 +#: users/templates/users/user_detail.html:487 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:14 #: xpack/plugins/cloud/api.py:61 msgid "Success" @@ -2383,12 +2411,12 @@ msgstr "资源" msgid "Change by" msgstr "修改者" -#: audits/models.py:71 users/templates/users/user_detail.html:99 +#: audits/models.py:71 users/templates/users/user_detail.html:84 msgid "Disabled" msgstr "禁用" #: audits/models.py:72 settings/models.py:30 -#: users/templates/users/user_detail.html:97 +#: users/templates/users/user_detail.html:82 msgid "Enabled" msgstr "启用" @@ -2652,12 +2680,12 @@ msgstr "MFA 验证码" msgid "Private Token" msgstr "ssh密钥" -#: authentication/models.py:44 users/templates/users/user_detail.html:271 +#: authentication/models.py:44 users/templates/users/user_detail.html:258 msgid "Reviewers" msgstr "审批人" #: authentication/models.py:53 tickets/models/ticket.py:25 -#: users/templates/users/user_detail.html:263 +#: users/templates/users/user_detail.html:250 msgid "Login confirm" msgstr "登录复核" @@ -2777,7 +2805,7 @@ msgid "Keycloak" msgstr "" #: authentication/templates/authentication/login_otp.html:46 -#: users/templates/users/user_detail.html:92 +#: users/templates/users/user_detail.html:77 #: users/templates/users/user_profile.html:87 msgid "MFA certification" msgstr "MFA认证" @@ -3339,10 +3367,14 @@ msgstr "提示:RDP 协议不支持单独控制上传或下载文件" #: perms/templates/perms/remote_app_permission_list.html:16 #: templates/_nav.html:21 users/forms/user.py:168 users/models/group.py:31 #: users/models/user.py:444 users/templates/users/_select_user_modal.html:16 -#: users/templates/users/user_asset_permission.html:56 -#: users/templates/users/user_asset_permission.html:87 -#: users/templates/users/user_detail.html:222 +#: users/templates/users/user_asset_permission.html:39 +#: users/templates/users/user_asset_permission.html:67 +#: users/templates/users/user_database_app_permission.html:38 +#: users/templates/users/user_database_app_permission.html:61 +#: users/templates/users/user_detail.html:209 #: users/templates/users/user_list.html:17 +#: users/templates/users/user_remote_app_permission.html:38 +#: users/templates/users/user_remote_app_permission.html:61 #: xpack/plugins/orgs/templates/orgs/org_list.html:16 msgid "User group" msgstr "用户组" @@ -3377,9 +3409,8 @@ msgstr "动作" #: perms/models/asset_permission.py:87 templates/_nav.html:76 #: tickets/templates/tickets/ticket_list.html:22 -#: users/templates/users/user_asset_permission.html:23 -#: users/templates/users/user_detail.html:23 -#: users/templates/users/user_granted_asset.html:24 users/views/user.py:219 +#: users/templates/users/_user_detail_nav_header.html:31 +#: users/views/user.py:221 msgid "Asset permission" msgstr "资产授权" @@ -3387,16 +3418,20 @@ msgstr "资产授权" #: perms/templates/perms/asset_permission_detail.html:85 #: perms/templates/perms/database_app_permission_detail.html:81 #: perms/templates/perms/remote_app_permission_detail.html:77 -#: users/models/user.py:476 users/templates/users/user_detail.html:108 +#: users/models/user.py:476 users/templates/users/user_detail.html:93 #: users/templates/users/user_profile.html:120 msgid "Date expired" msgstr "失效日期" #: perms/models/database_app_permission.py:26 +#: users/templates/users/_user_detail_nav_header.html:61 +#: users/views/user.py:277 msgid "DatabaseApp permission" msgstr "数据库应用授权" #: perms/models/remote_app_permission.py:20 +#: users/templates/users/_user_detail_nav_header.html:47 +#: users/views/user.py:249 msgid "RemoteApp permission" msgstr "远程应用授权" @@ -3449,7 +3484,7 @@ msgid "Add node to this permission" msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:105 -#: users/templates/users/user_detail.html:239 +#: users/templates/users/user_detail.html:226 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:105 msgid "Join" msgstr "加入" @@ -3507,26 +3542,29 @@ msgstr "刷新授权缓存" #: perms/templates/perms/asset_permission_list.html:184 #: perms/templates/perms/database_app_permission_list.html:19 #: perms/templates/perms/remote_app_permission_list.html:19 -#: users/templates/users/user_asset_permission.html:60 -#: users/templates/users/user_asset_permission.html:175 -#: users/templates/users/user_list.html:19 xpack/plugins/cloud/models.py:74 +#: users/templates/users/user_asset_permission.html:43 +#: users/templates/users/user_asset_permission.html:155 +#: users/templates/users/user_database_app_permission.html:41 +#: users/templates/users/user_list.html:19 +#: users/templates/users/user_remote_app_permission.html:41 +#: xpack/plugins/cloud/models.py:74 #: xpack/plugins/cloud/templates/cloud/account_detail.html:58 #: xpack/plugins/cloud/templates/cloud/account_list.html:14 msgid "Validity" msgstr "有效" #: perms/templates/perms/asset_permission_list.html:191 -#: users/templates/users/user_asset_permission.html:180 +#: users/templates/users/user_asset_permission.html:160 msgid "Inherit" msgstr "继承" #: perms/templates/perms/asset_permission_list.html:192 -#: users/templates/users/user_asset_permission.html:181 +#: users/templates/users/user_asset_permission.html:161 msgid "Include" msgstr "包含" #: perms/templates/perms/asset_permission_list.html:193 -#: users/templates/users/user_asset_permission.html:182 +#: users/templates/users/user_asset_permission.html:162 msgid "Exclude" msgstr "不包含" @@ -4037,7 +4075,7 @@ msgstr "刷新缓存" #: settings/templates/settings/_ldap_list_users_modal.html:33 #: users/forms/profile.py:89 users/models/user.py:440 -#: users/templates/users/user_detail.html:72 +#: users/templates/users/user_detail.html:57 #: users/templates/users/user_profile.html:59 msgid "Email" msgstr "邮件" @@ -4261,13 +4299,14 @@ msgstr "" #: templates/_nav.html:17 users/views/group.py:28 users/views/group.py:45 #: users/views/group.py:63 users/views/group.py:82 users/views/group.py:99 #: users/views/login.py:158 users/views/profile.py:88 -#: users/views/profile.py:123 users/views/user.py:48 users/views/user.py:65 -#: users/views/user.py:109 users/views/user.py:176 users/views/user.py:204 -#: users/views/user.py:218 +#: users/views/profile.py:123 users/views/user.py:50 users/views/user.py:67 +#: users/views/user.py:111 users/views/user.py:178 users/views/user.py:206 +#: users/views/user.py:220 users/views/user.py:234 users/views/user.py:248 +#: users/views/user.py:262 users/views/user.py:276 msgid "Users" msgstr "用户管理" -#: templates/_nav.html:20 users/views/user.py:49 +#: templates/_nav.html:20 users/views/user.py:51 msgid "User list" msgstr "用户列表" @@ -5078,14 +5117,14 @@ msgstr "ssh密钥不合法" #: users/forms/user.py:27 users/models/user.py:448 #: users/templates/users/_select_user_modal.html:15 -#: users/templates/users/user_detail.html:88 +#: users/templates/users/user_detail.html:73 #: users/templates/users/user_list.html:16 #: users/templates/users/user_profile.html:55 msgid "Role" msgstr "角色" #: users/forms/user.py:31 users/models/user.py:483 -#: users/templates/users/user_detail.html:104 +#: users/templates/users/user_detail.html:89 #: users/templates/users/user_list.html:18 #: users/templates/users/user_profile.html:102 msgid "Source" @@ -5095,7 +5134,7 @@ msgstr "用户来源" msgid "Paste user id_rsa.pub here." msgstr "复制用户公钥到这里" -#: users/forms/user.py:51 users/templates/users/user_detail.html:230 +#: users/forms/user.py:51 users/templates/users/user_detail.html:217 msgid "Join user groups" msgstr "添加到用户组" @@ -5148,7 +5187,7 @@ msgstr "数据库" msgid "Avatar" msgstr "头像" -#: users/models/user.py:454 users/templates/users/user_detail.html:83 +#: users/models/user.py:454 users/templates/users/user_detail.html:68 msgid "Wechat" msgstr "微信" @@ -5232,6 +5271,29 @@ msgstr "资产数量" msgid "Security and Role" msgstr "角色安全" +#: users/templates/users/_user_detail_nav_header.html:11 +#: users/views/user.py:179 +msgid "User detail" +msgstr "用户详情" + +#: users/templates/users/_user_detail_nav_header.html:15 +msgid "User permissions" +msgstr "用户授权" + +#: users/templates/users/_user_detail_nav_header.html:23 +#: users/templates/users/user_group_detail.html:20 +#: users/templates/users/user_group_granted_asset.html:21 +msgid "Asset granted" +msgstr "授权的资产" + +#: users/templates/users/_user_detail_nav_header.html:40 +msgid "RemoteApp granted" +msgstr "授权的远程应用" + +#: users/templates/users/_user_detail_nav_header.html:54 +msgid "DatabaseApp granted" +msgstr "授权的数据库应用" + #: users/templates/users/_user_update_pk_modal.html:4 msgid "Update User SSH Public Key" msgstr "更新ssh密钥" @@ -5276,7 +5338,7 @@ msgstr "输入您的邮箱, 将会发一封重置邮件到您的邮箱中" #: users/templates/users/reset_password.html:5 #: users/templates/users/reset_password.html:6 -#: users/templates/users/user_detail.html:417 users/utils.py:83 +#: users/templates/users/user_detail.html:402 users/utils.py:83 msgid "Reset password" msgstr "重置密码" @@ -5336,109 +5398,95 @@ msgstr "强" msgid "Very strong" msgstr "很强" -#: users/templates/users/user_asset_permission.html:17 -#: users/templates/users/user_detail.html:17 -#: users/templates/users/user_granted_asset.html:18 users/views/user.py:177 -msgid "User detail" -msgstr "用户详情" - -#: users/templates/users/user_asset_permission.html:20 -#: users/templates/users/user_detail.html:20 -#: users/templates/users/user_granted_asset.html:21 -#: users/templates/users/user_group_detail.html:20 -#: users/templates/users/user_group_granted_asset.html:21 -msgid "Asset granted" -msgstr "授权的资产" - #: users/templates/users/user_create.html:4 -#: users/templates/users/user_list.html:7 users/views/user.py:66 +#: users/templates/users/user_list.html:7 users/views/user.py:68 msgid "Create user" msgstr "创建用户" -#: users/templates/users/user_detail.html:95 +#: users/templates/users/user_detail.html:80 msgid "Force enabled" msgstr "强制启用" -#: users/templates/users/user_detail.html:120 +#: users/templates/users/user_detail.html:105 #: users/templates/users/user_profile.html:110 msgid "Last login" msgstr "最后登录" -#: users/templates/users/user_detail.html:125 +#: users/templates/users/user_detail.html:110 #: users/templates/users/user_profile.html:115 msgid "Last password updated" msgstr "最后更新密码" -#: users/templates/users/user_detail.html:161 +#: users/templates/users/user_detail.html:148 msgid "Force enabled MFA" msgstr "强制启用MFA" -#: users/templates/users/user_detail.html:178 +#: users/templates/users/user_detail.html:165 msgid "Reset MFA" msgstr "重置MFA" -#: users/templates/users/user_detail.html:187 +#: users/templates/users/user_detail.html:174 msgid "Send reset password mail" msgstr "发送重置密码邮件" -#: users/templates/users/user_detail.html:190 -#: users/templates/users/user_detail.html:200 +#: users/templates/users/user_detail.html:177 +#: users/templates/users/user_detail.html:187 msgid "Send" msgstr "发送" -#: users/templates/users/user_detail.html:197 +#: users/templates/users/user_detail.html:184 msgid "Send reset ssh key mail" msgstr "发送重置密钥邮件" -#: users/templates/users/user_detail.html:206 -#: users/templates/users/user_detail.html:505 +#: users/templates/users/user_detail.html:193 +#: users/templates/users/user_detail.html:490 msgid "Unblock user" msgstr "解除登录限制" -#: users/templates/users/user_detail.html:209 +#: users/templates/users/user_detail.html:196 msgid "Unblock" msgstr "解除" -#: users/templates/users/user_detail.html:380 +#: users/templates/users/user_detail.html:365 msgid "Goto profile page enable MFA" msgstr "请去个人信息页面启用自己的MFA" -#: users/templates/users/user_detail.html:416 +#: users/templates/users/user_detail.html:401 msgid "An e-mail has been sent to the user`s mailbox." msgstr "已发送邮件到用户邮箱" -#: users/templates/users/user_detail.html:427 +#: users/templates/users/user_detail.html:412 msgid "This will reset the user password and send a reset mail" msgstr "将失效用户当前密码,并发送重设密码邮件到用户邮箱" -#: users/templates/users/user_detail.html:442 +#: users/templates/users/user_detail.html:427 msgid "" "The reset-ssh-public-key E-mail has been sent successfully. Please inform " "the user to update his new ssh public key." msgstr "重设密钥邮件将会发送到用户邮箱" -#: users/templates/users/user_detail.html:443 +#: users/templates/users/user_detail.html:428 msgid "Reset SSH public key" msgstr "重置SSH密钥" -#: users/templates/users/user_detail.html:453 +#: users/templates/users/user_detail.html:438 msgid "This will reset the user public key and send a reset mail" msgstr "将会失效用户当前密钥,并发送重置邮件到用户邮箱" -#: users/templates/users/user_detail.html:471 +#: users/templates/users/user_detail.html:456 msgid "Successfully updated the SSH public key." msgstr "更新ssh密钥成功" -#: users/templates/users/user_detail.html:472 -#: users/templates/users/user_detail.html:476 +#: users/templates/users/user_detail.html:457 +#: users/templates/users/user_detail.html:461 msgid "User SSH public key update" msgstr "ssh密钥" -#: users/templates/users/user_detail.html:521 +#: users/templates/users/user_detail.html:506 msgid "After unlocking the user, the user can log in normally." msgstr "解除用户登录限制后,此用户即可正常登录" -#: users/templates/users/user_detail.html:535 +#: users/templates/users/user_detail.html:520 msgid "Reset user MFA success" msgstr "重置用户MFA成功" @@ -5599,7 +5647,7 @@ msgid "" "corresponding private key." msgstr "新的公钥已设置成功,请下载对应的私钥" -#: users/templates/users/user_update.html:4 users/views/user.py:110 +#: users/templates/users/user_update.html:4 users/views/user.py:112 msgid "Update user" msgstr "更新用户" @@ -5883,18 +5931,26 @@ msgstr "MFA 解绑成功" msgid "MFA disable success, return login page" msgstr "MFA 解绑成功,返回登录页面" -#: users/views/user.py:128 +#: users/views/user.py:130 msgid "Bulk update user success" msgstr "批量更新用户成功" -#: users/views/user.py:156 +#: users/views/user.py:158 msgid "Bulk update user" msgstr "批量更新用户" -#: users/views/user.py:205 +#: users/views/user.py:207 msgid "User granted assets" msgstr "用户授权资产" +#: users/views/user.py:235 +msgid "User granted RemoteApp" +msgstr "用户授权远程应用" + +#: users/views/user.py:263 +msgid "User granted DatabaseApp" +msgstr "用户授权数据库应用" + #: xpack/plugins/change_auth_plan/forms.py:20 msgid "Password length" msgstr "密码长度"