From f16ec02c40a9aee445cb10ac78c2237780187d31 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 27 May 2024 16:43:26 +0800 Subject: [PATCH] =?UTF-8?q?perf:=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/i18n/core/en/LC_MESSAGES/django.po | 933 +++++++++++------ apps/i18n/core/ja/LC_MESSAGES/django.po | 1109 +++++++++++++-------- apps/i18n/core/zh/LC_MESSAGES/django.po | 1037 +++++++++++++------ apps/i18n/lina/en.json | 2 +- apps/i18n/lina/zh.json | 16 +- apps/terminal/migrations/0001_initial.py | 13 +- apps/terminal/models/component/storage.py | 64 +- 7 files changed, 2113 insertions(+), 1061 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 5170a0550..748573da9 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-22 18:28+0800\n" +"POT-Creation-Date: 2024-05-27 16:41+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,11 +40,12 @@ msgstr "" #: authentication/forms.py:28 #: authentication/templates/authentication/login.html:329 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:50 -#: settings/serializers/msg.py:37 terminal/serializers/storage.py:123 -#: terminal/serializers/storage.py:142 users/forms/profile.py:21 -#: users/serializers/user.py:112 +#: settings/serializers/msg.py:37 settings/serializers/terminal.py:28 +#: terminal/serializers/storage.py:123 terminal/serializers/storage.py:142 +#: users/forms/profile.py:21 users/serializers/user.py:142 #: users/templates/users/_msg_user_created.html:13 #: users/templates/users/user_password_verify.html:18 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:28 #: xpack/plugins/cloud/serializers/account_attrs.py:28 msgid "Password" msgstr "" @@ -89,7 +90,7 @@ msgstr "" msgid "Specified account" msgstr "" -#: accounts/const/account.py:26 users/models/user.py:753 +#: accounts/const/account.py:26 users/models/user.py:789 msgid "Local" msgstr "" @@ -114,7 +115,8 @@ msgstr "" #: accounts/const/account.py:34 accounts/const/automation.py:109 #: accounts/serializers/automations/change_secret.py:164 audits/const.py:62 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19 -#: ops/const.py:76 terminal/const.py:79 xpack/plugins/cloud/const.py:47 +#: ops/const.py:76 terminal/const.py:79 xpack.bak/plugins/cloud/const.py:47 +#: xpack/plugins/cloud/const.py:47 msgid "Failed" msgstr "" @@ -216,7 +218,7 @@ msgstr "" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 #: settings/serializers/msg.py:59 users/forms/profile.py:100 -#: users/forms/profile.py:108 users/models/user.py:878 +#: users/forms/profile.py:108 users/models/user.py:900 #: users/templates/users/forgot_password.html:162 #: users/views/profile/reset.py:94 msgid "Email" @@ -284,7 +286,8 @@ msgstr "" #: terminal/serializers/command.py:17 terminal/serializers/session.py:28 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:252 +#: tickets/models/ticket/apply_asset.py:16 +#: xpack.bak/plugins/cloud/models.py:252 xpack/plugins/cloud/models.py:252 msgid "Asset" msgstr "" @@ -303,7 +306,7 @@ msgid "Version" msgstr "" #: accounts/models/account.py:57 accounts/serializers/account/account.py:217 -#: users/models/user.py:930 +#: users/models/user.py:961 msgid "Source" msgstr "" @@ -322,7 +325,8 @@ msgstr "" #: terminal/models/session/session.py:34 terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 -#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:85 +#: tickets/models/ticket/command_confirm.py:13 +#: xpack.bak/plugins/cloud/models.py:85 xpack/plugins/cloud/models.py:85 msgid "Account" msgstr "" @@ -416,7 +420,8 @@ msgid "Trigger mode" msgstr "" #: accounts/models/automations/backup_account.py:134 audits/models.py:203 -#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:204 +#: terminal/models/session/sharing.py:125 xpack.bak/plugins/cloud/models.py:204 +#: xpack/plugins/cloud/manager.py:165 xpack/plugins/cloud/models.py:204 msgid "Reason" msgstr "" @@ -511,8 +516,9 @@ msgstr "" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:136 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:281 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:200 -#: xpack/plugins/cloud/models.py:256 +#: tickets/serializers/ticket/ticket.py:20 +#: xpack.bak/plugins/cloud/models.py:200 xpack.bak/plugins/cloud/models.py:256 +#: xpack/plugins/cloud/models.py:200 xpack/plugins/cloud/models.py:256 msgid "Status" msgstr "" @@ -547,8 +553,9 @@ msgstr "" #: authentication/templates/authentication/_msg_different_city.html:9 #: authentication/templates/authentication/_msg_oauth_bind.html:9 #: terminal/serializers/storage.py:136 users/forms/profile.py:31 -#: users/forms/profile.py:114 users/models/user.py:874 +#: users/forms/profile.py:114 users/models/user.py:898 #: users/templates/users/_msg_user_created.html:12 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:26 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Username" msgstr "" @@ -643,9 +650,11 @@ msgstr "" #: terminal/models/virtualapp/provider.py:10 #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 -#: users/models/preference.py:11 users/models/user.py:876 +#: users/models/preference.py:11 users/models/user.py:899 +#: xpack.bak/plugins/cloud/models.py:32 xpack.bak/plugins/cloud/models.py:272 +#: xpack.bak/plugins/cloud/serializers/task.py:70 #: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:272 -#: xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/serializers/task.py:71 msgid "Name" msgstr "" @@ -653,13 +662,11 @@ msgstr "" msgid "Privileged" msgstr "" -#: accounts/models/base.py:70 assets/models/asset/common.py:165 -#: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39 -#: assets/models/label.py:22 +#: accounts/models/base.py:70 assets/models/automations/base.py:21 +#: assets/models/cmd_filter.py:39 assets/models/label.py:22 #: authentication/serializers/connect_token_secret.py:117 #: terminal/models/applet/applet.py:40 -#: terminal/models/component/endpoint.py:120 -#: terminal/models/virtualapp/virtualapp.py:23 users/serializers/user.py:188 +#: terminal/models/virtualapp/virtualapp.py:23 users/serializers/user.py:266 msgid "Is active" msgstr "Active" @@ -675,7 +682,8 @@ msgstr "" msgid "Push params" msgstr "" -#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:329 +#: accounts/models/template.py:26 xpack.bak/plugins/cloud/models.py:329 +#: xpack/plugins/cloud/models.py:329 msgid "Account template" msgstr "" @@ -786,10 +794,10 @@ msgstr "" #: audits/serializers.py:170 #: authentication/serializers/connect_token_secret.py:126 ops/models/job.py:150 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39 -#: terminal/models/component/storage.py:57 -#: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:23 terminal/serializers/storage.py:264 -#: terminal/serializers/storage.py:276 tickets/models/comment.py:26 +#: terminal/models/component/storage.py:58 +#: terminal/models/component/storage.py:154 terminal/serializers/applet.py:29 +#: terminal/serializers/session.py:23 terminal/serializers/storage.py:271 +#: terminal/serializers/storage.py:284 tickets/models/comment.py:26 #: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:273 tickets/serializers/flow.py:53 #: tickets/serializers/ticket/ticket.py:19 @@ -823,6 +831,7 @@ msgstr "" #: ops/models/job.py:152 ops/serializers/job.py:19 #: perms/serializers/permission.py:36 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 +#: xpack/plugins/cloud/manager.py:73 msgid "Assets" msgstr "" @@ -836,6 +845,7 @@ msgid "Asset does not support this secret type: %s" msgstr "" #: accounts/serializers/account/account.py:410 +#: xpack/plugins/cloud/serializers/account.py:111 msgid "Account has exist" msgstr "" @@ -862,8 +872,8 @@ msgstr "" #: terminal/notifications.py:205 terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 -#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1064 -#: users/models/user.py:1102 +#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1109 +#: users/models/user.py:1153 msgid "User" msgstr "" @@ -891,19 +901,19 @@ msgstr "" msgid "Asset type" msgstr "" -#: accounts/serializers/account/base.py:25 terminal/serializers/storage.py:149 +#: accounts/serializers/account/base.py:33 terminal/serializers/storage.py:149 msgid "Passphrase" msgstr "" -#: accounts/serializers/account/base.py:78 +#: accounts/serializers/account/base.py:93 #: assets/serializers/asset/common.py:384 msgid "Spec info" msgstr "" -#: accounts/serializers/account/base.py:80 +#: accounts/serializers/account/base.py:96 msgid "" -"* If no username is required for authentication, enter null. " -"For AD accounts, use the format username@domain." +"* If no username is required for authentication, enter null. For AD " +"accounts, use the format username@domain." msgstr "" #: accounts/serializers/account/template.py:13 @@ -955,7 +965,8 @@ msgstr "" #: terminal/models/component/endpoint.py:119 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 -#: tickets/models/ticket/general.py:295 users/models/user.py:912 +#: tickets/models/ticket/general.py:295 users/models/user.py:933 +#: xpack.bak/plugins/cloud/models.py:39 xpack.bak/plugins/cloud/models.py:106 #: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:106 msgid "Comment" msgstr "Description" @@ -1130,12 +1141,14 @@ msgid "Notify" msgstr "" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:278 +#: terminal/models/component/endpoint.py:112 +#: xpack.bak/plugins/cloud/models.py:278 xpack/plugins/cloud/models.py:278 msgid "Priority" msgstr "" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:279 +#: terminal/models/component/endpoint.py:113 +#: xpack.bak/plugins/cloud/models.py:279 xpack/plugins/cloud/models.py:279 msgid "1-100, the lower the value will be match first" msgstr "" @@ -1144,17 +1157,19 @@ msgstr "" msgid "Reviewers" msgstr "" -#: acls/models/base.py:43 authentication/models/access_key.py:25 +#: acls/models/base.py:43 assets/models/asset/common.py:165 +#: authentication/models/access_key.py:25 #: authentication/models/connection_token.py:53 #: authentication/templates/authentication/_access_key_modal.html:32 -#: perms/models/asset_permission.py:82 terminal/models/session/sharing.py:29 -#: tickets/const.py:36 +#: perms/models/asset_permission.py:82 +#: terminal/models/component/endpoint.py:120 +#: terminal/models/session/sharing.py:29 tickets/const.py:36 msgid "Active" msgstr "Active" #: acls/models/base.py:81 perms/serializers/permission.py:32 #: users/models/preference.py:16 users/serializers/group.py:21 -#: users/serializers/user.py:332 +#: users/serializers/user.py:414 msgid "Users" msgstr "" @@ -1175,13 +1190,14 @@ msgid "Command" msgstr "" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack/plugins/cloud/models.py:295 +#: xpack.bak/plugins/cloud/models.py:295 xpack/plugins/cloud/models.py:295 msgid "Regex" msgstr "" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:184 settings/serializers/feature.py:19 -#: settings/serializers/msg.py:76 xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:76 xpack.bak/plugins/license/models.py:30 +#: xpack/plugins/license/models.py:30 msgid "Content" msgstr "" @@ -1278,7 +1294,8 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:145 +#: xpack.bak/plugins/cloud/serializers/task.py:145 +#: xpack/plugins/cloud/serializers/task.py:146 msgid "IP address invalid: `{}`" msgstr "" @@ -1404,6 +1421,7 @@ msgstr "" #: assets/automations/ping_gateway/manager.py:58 #: authentication/backends/oauth2/views.py:60 authentication/middleware.py:93 +#: xpack.bak/plugins/cloud/providers/fc.py:47 #: xpack/plugins/cloud/providers/fc.py:47 msgid "Authentication failed" msgstr "" @@ -1436,7 +1454,7 @@ msgid "Gather facts" msgstr "" #: assets/const/base.py:32 audits/const.py:55 -#: terminal/serializers/applet_host.py:32 +#: terminal/serializers/applet_host.py:32 users/models/user.py:686 msgid "Disabled" msgstr "" @@ -1456,6 +1474,8 @@ msgstr "" #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:76 #: settings/serializers/feature.py:49 settings/serializers/msg.py:31 #: terminal/models/component/endpoint.py:13 terminal/serializers/applet.py:17 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:72 +#: xpack/plugins/cloud/manager.py:73 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" msgstr "" @@ -1663,6 +1683,7 @@ msgstr "" #: assets/models/asset/common.py:94 assets/models/platform.py:16 #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:77 #: settings/serializers/msg.py:32 terminal/serializers/storage.py:133 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:73 #: xpack/plugins/cloud/serializers/account_attrs.py:73 msgid "Port" msgstr "" @@ -1675,7 +1696,8 @@ msgstr "" #: assets/models/asset/common.py:161 assets/models/platform.py:134 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:325 +#: perms/serializers/user_permission.py:25 +#: xpack.bak/plugins/cloud/models.py:325 xpack/plugins/cloud/models.py:325 msgid "Platform" msgstr "" @@ -1734,7 +1756,8 @@ msgstr "" #: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 perms/models/asset_permission.py:72 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:326 +#: tickets/models/ticket/apply_asset.py:14 +#: xpack.bak/plugins/cloud/models.py:326 xpack/plugins/cloud/models.py:326 msgid "Node" msgstr "" @@ -1753,7 +1776,7 @@ msgstr "" #: assets/models/automations/base.py:114 assets/models/cmd_filter.py:41 #: audits/models.py:267 common/db/models.py:34 ops/models/base.py:54 -#: ops/models/job.py:240 users/models/user.py:1103 +#: ops/models/job.py:240 users/models/user.py:1156 msgid "Date created" msgstr "" @@ -1774,17 +1797,17 @@ msgid "Date verified" msgstr "" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:66 -#: users/models/group.py:25 users/models/user.py:882 +#: users/models/group.py:25 users/models/user.py:905 msgid "User group" msgstr "" #: assets/models/cmd_filter.py:42 common/db/models.py:35 -#: users/models/user.py:938 +#: users/models/user.py:981 msgid "Date updated" msgstr "" #: assets/models/cmd_filter.py:44 assets/models/cmd_filter.py:91 -#: common/db/models.py:32 users/models/user.py:919 +#: common/db/models.py:32 users/models/user.py:943 #: users/serializers/group.py:32 msgid "Created by" msgstr "" @@ -1821,7 +1844,7 @@ msgstr "" msgid "Gateway" msgstr "" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1088 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1135 msgid "System" msgstr "" @@ -1839,8 +1862,8 @@ msgstr "" #: assets/serializers/cagegory.py:17 assets/serializers/cagegory.py:23 #: assets/serializers/platform.py:144 #: authentication/serializers/connect_token_secret.py:124 -#: common/serializers/common.py:85 labels/models.py:17 labels/models.py:33 -#: labels/serializers.py:45 settings/serializers/msg.py:88 +#: common/serializers/common.py:85 labels/serializers.py:45 +#: settings/serializers/msg.py:88 msgid "Label" msgstr "" @@ -1877,6 +1900,8 @@ msgid "Required" msgstr "" #: assets/models/platform.py:19 assets/serializers/platform.py:146 +#: terminal/models/component/storage.py:28 +#: xpack.bak/plugins/cloud/providers/nutanix.py:30 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "" @@ -1893,7 +1918,7 @@ msgstr "" #: assets/models/platform.py:38 audits/const.py:56 #: authentication/backends/passkey/models.py:11 settings/models.py:38 -#: terminal/serializers/applet_host.py:33 +#: terminal/serializers/applet_host.py:33 users/models/user.py:687 msgid "Enabled" msgstr "" @@ -2018,8 +2043,10 @@ msgstr "" #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:46 -#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:328 -#: xpack/plugins/cloud/serializers/task.py:33 +#: perms/serializers/user_permission.py:74 +#: xpack.bak/plugins/cloud/models.py:328 +#: xpack.bak/plugins/cloud/serializers/task.py:33 +#: xpack/plugins/cloud/models.py:328 xpack/plugins/cloud/serializers/task.py:34 msgid "Protocols" msgstr "" @@ -2353,6 +2380,7 @@ msgstr "" #: audits/const.py:23 terminal/api/session/session.py:277 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 +#: xpack/plugins/cloud/manager.py:74 msgid "View" msgstr "" @@ -2411,6 +2439,7 @@ msgstr "" #: audits/const.py:51 terminal/models/applet/host.py:144 #: terminal/models/component/task.py:22 +#: xpack/plugins/cloud/serializers/account.py:55 msgid "Task" msgstr "" @@ -2509,7 +2538,7 @@ msgstr "" #: audits/models.py:200 audits/serializers.py:52 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:63 users/models/user.py:899 +#: users/forms/profile.py:63 users/models/user.py:921 #: users/serializers/profile.py:102 msgid "MFA" msgstr "" @@ -2563,7 +2592,7 @@ msgstr "" #: audits/serializers.py:172 authentication/models/connection_token.py:47 #: authentication/models/temp_token.py:13 perms/models/asset_permission.py:80 #: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:917 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:940 msgid "Date expired" msgstr "" @@ -2597,28 +2626,29 @@ msgstr "" #: audits/signal_handlers/login_log.py:37 authentication/notifications.py:73 #: authentication/views/login.py:77 notifications/backends/__init__.py:11 #: settings/serializers/auth/wecom.py:10 settings/serializers/auth/wecom.py:15 -#: users/models/user.py:760 users/models/user.py:932 +#: users/models/user.py:796 users/models/user.py:964 msgid "WeCom" msgstr "" #: audits/signal_handlers/login_log.py:38 authentication/views/feishu.py:105 #: authentication/views/login.py:89 notifications/backends/__init__.py:14 -#: settings/serializers/auth/feishu.py:10 users/models/user.py:762 -#: users/models/user.py:934 +#: settings/serializers/auth/feishu.py:10 +#: settings/serializers/auth/feishu.py:12 users/models/user.py:798 +#: users/models/user.py:970 msgid "FeiShu" msgstr "" #: audits/signal_handlers/login_log.py:40 authentication/views/login.py:101 #: authentication/views/slack.py:87 notifications/backends/__init__.py:16 #: settings/serializers/auth/slack.py:10 settings/serializers/auth/slack.py:12 -#: users/models/user.py:764 users/models/user.py:936 +#: users/models/user.py:800 users/models/user.py:976 msgid "Slack" msgstr "" #: audits/signal_handlers/login_log.py:41 authentication/views/dingtalk.py:161 #: authentication/views/login.py:83 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:761 -#: users/models/user.py:933 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:797 +#: users/models/user.py:967 msgid "DingTalk" msgstr "" @@ -3175,7 +3205,8 @@ msgid "Component" msgstr "" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:327 +#: perms/serializers/user_permission.py:28 +#: xpack.bak/plugins/cloud/models.py:327 xpack/plugins/cloud/models.py:327 msgid "Domain" msgstr "" @@ -3216,7 +3247,7 @@ msgstr "" #: authentication/serializers/connection_token.py:42 #: perms/serializers/permission.py:44 perms/serializers/permission.py:65 -#: users/serializers/user.py:103 users/serializers/user.py:192 +#: users/serializers/user.py:125 users/serializers/user.py:270 msgid "Is expired" msgstr "Expired" @@ -3230,8 +3261,8 @@ msgid "Access IP" msgstr "" #: authentication/serializers/token.py:92 perms/serializers/permission.py:43 -#: perms/serializers/permission.py:66 users/serializers/user.py:104 -#: users/serializers/user.py:189 +#: perms/serializers/permission.py:66 users/serializers/user.py:126 +#: users/serializers/user.py:267 msgid "Is valid" msgstr "Is Valid" @@ -3256,14 +3287,12 @@ msgid "Show" msgstr "" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/const.py:42 users/models/user.py:654 -#: users/templates/users/user_verify_mfa.html:36 +#: users/const.py:42 users/templates/users/user_verify_mfa.html:36 msgid "Disable" msgstr "" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/const.py:43 users/models/user.py:655 -#: users/templates/users/mfa_setting.html:26 +#: users/const.py:43 users/templates/users/mfa_setting.html:26 #: users/templates/users/mfa_setting.html:68 msgid "Enable" msgstr "" @@ -3458,7 +3487,7 @@ msgid "Do you want to retry ?" msgstr "" #: authentication/utils.py:24 common/utils/ip/geoip/utils.py:24 -#: xpack/plugins/cloud/const.py:33 +#: xpack.bak/plugins/cloud/const.py:33 xpack/plugins/cloud/const.py:33 msgid "LAN" msgstr "" @@ -3638,7 +3667,7 @@ msgstr "" msgid "Canceled" msgstr "" -#: common/const/common.py:5 +#: common/const/common.py:5 xpack/plugins/cloud/manager.py:380 #, python-format msgid "%(name)s was created successfully" msgstr "" @@ -3697,6 +3726,9 @@ msgstr "" #: common/db/fields.py:594 common/db/fields.py:599 #: common/serializers/fields.py:133 tickets/serializers/ticket/common.py:58 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:56 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:79 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:150 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 #: xpack/plugins/cloud/serializers/account_attrs.py:150 @@ -3719,7 +3751,7 @@ msgstr "" msgid "discard time" msgstr "" -#: common/db/models.py:33 users/models/user.py:920 +#: common/db/models.py:33 users/models/user.py:946 msgid "Updated by" msgstr "" @@ -3831,7 +3863,8 @@ msgstr "" msgid "Tencent cloud" msgstr "" -#: common/sdk/sms/endpoint.py:18 xpack/plugins/cloud/const.py:13 +#: common/sdk/sms/endpoint.py:18 xpack.bak/plugins/cloud/const.py:13 +#: xpack/plugins/cloud/const.py:13 msgid "Huawei Cloud" msgstr "" @@ -3885,8 +3918,9 @@ msgstr "" msgid "Invalid choice: {}" msgstr "" -#: common/serializers/mixin.py:409 -msgid "Labels" +#: common/serializers/mixin.py:441 terminal/models/applet/applet.py:44 +#: terminal/models/virtualapp/virtualapp.py:29 +msgid "Tags" msgstr "" #: common/tasks.py:31 common/utils/verify_code.py:16 @@ -3969,11 +4003,15 @@ msgstr "" msgid "App Labels" msgstr "Labels" -#: labels/models.py:36 +#: labels/models.py:17 labels/models.py:36 +msgid "Tag" +msgstr "" + +#: labels/models.py:40 msgid "Resource ID" msgstr "" -#: labels/models.py:41 +#: labels/models.py:46 msgid "Tagged resource" msgstr "" @@ -4261,11 +4299,12 @@ msgid "Date last run" msgstr "" #: ops/models/base.py:51 ops/models/job.py:237 -#: xpack/plugins/cloud/models.py:198 +#: xpack.bak/plugins/cloud/models.py:198 xpack/plugins/cloud/models.py:198 msgid "Result" msgstr "" #: ops/models/base.py:52 ops/models/job.py:238 +#: xpack/plugins/cloud/manager.py:77 msgid "Summary" msgstr "" @@ -4661,7 +4700,7 @@ msgstr "" msgid "asset permissions of organization {}" msgstr "" -#: perms/serializers/permission.py:34 users/serializers/user.py:181 +#: perms/serializers/permission.py:34 users/serializers/user.py:254 msgid "Groups" msgstr "" @@ -4768,7 +4807,7 @@ msgid "Scope" msgstr "" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:886 +#: users/models/user.py:908 msgid "Role" msgstr "" @@ -4839,7 +4878,7 @@ msgstr "" msgid "Session audits" msgstr "Session" -#: rbac/tree.py:49 +#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:74 msgid "Cloud import" msgstr "" @@ -5121,13 +5160,13 @@ msgstr "" msgid "Proxy Server" msgstr "" -#: settings/serializers/auth/cas.py:19 settings/serializers/auth/oauth2.py:54 -#: settings/serializers/auth/saml2.py:33 +#: settings/serializers/auth/cas.py:19 settings/serializers/auth/oauth2.py:55 +#: settings/serializers/auth/saml2.py:40 msgid "Logout completely" msgstr "" #: settings/serializers/auth/cas.py:20 -msgid "When the user signs out, they also be logged out from the CAS Server" +msgid "When the user signs out, they also be logged out from the CAS server" msgstr "" #: settings/serializers/auth/cas.py:26 @@ -5139,8 +5178,8 @@ msgid "Enable attributes map" msgstr "" #: settings/serializers/auth/cas.py:32 settings/serializers/auth/ldap.py:64 -#: settings/serializers/auth/oauth2.py:56 settings/serializers/auth/oidc.py:38 -#: settings/serializers/auth/saml2.py:32 +#: settings/serializers/auth/oauth2.py:59 settings/serializers/auth/oidc.py:38 +#: settings/serializers/auth/saml2.py:33 msgid "User attribute" msgstr "" @@ -5164,12 +5203,8 @@ msgstr "" msgid "Dingtalk" msgstr "" -#: settings/serializers/auth/feishu.py:12 -msgid "Enable FeiShu Auth" -msgstr "" - -#: settings/serializers/auth/lark.py:12 -msgid "Enable Lark Auth" +#: settings/serializers/auth/lark.py:12 users/models/user.py:799 +msgid "Lark" msgstr "" #: settings/serializers/auth/ldap.py:39 settings/serializers/auth/ldap.py:103 @@ -5250,11 +5285,14 @@ msgstr "" msgid "Service provider" msgstr "" -#: settings/serializers/auth/oauth2.py:30 settings/serializers/auth/oidc.py:20 -msgid "Client Id" +#: settings/serializers/auth/oauth2.py:30 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:35 +#: xpack/plugins/cloud/serializers/account_attrs.py:35 +msgid "Client ID" msgstr "" #: settings/serializers/auth/oauth2.py:33 settings/serializers/auth/oidc.py:23 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:38 #: xpack/plugins/cloud/serializers/account_attrs.py:38 msgid "Client Secret" msgstr "" @@ -5280,8 +5318,18 @@ msgstr "" msgid "End session endpoint" msgstr "" -#: settings/serializers/auth/oauth2.py:59 settings/serializers/auth/oidc.py:112 -#: settings/serializers/auth/saml2.py:34 +#: settings/serializers/auth/oauth2.py:56 +msgid "When the user signs out, they also be logged out from the OAuth2 server" +msgstr "" + +#: settings/serializers/auth/oauth2.py:61 +msgid "" +"User attribute mapping, where the `key` is the JumpServer user attribute " +"name and the `value` is the OAuth2 service user attribute name" +msgstr "" + +#: settings/serializers/auth/oauth2.py:66 settings/serializers/auth/oidc.py:112 +#: settings/serializers/auth/saml2.py:43 msgid "Always update user" msgstr "" @@ -5297,6 +5345,10 @@ msgstr "" msgid "The current site's URL is used to construct the callback address" msgstr "" +#: settings/serializers/auth/oidc.py:20 +msgid "Client Id" +msgstr "" + #: settings/serializers/auth/oidc.py:33 msgid "Share session" msgstr "" @@ -5396,8 +5448,12 @@ msgstr "" msgid "Radius" msgstr "" -#: settings/serializers/auth/radius.py:21 -msgid "OTP in Radius" +#: settings/serializers/auth/radius.py:22 +msgid "OTP in RADIUS" +msgstr "" + +#: settings/serializers/auth/radius.py:23 +msgid "* Using OTP in RADIUS means users can employ RADIUS as a method for MFA" msgstr "" #: settings/serializers/auth/saml2.py:10 settings/serializers/auth/saml2.py:13 @@ -5424,11 +5480,22 @@ msgstr "" msgid "SP cert" msgstr "" +#: settings/serializers/auth/saml2.py:35 +msgid "" +"User attribute mapping, where the `key` is the SAML2 service user attribute " +"name and the `value` is the JumpServer user attribute name" +msgstr "" + +#: settings/serializers/auth/saml2.py:41 +msgid "When the user signs out, they also be logged out from the SAML2 server" +msgstr "" + #: settings/serializers/auth/sms.py:18 msgid "Enable Short Message Service (SMS)" msgstr "" -#: settings/serializers/auth/sms.py:21 xpack/plugins/cloud/models.py:34 +#: settings/serializers/auth/sms.py:21 xpack.bak/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:34 msgid "Provider" msgstr "" @@ -5455,8 +5522,8 @@ msgstr "" msgid "Template code" msgstr "" -#: settings/serializers/auth/sms.py:40 users/models/user.py:896 -#: users/serializers/user.py:114 +#: settings/serializers/auth/sms.py:40 users/models/user.py:918 +#: users/serializers/user.py:153 msgid "Phone" msgstr "" @@ -5518,6 +5585,7 @@ msgid "SSO auth key TTL" msgstr "" #: settings/serializers/auth/sso.py:20 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Unit: second" msgstr "" @@ -5731,7 +5799,7 @@ msgstr "" #: terminal/models/virtualapp/virtualapp.py:36 #: terminal/models/virtualapp/virtualapp.py:97 #: terminal/serializers/virtualapp.py:32 -msgid "Virtual App" +msgid "Virtual app" msgstr "" #: settings/serializers/feature.py:148 @@ -6089,35 +6157,61 @@ msgid "Auto" msgstr "" #: settings/serializers/terminal.py:22 -msgid "Terminal registration" +msgid "Registration" msgstr "" #: settings/serializers/terminal.py:24 msgid "" -"Allow terminal register, after all terminal setup, you should disable this " +"Allow component register, after all component setup, you should disable this " "for security" msgstr "" -#: settings/serializers/terminal.py:27 -msgid "Password auth" +#: settings/serializers/terminal.py:30 +msgid "" +"* Allow users to log in to the KoKo component via password authentication" +msgstr "" + +#: settings/serializers/terminal.py:34 users/forms/profile.py:172 +#: users/models/user.py:931 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:210 +#: xpack/plugins/cloud/serializers/account_attrs.py:210 +msgid "Public key" msgstr "" -#: settings/serializers/terminal.py:29 -msgid "Public key auth" -msgstr "Public key auth" +#: settings/serializers/terminal.py:36 +msgid "" +"* Allow users to log in to the KoKo component via Public key " +"authentication
If third-party authentication services, such as AD/LDAP, " +"are enabled, you should disable this option to prevent users from logging in " +"after being deleted from the AD/LDAP server" +msgstr "" -#: settings/serializers/terminal.py:30 +#: settings/serializers/terminal.py:43 +msgid "Asset sorting" +msgstr "" + +#: settings/serializers/terminal.py:46 +msgid "Asset page size" +msgstr "" + +#: settings/serializers/terminal.py:51 msgid "" -"Information: If use other auth method, like AD/LDAP, you should disable this " -"to avoid being able to log in after deleting" +"* You can individually configure the service address and port in the service " +"endpoint
If enabled, the Luna page will display the DB client launch " +"method when connecting to assets" msgstr "" -#: settings/serializers/terminal.py:34 -msgid "Asset list sorting" +#: settings/serializers/terminal.py:59 +msgid "" +"* You can individually configure the service address and port in the service " +"endpoint
If enabled, the Luna page will display the download rdp file " +"button and RDP Client launch method when connecting to assets" msgstr "" -#: settings/serializers/terminal.py:37 -msgid "Asset list page size" +#: settings/serializers/terminal.py:68 +msgid "" +"* Allow connecting to the KoKo component via SSH client
If enabled, the " +"Luna page will display the SSH client launch method when connecting to assets" msgstr "" #: settings/tasks/ldap.py:28 @@ -6623,7 +6717,8 @@ msgstr "" msgid "Storage is invalid" msgstr "" -#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 +#: terminal/models/applet/applet.py:30 xpack.bak/plugins/license/models.py:88 +#: xpack/plugins/license/models.py:88 msgid "Community edition" msgstr "" @@ -6644,11 +6739,6 @@ msgstr "" msgid "Can concurrent" msgstr "" -#: terminal/models/applet/applet.py:44 -#: terminal/models/virtualapp/virtualapp.py:29 -msgid "Tags" -msgstr "" - #: terminal/models/applet/applet.py:48 terminal/serializers/applet_host.py:167 #: terminal/serializers/storage.py:197 msgid "Hosts" @@ -6784,16 +6874,12 @@ msgstr "" msgid "Boot Time" msgstr "" -#: terminal/models/component/storage.py:28 -msgid "Default storage" -msgstr "" - -#: terminal/models/component/storage.py:140 +#: terminal/models/component/storage.py:146 #: terminal/models/component/terminal.py:91 msgid "Command storage" msgstr "" -#: terminal/models/component/storage.py:204 +#: terminal/models/component/storage.py:214 #: terminal/models/component/terminal.py:92 msgid "Replay storage" msgstr "" @@ -6942,7 +7028,7 @@ msgid "App Provider" msgstr "" #: terminal/models/virtualapp/virtualapp.py:102 -msgid "Virtual App publication" +msgid "Virtual app publication" msgstr "" #: terminal/notifications.py:25 @@ -7190,11 +7276,13 @@ msgid "Access key ID" msgstr "" #: terminal/serializers/storage.py:37 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:20 #: xpack/plugins/cloud/serializers/account_attrs.py:20 msgid "Access key secret" msgstr "" -#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:249 +#: terminal/serializers/storage.py:68 xpack.bak/plugins/cloud/models.py:249 +#: xpack/plugins/cloud/manager.py:90 xpack/plugins/cloud/models.py:249 msgid "Region" msgstr "" @@ -7214,7 +7302,8 @@ msgstr "" msgid "HOST" msgstr "" -#: terminal/serializers/storage.py:146 users/models/user.py:906 +#: terminal/serializers/storage.py:146 users/models/user.py:928 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:213 #: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "" @@ -7255,6 +7344,12 @@ msgstr "" msgid "Doc type" msgstr "" +#: terminal/serializers/storage.py:264 +msgid "" +"set as the default storage, will make new Component use the current storage " +"by default, without affecting existing Component" +msgstr "" + #: terminal/serializers/task.py:9 msgid "Session id" msgstr "" @@ -7928,81 +8023,74 @@ msgstr "" msgid "Not a valid ssh public key" msgstr "" -#: users/forms/profile.py:172 users/models/user.py:909 -#: xpack/plugins/cloud/serializers/account_attrs.py:210 -msgid "Public key" -msgstr "" - #: users/models/preference.py:38 users/serializers/preference/preference.py:19 msgid "Preference" msgstr "" -#: users/models/user.py:656 -msgid "Force enable" -msgstr "" - -#: users/models/user.py:763 -msgid "Lark" -msgstr "" +#: users/models/user.py:688 +#, fuzzy +#| msgid "Su enabled" +msgid "Force enabled" +msgstr "Switch account enabled" -#: users/models/user.py:888 users/serializers/user.py:190 +#: users/models/user.py:911 users/serializers/user.py:268 msgid "Is service account" msgstr "Is service account" -#: users/models/user.py:890 +#: users/models/user.py:913 msgid "Avatar" msgstr "" -#: users/models/user.py:893 +#: users/models/user.py:915 msgid "Wechat" msgstr "" -#: users/models/user.py:902 +#: users/models/user.py:924 msgid "OTP secret key" msgstr "" -#: users/models/user.py:914 users/serializers/profile.py:129 -#: users/serializers/user.py:187 +#: users/models/user.py:934 users/serializers/profile.py:129 +#: users/serializers/user.py:265 msgid "Is first login" msgstr "First login" -#: users/models/user.py:923 +#: users/models/user.py:952 msgid "Date password last updated" msgstr "Password updated" -#: users/models/user.py:926 +#: users/models/user.py:955 msgid "Need update password" msgstr "" -#: users/models/user.py:937 +#: users/models/user.py:979 msgid "Date api key used" msgstr "" -#: users/models/user.py:1059 +#: users/models/user.py:1104 msgid "Can not delete admin user" msgstr "" -#: users/models/user.py:1073 +#: users/models/user.py:1118 msgid "Can invite user" msgstr "" -#: users/models/user.py:1074 +#: users/models/user.py:1119 msgid "Can remove user" msgstr "" -#: users/models/user.py:1075 +#: users/models/user.py:1120 msgid "Can match user" msgstr "" -#: users/models/user.py:1084 +#: users/models/user.py:1131 msgid "Administrator" msgstr "" -#: users/models/user.py:1087 +#: users/models/user.py:1134 msgid "Administrator is the super user of system" msgstr "" -#: users/models/user.py:1112 +#: users/models/user.py:1166 msgid "User password history" msgstr "" @@ -8139,92 +8227,113 @@ msgstr "" msgid "Forced enabled" msgstr "" -#: users/serializers/user.py:44 +#: users/serializers/user.py:49 msgid "System roles" msgstr "" -#: users/serializers/user.py:45 +#: users/serializers/user.py:53 msgid "" "System roles are roles at the system level, and they will take effect across " "all organizations" msgstr "" -#: users/serializers/user.py:49 +#: users/serializers/user.py:59 msgid "Org roles" msgstr "" -#: users/serializers/user.py:52 +#: users/serializers/user.py:64 msgid "" "Org roles are roles at the organization level, and they will only take " "effect within current organization" msgstr "" -#: users/serializers/user.py:54 +#: users/serializers/user.py:68 msgid "Organizations and roles" msgstr "" -#: users/serializers/user.py:96 +#: users/serializers/user.py:118 msgid "Password setting" msgstr "" -#: users/serializers/user.py:98 +#: users/serializers/user.py:120 msgid "MFA enabled" msgstr "" -#: users/serializers/user.py:100 +#: users/serializers/user.py:122 msgid "MFA force enabled" msgstr "" -#: users/serializers/user.py:102 +#: users/serializers/user.py:124 msgid "Login blocked" msgstr "" -#: users/serializers/user.py:105 users/serializers/user.py:196 +#: users/serializers/user.py:128 users/serializers/user.py:274 msgid "Is OTP bound" msgstr "OTP bound" -#: users/serializers/user.py:106 +#: users/serializers/user.py:131 msgid "Super Administrator" msgstr "" -#: users/serializers/user.py:107 +#: users/serializers/user.py:134 msgid "Organization Administrator" msgstr "" -#: users/serializers/user.py:109 +#: users/serializers/user.py:138 msgid "Can public key authentication" msgstr "Can public key authentication" -#: users/serializers/user.py:169 -msgid "Fullname of user" +#: users/serializers/user.py:239 +msgid "Full name" msgstr "" -#: users/serializers/user.py:172 +#: users/serializers/user.py:242 msgid "Login username" msgstr "" -#: users/serializers/user.py:184 +#: users/serializers/user.py:245 +msgid "Email address" +msgstr "" + +#: users/serializers/user.py:255 +msgid "User groups to join" +msgstr "" + +#: users/serializers/user.py:259 +msgid "" +"User source identifies where the user was created, which could be AD or " +"other sources.There are security settings that can restrict users to log in " +"to the system only from the sources." +msgstr "" + +#: users/serializers/user.py:263 msgid "Superuser" msgstr "" -#: users/serializers/user.py:191 +#: users/serializers/user.py:269 msgid "Is org admin" msgstr "Org admin" -#: users/serializers/user.py:193 +#: users/serializers/user.py:271 msgid "Avatar url" msgstr "" -#: users/serializers/user.py:197 +#: users/serializers/user.py:276 msgid "MFA level" msgstr "MFA" -#: users/serializers/user.py:333 +#: users/serializers/user.py:277 +#, fuzzy +#| msgid "App Authentication" +msgid "Multi-Factor Authentication" +msgstr "Authentication" + +#: users/serializers/user.py:416 msgid "" -"For security, only a partial of users is displayed. You can search for more" +"* For security, only a partial of users is displayed. You can search for more" msgstr "" -#: users/serializers/user.py:366 +#: users/serializers/user.py:451 msgid "name not unique" msgstr "" @@ -8507,537 +8616,627 @@ msgstr "" msgid "Reset password success, return to login page" msgstr "" -#: xpack/apps.py:8 +#: xpack.bak/apps.py:8 xpack/apps.py:8 msgid "XPACK" msgstr "" -#: xpack/exceptions.py:7 +#: xpack.bak/exceptions.py:7 msgid "" "The current task is not synchronized with unmatched policy assets, skipping" msgstr "" -#: xpack/plugins/cloud/api.py:60 +#: xpack.bak/plugins/cloud/api.py:60 xpack/plugins/cloud/api.py:60 msgid "Test connection successful" msgstr "" -#: xpack/plugins/cloud/api.py:62 +#: xpack.bak/plugins/cloud/api.py:62 xpack/plugins/cloud/api.py:62 msgid "Test connection failed: {}" msgstr "" -#: xpack/plugins/cloud/const.py:8 +#: xpack.bak/plugins/cloud/const.py:8 xpack/plugins/cloud/const.py:8 msgid "Alibaba Cloud" msgstr "" -#: xpack/plugins/cloud/const.py:9 +#: xpack.bak/plugins/cloud/const.py:9 xpack/plugins/cloud/const.py:9 msgid "AWS (International)" msgstr "" -#: xpack/plugins/cloud/const.py:10 +#: xpack.bak/plugins/cloud/const.py:10 xpack/plugins/cloud/const.py:10 msgid "AWS (China)" msgstr "" -#: xpack/plugins/cloud/const.py:11 +#: xpack.bak/plugins/cloud/const.py:11 xpack/plugins/cloud/const.py:11 msgid "Azure (China)" msgstr "" -#: xpack/plugins/cloud/const.py:12 +#: xpack.bak/plugins/cloud/const.py:12 xpack/plugins/cloud/const.py:12 msgid "Azure (International)" msgstr "" -#: xpack/plugins/cloud/const.py:14 +#: xpack.bak/plugins/cloud/const.py:14 xpack/plugins/cloud/const.py:14 msgid "Baidu Cloud" msgstr "" -#: xpack/plugins/cloud/const.py:15 +#: xpack.bak/plugins/cloud/const.py:15 xpack/plugins/cloud/const.py:15 msgid "JD Cloud" msgstr "" -#: xpack/plugins/cloud/const.py:16 +#: xpack.bak/plugins/cloud/const.py:16 xpack/plugins/cloud/const.py:16 msgid "KingSoft Cloud" msgstr "" -#: xpack/plugins/cloud/const.py:17 +#: xpack.bak/plugins/cloud/const.py:17 xpack/plugins/cloud/const.py:17 msgid "Tencent Cloud" msgstr "" -#: xpack/plugins/cloud/const.py:18 +#: xpack.bak/plugins/cloud/const.py:18 xpack/plugins/cloud/const.py:18 msgid "Tencent Cloud (Lighthouse)" msgstr "" -#: xpack/plugins/cloud/const.py:19 +#: xpack.bak/plugins/cloud/const.py:19 xpack/plugins/cloud/const.py:19 msgid "Google Cloud Platform" msgstr "" -#: xpack/plugins/cloud/const.py:20 +#: xpack.bak/plugins/cloud/const.py:20 xpack/plugins/cloud/const.py:20 msgid "UCloud" msgstr "" -#: xpack/plugins/cloud/const.py:21 +#: xpack.bak/plugins/cloud/const.py:21 xpack/plugins/cloud/const.py:21 msgid "Volcengine" msgstr "" -#: xpack/plugins/cloud/const.py:23 +#: xpack.bak/plugins/cloud/const.py:23 xpack/plugins/cloud/const.py:23 msgid "VMware" msgstr "" +#: xpack.bak/plugins/cloud/const.py:24 +#: xpack.bak/plugins/cloud/providers/nutanix.py:15 #: xpack/plugins/cloud/const.py:24 xpack/plugins/cloud/providers/nutanix.py:15 msgid "Nutanix" msgstr "" -#: xpack/plugins/cloud/const.py:25 +#: xpack.bak/plugins/cloud/const.py:25 xpack/plugins/cloud/const.py:25 msgid "Huawei Private Cloud" msgstr "" -#: xpack/plugins/cloud/const.py:26 +#: xpack.bak/plugins/cloud/const.py:26 xpack/plugins/cloud/const.py:26 msgid "Qingyun Private Cloud" msgstr "" -#: xpack/plugins/cloud/const.py:27 +#: xpack.bak/plugins/cloud/const.py:27 xpack/plugins/cloud/const.py:27 msgid "CTYun Private Cloud" msgstr "" -#: xpack/plugins/cloud/const.py:28 +#: xpack.bak/plugins/cloud/const.py:28 xpack/plugins/cloud/const.py:28 msgid "OpenStack" msgstr "" +#: xpack.bak/plugins/cloud/const.py:29 +#: xpack.bak/plugins/cloud/providers/zstack.py:21 #: xpack/plugins/cloud/const.py:29 xpack/plugins/cloud/providers/zstack.py:21 msgid "ZStack" msgstr "" -#: xpack/plugins/cloud/const.py:30 +#: xpack.bak/plugins/cloud/const.py:30 xpack/plugins/cloud/const.py:30 msgid "Fusion Compute" msgstr "" -#: xpack/plugins/cloud/const.py:31 +#: xpack.bak/plugins/cloud/const.py:31 xpack/plugins/cloud/const.py:31 msgid "SCP" msgstr "" -#: xpack/plugins/cloud/const.py:32 +#: xpack.bak/plugins/cloud/const.py:32 xpack/plugins/cloud/const.py:32 msgid "Apsara Stack" msgstr "" -#: xpack/plugins/cloud/const.py:37 +#: xpack.bak/plugins/cloud/const.py:37 xpack/plugins/cloud/const.py:37 msgid "Private IP" msgstr "" -#: xpack/plugins/cloud/const.py:38 +#: xpack.bak/plugins/cloud/const.py:38 xpack/plugins/cloud/const.py:38 msgid "Public IP" msgstr "" +#: xpack.bak/plugins/cloud/const.py:42 xpack.bak/plugins/cloud/models.py:299 #: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:299 msgid "Instance name" msgstr "" -#: xpack/plugins/cloud/const.py:43 +#: xpack.bak/plugins/cloud/const.py:43 xpack/plugins/cloud/const.py:43 msgid "Instance name and Partial IP" msgstr "" -#: xpack/plugins/cloud/const.py:48 +#: xpack.bak/plugins/cloud/const.py:48 xpack/plugins/cloud/const.py:48 msgid "Succeed" msgstr "" -#: xpack/plugins/cloud/const.py:52 +#: xpack.bak/plugins/cloud/const.py:52 xpack/plugins/cloud/const.py:52 +#: xpack/plugins/cloud/manager.py:80 msgid "Unsync" msgstr "" -#: xpack/plugins/cloud/const.py:53 +#: xpack.bak/plugins/cloud/const.py:53 xpack/plugins/cloud/const.py:53 +#: xpack/plugins/cloud/manager.py:79 msgid "New Sync" msgstr "" -#: xpack/plugins/cloud/const.py:54 +#: xpack.bak/plugins/cloud/const.py:54 xpack/plugins/cloud/const.py:54 +#: xpack/plugins/cloud/manager.py:79 msgid "Synced" msgstr "" -#: xpack/plugins/cloud/const.py:55 +#: xpack.bak/plugins/cloud/const.py:55 xpack/plugins/cloud/const.py:55 +#: xpack/plugins/cloud/manager.py:80 msgid "Released" msgstr "" -#: xpack/plugins/cloud/const.py:59 +#: xpack.bak/plugins/cloud/const.py:59 xpack/plugins/cloud/const.py:59 msgid "And" msgstr "" -#: xpack/plugins/cloud/const.py:60 +#: xpack.bak/plugins/cloud/const.py:60 xpack/plugins/cloud/const.py:60 msgid "Or" msgstr "" -#: xpack/plugins/cloud/manager.py:55 xpack/plugins/cloud/providers/gcp.py:64 +#: xpack.bak/plugins/cloud/manager.py:55 +#: xpack.bak/plugins/cloud/providers/gcp.py:64 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:34 +#: xpack/plugins/cloud/manager.py:45 xpack/plugins/cloud/manager.py:55 +#: xpack/plugins/cloud/manager.py:57 xpack/plugins/cloud/providers/gcp.py:64 #: xpack/plugins/cloud/providers/huaweicloud.py:34 msgid "Account unavailable" msgstr "" -#: xpack/plugins/cloud/meta.py:9 +#: xpack.bak/plugins/cloud/meta.py:9 xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "" +#: xpack.bak/plugins/cloud/models.py:37 +#: xpack.bak/plugins/cloud/serializers/account.py:68 #: xpack/plugins/cloud/models.py:37 -#: xpack/plugins/cloud/serializers/account.py:68 +#: xpack/plugins/cloud/serializers/account.py:69 msgid "Attrs" msgstr "" -#: xpack/plugins/cloud/models.py:38 +#: xpack.bak/plugins/cloud/models.py:38 xpack/plugins/cloud/models.py:38 msgid "Validity" msgstr "" -#: xpack/plugins/cloud/models.py:43 +#: xpack.bak/plugins/cloud/models.py:43 xpack/plugins/cloud/models.py:43 msgid "Cloud account" msgstr "" -#: xpack/plugins/cloud/models.py:45 +#: xpack.bak/plugins/cloud/models.py:45 xpack/plugins/cloud/models.py:45 msgid "Test cloud account" msgstr "" -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:159 +#: xpack.bak/plugins/cloud/models.py:88 +#: xpack.bak/plugins/cloud/serializers/task.py:159 +#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:160 msgid "Regions" msgstr "" -#: xpack/plugins/cloud/models.py:91 +#: xpack.bak/plugins/cloud/models.py:91 xpack/plugins/cloud/models.py:91 msgid "Hostname strategy" msgstr "" -#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:162 +#: xpack.bak/plugins/cloud/models.py:96 +#: xpack.bak/plugins/cloud/serializers/task.py:162 +#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:163 msgid "IP network segment group" msgstr "" -#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:167 +#: xpack.bak/plugins/cloud/models.py:99 +#: xpack.bak/plugins/cloud/serializers/task.py:167 +#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:168 msgid "Sync IP type" msgstr "" +#: xpack.bak/plugins/cloud/models.py:102 +#: xpack.bak/plugins/cloud/serializers/task.py:185 #: xpack/plugins/cloud/models.py:102 -#: xpack/plugins/cloud/serializers/task.py:185 +#: xpack/plugins/cloud/serializers/task.py:186 msgid "Always update" msgstr "" -#: xpack/plugins/cloud/models.py:104 +#: xpack.bak/plugins/cloud/models.py:104 xpack/plugins/cloud/models.py:104 msgid "Fully synchronous" msgstr "" -#: xpack/plugins/cloud/models.py:109 +#: xpack.bak/plugins/cloud/models.py:109 xpack/plugins/cloud/models.py:109 msgid "Date last sync" msgstr "" -#: xpack/plugins/cloud/models.py:112 xpack/plugins/cloud/models.py:317 -#: xpack/plugins/cloud/models.py:341 +#: xpack.bak/plugins/cloud/models.py:112 xpack.bak/plugins/cloud/models.py:317 +#: xpack.bak/plugins/cloud/models.py:341 xpack/plugins/cloud/models.py:112 +#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/models.py:341 msgid "Strategy" msgstr "" +#: xpack.bak/plugins/cloud/models.py:117 xpack.bak/plugins/cloud/models.py:196 #: xpack/plugins/cloud/models.py:117 xpack/plugins/cloud/models.py:196 msgid "Sync instance task" msgstr "" +#: xpack.bak/plugins/cloud/models.py:207 xpack.bak/plugins/cloud/models.py:259 #: xpack/plugins/cloud/models.py:207 xpack/plugins/cloud/models.py:259 msgid "Date sync" msgstr "" -#: xpack/plugins/cloud/models.py:211 +#: xpack.bak/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:211 msgid "Sync instance snapshot" msgstr "" -#: xpack/plugins/cloud/models.py:215 +#: xpack.bak/plugins/cloud/models.py:215 xpack/plugins/cloud/models.py:215 msgid "Sync instance task execution" msgstr "" -#: xpack/plugins/cloud/models.py:239 +#: xpack.bak/plugins/cloud/models.py:239 xpack/plugins/cloud/models.py:239 msgid "Sync task" msgstr "" -#: xpack/plugins/cloud/models.py:243 +#: xpack.bak/plugins/cloud/models.py:243 xpack/plugins/cloud/models.py:243 msgid "Sync instance task history" msgstr "" -#: xpack/plugins/cloud/models.py:246 +#: xpack.bak/plugins/cloud/models.py:246 xpack/plugins/cloud/models.py:246 msgid "Instance" msgstr "" -#: xpack/plugins/cloud/models.py:263 +#: xpack.bak/plugins/cloud/models.py:263 xpack/plugins/cloud/models.py:263 msgid "Sync instance detail" msgstr "" -#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/serializers/task.py:72 +#: xpack.bak/plugins/cloud/models.py:275 +#: xpack.bak/plugins/cloud/serializers/task.py:72 +#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/serializers/task.py:73 msgid "Rule relation" msgstr "" -#: xpack/plugins/cloud/models.py:284 +#: xpack.bak/plugins/cloud/models.py:284 xpack/plugins/cloud/models.py:284 msgid "Task strategy" msgstr "" -#: xpack/plugins/cloud/models.py:288 +#: xpack.bak/plugins/cloud/models.py:288 xpack/plugins/cloud/models.py:288 msgid "Equal" msgstr "" -#: xpack/plugins/cloud/models.py:289 +#: xpack.bak/plugins/cloud/models.py:289 xpack/plugins/cloud/models.py:289 msgid "Not Equal" msgstr "" -#: xpack/plugins/cloud/models.py:290 +#: xpack.bak/plugins/cloud/models.py:290 xpack/plugins/cloud/models.py:290 msgid "In" msgstr "" -#: xpack/plugins/cloud/models.py:291 +#: xpack.bak/plugins/cloud/models.py:291 xpack/plugins/cloud/models.py:291 msgid "Contains" msgstr "" -#: xpack/plugins/cloud/models.py:292 +#: xpack.bak/plugins/cloud/models.py:292 xpack/plugins/cloud/models.py:292 msgid "Exclude" msgstr "" -#: xpack/plugins/cloud/models.py:293 +#: xpack.bak/plugins/cloud/models.py:293 xpack/plugins/cloud/models.py:293 msgid "Startswith" msgstr "" -#: xpack/plugins/cloud/models.py:294 +#: xpack.bak/plugins/cloud/models.py:294 xpack/plugins/cloud/models.py:294 msgid "Endswith" msgstr "" -#: xpack/plugins/cloud/models.py:300 +#: xpack.bak/plugins/cloud/models.py:300 xpack/plugins/cloud/models.py:300 msgid "Instance platform" msgstr "" -#: xpack/plugins/cloud/models.py:301 +#: xpack.bak/plugins/cloud/models.py:301 xpack/plugins/cloud/models.py:301 msgid "Instance address" msgstr "" -#: xpack/plugins/cloud/models.py:308 +#: xpack.bak/plugins/cloud/models.py:308 xpack/plugins/cloud/models.py:308 msgid "Rule attr" msgstr "" -#: xpack/plugins/cloud/models.py:312 +#: xpack.bak/plugins/cloud/models.py:312 xpack/plugins/cloud/models.py:312 msgid "Rule match" msgstr "" -#: xpack/plugins/cloud/models.py:314 +#: xpack.bak/plugins/cloud/models.py:314 xpack/plugins/cloud/models.py:314 msgid "Rule value" msgstr "" -#: xpack/plugins/cloud/models.py:321 xpack/plugins/cloud/serializers/task.py:75 +#: xpack.bak/plugins/cloud/models.py:321 +#: xpack.bak/plugins/cloud/serializers/task.py:75 +#: xpack/plugins/cloud/models.py:321 xpack/plugins/cloud/serializers/task.py:76 msgid "Strategy rule" msgstr "" -#: xpack/plugins/cloud/models.py:336 +#: xpack.bak/plugins/cloud/models.py:336 xpack/plugins/cloud/models.py:336 msgid "Action attr" msgstr "" -#: xpack/plugins/cloud/models.py:338 +#: xpack.bak/plugins/cloud/models.py:338 xpack/plugins/cloud/models.py:338 msgid "Action value" msgstr "" -#: xpack/plugins/cloud/models.py:345 xpack/plugins/cloud/serializers/task.py:78 +#: xpack.bak/plugins/cloud/models.py:345 +#: xpack.bak/plugins/cloud/serializers/task.py:78 +#: xpack/plugins/cloud/models.py:345 xpack/plugins/cloud/serializers/task.py:79 msgid "Strategy action" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:18 #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:19 #: xpack/plugins/cloud/providers/aws_international.py:19 msgid "China (Ningxia)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:22 #: xpack/plugins/cloud/providers/aws_international.py:22 msgid "US East (Ohio)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:23 #: xpack/plugins/cloud/providers/aws_international.py:23 msgid "US East (N. Virginia)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:24 #: xpack/plugins/cloud/providers/aws_international.py:24 msgid "US West (N. California)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:25 #: xpack/plugins/cloud/providers/aws_international.py:25 msgid "US West (Oregon)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:26 #: xpack/plugins/cloud/providers/aws_international.py:26 msgid "Africa (Cape Town)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:27 #: xpack/plugins/cloud/providers/aws_international.py:27 msgid "Asia Pacific (Hong Kong)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:28 #: xpack/plugins/cloud/providers/aws_international.py:28 msgid "Asia Pacific (Mumbai)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:29 #: xpack/plugins/cloud/providers/aws_international.py:29 msgid "Asia Pacific (Osaka-Local)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:30 #: xpack/plugins/cloud/providers/aws_international.py:30 msgid "Asia Pacific (Seoul)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:31 #: xpack/plugins/cloud/providers/aws_international.py:31 msgid "Asia Pacific (Singapore)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:32 #: xpack/plugins/cloud/providers/aws_international.py:32 msgid "Asia Pacific (Sydney)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:33 #: xpack/plugins/cloud/providers/aws_international.py:33 msgid "Asia Pacific (Tokyo)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:34 #: xpack/plugins/cloud/providers/aws_international.py:34 msgid "Canada (Central)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:35 #: xpack/plugins/cloud/providers/aws_international.py:35 msgid "Europe (Frankfurt)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:36 #: xpack/plugins/cloud/providers/aws_international.py:36 msgid "Europe (Ireland)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:37 #: xpack/plugins/cloud/providers/aws_international.py:37 msgid "Europe (London)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:38 #: xpack/plugins/cloud/providers/aws_international.py:38 msgid "Europe (Milan)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:39 #: xpack/plugins/cloud/providers/aws_international.py:39 msgid "Europe (Paris)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:40 #: xpack/plugins/cloud/providers/aws_international.py:40 msgid "Europe (Stockholm)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:41 #: xpack/plugins/cloud/providers/aws_international.py:41 msgid "Middle East (Bahrain)" msgstr "" +#: xpack.bak/plugins/cloud/providers/aws_international.py:42 #: xpack/plugins/cloud/providers/aws_international.py:42 msgid "South America (São Paulo)" msgstr "" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:56 +#: xpack.bak/plugins/cloud/providers/jdcloud.py:125 #: xpack/plugins/cloud/providers/baiducloud.py:56 #: xpack/plugins/cloud/providers/jdcloud.py:125 msgid "CN North-Beijing" msgstr "" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:57 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:47 +#: xpack.bak/plugins/cloud/providers/jdcloud.py:128 #: xpack/plugins/cloud/providers/baiducloud.py:57 #: xpack/plugins/cloud/providers/huaweicloud.py:47 #: xpack/plugins/cloud/providers/jdcloud.py:128 msgid "CN South-Guangzhou" msgstr "" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:58 #: xpack/plugins/cloud/providers/baiducloud.py:58 msgid "CN East-Suzhou" msgstr "" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:59 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:54 #: xpack/plugins/cloud/providers/baiducloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:54 msgid "CN-Hong Kong" msgstr "" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:60 #: xpack/plugins/cloud/providers/baiducloud.py:60 msgid "CN Center-Wuhan" msgstr "" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:61 #: xpack/plugins/cloud/providers/baiducloud.py:61 msgid "CN North-Baoding" msgstr "" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:62 +#: xpack.bak/plugins/cloud/providers/jdcloud.py:127 #: xpack/plugins/cloud/providers/baiducloud.py:62 #: xpack/plugins/cloud/providers/jdcloud.py:127 msgid "CN East-Shanghai" msgstr "" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:63 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:56 #: xpack/plugins/cloud/providers/baiducloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:56 msgid "AP-Singapore" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:44 #: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN North-Beijing1" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:45 #: xpack/plugins/cloud/providers/huaweicloud.py:45 msgid "CN North-Beijing4" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:46 #: xpack/plugins/cloud/providers/huaweicloud.py:46 msgid "CN North-Ulanqab1" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:48 #: xpack/plugins/cloud/providers/huaweicloud.py:48 msgid "CN South-Shenzhen" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:49 #: xpack/plugins/cloud/providers/huaweicloud.py:49 msgid "CN South-Guangzhou-InvitationOnly" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:50 #: xpack/plugins/cloud/providers/huaweicloud.py:50 msgid "CN East-Shanghai2" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:51 #: xpack/plugins/cloud/providers/huaweicloud.py:51 msgid "CN East-Shanghai1" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:53 #: xpack/plugins/cloud/providers/huaweicloud.py:53 msgid "CN Southwest-Guiyang1" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:55 #: xpack/plugins/cloud/providers/huaweicloud.py:55 msgid "AP-Bangkok" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:58 #: xpack/plugins/cloud/providers/huaweicloud.py:58 msgid "AF-Johannesburg" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:59 msgid "LA-Mexico City1" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:60 #: xpack/plugins/cloud/providers/huaweicloud.py:60 msgid "LA-Santiago" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:61 #: xpack/plugins/cloud/providers/huaweicloud.py:61 msgid "LA-Sao Paulo1" msgstr "" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:63 msgid "TR-Istanbul" msgstr "" +#: xpack.bak/plugins/cloud/providers/jdcloud.py:126 #: xpack/plugins/cloud/providers/jdcloud.py:126 msgid "CN East-Suqian" msgstr "" -#: xpack/plugins/cloud/serializers/account.py:69 +#: xpack.bak/plugins/cloud/serializers/account.py:69 +#: xpack/plugins/cloud/serializers/account.py:70 msgid "Validity display" msgstr "" -#: xpack/plugins/cloud/serializers/account.py:70 +#: xpack.bak/plugins/cloud/serializers/account.py:70 +#: xpack/plugins/cloud/serializers/account.py:71 msgid "Provider display" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:17 #: xpack/plugins/cloud/serializers/account_attrs.py:17 msgid "Access key id" msgstr "Access key id" -#: xpack/plugins/cloud/serializers/account_attrs.py:35 -msgid "Client ID" -msgstr "" - +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:41 #: xpack/plugins/cloud/serializers/account_attrs.py:41 msgid "Tenant ID" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:44 #: xpack/plugins/cloud/serializers/account_attrs.py:44 msgid "Subscription ID" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:98 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:102 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:126 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:156 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:206 #: xpack/plugins/cloud/serializers/account_attrs.py:98 #: xpack/plugins/cloud/serializers/account_attrs.py:102 #: xpack/plugins/cloud/serializers/account_attrs.py:126 @@ -9046,42 +9245,52 @@ msgstr "" msgid "API Endpoint" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:108 #: xpack/plugins/cloud/serializers/account_attrs.py:108 msgid "Auth url" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:109 #: xpack/plugins/cloud/serializers/account_attrs.py:109 msgid "eg: http://openstack.example.com:5000/v3" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:112 #: xpack/plugins/cloud/serializers/account_attrs.py:112 msgid "User domain" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:127 #: xpack/plugins/cloud/serializers/account_attrs.py:127 msgid "Cert File" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:128 #: xpack/plugins/cloud/serializers/account_attrs.py:128 msgid "Key File" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:144 #: xpack/plugins/cloud/serializers/account_attrs.py:144 msgid "Service account key" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:145 #: xpack/plugins/cloud/serializers/account_attrs.py:145 msgid "The file is in JSON format" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:163 #: xpack/plugins/cloud/serializers/account_attrs.py:163 msgid "IP address invalid `{}`, {}" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:179 #: xpack/plugins/cloud/serializers/account_attrs.py:179 msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:182 #: xpack/plugins/cloud/serializers/account_attrs.py:182 msgid "" "The port is used to detect the validity of the IP address. When the " @@ -9089,27 +9298,33 @@ msgid "" "synchronized.
If the port is 0, all IP addresses are valid." msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:190 #: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Hostname prefix" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:193 #: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "IP segment" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:197 #: xpack/plugins/cloud/serializers/account_attrs.py:197 msgid "Test port" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Test timeout" msgstr "" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:216 #: xpack/plugins/cloud/serializers/account_attrs.py:216 msgid "Project" msgstr "" -#: xpack/plugins/cloud/serializers/task.py:151 +#: xpack.bak/plugins/cloud/serializers/task.py:151 +#: xpack/plugins/cloud/serializers/task.py:152 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -9118,101 +9333,229 @@ msgid "" "10.1.1.1-10.1.1.20" msgstr "" -#: xpack/plugins/cloud/serializers/task.py:157 +#: xpack.bak/plugins/cloud/serializers/task.py:157 +#: xpack/plugins/cloud/serializers/task.py:158 msgid "History count" msgstr "" -#: xpack/plugins/cloud/serializers/task.py:158 +#: xpack.bak/plugins/cloud/serializers/task.py:158 +#: xpack/plugins/cloud/serializers/task.py:159 msgid "Instance count" msgstr "" -#: xpack/plugins/cloud/tasks.py:27 +#: xpack.bak/plugins/cloud/tasks.py:27 xpack/plugins/cloud/tasks.py:27 msgid "Run sync instance task" msgstr "" -#: xpack/plugins/cloud/tasks.py:41 +#: xpack.bak/plugins/cloud/tasks.py:41 xpack/plugins/cloud/tasks.py:41 msgid "Period clean sync instance task execution" msgstr "" -#: xpack/plugins/interface/api.py:52 +#: xpack.bak/plugins/interface/api.py:52 xpack/plugins/interface/api.py:52 msgid "Restore default successfully." msgstr "" -#: xpack/plugins/interface/meta.py:9 +#: xpack.bak/plugins/interface/meta.py:9 xpack/plugins/interface/meta.py:9 +#: xpack/plugins/interface/models.py:45 xpack/plugins/interface/models.py:86 msgid "Interface settings" msgstr "" -#: xpack/plugins/interface/models.py:23 -msgid "Login title" +#: xpack.bak/plugins/interface/models.py:23 +msgid "Title of login page" msgstr "" -#: xpack/plugins/interface/models.py:27 -msgid "Login image" +#: xpack.bak/plugins/interface/models.py:27 +msgid "Image of login page" msgstr "" +#: xpack.bak/plugins/interface/models.py:31 #: xpack/plugins/interface/models.py:31 msgid "Website icon" msgstr "" -#: xpack/plugins/interface/models.py:35 -msgid "Index logo" +#: xpack.bak/plugins/interface/models.py:35 +msgid "Logo of management page" msgstr "" -#: xpack/plugins/interface/models.py:39 -msgid "Logout logo" +#: xpack.bak/plugins/interface/models.py:39 +msgid "Logo of logout page" msgstr "" +#: xpack.bak/plugins/interface/models.py:41 #: xpack/plugins/interface/models.py:41 #: xpack/plugins/interface/serializers/interface.py:26 msgid "Theme" msgstr "" +#: xpack.bak/plugins/interface/models.py:42 #: xpack/plugins/interface/models.py:42 msgid "Footer content" msgstr "" -#: xpack/plugins/interface/models.py:45 xpack/plugins/interface/models.py:86 +#: xpack.bak/plugins/interface/models.py:45 +#: xpack.bak/plugins/interface/models.py:86 #, fuzzy #| msgid "Terminal setting" msgid "Interface setting" msgstr "Terminal" -#: xpack/plugins/interface/serializers/interface.py:37 -msgid "Wide logo on top" -msgstr "" - -#: xpack/plugins/interface/serializers/interface.py:38 -msgid "Small logo without text" -msgstr "" - -#: xpack/plugins/license/api.py:52 +#: xpack.bak/plugins/license/api.py:52 xpack/plugins/license/api.py:52 msgid "License import successfully" msgstr "" -#: xpack/plugins/license/api.py:53 +#: xpack.bak/plugins/license/api.py:53 msgid "License is invalid" msgstr "" +#: xpack.bak/plugins/license/meta.py:10 xpack.bak/plugins/license/models.py:144 #: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:144 msgid "License" msgstr "" -#: xpack/plugins/license/models.py:80 +#: xpack.bak/plugins/license/models.py:80 xpack/plugins/license/models.py:80 msgid "Basic edition" msgstr "" -#: xpack/plugins/license/models.py:82 +#: xpack.bak/plugins/license/models.py:82 xpack/plugins/license/models.py:82 msgid "Standard edition" msgstr "" -#: xpack/plugins/license/models.py:84 +#: xpack.bak/plugins/license/models.py:84 xpack/plugins/license/models.py:84 msgid "Professional edition" msgstr "" -#: xpack/plugins/license/models.py:86 +#: xpack.bak/plugins/license/models.py:86 xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "" +#: xpack/exceptions.py:8 +msgid "" +"Based on the current task configuration, assets that do not match the " +"strategy will skipped." +msgstr "" + +#: xpack/plugins/cloud/manager.py:41 +#, python-format +msgid "Task \"%s\" starts executing" +msgstr "" + +#: xpack/plugins/cloud/manager.py:71 +msgid "View the task details path: " +msgstr "" + +#: xpack/plugins/cloud/manager.py:74 +msgid "Account Details" +msgstr "" + +#: xpack/plugins/cloud/manager.py:75 +msgid "Synchronization History List" +msgstr "" + +#: xpack/plugins/cloud/manager.py:75 +msgid "Synchronization Instance List" +msgstr "" + +#: xpack/plugins/cloud/manager.py:83 +msgid "Task execution completed" +msgstr "" + +#: xpack/plugins/cloud/manager.py:87 +msgid "Synchronization regions" +msgstr "" + +#: xpack/plugins/cloud/manager.py:110 +#, python-format +msgid "Get instances of region \"%s\" error, error: %s" +msgstr "" + +#: xpack/plugins/cloud/manager.py:128 +#, python-format +msgid "The instance IP \"%s\" is not in network segment \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:164 +#, python-format +msgid "Failed to synchronize the instance \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:316 +#, python-format +msgid "" +"The updated platform of asset \"%s\" is inconsistent with the original " +"platform type. Skip platform and protocol updates" +msgstr "" + +#: xpack/plugins/cloud/manager.py:358 +#, python-format +msgid "The asset \"%s\" already exists" +msgstr "" + +#: xpack/plugins/cloud/manager.py:362 +#, python-format +msgid "Update asset \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:365 +#, python-format +msgid "Asset \"%s\" has been updated" +msgstr "" + +#: xpack/plugins/cloud/manager.py:376 +#, python-format +msgid "Prepare to create asset \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:388 +#, python-format +msgid "Set nodes \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:414 +#, python-format +msgid "Set accounts \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:430 +#, python-format +msgid "Set protocols \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/providers/lan.py:79 +#, python-format +msgid "Port \"%(port)s\" of instance IP \"%(ip)s\" is not reachable" +msgstr "" + +#: xpack/plugins/interface/models.py:23 +msgid "Login title" +msgstr "" + +#: xpack/plugins/interface/models.py:27 +msgid "Login image" +msgstr "" + +#: xpack/plugins/interface/models.py:35 +msgid "Index logo" +msgstr "" + +#: xpack/plugins/interface/models.py:39 +msgid "Logout logo" +msgstr "" + +#: xpack/plugins/interface/serializers/interface.py:37 +msgid "Wide logo on top" +msgstr "" + +#: xpack/plugins/interface/serializers/interface.py:38 +msgid "Small logo without text" +msgstr "" + +#: xpack/plugins/license/api.py:53 +msgid "Invalid license" +msgstr "" + +#~ msgid "Public key auth" +#~ msgstr "Public key auth" + #~ msgid "Help Docs URL" #~ msgstr "Document URL" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 2360e4572..960216ce2 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-22 18:28+0800\n" +"POT-Creation-Date: 2024-05-27 16:41+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,11 +40,12 @@ msgstr "成功: %s、失敗: %s、合計: %s" #: authentication/forms.py:28 #: authentication/templates/authentication/login.html:329 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:50 -#: settings/serializers/msg.py:37 terminal/serializers/storage.py:123 -#: terminal/serializers/storage.py:142 users/forms/profile.py:21 -#: users/serializers/user.py:112 +#: settings/serializers/msg.py:37 settings/serializers/terminal.py:28 +#: terminal/serializers/storage.py:123 terminal/serializers/storage.py:142 +#: users/forms/profile.py:21 users/serializers/user.py:142 #: users/templates/users/_msg_user_created.html:13 #: users/templates/users/user_password_verify.html:18 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:28 #: xpack/plugins/cloud/serializers/account_attrs.py:28 msgid "Password" msgstr "パスワード" @@ -89,7 +90,7 @@ msgstr "匿名ユーザー" msgid "Specified account" msgstr "特定のアカウント" -#: accounts/const/account.py:26 users/models/user.py:753 +#: accounts/const/account.py:26 users/models/user.py:789 msgid "Local" msgstr "ローカル" @@ -114,7 +115,8 @@ msgstr "更新" #: accounts/const/account.py:34 accounts/const/automation.py:109 #: accounts/serializers/automations/change_secret.py:164 audits/const.py:62 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19 -#: ops/const.py:76 terminal/const.py:79 xpack/plugins/cloud/const.py:47 +#: ops/const.py:76 terminal/const.py:79 xpack.bak/plugins/cloud/const.py:47 +#: xpack/plugins/cloud/const.py:47 msgid "Failed" msgstr "失敗しました" @@ -216,7 +218,7 @@ msgstr "作成のみ" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 #: settings/serializers/msg.py:59 users/forms/profile.py:100 -#: users/forms/profile.py:108 users/models/user.py:878 +#: users/forms/profile.py:108 users/models/user.py:900 #: users/templates/users/forgot_password.html:162 #: users/views/profile/reset.py:94 msgid "Email" @@ -284,7 +286,8 @@ msgstr "ユーザー %s がパスワードを閲覧/導き出しました" #: terminal/serializers/command.py:17 terminal/serializers/session.py:28 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:252 +#: tickets/models/ticket/apply_asset.py:16 +#: xpack.bak/plugins/cloud/models.py:252 xpack/plugins/cloud/models.py:252 msgid "Asset" msgstr "資産" @@ -303,7 +306,7 @@ msgid "Version" msgstr "バージョン" #: accounts/models/account.py:57 accounts/serializers/account/account.py:217 -#: users/models/user.py:930 +#: users/models/user.py:961 msgid "Source" msgstr "ソース" @@ -322,7 +325,8 @@ msgstr "ソース ID" #: terminal/models/session/session.py:34 terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 -#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:85 +#: tickets/models/ticket/command_confirm.py:13 +#: xpack.bak/plugins/cloud/models.py:85 xpack/plugins/cloud/models.py:85 msgid "Account" msgstr "アカウント" @@ -424,7 +428,8 @@ msgid "Trigger mode" msgstr "トリガーモード" #: accounts/models/automations/backup_account.py:134 audits/models.py:203 -#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:204 +#: terminal/models/session/sharing.py:125 xpack.bak/plugins/cloud/models.py:204 +#: xpack/plugins/cloud/manager.py:165 xpack/plugins/cloud/models.py:204 msgid "Reason" msgstr "理由" @@ -519,8 +524,9 @@ msgstr "終了日" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:136 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:281 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:200 -#: xpack/plugins/cloud/models.py:256 +#: tickets/serializers/ticket/ticket.py:20 +#: xpack.bak/plugins/cloud/models.py:200 xpack.bak/plugins/cloud/models.py:256 +#: xpack/plugins/cloud/models.py:200 xpack/plugins/cloud/models.py:256 msgid "Status" msgstr "ステータス" @@ -557,8 +563,9 @@ msgstr "最終ログイン日" #: authentication/templates/authentication/_msg_different_city.html:9 #: authentication/templates/authentication/_msg_oauth_bind.html:9 #: terminal/serializers/storage.py:136 users/forms/profile.py:31 -#: users/forms/profile.py:114 users/models/user.py:874 +#: users/forms/profile.py:114 users/models/user.py:898 #: users/templates/users/_msg_user_created.html:12 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:26 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Username" msgstr "ユーザー名" @@ -655,9 +662,11 @@ msgstr "パスワードルール" #: terminal/models/virtualapp/provider.py:10 #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 -#: users/models/preference.py:11 users/models/user.py:876 +#: users/models/preference.py:11 users/models/user.py:899 +#: xpack.bak/plugins/cloud/models.py:32 xpack.bak/plugins/cloud/models.py:272 +#: xpack.bak/plugins/cloud/serializers/task.py:70 #: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:272 -#: xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/serializers/task.py:71 msgid "Name" msgstr "名前" @@ -665,13 +674,11 @@ msgstr "名前" msgid "Privileged" msgstr "特権アカウント" -#: accounts/models/base.py:70 assets/models/asset/common.py:165 -#: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39 -#: assets/models/label.py:22 +#: accounts/models/base.py:70 assets/models/automations/base.py:21 +#: assets/models/cmd_filter.py:39 assets/models/label.py:22 #: authentication/serializers/connect_token_secret.py:117 #: terminal/models/applet/applet.py:40 -#: terminal/models/component/endpoint.py:120 -#: terminal/models/virtualapp/virtualapp.py:23 users/serializers/user.py:188 +#: terminal/models/virtualapp/virtualapp.py:23 users/serializers/user.py:266 msgid "Is active" msgstr "アクティブです。" @@ -687,7 +694,8 @@ msgstr "プラットフォーム" msgid "Push params" msgstr "パラメータをプッシュする" -#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:329 +#: accounts/models/template.py:26 xpack.bak/plugins/cloud/models.py:329 +#: xpack/plugins/cloud/models.py:329 msgid "Account template" msgstr "アカウント テンプレート" @@ -810,10 +818,10 @@ msgstr "カテゴリ" #: audits/serializers.py:170 #: authentication/serializers/connect_token_secret.py:126 ops/models/job.py:150 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39 -#: terminal/models/component/storage.py:57 -#: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:23 terminal/serializers/storage.py:264 -#: terminal/serializers/storage.py:276 tickets/models/comment.py:26 +#: terminal/models/component/storage.py:58 +#: terminal/models/component/storage.py:154 terminal/serializers/applet.py:29 +#: terminal/serializers/session.py:23 terminal/serializers/storage.py:271 +#: terminal/serializers/storage.py:284 tickets/models/comment.py:26 #: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:273 tickets/serializers/flow.py:53 #: tickets/serializers/ticket/ticket.py:19 @@ -847,6 +855,7 @@ msgstr "編集済み" #: ops/models/job.py:152 ops/serializers/job.py:19 #: perms/serializers/permission.py:36 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 +#: xpack/plugins/cloud/manager.py:73 msgid "Assets" msgstr "資産" @@ -860,6 +869,7 @@ msgid "Asset does not support this secret type: %s" msgstr "アセットはアカウント タイプをサポートしていません: %s" #: accounts/serializers/account/account.py:410 +#: xpack/plugins/cloud/serializers/account.py:111 msgid "Account has exist" msgstr "アカウントはすでに存在しています" @@ -886,8 +896,8 @@ msgstr "ID" #: terminal/notifications.py:205 terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 -#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1064 -#: users/models/user.py:1102 +#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1109 +#: users/models/user.py:1153 msgid "User" msgstr "ユーザー" @@ -919,19 +929,19 @@ msgstr "現在、メール送信のみがサポートされています" msgid "Asset type" msgstr "資産タイプ" -#: accounts/serializers/account/base.py:25 terminal/serializers/storage.py:149 +#: accounts/serializers/account/base.py:33 terminal/serializers/storage.py:149 msgid "Passphrase" msgstr "" -#: accounts/serializers/account/base.py:78 +#: accounts/serializers/account/base.py:93 #: assets/serializers/asset/common.py:384 msgid "Spec info" msgstr "特別情報" -#: accounts/serializers/account/base.py:80 +#: accounts/serializers/account/base.py:96 msgid "" -"* If no username is required for authentication, enter null. " -"For AD accounts, use the format username@domain." +"* If no username is required for authentication, enter null. For AD " +"accounts, use the format username@domain." msgstr "" "ヒント: 認証にユーザー名が必要ない場合は、`null`を入力します。ADアカウントの" "場合は、`username@domain`のようになります。" @@ -985,7 +995,8 @@ msgstr "关联平台，可以配置推送参数，如果不关联，则使用默 #: terminal/models/component/endpoint.py:119 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 -#: tickets/models/ticket/general.py:295 users/models/user.py:912 +#: tickets/models/ticket/general.py:295 users/models/user.py:933 +#: xpack.bak/plugins/cloud/models.py:39 xpack.bak/plugins/cloud/models.py:106 #: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:106 msgid "Comment" msgstr "コメント" @@ -1169,12 +1180,14 @@ msgid "Notify" msgstr "" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:278 +#: terminal/models/component/endpoint.py:112 +#: xpack.bak/plugins/cloud/models.py:278 xpack/plugins/cloud/models.py:278 msgid "Priority" msgstr "優先順位" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:279 +#: terminal/models/component/endpoint.py:113 +#: xpack.bak/plugins/cloud/models.py:279 xpack/plugins/cloud/models.py:279 msgid "1-100, the lower the value will be match first" msgstr "1-100、低い値は最初に一致します" @@ -1183,17 +1196,19 @@ msgstr "1-100、低い値は最初に一致します" msgid "Reviewers" msgstr "レビュー担当者" -#: acls/models/base.py:43 authentication/models/access_key.py:25 +#: acls/models/base.py:43 assets/models/asset/common.py:165 +#: authentication/models/access_key.py:25 #: authentication/models/connection_token.py:53 #: authentication/templates/authentication/_access_key_modal.html:32 -#: perms/models/asset_permission.py:82 terminal/models/session/sharing.py:29 -#: tickets/const.py:36 +#: perms/models/asset_permission.py:82 +#: terminal/models/component/endpoint.py:120 +#: terminal/models/session/sharing.py:29 tickets/const.py:36 msgid "Active" msgstr "アクティブ" #: acls/models/base.py:81 perms/serializers/permission.py:32 #: users/models/preference.py:16 users/serializers/group.py:21 -#: users/serializers/user.py:332 +#: users/serializers/user.py:414 msgid "Users" msgstr "ユーザー" @@ -1214,13 +1229,14 @@ msgid "Command" msgstr "コマンド" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack/plugins/cloud/models.py:295 +#: xpack.bak/plugins/cloud/models.py:295 xpack/plugins/cloud/models.py:295 msgid "Regex" msgstr "正規情報" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:184 settings/serializers/feature.py:19 -#: settings/serializers/msg.py:76 xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:76 xpack.bak/plugins/license/models.py:30 +#: xpack/plugins/license/models.py:30 msgid "Content" msgstr "コンテンツ" @@ -1320,7 +1336,8 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "いずれのレビューアも組織 '{}' に属していません" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:145 +#: xpack.bak/plugins/cloud/serializers/task.py:145 +#: xpack/plugins/cloud/serializers/task.py:146 msgid "IP address invalid: `{}`" msgstr "IPアドレスが無効: '{}'" @@ -1457,6 +1474,7 @@ msgstr "{port} のポート {address} に接続できません" #: assets/automations/ping_gateway/manager.py:58 #: authentication/backends/oauth2/views.py:60 authentication/middleware.py:93 +#: xpack.bak/plugins/cloud/providers/fc.py:47 #: xpack/plugins/cloud/providers/fc.py:47 msgid "Authentication failed" msgstr "認証に失敗しました" @@ -1489,7 +1507,7 @@ msgid "Gather facts" msgstr "資産情報の収集" #: assets/const/base.py:32 audits/const.py:55 -#: terminal/serializers/applet_host.py:32 +#: terminal/serializers/applet_host.py:32 users/models/user.py:686 msgid "Disabled" msgstr "無効" @@ -1509,6 +1527,8 @@ msgstr "脚本" #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:76 #: settings/serializers/feature.py:49 settings/serializers/msg.py:31 #: terminal/models/component/endpoint.py:13 terminal/serializers/applet.py:17 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:72 +#: xpack/plugins/cloud/manager.py:73 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" msgstr "ホスト" @@ -1721,6 +1741,7 @@ msgstr "クラウド サービス" #: assets/models/asset/common.py:94 assets/models/platform.py:16 #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:77 #: settings/serializers/msg.py:32 terminal/serializers/storage.py:133 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:73 #: xpack/plugins/cloud/serializers/account_attrs.py:73 msgid "Port" msgstr "ポート" @@ -1733,7 +1754,8 @@ msgstr "アドレス" #: assets/models/asset/common.py:161 assets/models/platform.py:134 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:325 +#: perms/serializers/user_permission.py:25 +#: xpack.bak/plugins/cloud/models.py:325 xpack/plugins/cloud/models.py:325 msgid "Platform" msgstr "プラットフォーム" @@ -1792,7 +1814,8 @@ msgstr "プロキシー" #: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 perms/models/asset_permission.py:72 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:326 +#: tickets/models/ticket/apply_asset.py:14 +#: xpack.bak/plugins/cloud/models.py:326 xpack/plugins/cloud/models.py:326 msgid "Node" msgstr "ノード" @@ -1811,7 +1834,7 @@ msgstr "アセットの自動化タスク" #: assets/models/automations/base.py:114 assets/models/cmd_filter.py:41 #: audits/models.py:267 common/db/models.py:34 ops/models/base.py:54 -#: ops/models/job.py:240 users/models/user.py:1103 +#: ops/models/job.py:240 users/models/user.py:1156 msgid "Date created" msgstr "作成された日付" @@ -1832,17 +1855,17 @@ msgid "Date verified" msgstr "確認済みの日付" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:66 -#: users/models/group.py:25 users/models/user.py:882 +#: users/models/group.py:25 users/models/user.py:905 msgid "User group" msgstr "ユーザーグループ" #: assets/models/cmd_filter.py:42 common/db/models.py:35 -#: users/models/user.py:938 +#: users/models/user.py:981 msgid "Date updated" msgstr "更新日" #: assets/models/cmd_filter.py:44 assets/models/cmd_filter.py:91 -#: common/db/models.py:32 users/models/user.py:919 +#: common/db/models.py:32 users/models/user.py:943 #: users/serializers/group.py:32 msgid "Created by" msgstr "によって作成された" @@ -1879,7 +1902,7 @@ msgstr "お気に入りのアセット" msgid "Gateway" msgstr "ゲートウェイ" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1088 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1135 msgid "System" msgstr "システム" @@ -1897,8 +1920,8 @@ msgstr "値" #: assets/serializers/cagegory.py:17 assets/serializers/cagegory.py:23 #: assets/serializers/platform.py:144 #: authentication/serializers/connect_token_secret.py:124 -#: common/serializers/common.py:85 labels/models.py:17 labels/models.py:33 -#: labels/serializers.py:45 settings/serializers/msg.py:88 +#: common/serializers/common.py:85 labels/serializers.py:45 +#: settings/serializers/msg.py:88 msgid "Label" msgstr "ラベル" @@ -1935,6 +1958,8 @@ msgid "Required" msgstr "必要" #: assets/models/platform.py:19 assets/serializers/platform.py:146 +#: terminal/models/component/storage.py:28 +#: xpack.bak/plugins/cloud/providers/nutanix.py:30 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "デフォルト" @@ -1951,7 +1976,7 @@ msgstr "設定" #: assets/models/platform.py:38 audits/const.py:56 #: authentication/backends/passkey/models.py:11 settings/models.py:38 -#: terminal/serializers/applet_host.py:33 +#: terminal/serializers/applet_host.py:33 users/models/user.py:687 msgid "Enabled" msgstr "有効化" @@ -2078,8 +2103,10 @@ msgstr "" #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:46 -#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:328 -#: xpack/plugins/cloud/serializers/task.py:33 +#: perms/serializers/user_permission.py:74 +#: xpack.bak/plugins/cloud/models.py:328 +#: xpack.bak/plugins/cloud/serializers/task.py:33 +#: xpack/plugins/cloud/models.py:328 xpack/plugins/cloud/serializers/task.py:34 msgid "Protocols" msgstr "プロトコル" @@ -2432,6 +2459,7 @@ msgstr "マップディレクトリ" #: audits/const.py:23 terminal/api/session/session.py:277 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 +#: xpack/plugins/cloud/manager.py:74 msgid "View" msgstr "表示" @@ -2490,6 +2518,7 @@ msgstr "ログインログ" #: audits/const.py:51 terminal/models/applet/host.py:144 #: terminal/models/component/task.py:22 +#: xpack/plugins/cloud/serializers/account.py:55 msgid "Task" msgstr "タスク" @@ -2588,7 +2617,7 @@ msgstr "ログインIP" #: audits/models.py:200 audits/serializers.py:52 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:63 users/models/user.py:899 +#: users/forms/profile.py:63 users/models/user.py:921 #: users/serializers/profile.py:102 msgid "MFA" msgstr "MFA" @@ -2645,7 +2674,7 @@ msgstr "ユーザー %s %s が現在のリソースをサブスクライブし #: audits/serializers.py:172 authentication/models/connection_token.py:47 #: authentication/models/temp_token.py:13 perms/models/asset_permission.py:80 #: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:917 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:940 msgid "Date expired" msgstr "期限切れの日付" @@ -2679,28 +2708,29 @@ msgstr "認証トークン" #: audits/signal_handlers/login_log.py:37 authentication/notifications.py:73 #: authentication/views/login.py:77 notifications/backends/__init__.py:11 #: settings/serializers/auth/wecom.py:10 settings/serializers/auth/wecom.py:15 -#: users/models/user.py:760 users/models/user.py:932 +#: users/models/user.py:796 users/models/user.py:964 msgid "WeCom" msgstr "企業微信" #: audits/signal_handlers/login_log.py:38 authentication/views/feishu.py:105 #: authentication/views/login.py:89 notifications/backends/__init__.py:14 -#: settings/serializers/auth/feishu.py:10 users/models/user.py:762 -#: users/models/user.py:934 +#: settings/serializers/auth/feishu.py:10 +#: settings/serializers/auth/feishu.py:12 users/models/user.py:798 +#: users/models/user.py:970 msgid "FeiShu" msgstr "本を飛ばす" #: audits/signal_handlers/login_log.py:40 authentication/views/login.py:101 #: authentication/views/slack.py:87 notifications/backends/__init__.py:16 #: settings/serializers/auth/slack.py:10 settings/serializers/auth/slack.py:12 -#: users/models/user.py:764 users/models/user.py:936 +#: users/models/user.py:800 users/models/user.py:976 msgid "Slack" msgstr "" #: audits/signal_handlers/login_log.py:41 authentication/views/dingtalk.py:161 #: authentication/views/login.py:83 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:761 -#: users/models/user.py:933 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:797 +#: users/models/user.py:967 msgid "DingTalk" msgstr "DingTalk" @@ -3277,7 +3307,8 @@ msgid "Component" msgstr "コンポーネント" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:327 +#: perms/serializers/user_permission.py:28 +#: xpack.bak/plugins/cloud/models.py:327 xpack/plugins/cloud/models.py:327 msgid "Domain" msgstr "ドメイン" @@ -3318,7 +3349,7 @@ msgstr "アクション" #: authentication/serializers/connection_token.py:42 #: perms/serializers/permission.py:44 perms/serializers/permission.py:65 -#: users/serializers/user.py:103 users/serializers/user.py:192 +#: users/serializers/user.py:125 users/serializers/user.py:270 msgid "Is expired" msgstr "期限切れです" @@ -3332,8 +3363,8 @@ msgid "Access IP" msgstr "Access IP" #: authentication/serializers/token.py:92 perms/serializers/permission.py:43 -#: perms/serializers/permission.py:66 users/serializers/user.py:104 -#: users/serializers/user.py:189 +#: perms/serializers/permission.py:66 users/serializers/user.py:126 +#: users/serializers/user.py:267 msgid "Is valid" msgstr "有効です" @@ -3358,14 +3389,12 @@ msgid "Show" msgstr "表示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/const.py:42 users/models/user.py:654 -#: users/templates/users/user_verify_mfa.html:36 +#: users/const.py:42 users/templates/users/user_verify_mfa.html:36 msgid "Disable" msgstr "無効化" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/const.py:43 users/models/user.py:655 -#: users/templates/users/mfa_setting.html:26 +#: users/const.py:43 users/templates/users/mfa_setting.html:26 #: users/templates/users/mfa_setting.html:68 msgid "Enable" msgstr "有効化" @@ -3572,7 +3601,7 @@ msgid "Do you want to retry ?" msgstr "再試行しますか？" #: authentication/utils.py:24 common/utils/ip/geoip/utils.py:24 -#: xpack/plugins/cloud/const.py:33 +#: xpack.bak/plugins/cloud/const.py:33 xpack/plugins/cloud/const.py:33 msgid "LAN" msgstr "ローカルエリアネットワーク" @@ -3754,7 +3783,7 @@ msgstr "ランニング" msgid "Canceled" msgstr "キャンセル" -#: common/const/common.py:5 +#: common/const/common.py:5 xpack/plugins/cloud/manager.py:380 #, python-format msgid "%(name)s was created successfully" msgstr "%(name)s が正常に作成されました" @@ -3816,6 +3845,9 @@ msgstr "無効なID、リストでなければなりません" #: common/db/fields.py:594 common/db/fields.py:599 #: common/serializers/fields.py:133 tickets/serializers/ticket/common.py:58 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:56 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:79 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:150 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 #: xpack/plugins/cloud/serializers/account_attrs.py:150 @@ -3838,7 +3870,7 @@ msgstr "は破棄されます" msgid "discard time" msgstr "時間を捨てる" -#: common/db/models.py:33 users/models/user.py:920 +#: common/db/models.py:33 users/models/user.py:946 msgid "Updated by" msgstr "によって更新" @@ -3952,7 +3984,8 @@ msgstr "アリ雲" msgid "Tencent cloud" msgstr "テンセント雲" -#: common/sdk/sms/endpoint.py:18 xpack/plugins/cloud/const.py:13 +#: common/sdk/sms/endpoint.py:18 xpack.bak/plugins/cloud/const.py:13 +#: xpack/plugins/cloud/const.py:13 msgid "Huawei Cloud" msgstr "華為雲" @@ -4006,8 +4039,9 @@ msgstr "間違ったデータ タイプです。リストにする必要があ msgid "Invalid choice: {}" msgstr "無効なオプション: {}" -#: common/serializers/mixin.py:409 -msgid "Labels" +#: common/serializers/mixin.py:441 terminal/models/applet/applet.py:44 +#: terminal/models/virtualapp/virtualapp.py:29 +msgid "Tags" msgstr "ラベル" #: common/tasks.py:31 common/utils/verify_code.py:16 @@ -4102,11 +4136,17 @@ msgstr "" msgid "App Labels" msgstr "ラベル" -#: labels/models.py:36 +#: labels/models.py:17 labels/models.py:36 +#, fuzzy +#| msgid "Tags" +msgid "Tag" +msgstr "ラベル" + +#: labels/models.py:40 msgid "Resource ID" msgstr "リソースID" -#: labels/models.py:41 +#: labels/models.py:46 msgid "Tagged resource" msgstr "関連リソース" @@ -4415,11 +4455,12 @@ msgid "Date last run" msgstr "最終実行日" #: ops/models/base.py:51 ops/models/job.py:237 -#: xpack/plugins/cloud/models.py:198 +#: xpack.bak/plugins/cloud/models.py:198 xpack/plugins/cloud/models.py:198 msgid "Result" msgstr "結果" #: ops/models/base.py:52 ops/models/job.py:238 +#: xpack/plugins/cloud/manager.py:77 msgid "Summary" msgstr "概要" @@ -4834,7 +4875,7 @@ msgstr "資産権限の有効期限が近づいています" msgid "asset permissions of organization {}" msgstr "組織 {} の資産権限" -#: perms/serializers/permission.py:34 users/serializers/user.py:181 +#: perms/serializers/permission.py:34 users/serializers/user.py:254 msgid "Groups" msgstr "" @@ -4948,7 +4989,7 @@ msgid "Scope" msgstr "スコープ" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:886 +#: users/models/user.py:908 msgid "Role" msgstr "ロール" @@ -5020,7 +5061,7 @@ msgstr "システム設定" msgid "Session audits" msgstr "セッション監査" -#: rbac/tree.py:49 +#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:74 msgid "Cloud import" msgstr "クラウドインポート" @@ -5320,13 +5361,13 @@ msgstr "LDAPサーバー" msgid "Proxy Server" msgstr "コールバックアドレス" -#: settings/serializers/auth/cas.py:19 settings/serializers/auth/oauth2.py:54 -#: settings/serializers/auth/saml2.py:33 +#: settings/serializers/auth/cas.py:19 settings/serializers/auth/oauth2.py:55 +#: settings/serializers/auth/saml2.py:40 msgid "Logout completely" msgstr "同期ログアウト" #: settings/serializers/auth/cas.py:20 -msgid "When the user signs out, they also be logged out from the CAS Server" +msgid "When the user signs out, they also be logged out from the CAS server" msgstr "" #: settings/serializers/auth/cas.py:26 @@ -5338,8 +5379,8 @@ msgid "Enable attributes map" msgstr "属性マップの有効化" #: settings/serializers/auth/cas.py:32 settings/serializers/auth/ldap.py:64 -#: settings/serializers/auth/oauth2.py:56 settings/serializers/auth/oidc.py:38 -#: settings/serializers/auth/saml2.py:32 +#: settings/serializers/auth/oauth2.py:59 settings/serializers/auth/oidc.py:38 +#: settings/serializers/auth/saml2.py:33 msgid "User attribute" msgstr "マッピングのプロパティ" @@ -5363,13 +5404,9 @@ msgstr "" msgid "Dingtalk" msgstr "ピン認証の有効化" -#: settings/serializers/auth/feishu.py:12 -msgid "Enable FeiShu Auth" -msgstr "飛本認証の有効化" - -#: settings/serializers/auth/lark.py:12 -msgid "Enable Lark Auth" -msgstr "Lark 認証の有効化" +#: settings/serializers/auth/lark.py:12 users/models/user.py:799 +msgid "Lark" +msgstr "" #: settings/serializers/auth/ldap.py:39 settings/serializers/auth/ldap.py:103 msgid "LDAP" @@ -5410,6 +5447,7 @@ msgid "Search filter" msgstr "ユーザー検索フィルター" #: settings/serializers/auth/ldap.py:61 +#, python-format msgid "Selection could include (cn|uid|sAMAccountName=%(user)s)" msgstr "選択は (cnまたはuidまたはsAMAccountName)=%(user)s)" @@ -5452,11 +5490,14 @@ msgstr "アイコン" msgid "Service provider" msgstr "サービスプロバイダー" -#: settings/serializers/auth/oauth2.py:30 settings/serializers/auth/oidc.py:20 -msgid "Client Id" +#: settings/serializers/auth/oauth2.py:30 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:35 +#: xpack/plugins/cloud/serializers/account_attrs.py:35 +msgid "Client ID" msgstr "クライアントID" #: settings/serializers/auth/oauth2.py:33 settings/serializers/auth/oidc.py:23 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:38 #: xpack/plugins/cloud/serializers/account_attrs.py:38 msgid "Client Secret" msgstr "クライアント秘密" @@ -5482,8 +5523,18 @@ msgstr "プロバイダーuserinfoエンドポイント" msgid "End session endpoint" msgstr "プロバイダーのセッション終了エンドポイント" -#: settings/serializers/auth/oauth2.py:59 settings/serializers/auth/oidc.py:112 -#: settings/serializers/auth/saml2.py:34 +#: settings/serializers/auth/oauth2.py:56 +msgid "When the user signs out, they also be logged out from the OAuth2 server" +msgstr "" + +#: settings/serializers/auth/oauth2.py:61 +msgid "" +"User attribute mapping, where the `key` is the JumpServer user attribute " +"name and the `value` is the OAuth2 service user attribute name" +msgstr "" + +#: settings/serializers/auth/oauth2.py:66 settings/serializers/auth/oidc.py:112 +#: settings/serializers/auth/saml2.py:43 msgid "Always update user" msgstr "常にユーザーを更新" @@ -5499,6 +5550,10 @@ msgstr "ベースサイトのアドレス" msgid "The current site's URL is used to construct the callback address" msgstr "" +#: settings/serializers/auth/oidc.py:20 +msgid "Client Id" +msgstr "クライアントID" + #: settings/serializers/auth/oidc.py:33 msgid "Share session" msgstr "セッションの共有" @@ -5601,10 +5656,16 @@ msgstr "FIDOサーバー名" msgid "Radius" msgstr "Radius" -#: settings/serializers/auth/radius.py:21 -msgid "OTP in Radius" +#: settings/serializers/auth/radius.py:22 +#, fuzzy +#| msgid "OTP in Radius" +msgid "OTP in RADIUS" msgstr "Radius のOTP" +#: settings/serializers/auth/radius.py:23 +msgid "* Using OTP in RADIUS means users can employ RADIUS as a method for MFA" +msgstr "" + #: settings/serializers/auth/saml2.py:10 settings/serializers/auth/saml2.py:13 msgid "SAML2" msgstr "SAML2" @@ -5629,11 +5690,22 @@ msgstr "SP プライベートキー" msgid "SP cert" msgstr "SP 証明書" +#: settings/serializers/auth/saml2.py:35 +msgid "" +"User attribute mapping, where the `key` is the SAML2 service user attribute " +"name and the `value` is the JumpServer user attribute name" +msgstr "" + +#: settings/serializers/auth/saml2.py:41 +msgid "When the user signs out, they also be logged out from the SAML2 server" +msgstr "" + #: settings/serializers/auth/sms.py:18 msgid "Enable Short Message Service (SMS)" msgstr "" -#: settings/serializers/auth/sms.py:21 xpack/plugins/cloud/models.py:34 +#: settings/serializers/auth/sms.py:21 xpack.bak/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:34 msgid "Provider" msgstr "プロバイダー" @@ -5660,8 +5732,8 @@ msgstr "署名" msgid "Template code" msgstr "テンプレートコード" -#: settings/serializers/auth/sms.py:40 users/models/user.py:896 -#: users/serializers/user.py:114 +#: settings/serializers/auth/sms.py:40 users/models/user.py:918 +#: users/serializers/user.py:153 msgid "Phone" msgstr "電話" @@ -5727,6 +5799,7 @@ msgid "SSO auth key TTL" msgstr "Token有効期間" #: settings/serializers/auth/sso.py:20 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Unit: second" msgstr "単位: 秒" @@ -5951,7 +6024,9 @@ msgstr "コマンドフィルタリング" #: terminal/models/virtualapp/virtualapp.py:36 #: terminal/models/virtualapp/virtualapp.py:97 #: terminal/serializers/virtualapp.py:32 -msgid "Virtual App" +#, fuzzy +#| msgid "Virtual App" +msgid "Virtual app" msgstr "仮想アプリケーション" #: settings/serializers/feature.py:148 @@ -6346,43 +6421,75 @@ msgid "Auto" msgstr "自動" #: settings/serializers/terminal.py:22 -msgid "Terminal registration" +#, fuzzy +#| msgid "Terminal registration" +msgid "Registration" msgstr "ターミナルレジスタの有効化" #: settings/serializers/terminal.py:24 +#, fuzzy +#| msgid "" +#| "Allow terminal register, after all terminal setup, you should disable " +#| "this for security" msgid "" -"Allow terminal register, after all terminal setup, you should disable this " +"Allow component register, after all component setup, you should disable this " "for security" msgstr "" "ターミナルレジスタを許可し、すべてのターミナルセットアップの後、セキュリティ" "のためにこれを無効にする必要があります" -#: settings/serializers/terminal.py:27 -msgid "Password auth" -msgstr "パスワード認証" +#: settings/serializers/terminal.py:30 +msgid "" +"* Allow users to log in to the KoKo component via password authentication" +msgstr "" -#: settings/serializers/terminal.py:29 -#, fuzzy -#| msgid "Public key auth" -msgid "Public key auth" -msgstr "鍵認証" +#: settings/serializers/terminal.py:34 users/forms/profile.py:172 +#: users/models/user.py:931 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:210 +#: xpack/plugins/cloud/serializers/account_attrs.py:210 +msgid "Public key" +msgstr "公開キー" -#: settings/serializers/terminal.py:30 +#: settings/serializers/terminal.py:36 msgid "" -"Information: If use other auth method, like AD/LDAP, you should disable this " -"to avoid being able to log in after deleting" +"* Allow users to log in to the KoKo component via Public key " +"authentication
If third-party authentication services, such as AD/LDAP, " +"are enabled, you should disable this option to prevent users from logging in " +"after being deleted from the AD/LDAP server" msgstr "" -"ヒント: AD/LDAPなどの他の認証方法を使用する場合は、サードパーティ製システムの" -"削除後にこの項目を無効にする必要があります, ログインも可能" -#: settings/serializers/terminal.py:34 -msgid "Asset list sorting" +#: settings/serializers/terminal.py:43 +#, fuzzy +#| msgid "Asset list sorting" +msgid "Asset sorting" msgstr "リストの並べ替え" -#: settings/serializers/terminal.py:37 -msgid "Asset list page size" +#: settings/serializers/terminal.py:46 +#, fuzzy +#| msgid "Asset list page size" +msgid "Asset page size" msgstr "ページサイズを一覧表示" +#: settings/serializers/terminal.py:51 +msgid "" +"* You can individually configure the service address and port in the service " +"endpoint
If enabled, the Luna page will display the DB client launch " +"method when connecting to assets" +msgstr "" + +#: settings/serializers/terminal.py:59 +msgid "" +"* You can individually configure the service address and port in the service " +"endpoint
If enabled, the Luna page will display the download rdp file " +"button and RDP Client launch method when connecting to assets" +msgstr "" + +#: settings/serializers/terminal.py:68 +msgid "" +"* Allow connecting to the KoKo component via SSH client
If enabled, the " +"Luna page will display the SSH client launch method when connecting to assets" +msgstr "" + #: settings/tasks/ldap.py:28 msgid "Periodic import ldap user" msgstr "LDAP ユーザーを定期的にインポートする" @@ -6918,7 +7025,8 @@ msgstr "一括作成非サポート" msgid "Storage is invalid" msgstr "ストレージが無効です" -#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 +#: terminal/models/applet/applet.py:30 xpack.bak/plugins/license/models.py:88 +#: xpack/plugins/license/models.py:88 msgid "Community edition" msgstr "コミュニティ版" @@ -6939,11 +7047,6 @@ msgstr "バージョン" msgid "Can concurrent" msgstr "同時実行可能" -#: terminal/models/applet/applet.py:44 -#: terminal/models/virtualapp/virtualapp.py:29 -msgid "Tags" -msgstr "ラベル" - #: terminal/models/applet/applet.py:48 terminal/serializers/applet_host.py:167 #: terminal/serializers/storage.py:197 msgid "Hosts" @@ -7079,16 +7182,12 @@ msgstr "スレッド" msgid "Boot Time" msgstr "ブート時間" -#: terminal/models/component/storage.py:28 -msgid "Default storage" -msgstr "デフォルトのストレージ" - -#: terminal/models/component/storage.py:140 +#: terminal/models/component/storage.py:146 #: terminal/models/component/terminal.py:91 msgid "Command storage" msgstr "コマンドストレージ" -#: terminal/models/component/storage.py:204 +#: terminal/models/component/storage.py:214 #: terminal/models/component/terminal.py:92 msgid "Replay storage" msgstr "再生ストレージ" @@ -7237,7 +7336,9 @@ msgid "App Provider" msgstr "アプリケーションプロバイダ" #: terminal/models/virtualapp/virtualapp.py:102 -msgid "Virtual App publication" +#, fuzzy +#| msgid "Virtual App publication" +msgid "Virtual app publication" msgstr "仮想アプリケーションの公開" #: terminal/notifications.py:25 @@ -7509,11 +7610,13 @@ msgid "Access key ID" msgstr "アクセスキー" #: terminal/serializers/storage.py:37 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:20 #: xpack/plugins/cloud/serializers/account_attrs.py:20 msgid "Access key secret" msgstr "アクセスキーシークレット" -#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:249 +#: terminal/serializers/storage.py:68 xpack.bak/plugins/cloud/models.py:249 +#: xpack/plugins/cloud/manager.py:90 xpack/plugins/cloud/models.py:249 msgid "Region" msgstr "リージョン" @@ -7533,7 +7636,8 @@ msgstr "エンドポイントサフィックス" msgid "HOST" msgstr "ホスト" -#: terminal/serializers/storage.py:146 users/models/user.py:906 +#: terminal/serializers/storage.py:146 users/models/user.py:928 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:213 #: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "ssh秘密鍵" @@ -7574,6 +7678,12 @@ msgstr "インデックス" msgid "Doc type" msgstr "Docタイプ" +#: terminal/serializers/storage.py:264 +msgid "" +"set as the default storage, will make new Component use the current storage " +"by default, without affecting existing Component" +msgstr "" + #: terminal/serializers/task.py:9 msgid "Session id" msgstr "セッション" @@ -8270,83 +8380,76 @@ msgstr "公開鍵は古いものと同じであってはなりません。" msgid "Not a valid ssh public key" msgstr "有効なssh公開鍵ではありません" -#: users/forms/profile.py:172 users/models/user.py:909 -#: xpack/plugins/cloud/serializers/account_attrs.py:210 -msgid "Public key" -msgstr "公開キー" - #: users/models/preference.py:38 users/serializers/preference/preference.py:19 msgid "Preference" msgstr "ユーザー設定" -#: users/models/user.py:656 -msgid "Force enable" +#: users/models/user.py:688 +#, fuzzy +#| msgid "Force enable" +msgid "Force enabled" msgstr "強制有効" -#: users/models/user.py:763 -msgid "Lark" -msgstr "" - -#: users/models/user.py:888 users/serializers/user.py:190 +#: users/models/user.py:911 users/serializers/user.py:268 msgid "Is service account" msgstr "サービスアカウントです" -#: users/models/user.py:890 +#: users/models/user.py:913 msgid "Avatar" msgstr "アバター" -#: users/models/user.py:893 +#: users/models/user.py:915 msgid "Wechat" msgstr "微信" -#: users/models/user.py:902 +#: users/models/user.py:924 msgid "OTP secret key" msgstr "OTP 秘密" # msgid "Private key" # msgstr "ssh秘密鍵" -#: users/models/user.py:914 users/serializers/profile.py:129 -#: users/serializers/user.py:187 +#: users/models/user.py:934 users/serializers/profile.py:129 +#: users/serializers/user.py:265 msgid "Is first login" msgstr "最初のログインです" -#: users/models/user.py:923 +#: users/models/user.py:952 msgid "Date password last updated" msgstr "最終更新日パスワード" -#: users/models/user.py:926 +#: users/models/user.py:955 msgid "Need update password" msgstr "更新パスワードが必要" -#: users/models/user.py:937 +#: users/models/user.py:979 msgid "Date api key used" msgstr "Api key 最後に使用した日付" -#: users/models/user.py:1059 +#: users/models/user.py:1104 msgid "Can not delete admin user" msgstr "管理者ユーザーを削除できませんでした" -#: users/models/user.py:1073 +#: users/models/user.py:1118 msgid "Can invite user" msgstr "ユーザーを招待できます" -#: users/models/user.py:1074 +#: users/models/user.py:1119 msgid "Can remove user" msgstr "ユーザーを削除できます" -#: users/models/user.py:1075 +#: users/models/user.py:1120 msgid "Can match user" msgstr "ユーザーに一致できます" -#: users/models/user.py:1084 +#: users/models/user.py:1131 msgid "Administrator" msgstr "管理者" -#: users/models/user.py:1087 +#: users/models/user.py:1134 msgid "Administrator is the super user of system" msgstr "管理者はシステムのスーパーユーザーです" -#: users/models/user.py:1112 +#: users/models/user.py:1166 msgid "User password history" msgstr "ユーザーパスワード履歴" @@ -8500,100 +8603,125 @@ msgstr "オープン" msgid "Forced enabled" msgstr "強制有効" -#: users/serializers/user.py:44 +#: users/serializers/user.py:49 msgid "System roles" msgstr "システムの役割" -#: users/serializers/user.py:45 +#: users/serializers/user.py:53 msgid "" "System roles are roles at the system level, and they will take effect across " "all organizations" msgstr "" -#: users/serializers/user.py:49 +#: users/serializers/user.py:59 msgid "Org roles" msgstr "組織ロール" -#: users/serializers/user.py:52 +#: users/serializers/user.py:64 msgid "" "Org roles are roles at the organization level, and they will only take " "effect within current organization" msgstr "" -#: users/serializers/user.py:54 +#: users/serializers/user.py:68 msgid "Organizations and roles" msgstr "そしきとやくわり" -#: users/serializers/user.py:96 +#: users/serializers/user.py:118 #, fuzzy #| msgid "Password strategy" msgid "Password setting" msgstr "パスワード戦略" -#: users/serializers/user.py:98 +#: users/serializers/user.py:120 msgid "MFA enabled" msgstr "MFA有効化" -#: users/serializers/user.py:100 +#: users/serializers/user.py:122 msgid "MFA force enabled" msgstr "MFAフォース有効化" -#: users/serializers/user.py:102 +#: users/serializers/user.py:124 msgid "Login blocked" msgstr "ログインがロックされました" -#: users/serializers/user.py:105 users/serializers/user.py:196 +#: users/serializers/user.py:128 users/serializers/user.py:274 msgid "Is OTP bound" msgstr "仮想MFAがバインドされているか" -#: users/serializers/user.py:106 +#: users/serializers/user.py:131 msgid "Super Administrator" msgstr "スーパーアドミニストレーター" -#: users/serializers/user.py:107 +#: users/serializers/user.py:134 msgid "Organization Administrator" msgstr "組織管理者" -#: users/serializers/user.py:109 +#: users/serializers/user.py:138 msgid "Can public key authentication" msgstr "公開鍵認証が可能" -#: users/serializers/user.py:169 +#: users/serializers/user.py:239 #, fuzzy -#| msgid "Same with user" -msgid "Fullname of user" -msgstr "ユーザーと同じユーザー名" +#| msgid "Full value" +msgid "Full name" +msgstr "フルバリュー" -#: users/serializers/user.py:172 +#: users/serializers/user.py:242 #, fuzzy #| msgid "Login user" msgid "Login username" msgstr "ログインユーザー" -#: users/serializers/user.py:184 +#: users/serializers/user.py:245 +#, fuzzy +#| msgid "Invalid address" +msgid "Email address" +msgstr "無効なアドレス。" + +#: users/serializers/user.py:255 +#, fuzzy +#| msgid "User groups amount" +msgid "User groups to join" +msgstr "ユーザーグループの数" + +#: users/serializers/user.py:259 +msgid "" +"User source identifies where the user was created, which could be AD or " +"other sources.There are security settings that can restrict users to log in " +"to the system only from the sources." +msgstr "" + +#: users/serializers/user.py:263 #, fuzzy #| msgid "System user" msgid "Superuser" msgstr "システムユーザー" -#: users/serializers/user.py:191 +#: users/serializers/user.py:269 msgid "Is org admin" msgstr "組織管理者です" -#: users/serializers/user.py:193 +#: users/serializers/user.py:271 msgid "Avatar url" msgstr "アバターURL" -#: users/serializers/user.py:197 +#: users/serializers/user.py:276 msgid "MFA level" msgstr "MFA レベル" -#: users/serializers/user.py:333 +#: users/serializers/user.py:277 +#, fuzzy +#| msgid "Authentication" +msgid "Multi-Factor Authentication" +msgstr "認証" + +#: users/serializers/user.py:416 msgid "" -"For security, only a partial of users is displayed. You can search for more" +"* For security, only a partial of users is displayed. You can search for more" msgstr "" -#: users/serializers/user.py:366 +#: users/serializers/user.py:451 msgid "name not unique" msgstr "名前が一意ではない" @@ -8892,539 +9020,629 @@ msgstr "* 新しいパスワードを最後の {} パスワードにすること msgid "Reset password success, return to login page" msgstr "パスワードの成功をリセットし、ログインページに戻る" -#: xpack/apps.py:8 +#: xpack.bak/apps.py:8 xpack/apps.py:8 msgid "XPACK" msgstr "XPack" -#: xpack/exceptions.py:7 +#: xpack.bak/exceptions.py:7 msgid "" "The current task is not synchronized with unmatched policy assets, skipping" msgstr "" -#: xpack/plugins/cloud/api.py:60 +#: xpack.bak/plugins/cloud/api.py:60 xpack/plugins/cloud/api.py:60 msgid "Test connection successful" msgstr "テスト接続成功" -#: xpack/plugins/cloud/api.py:62 +#: xpack.bak/plugins/cloud/api.py:62 xpack/plugins/cloud/api.py:62 msgid "Test connection failed: {}" msgstr "テスト接続に失敗しました: {}" -#: xpack/plugins/cloud/const.py:8 +#: xpack.bak/plugins/cloud/const.py:8 xpack/plugins/cloud/const.py:8 msgid "Alibaba Cloud" msgstr "アリ雲" -#: xpack/plugins/cloud/const.py:9 +#: xpack.bak/plugins/cloud/const.py:9 xpack/plugins/cloud/const.py:9 msgid "AWS (International)" msgstr "AWS (国際)" -#: xpack/plugins/cloud/const.py:10 +#: xpack.bak/plugins/cloud/const.py:10 xpack/plugins/cloud/const.py:10 msgid "AWS (China)" msgstr "AWS (中国)" -#: xpack/plugins/cloud/const.py:11 +#: xpack.bak/plugins/cloud/const.py:11 xpack/plugins/cloud/const.py:11 msgid "Azure (China)" msgstr "Azure (中国)" -#: xpack/plugins/cloud/const.py:12 +#: xpack.bak/plugins/cloud/const.py:12 xpack/plugins/cloud/const.py:12 msgid "Azure (International)" msgstr "Azure (国際)" -#: xpack/plugins/cloud/const.py:14 +#: xpack.bak/plugins/cloud/const.py:14 xpack/plugins/cloud/const.py:14 msgid "Baidu Cloud" msgstr "百度雲" -#: xpack/plugins/cloud/const.py:15 +#: xpack.bak/plugins/cloud/const.py:15 xpack/plugins/cloud/const.py:15 msgid "JD Cloud" msgstr "京東雲" -#: xpack/plugins/cloud/const.py:16 +#: xpack.bak/plugins/cloud/const.py:16 xpack/plugins/cloud/const.py:16 msgid "KingSoft Cloud" msgstr "金山雲" -#: xpack/plugins/cloud/const.py:17 +#: xpack.bak/plugins/cloud/const.py:17 xpack/plugins/cloud/const.py:17 msgid "Tencent Cloud" msgstr "テンセント雲" -#: xpack/plugins/cloud/const.py:18 +#: xpack.bak/plugins/cloud/const.py:18 xpack/plugins/cloud/const.py:18 msgid "Tencent Cloud (Lighthouse)" msgstr "テンセント雲(軽量アプリケーション)" -#: xpack/plugins/cloud/const.py:19 +#: xpack.bak/plugins/cloud/const.py:19 xpack/plugins/cloud/const.py:19 msgid "Google Cloud Platform" msgstr "谷歌雲" -#: xpack/plugins/cloud/const.py:20 +#: xpack.bak/plugins/cloud/const.py:20 xpack/plugins/cloud/const.py:20 msgid "UCloud" msgstr "ucloud" -#: xpack/plugins/cloud/const.py:21 +#: xpack.bak/plugins/cloud/const.py:21 xpack/plugins/cloud/const.py:21 msgid "Volcengine" msgstr "Volcengine" -#: xpack/plugins/cloud/const.py:23 +#: xpack.bak/plugins/cloud/const.py:23 xpack/plugins/cloud/const.py:23 msgid "VMware" msgstr "VMware" +#: xpack.bak/plugins/cloud/const.py:24 +#: xpack.bak/plugins/cloud/providers/nutanix.py:15 #: xpack/plugins/cloud/const.py:24 xpack/plugins/cloud/providers/nutanix.py:15 msgid "Nutanix" msgstr "Nutanix" -#: xpack/plugins/cloud/const.py:25 +#: xpack.bak/plugins/cloud/const.py:25 xpack/plugins/cloud/const.py:25 msgid "Huawei Private Cloud" msgstr "華為私有雲" -#: xpack/plugins/cloud/const.py:26 +#: xpack.bak/plugins/cloud/const.py:26 xpack/plugins/cloud/const.py:26 msgid "Qingyun Private Cloud" msgstr "青雲私有雲" -#: xpack/plugins/cloud/const.py:27 +#: xpack.bak/plugins/cloud/const.py:27 xpack/plugins/cloud/const.py:27 msgid "CTYun Private Cloud" msgstr "スカイウィング私有雲" -#: xpack/plugins/cloud/const.py:28 +#: xpack.bak/plugins/cloud/const.py:28 xpack/plugins/cloud/const.py:28 msgid "OpenStack" msgstr "OpenStack" +#: xpack.bak/plugins/cloud/const.py:29 +#: xpack.bak/plugins/cloud/providers/zstack.py:21 #: xpack/plugins/cloud/const.py:29 xpack/plugins/cloud/providers/zstack.py:21 msgid "ZStack" msgstr "ZStack" -#: xpack/plugins/cloud/const.py:30 +#: xpack.bak/plugins/cloud/const.py:30 xpack/plugins/cloud/const.py:30 msgid "Fusion Compute" msgstr "融合計算" -#: xpack/plugins/cloud/const.py:31 +#: xpack.bak/plugins/cloud/const.py:31 xpack/plugins/cloud/const.py:31 msgid "SCP" msgstr "SCP" -#: xpack/plugins/cloud/const.py:32 +#: xpack.bak/plugins/cloud/const.py:32 xpack/plugins/cloud/const.py:32 msgid "Apsara Stack" msgstr "Apsara Stack" -#: xpack/plugins/cloud/const.py:37 +#: xpack.bak/plugins/cloud/const.py:37 xpack/plugins/cloud/const.py:37 msgid "Private IP" msgstr "プライベートIP" -#: xpack/plugins/cloud/const.py:38 +#: xpack.bak/plugins/cloud/const.py:38 xpack/plugins/cloud/const.py:38 msgid "Public IP" msgstr "パブリックIP" +#: xpack.bak/plugins/cloud/const.py:42 xpack.bak/plugins/cloud/models.py:299 #: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:299 msgid "Instance name" msgstr "インスタンス名" -#: xpack/plugins/cloud/const.py:43 +#: xpack.bak/plugins/cloud/const.py:43 xpack/plugins/cloud/const.py:43 msgid "Instance name and Partial IP" msgstr "インスタンス名と部分IP" -#: xpack/plugins/cloud/const.py:48 +#: xpack.bak/plugins/cloud/const.py:48 xpack/plugins/cloud/const.py:48 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:52 +#: xpack.bak/plugins/cloud/const.py:52 xpack/plugins/cloud/const.py:52 +#: xpack/plugins/cloud/manager.py:80 msgid "Unsync" msgstr "同期していません" -#: xpack/plugins/cloud/const.py:53 +#: xpack.bak/plugins/cloud/const.py:53 xpack/plugins/cloud/const.py:53 +#: xpack/plugins/cloud/manager.py:79 msgid "New Sync" msgstr "新しい同期" -#: xpack/plugins/cloud/const.py:54 +#: xpack.bak/plugins/cloud/const.py:54 xpack/plugins/cloud/const.py:54 +#: xpack/plugins/cloud/manager.py:79 msgid "Synced" msgstr "同期済み" -#: xpack/plugins/cloud/const.py:55 +#: xpack.bak/plugins/cloud/const.py:55 xpack/plugins/cloud/const.py:55 +#: xpack/plugins/cloud/manager.py:80 msgid "Released" msgstr "リリース済み" -#: xpack/plugins/cloud/const.py:59 +#: xpack.bak/plugins/cloud/const.py:59 xpack/plugins/cloud/const.py:59 msgid "And" msgstr "そして" -#: xpack/plugins/cloud/const.py:60 +#: xpack.bak/plugins/cloud/const.py:60 xpack/plugins/cloud/const.py:60 msgid "Or" msgstr "または" -#: xpack/plugins/cloud/manager.py:55 xpack/plugins/cloud/providers/gcp.py:64 +#: xpack.bak/plugins/cloud/manager.py:55 +#: xpack.bak/plugins/cloud/providers/gcp.py:64 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:34 +#: xpack/plugins/cloud/manager.py:45 xpack/plugins/cloud/manager.py:55 +#: xpack/plugins/cloud/manager.py:57 xpack/plugins/cloud/providers/gcp.py:64 #: xpack/plugins/cloud/providers/huaweicloud.py:34 msgid "Account unavailable" msgstr "利用できないアカウント" -#: xpack/plugins/cloud/meta.py:9 +#: xpack.bak/plugins/cloud/meta.py:9 xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "クラウドセンター" +#: xpack.bak/plugins/cloud/models.py:37 +#: xpack.bak/plugins/cloud/serializers/account.py:68 #: xpack/plugins/cloud/models.py:37 -#: xpack/plugins/cloud/serializers/account.py:68 +#: xpack/plugins/cloud/serializers/account.py:69 msgid "Attrs" msgstr "ツールバーの" -#: xpack/plugins/cloud/models.py:38 +#: xpack.bak/plugins/cloud/models.py:38 xpack/plugins/cloud/models.py:38 msgid "Validity" msgstr "有効性" -#: xpack/plugins/cloud/models.py:43 +#: xpack.bak/plugins/cloud/models.py:43 xpack/plugins/cloud/models.py:43 msgid "Cloud account" msgstr "クラウドアカウント" -#: xpack/plugins/cloud/models.py:45 +#: xpack.bak/plugins/cloud/models.py:45 xpack/plugins/cloud/models.py:45 msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:159 +#: xpack.bak/plugins/cloud/models.py:88 +#: xpack.bak/plugins/cloud/serializers/task.py:159 +#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:160 msgid "Regions" msgstr "リージョン" -#: xpack/plugins/cloud/models.py:91 +#: xpack.bak/plugins/cloud/models.py:91 xpack/plugins/cloud/models.py:91 msgid "Hostname strategy" msgstr "ホスト名戦略" -#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:162 +#: xpack.bak/plugins/cloud/models.py:96 +#: xpack.bak/plugins/cloud/serializers/task.py:162 +#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:163 msgid "IP network segment group" msgstr "IPネットワークセグメントグループ" -#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:167 +#: xpack.bak/plugins/cloud/models.py:99 +#: xpack.bak/plugins/cloud/serializers/task.py:167 +#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:168 msgid "Sync IP type" msgstr "同期IPタイプ" +#: xpack.bak/plugins/cloud/models.py:102 +#: xpack.bak/plugins/cloud/serializers/task.py:185 #: xpack/plugins/cloud/models.py:102 -#: xpack/plugins/cloud/serializers/task.py:185 +#: xpack/plugins/cloud/serializers/task.py:186 msgid "Always update" msgstr "常に更新" -#: xpack/plugins/cloud/models.py:104 +#: xpack.bak/plugins/cloud/models.py:104 xpack/plugins/cloud/models.py:104 msgid "Fully synchronous" msgstr "完全同期" -#: xpack/plugins/cloud/models.py:109 +#: xpack.bak/plugins/cloud/models.py:109 xpack/plugins/cloud/models.py:109 msgid "Date last sync" msgstr "最終同期日" -#: xpack/plugins/cloud/models.py:112 xpack/plugins/cloud/models.py:317 -#: xpack/plugins/cloud/models.py:341 +#: xpack.bak/plugins/cloud/models.py:112 xpack.bak/plugins/cloud/models.py:317 +#: xpack.bak/plugins/cloud/models.py:341 xpack/plugins/cloud/models.py:112 +#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/models.py:341 msgid "Strategy" msgstr "戦略" +#: xpack.bak/plugins/cloud/models.py:117 xpack.bak/plugins/cloud/models.py:196 #: xpack/plugins/cloud/models.py:117 xpack/plugins/cloud/models.py:196 msgid "Sync instance task" msgstr "インスタンスの同期タスク" +#: xpack.bak/plugins/cloud/models.py:207 xpack.bak/plugins/cloud/models.py:259 #: xpack/plugins/cloud/models.py:207 xpack/plugins/cloud/models.py:259 msgid "Date sync" msgstr "日付の同期" -#: xpack/plugins/cloud/models.py:211 +#: xpack.bak/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:211 msgid "Sync instance snapshot" msgstr "インスタンススナップショットの同期" -#: xpack/plugins/cloud/models.py:215 +#: xpack.bak/plugins/cloud/models.py:215 xpack/plugins/cloud/models.py:215 msgid "Sync instance task execution" msgstr "インスタンスタスクの同期実行" -#: xpack/plugins/cloud/models.py:239 +#: xpack.bak/plugins/cloud/models.py:239 xpack/plugins/cloud/models.py:239 msgid "Sync task" msgstr "同期タスク" -#: xpack/plugins/cloud/models.py:243 +#: xpack.bak/plugins/cloud/models.py:243 xpack/plugins/cloud/models.py:243 msgid "Sync instance task history" msgstr "インスタンスタスク履歴の同期" -#: xpack/plugins/cloud/models.py:246 +#: xpack.bak/plugins/cloud/models.py:246 xpack/plugins/cloud/models.py:246 msgid "Instance" msgstr "インスタンス" -#: xpack/plugins/cloud/models.py:263 +#: xpack.bak/plugins/cloud/models.py:263 xpack/plugins/cloud/models.py:263 msgid "Sync instance detail" msgstr "同期インスタンスの詳細" -#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/serializers/task.py:72 +#: xpack.bak/plugins/cloud/models.py:275 +#: xpack.bak/plugins/cloud/serializers/task.py:72 +#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/serializers/task.py:73 msgid "Rule relation" msgstr "条件関係" -#: xpack/plugins/cloud/models.py:284 +#: xpack.bak/plugins/cloud/models.py:284 xpack/plugins/cloud/models.py:284 msgid "Task strategy" msgstr "ミッション戦略です" -#: xpack/plugins/cloud/models.py:288 +#: xpack.bak/plugins/cloud/models.py:288 xpack/plugins/cloud/models.py:288 msgid "Equal" msgstr "等しい" -#: xpack/plugins/cloud/models.py:289 +#: xpack.bak/plugins/cloud/models.py:289 xpack/plugins/cloud/models.py:289 msgid "Not Equal" msgstr "不等于" -#: xpack/plugins/cloud/models.py:290 +#: xpack.bak/plugins/cloud/models.py:290 xpack/plugins/cloud/models.py:290 msgid "In" msgstr "で..." -#: xpack/plugins/cloud/models.py:291 +#: xpack.bak/plugins/cloud/models.py:291 xpack/plugins/cloud/models.py:291 msgid "Contains" msgstr "含む" -#: xpack/plugins/cloud/models.py:292 +#: xpack.bak/plugins/cloud/models.py:292 xpack/plugins/cloud/models.py:292 msgid "Exclude" msgstr "除外" -#: xpack/plugins/cloud/models.py:293 +#: xpack.bak/plugins/cloud/models.py:293 xpack/plugins/cloud/models.py:293 msgid "Startswith" msgstr "始まる..." -#: xpack/plugins/cloud/models.py:294 +#: xpack.bak/plugins/cloud/models.py:294 xpack/plugins/cloud/models.py:294 msgid "Endswith" msgstr "終わる..." -#: xpack/plugins/cloud/models.py:300 +#: xpack.bak/plugins/cloud/models.py:300 xpack/plugins/cloud/models.py:300 msgid "Instance platform" msgstr "インスタンス名" -#: xpack/plugins/cloud/models.py:301 +#: xpack.bak/plugins/cloud/models.py:301 xpack/plugins/cloud/models.py:301 msgid "Instance address" msgstr "インスタンスアドレス" -#: xpack/plugins/cloud/models.py:308 +#: xpack.bak/plugins/cloud/models.py:308 xpack/plugins/cloud/models.py:308 msgid "Rule attr" msgstr "ルール属性" -#: xpack/plugins/cloud/models.py:312 +#: xpack.bak/plugins/cloud/models.py:312 xpack/plugins/cloud/models.py:312 msgid "Rule match" msgstr "ルール一致" -#: xpack/plugins/cloud/models.py:314 +#: xpack.bak/plugins/cloud/models.py:314 xpack/plugins/cloud/models.py:314 msgid "Rule value" msgstr "ルール値" -#: xpack/plugins/cloud/models.py:321 xpack/plugins/cloud/serializers/task.py:75 +#: xpack.bak/plugins/cloud/models.py:321 +#: xpack.bak/plugins/cloud/serializers/task.py:75 +#: xpack/plugins/cloud/models.py:321 xpack/plugins/cloud/serializers/task.py:76 msgid "Strategy rule" msgstr "戦略ルール" -#: xpack/plugins/cloud/models.py:336 +#: xpack.bak/plugins/cloud/models.py:336 xpack/plugins/cloud/models.py:336 msgid "Action attr" msgstr "アクション属性" -#: xpack/plugins/cloud/models.py:338 +#: xpack.bak/plugins/cloud/models.py:338 xpack/plugins/cloud/models.py:338 msgid "Action value" msgstr "アクション値" -#: xpack/plugins/cloud/models.py:345 xpack/plugins/cloud/serializers/task.py:78 +#: xpack.bak/plugins/cloud/models.py:345 +#: xpack.bak/plugins/cloud/serializers/task.py:78 +#: xpack/plugins/cloud/models.py:345 xpack/plugins/cloud/serializers/task.py:79 msgid "Strategy action" msgstr "戦略アクション" +#: xpack.bak/plugins/cloud/providers/aws_international.py:18 #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" msgstr "中国 (北京)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:19 #: xpack/plugins/cloud/providers/aws_international.py:19 msgid "China (Ningxia)" msgstr "中国 (寧夏)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:22 #: xpack/plugins/cloud/providers/aws_international.py:22 msgid "US East (Ohio)" msgstr "米国東部 (オハイオ州)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:23 #: xpack/plugins/cloud/providers/aws_international.py:23 msgid "US East (N. Virginia)" msgstr "米国東部 (N. バージニア州)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:24 #: xpack/plugins/cloud/providers/aws_international.py:24 msgid "US West (N. California)" msgstr "米国西部 (N. カリフォルニア州)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:25 #: xpack/plugins/cloud/providers/aws_international.py:25 msgid "US West (Oregon)" msgstr "米国西部 (オレゴン州)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:26 #: xpack/plugins/cloud/providers/aws_international.py:26 msgid "Africa (Cape Town)" msgstr "アフリカ (ケープタウン)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:27 #: xpack/plugins/cloud/providers/aws_international.py:27 msgid "Asia Pacific (Hong Kong)" msgstr "アジアパシフィック (香港)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:28 #: xpack/plugins/cloud/providers/aws_international.py:28 msgid "Asia Pacific (Mumbai)" msgstr "アジア太平洋 (ムンバイ)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:29 #: xpack/plugins/cloud/providers/aws_international.py:29 msgid "Asia Pacific (Osaka-Local)" msgstr "アジアパシフィック (大阪-ローカル)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:30 #: xpack/plugins/cloud/providers/aws_international.py:30 msgid "Asia Pacific (Seoul)" msgstr "アジア太平洋地域 (ソウル)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:31 #: xpack/plugins/cloud/providers/aws_international.py:31 msgid "Asia Pacific (Singapore)" msgstr "アジア太平洋 (シンガポール)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:32 #: xpack/plugins/cloud/providers/aws_international.py:32 msgid "Asia Pacific (Sydney)" msgstr "アジア太平洋 (シドニー)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:33 #: xpack/plugins/cloud/providers/aws_international.py:33 msgid "Asia Pacific (Tokyo)" msgstr "アジアパシフィック (東京)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:34 #: xpack/plugins/cloud/providers/aws_international.py:34 msgid "Canada (Central)" msgstr "カナダ (中央)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:35 #: xpack/plugins/cloud/providers/aws_international.py:35 msgid "Europe (Frankfurt)" msgstr "ヨーロッパ (フランクフルト)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:36 #: xpack/plugins/cloud/providers/aws_international.py:36 msgid "Europe (Ireland)" msgstr "ヨーロッパ (アイルランド)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:37 #: xpack/plugins/cloud/providers/aws_international.py:37 msgid "Europe (London)" msgstr "ヨーロッパ (ロンドン)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:38 #: xpack/plugins/cloud/providers/aws_international.py:38 msgid "Europe (Milan)" msgstr "ヨーロッパ (ミラノ)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:39 #: xpack/plugins/cloud/providers/aws_international.py:39 msgid "Europe (Paris)" msgstr "ヨーロッパ (パリ)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:40 #: xpack/plugins/cloud/providers/aws_international.py:40 msgid "Europe (Stockholm)" msgstr "ヨーロッパ (ストックホルム)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:41 #: xpack/plugins/cloud/providers/aws_international.py:41 msgid "Middle East (Bahrain)" msgstr "中东 (バーレーン)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:42 #: xpack/plugins/cloud/providers/aws_international.py:42 msgid "South America (São Paulo)" msgstr "南米 (サンパウロ)" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:56 +#: xpack.bak/plugins/cloud/providers/jdcloud.py:125 #: xpack/plugins/cloud/providers/baiducloud.py:56 #: xpack/plugins/cloud/providers/jdcloud.py:125 msgid "CN North-Beijing" msgstr "華北-北京" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:57 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:47 +#: xpack.bak/plugins/cloud/providers/jdcloud.py:128 #: xpack/plugins/cloud/providers/baiducloud.py:57 #: xpack/plugins/cloud/providers/huaweicloud.py:47 #: xpack/plugins/cloud/providers/jdcloud.py:128 msgid "CN South-Guangzhou" msgstr "華南-広州" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:58 #: xpack/plugins/cloud/providers/baiducloud.py:58 msgid "CN East-Suzhou" msgstr "華東-蘇州" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:59 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:54 #: xpack/plugins/cloud/providers/baiducloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:54 msgid "CN-Hong Kong" msgstr "中国-香港" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:60 #: xpack/plugins/cloud/providers/baiducloud.py:60 msgid "CN Center-Wuhan" msgstr "華中-武漢" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:61 #: xpack/plugins/cloud/providers/baiducloud.py:61 msgid "CN North-Baoding" msgstr "華北-保定" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:62 +#: xpack.bak/plugins/cloud/providers/jdcloud.py:127 #: xpack/plugins/cloud/providers/baiducloud.py:62 #: xpack/plugins/cloud/providers/jdcloud.py:127 msgid "CN East-Shanghai" msgstr "華東-上海" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:63 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:56 #: xpack/plugins/cloud/providers/baiducloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:56 msgid "AP-Singapore" msgstr "アジア太平洋-シンガポール" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:44 #: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN North-Beijing1" msgstr "華北-北京1" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:45 #: xpack/plugins/cloud/providers/huaweicloud.py:45 msgid "CN North-Beijing4" msgstr "華北-北京4" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:46 #: xpack/plugins/cloud/providers/huaweicloud.py:46 msgid "CN North-Ulanqab1" msgstr "華北-ウランチャブ一" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:48 #: xpack/plugins/cloud/providers/huaweicloud.py:48 msgid "CN South-Shenzhen" msgstr "華南-広州" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:49 #: xpack/plugins/cloud/providers/huaweicloud.py:49 msgid "CN South-Guangzhou-InvitationOnly" msgstr "華南-広州-友好ユーザー環境" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:50 #: xpack/plugins/cloud/providers/huaweicloud.py:50 msgid "CN East-Shanghai2" msgstr "華東-上海2" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:51 #: xpack/plugins/cloud/providers/huaweicloud.py:51 msgid "CN East-Shanghai1" msgstr "華東-上海1" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:53 #: xpack/plugins/cloud/providers/huaweicloud.py:53 msgid "CN Southwest-Guiyang1" msgstr "南西-貴陽1" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:55 #: xpack/plugins/cloud/providers/huaweicloud.py:55 msgid "AP-Bangkok" msgstr "アジア太平洋-バンコク" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:58 #: xpack/plugins/cloud/providers/huaweicloud.py:58 msgid "AF-Johannesburg" msgstr "アフリカ-ヨハネスブルク" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:59 msgid "LA-Mexico City1" msgstr "LA-メキシコCity1" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:60 #: xpack/plugins/cloud/providers/huaweicloud.py:60 msgid "LA-Santiago" msgstr "ラテンアメリカ-サンディエゴ" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:61 #: xpack/plugins/cloud/providers/huaweicloud.py:61 msgid "LA-Sao Paulo1" msgstr "ラミー・サンパウロ1" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:63 msgid "TR-Istanbul" msgstr "TR-Istanbul" +#: xpack.bak/plugins/cloud/providers/jdcloud.py:126 #: xpack/plugins/cloud/providers/jdcloud.py:126 msgid "CN East-Suqian" msgstr "華東-宿遷" -#: xpack/plugins/cloud/serializers/account.py:69 +#: xpack.bak/plugins/cloud/serializers/account.py:69 +#: xpack/plugins/cloud/serializers/account.py:70 msgid "Validity display" msgstr "有効表示" -#: xpack/plugins/cloud/serializers/account.py:70 +#: xpack.bak/plugins/cloud/serializers/account.py:70 +#: xpack/plugins/cloud/serializers/account.py:71 msgid "Provider display" msgstr "プロバイダ表示" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:17 #: xpack/plugins/cloud/serializers/account_attrs.py:17 #, fuzzy #| msgid "Access key" msgid "Access key id" msgstr "アクセスキー" -#: xpack/plugins/cloud/serializers/account_attrs.py:35 -msgid "Client ID" -msgstr "クライアントID" - +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:41 #: xpack/plugins/cloud/serializers/account_attrs.py:41 msgid "Tenant ID" msgstr "テナントID" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:44 #: xpack/plugins/cloud/serializers/account_attrs.py:44 msgid "Subscription ID" msgstr "サブスクリプションID" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:98 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:102 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:126 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:156 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:206 #: xpack/plugins/cloud/serializers/account_attrs.py:98 #: xpack/plugins/cloud/serializers/account_attrs.py:102 #: xpack/plugins/cloud/serializers/account_attrs.py:126 @@ -9433,42 +9651,52 @@ msgstr "サブスクリプションID" msgid "API Endpoint" msgstr "APIエンドポイント" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:108 #: xpack/plugins/cloud/serializers/account_attrs.py:108 msgid "Auth url" msgstr "認証アドレス" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:109 #: xpack/plugins/cloud/serializers/account_attrs.py:109 msgid "eg: http://openstack.example.com:5000/v3" msgstr "例えば: http://openstack.example.com:5000/v3" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:112 #: xpack/plugins/cloud/serializers/account_attrs.py:112 msgid "User domain" msgstr "ユーザードメイン" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:127 #: xpack/plugins/cloud/serializers/account_attrs.py:127 msgid "Cert File" msgstr "証明書ファイル" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:128 #: xpack/plugins/cloud/serializers/account_attrs.py:128 msgid "Key File" msgstr "キーファイル" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:144 #: xpack/plugins/cloud/serializers/account_attrs.py:144 msgid "Service account key" msgstr "サービスアカウントキー" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:145 #: xpack/plugins/cloud/serializers/account_attrs.py:145 msgid "The file is in JSON format" msgstr "ファイルはJSON形式です。" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:163 #: xpack/plugins/cloud/serializers/account_attrs.py:163 msgid "IP address invalid `{}`, {}" msgstr "IPアドレスが無効: '{}', {}" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:179 #: xpack/plugins/cloud/serializers/account_attrs.py:179 msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" msgstr "例：192.168.1.0/24、10.0.0.0.0-10.0.0.255" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:182 #: xpack/plugins/cloud/serializers/account_attrs.py:182 msgid "" "The port is used to detect the validity of the IP address. When the " @@ -9479,27 +9707,33 @@ msgstr "" "実行されると、有効な IP アドレスのみが同期されます。
ポートが0の場合、す" "べてのIPアドレスが有効です。" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:190 #: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Hostname prefix" msgstr "ホスト名プレフィックス" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:193 #: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "IP segment" msgstr "IP セグメント" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:197 #: xpack/plugins/cloud/serializers/account_attrs.py:197 msgid "Test port" msgstr "テストポート" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Test timeout" msgstr "テストタイムアウト" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:216 #: xpack/plugins/cloud/serializers/account_attrs.py:216 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:151 +#: xpack.bak/plugins/cloud/serializers/task.py:151 +#: xpack/plugins/cloud/serializers/task.py:152 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -9513,101 +9747,268 @@ msgstr "" "ドレスをランダムに一致させることを意味します。
例: " "192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:157 +#: xpack.bak/plugins/cloud/serializers/task.py:157 +#: xpack/plugins/cloud/serializers/task.py:158 msgid "History count" msgstr "実行回数" -#: xpack/plugins/cloud/serializers/task.py:158 +#: xpack.bak/plugins/cloud/serializers/task.py:158 +#: xpack/plugins/cloud/serializers/task.py:159 msgid "Instance count" msgstr "インスタンス数" -#: xpack/plugins/cloud/tasks.py:27 +#: xpack.bak/plugins/cloud/tasks.py:27 xpack/plugins/cloud/tasks.py:27 msgid "Run sync instance task" msgstr "同期インスタンス タスクを実行する" -#: xpack/plugins/cloud/tasks.py:41 +#: xpack.bak/plugins/cloud/tasks.py:41 xpack/plugins/cloud/tasks.py:41 msgid "Period clean sync instance task execution" msgstr "同期インスタンス タスクの実行記録を定期的にクリアする" -#: xpack/plugins/interface/api.py:52 +#: xpack.bak/plugins/interface/api.py:52 xpack/plugins/interface/api.py:52 msgid "Restore default successfully." msgstr "デフォルトの復元に成功しました。" -#: xpack/plugins/interface/meta.py:9 +#: xpack.bak/plugins/interface/meta.py:9 xpack/plugins/interface/meta.py:9 +#: xpack/plugins/interface/models.py:45 xpack/plugins/interface/models.py:86 msgid "Interface settings" msgstr "インターフェイスの設定" -#: xpack/plugins/interface/models.py:23 -msgid "Login title" -msgstr "ログインページのタイトル" +#: xpack.bak/plugins/interface/models.py:23 +#, fuzzy +#| msgid "MFA in login page" +msgid "Title of login page" +msgstr "ログインページのMFA" -#: xpack/plugins/interface/models.py:27 -msgid "Login image" -msgstr "ログインページのイメージ" +#: xpack.bak/plugins/interface/models.py:27 +#, fuzzy +#| msgid "MFA in login page" +msgid "Image of login page" +msgstr "ログインページのMFA" +#: xpack.bak/plugins/interface/models.py:31 #: xpack/plugins/interface/models.py:31 msgid "Website icon" msgstr "ウェブサイトのアイコン" -#: xpack/plugins/interface/models.py:35 -msgid "Index logo" -msgstr "管理ページのロゴ" +#: xpack.bak/plugins/interface/models.py:35 +#, fuzzy +#| msgid "Logout" +msgid "Logo of management page" +msgstr "ログアウト" -#: xpack/plugins/interface/models.py:39 +#: xpack.bak/plugins/interface/models.py:39 #, fuzzy #| msgid "Logout" -msgid "Logout logo" +msgid "Logo of logout page" msgstr "ログアウト" +#: xpack.bak/plugins/interface/models.py:41 #: xpack/plugins/interface/models.py:41 #: xpack/plugins/interface/serializers/interface.py:26 msgid "Theme" msgstr "テーマ" +#: xpack.bak/plugins/interface/models.py:42 #: xpack/plugins/interface/models.py:42 msgid "Footer content" msgstr "フッターの内容" -#: xpack/plugins/interface/models.py:45 xpack/plugins/interface/models.py:86 +#: xpack.bak/plugins/interface/models.py:45 +#: xpack.bak/plugins/interface/models.py:86 msgid "Interface setting" msgstr "インターフェイスの設定" -#: xpack/plugins/interface/serializers/interface.py:37 -msgid "Wide logo on top" -msgstr "" - -#: xpack/plugins/interface/serializers/interface.py:38 -msgid "Small logo without text" -msgstr "" - -#: xpack/plugins/license/api.py:52 +#: xpack.bak/plugins/license/api.py:52 xpack/plugins/license/api.py:52 msgid "License import successfully" msgstr "ライセンスのインポートに成功" -#: xpack/plugins/license/api.py:53 +#: xpack.bak/plugins/license/api.py:53 msgid "License is invalid" msgstr "ライセンスが無効です" +#: xpack.bak/plugins/license/meta.py:10 xpack.bak/plugins/license/models.py:144 #: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:144 msgid "License" msgstr "ライセンス" -#: xpack/plugins/license/models.py:80 +#: xpack.bak/plugins/license/models.py:80 xpack/plugins/license/models.py:80 msgid "Basic edition" msgstr "エンタープライズ基本版" -#: xpack/plugins/license/models.py:82 +#: xpack.bak/plugins/license/models.py:82 xpack/plugins/license/models.py:82 msgid "Standard edition" msgstr "エンタープライズ標準版" -#: xpack/plugins/license/models.py:84 +#: xpack.bak/plugins/license/models.py:84 xpack/plugins/license/models.py:84 msgid "Professional edition" msgstr "エンタープライズプロフェッショナル版" -#: xpack/plugins/license/models.py:86 +#: xpack.bak/plugins/license/models.py:86 xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" +#: xpack/exceptions.py:8 +msgid "" +"Based on the current task configuration, assets that do not match the " +"strategy will skipped." +msgstr "現在のタスク構成に基づいて、未一致ポリシーの資産はスキップされます" + +#: xpack/plugins/cloud/manager.py:41 +#, python-format +msgid "Task \"%s\" starts executing" +msgstr "タスク \"%s\" の実行開始" + +#: xpack/plugins/cloud/manager.py:71 +msgid "View the task details path: " +msgstr "タスク詳細パスの表示: " + +#: xpack/plugins/cloud/manager.py:74 +msgid "Account Details" +msgstr "アカウントの詳細" + +#: xpack/plugins/cloud/manager.py:75 +msgid "Synchronization History List" +msgstr "履歴リストの同期" + +#: xpack/plugins/cloud/manager.py:75 +msgid "Synchronization Instance List" +msgstr "インスタンスリストの同期" + +#: xpack/plugins/cloud/manager.py:83 +msgid "Task execution completed" +msgstr "タスク実行完了" + +#: xpack/plugins/cloud/manager.py:87 +msgid "Synchronization regions" +msgstr "同期地域" + +#: xpack/plugins/cloud/manager.py:110 +#, python-format +msgid "Get instances of region \"%s\" error, error: %s" +msgstr "地域 \"%s\" のインスタンスを取得できませんでした、エラー：%s" + +#: xpack/plugins/cloud/manager.py:128 +#, python-format +msgid "The instance IP \"%s\" is not in network segment \"%s\"" +msgstr "インスタンスのIP \"%s\" はネットワークセグメント \"%s\" にありません" + +#: xpack/plugins/cloud/manager.py:164 +#, python-format +msgid "Failed to synchronize the instance \"%s\"" +msgstr "インスタンス \"%s\" の同期に失敗しました" + +#: xpack/plugins/cloud/manager.py:316 +#, python-format +msgid "" +"The updated platform of asset \"%s\" is inconsistent with the original " +"platform type. Skip platform and protocol updates" +msgstr "" +"更新された資産 \"%s\" のプラットフォームタイプと元のタイプは一致しません。プ" +"ラットフォームとプロトコルの更新をスキップ" + +#: xpack/plugins/cloud/manager.py:358 +#, python-format +msgid "The asset \"%s\" already exists" +msgstr "資産 \"%s\" はすでに存在します" + +#: xpack/plugins/cloud/manager.py:362 +#, python-format +msgid "Update asset \"%s\"" +msgstr "資産の更新 \"%s\"" + +#: xpack/plugins/cloud/manager.py:365 +#, python-format +msgid "Asset \"%s\" has been updated" +msgstr "資産 \"%s\" が更新されました" + +#: xpack/plugins/cloud/manager.py:376 +#, python-format +msgid "Prepare to create asset \"%s\"" +msgstr "資産 \"%s\" の作成準備" + +#: xpack/plugins/cloud/manager.py:388 +#, python-format +msgid "Set nodes \"%s\"" +msgstr "ノード \"%s\" の設定" + +#: xpack/plugins/cloud/manager.py:414 +#, python-format +msgid "Set accounts \"%s\"" +msgstr "アカウント \"%s\" の設定" + +#: xpack/plugins/cloud/manager.py:430 +#, python-format +msgid "Set protocols \"%s\"" +msgstr "プロトコル \"%s\" の設定" + +#: xpack/plugins/cloud/providers/lan.py:79 +#, python-format +msgid "Port \"%(port)s\" of instance IP \"%(ip)s\" is not reachable" +msgstr "インスタンスIP \"%(ip)s\" のポート \"%(port)s\" は接続できません" + +#: xpack/plugins/interface/models.py:23 +msgid "Login title" +msgstr "ログインページのタイトル" + +#: xpack/plugins/interface/models.py:27 +msgid "Login image" +msgstr "ログインページのイメージ" + +#: xpack/plugins/interface/models.py:35 +msgid "Index logo" +msgstr "管理ページのロゴ" + +#: xpack/plugins/interface/models.py:39 +#, fuzzy +#| msgid "Logout" +msgid "Logout logo" +msgstr "ログアウト" + +#: xpack/plugins/interface/serializers/interface.py:37 +msgid "Wide logo on top" +msgstr "" + +#: xpack/plugins/interface/serializers/interface.py:38 +msgid "Small logo without text" +msgstr "" + +#: xpack/plugins/license/api.py:53 +msgid "Invalid license" +msgstr "無効なライセンス" + +#~ msgid "Labels" +#~ msgstr "ラベル" + +#~ msgid "Enable FeiShu Auth" +#~ msgstr "飛本認証の有効化" + +#~ msgid "Enable Lark Auth" +#~ msgstr "Lark 認証の有効化" + +#~ msgid "Password auth" +#~ msgstr "パスワード認証" + +#, fuzzy +#~| msgid "Public key auth" +#~ msgid "Public key auth" +#~ msgstr "鍵認証" + +#~ msgid "" +#~ "Information: If use other auth method, like AD/LDAP, you should disable " +#~ "this to avoid being able to log in after deleting" +#~ msgstr "" +#~ "ヒント: AD/LDAPなどの他の認証方法を使用する場合は、サードパーティ製システ" +#~ "ムの削除後にこの項目を無効にする必要があります, ログインも可能" + +#~ msgid "Force enable" +#~ msgstr "強制有効" + +#, fuzzy +#~| msgid "Same with user" +#~ msgid "Fullname of user" +#~ msgstr "ユーザーと同じユーザー名" + #, fuzzy #~| msgid "Forgot password" #~ msgid "Forgot Password URL" @@ -9705,89 +10106,6 @@ msgstr "エンタープライズ・フラッグシップ・エディション" #~ msgid "If SMTP port is 587, may be select" #~ msgstr "SMTPポートが587の場合は、" -#~ msgid "" -#~ "Based on the current task configuration, assets that do not match the " -#~ "strategy will skipped." -#~ msgstr "現在のタスク構成に基づいて、未一致ポリシーの資産はスキップされます" - -#, python-format -#~ msgid "Task \"%s\" starts executing" -#~ msgstr "タスク \"%s\" の実行開始" - -#~ msgid "View the task details path: " -#~ msgstr "タスク詳細パスの表示: " - -#~ msgid "Account Details" -#~ msgstr "アカウントの詳細" - -#~ msgid "Synchronization History List" -#~ msgstr "履歴リストの同期" - -#~ msgid "Synchronization Instance List" -#~ msgstr "インスタンスリストの同期" - -#~ msgid "Task execution completed" -#~ msgstr "タスク実行完了" - -#~ msgid "Synchronization regions" -#~ msgstr "同期地域" - -#, python-format -#~ msgid "Get instances of region \"%s\" error, error: %s" -#~ msgstr "地域 \"%s\" のインスタンスを取得できませんでした、エラー：%s" - -#, python-format -#~ msgid "The instance IP \"%s\" is not in network segment \"%s\"" -#~ msgstr "" -#~ "インスタンスのIP \"%s\" はネットワークセグメント \"%s\" にありません" - -#, python-format -#~ msgid "Failed to synchronize the instance \"%s\"" -#~ msgstr "インスタンス \"%s\" の同期に失敗しました" - -#, python-format -#~ msgid "" -#~ "The updated platform of asset \"%s\" is inconsistent with the original " -#~ "platform type. Skip platform and protocol updates" -#~ msgstr "" -#~ "更新された資産 \"%s\" のプラットフォームタイプと元のタイプは一致しません。" -#~ "プラットフォームとプロトコルの更新をスキップ" - -#, python-format -#~ msgid "The asset \"%s\" already exists" -#~ msgstr "資産 \"%s\" はすでに存在します" - -#, python-format -#~ msgid "Update asset \"%s\"" -#~ msgstr "資産の更新 \"%s\"" - -#, python-format -#~ msgid "Asset \"%s\" has been updated" -#~ msgstr "資産 \"%s\" が更新されました" - -#, python-format -#~ msgid "Prepare to create asset \"%s\"" -#~ msgstr "資産 \"%s\" の作成準備" - -#, python-format -#~ msgid "Set nodes \"%s\"" -#~ msgstr "ノード \"%s\" の設定" - -#, python-format -#~ msgid "Set accounts \"%s\"" -#~ msgstr "アカウント \"%s\" の設定" - -#, python-format -#~ msgid "Set protocols \"%s\"" -#~ msgstr "プロトコル \"%s\" の設定" - -#, python-format -#~ msgid "Port \"%(port)s\" of instance IP \"%(ip)s\" is not reachable" -#~ msgstr "インスタンスIP \"%(ip)s\" のポート \"%(port)s\" は接続できません" - -#~ msgid "Invalid license" -#~ msgstr "無効なライセンス" - #~ msgid "" #~ "External URL, email links or other system callbacks are used to access " #~ "it, eg: http://dev.jumpserver.org:8080" @@ -9800,21 +10118,6 @@ msgstr "エンタープライズ・フラッグシップ・エディション" #~ msgid "Release assets" #~ msgstr "パーマ資産" -#, fuzzy -#~| msgid "MFA in login page" -#~ msgid "Title of login page" -#~ msgstr "ログインページのMFA" - -#, fuzzy -#~| msgid "MFA in login page" -#~ msgid "Image of login page" -#~ msgstr "ログインページのMFA" - -#, fuzzy -#~| msgid "Logout" -#~ msgid "Logo of logout page" -#~ msgstr "ログアウト" - #, fuzzy #~| msgid "Apply applications" #~ msgid "App Applications" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 40a1dd020..bf298a81c 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-22 18:27+0800\n" +"POT-Creation-Date: 2024-05-27 16:41+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -39,11 +39,12 @@ msgstr "成功: %s, 失败: %s, 总数: %s" #: authentication/forms.py:28 #: authentication/templates/authentication/login.html:329 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:50 -#: settings/serializers/msg.py:37 terminal/serializers/storage.py:123 -#: terminal/serializers/storage.py:142 users/forms/profile.py:21 -#: users/serializers/user.py:112 +#: settings/serializers/msg.py:37 settings/serializers/terminal.py:28 +#: terminal/serializers/storage.py:123 terminal/serializers/storage.py:142 +#: users/forms/profile.py:21 users/serializers/user.py:142 #: users/templates/users/_msg_user_created.html:13 #: users/templates/users/user_password_verify.html:18 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:28 #: xpack/plugins/cloud/serializers/account_attrs.py:28 msgid "Password" msgstr "密码" @@ -88,7 +89,7 @@ msgstr "匿名账号" msgid "Specified account" msgstr "指定账号" -#: accounts/const/account.py:26 users/models/user.py:753 +#: accounts/const/account.py:26 users/models/user.py:789 msgid "Local" msgstr "数据库" @@ -113,7 +114,8 @@ msgstr "更新" #: accounts/const/account.py:34 accounts/const/automation.py:109 #: accounts/serializers/automations/change_secret.py:164 audits/const.py:62 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19 -#: ops/const.py:76 terminal/const.py:79 xpack/plugins/cloud/const.py:47 +#: ops/const.py:76 terminal/const.py:79 xpack.bak/plugins/cloud/const.py:47 +#: xpack/plugins/cloud/const.py:47 msgid "Failed" msgstr "失败" @@ -215,7 +217,7 @@ msgstr "仅创建" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 #: settings/serializers/msg.py:59 users/forms/profile.py:100 -#: users/forms/profile.py:108 users/models/user.py:878 +#: users/forms/profile.py:108 users/models/user.py:900 #: users/templates/users/forgot_password.html:162 #: users/views/profile/reset.py:94 msgid "Email" @@ -283,7 +285,8 @@ msgstr "用户 %s 查看/导出 了密码" #: terminal/serializers/command.py:17 terminal/serializers/session.py:28 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:252 +#: tickets/models/ticket/apply_asset.py:16 +#: xpack.bak/plugins/cloud/models.py:252 xpack/plugins/cloud/models.py:252 msgid "Asset" msgstr "资产" @@ -302,7 +305,7 @@ msgid "Version" msgstr "版本" #: accounts/models/account.py:57 accounts/serializers/account/account.py:217 -#: users/models/user.py:930 +#: users/models/user.py:961 msgid "Source" msgstr "来源" @@ -321,7 +324,8 @@ msgstr "来源 ID" #: terminal/models/session/session.py:34 terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 -#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:85 +#: tickets/models/ticket/command_confirm.py:13 +#: xpack.bak/plugins/cloud/models.py:85 xpack/plugins/cloud/models.py:85 msgid "Account" msgstr "账号" @@ -423,7 +427,8 @@ msgid "Trigger mode" msgstr "触发模式" #: accounts/models/automations/backup_account.py:134 audits/models.py:203 -#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:204 +#: terminal/models/session/sharing.py:125 xpack.bak/plugins/cloud/models.py:204 +#: xpack/plugins/cloud/manager.py:165 xpack/plugins/cloud/models.py:204 msgid "Reason" msgstr "原因" @@ -518,8 +523,9 @@ msgstr "结束日期" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:136 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:281 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:200 -#: xpack/plugins/cloud/models.py:256 +#: tickets/serializers/ticket/ticket.py:20 +#: xpack.bak/plugins/cloud/models.py:200 xpack.bak/plugins/cloud/models.py:256 +#: xpack/plugins/cloud/models.py:200 xpack/plugins/cloud/models.py:256 msgid "Status" msgstr "状态" @@ -556,8 +562,9 @@ msgstr "最后登录日期" #: authentication/templates/authentication/_msg_different_city.html:9 #: authentication/templates/authentication/_msg_oauth_bind.html:9 #: terminal/serializers/storage.py:136 users/forms/profile.py:31 -#: users/forms/profile.py:114 users/models/user.py:874 +#: users/forms/profile.py:114 users/models/user.py:898 #: users/templates/users/_msg_user_created.html:12 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:26 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Username" msgstr "用户名" @@ -654,9 +661,11 @@ msgstr "密码规则" #: terminal/models/virtualapp/provider.py:10 #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 -#: users/models/preference.py:11 users/models/user.py:876 +#: users/models/preference.py:11 users/models/user.py:899 +#: xpack.bak/plugins/cloud/models.py:32 xpack.bak/plugins/cloud/models.py:272 +#: xpack.bak/plugins/cloud/serializers/task.py:70 #: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:272 -#: xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/serializers/task.py:71 msgid "Name" msgstr "名称" @@ -664,13 +673,11 @@ msgstr "名称" msgid "Privileged" msgstr "特权账号" -#: accounts/models/base.py:70 assets/models/asset/common.py:165 -#: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39 -#: assets/models/label.py:22 +#: accounts/models/base.py:70 assets/models/automations/base.py:21 +#: assets/models/cmd_filter.py:39 assets/models/label.py:22 #: authentication/serializers/connect_token_secret.py:117 #: terminal/models/applet/applet.py:40 -#: terminal/models/component/endpoint.py:120 -#: terminal/models/virtualapp/virtualapp.py:23 users/serializers/user.py:188 +#: terminal/models/virtualapp/virtualapp.py:23 users/serializers/user.py:266 msgid "Is active" msgstr "激活" @@ -686,7 +693,8 @@ msgstr "平台" msgid "Push params" msgstr "账号推送参数" -#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:329 +#: accounts/models/template.py:26 xpack.bak/plugins/cloud/models.py:329 +#: xpack/plugins/cloud/models.py:329 msgid "Account template" msgstr "账号模板" @@ -806,10 +814,10 @@ msgstr "类别" #: audits/serializers.py:170 #: authentication/serializers/connect_token_secret.py:126 ops/models/job.py:150 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39 -#: terminal/models/component/storage.py:57 -#: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:23 terminal/serializers/storage.py:264 -#: terminal/serializers/storage.py:276 tickets/models/comment.py:26 +#: terminal/models/component/storage.py:58 +#: terminal/models/component/storage.py:154 terminal/serializers/applet.py:29 +#: terminal/serializers/session.py:23 terminal/serializers/storage.py:271 +#: terminal/serializers/storage.py:284 tickets/models/comment.py:26 #: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:273 tickets/serializers/flow.py:53 #: tickets/serializers/ticket/ticket.py:19 @@ -843,6 +851,7 @@ msgstr "已修改" #: ops/models/job.py:152 ops/serializers/job.py:19 #: perms/serializers/permission.py:36 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 +#: xpack/plugins/cloud/manager.py:73 msgid "Assets" msgstr "资产" @@ -856,6 +865,7 @@ msgid "Asset does not support this secret type: %s" msgstr "资产不支持账号类型: %s" #: accounts/serializers/account/account.py:410 +#: xpack/plugins/cloud/serializers/account.py:111 msgid "Account has exist" msgstr "账号已存在" @@ -882,8 +892,8 @@ msgstr "ID" #: terminal/notifications.py:205 terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 -#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1064 -#: users/models/user.py:1102 +#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1109 +#: users/models/user.py:1153 msgid "User" msgstr "用户" @@ -911,19 +921,19 @@ msgstr "当前只支持邮件发送" msgid "Asset type" msgstr "资产类型" -#: accounts/serializers/account/base.py:25 terminal/serializers/storage.py:149 +#: accounts/serializers/account/base.py:33 terminal/serializers/storage.py:149 msgid "Passphrase" msgstr "" -#: accounts/serializers/account/base.py:78 +#: accounts/serializers/account/base.py:93 #: assets/serializers/asset/common.py:384 msgid "Spec info" msgstr "特殊信息" -#: accounts/serializers/account/base.py:80 +#: accounts/serializers/account/base.py:96 msgid "" -"* If no username is required for authentication, enter null. " -"For AD accounts, use the format username@domain." +"* If no username is required for authentication, enter null. For AD " +"accounts, use the format username@domain." msgstr "" "提示: 如果认证时不需要用户名，可填写为 null, 如果是 AD 账号，格式为 " "username@domain" @@ -977,7 +987,8 @@ msgstr "关联平台，可配置推送参数，如果不关联，将使用默认 #: terminal/models/component/endpoint.py:119 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 -#: tickets/models/ticket/general.py:295 users/models/user.py:912 +#: tickets/models/ticket/general.py:295 users/models/user.py:933 +#: xpack.bak/plugins/cloud/models.py:39 xpack.bak/plugins/cloud/models.py:106 #: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:106 msgid "Comment" msgstr "备注" @@ -1155,12 +1166,14 @@ msgid "Notify" msgstr "" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:278 +#: terminal/models/component/endpoint.py:112 +#: xpack.bak/plugins/cloud/models.py:278 xpack/plugins/cloud/models.py:278 msgid "Priority" msgstr "优先级" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:279 +#: terminal/models/component/endpoint.py:113 +#: xpack.bak/plugins/cloud/models.py:279 xpack/plugins/cloud/models.py:279 msgid "1-100, the lower the value will be match first" msgstr "优先级可选范围为 1-100 (数值越小越优先)" @@ -1169,17 +1182,19 @@ msgstr "优先级可选范围为 1-100 (数值越小越优先)" msgid "Reviewers" msgstr "审批人" -#: acls/models/base.py:43 authentication/models/access_key.py:25 +#: acls/models/base.py:43 assets/models/asset/common.py:165 +#: authentication/models/access_key.py:25 #: authentication/models/connection_token.py:53 #: authentication/templates/authentication/_access_key_modal.html:32 -#: perms/models/asset_permission.py:82 terminal/models/session/sharing.py:29 -#: tickets/const.py:36 +#: perms/models/asset_permission.py:82 +#: terminal/models/component/endpoint.py:120 +#: terminal/models/session/sharing.py:29 tickets/const.py:36 msgid "Active" msgstr "激活中" #: acls/models/base.py:81 perms/serializers/permission.py:32 #: users/models/preference.py:16 users/serializers/group.py:21 -#: users/serializers/user.py:332 +#: users/serializers/user.py:414 msgid "Users" msgstr "用户" @@ -1200,13 +1215,14 @@ msgid "Command" msgstr "命令" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack/plugins/cloud/models.py:295 +#: xpack.bak/plugins/cloud/models.py:295 xpack/plugins/cloud/models.py:295 msgid "Regex" msgstr "正则表达式" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:184 settings/serializers/feature.py:19 -#: settings/serializers/msg.py:76 xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:76 xpack.bak/plugins/license/models.py:30 +#: xpack/plugins/license/models.py:30 msgid "Content" msgstr "内容" @@ -1305,7 +1321,8 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "所有复核人都不属于组织 `{}`" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:145 +#: xpack.bak/plugins/cloud/serializers/task.py:145 +#: xpack/plugins/cloud/serializers/task.py:146 msgid "IP address invalid: `{}`" msgstr "IP 地址无效: `{}`" @@ -1437,6 +1454,7 @@ msgstr "无法连接到 {port} 上的端口 {address}" #: assets/automations/ping_gateway/manager.py:58 #: authentication/backends/oauth2/views.py:60 authentication/middleware.py:93 +#: xpack.bak/plugins/cloud/providers/fc.py:47 #: xpack/plugins/cloud/providers/fc.py:47 msgid "Authentication failed" msgstr "认证失败" @@ -1469,7 +1487,7 @@ msgid "Gather facts" msgstr "收集资产信息" #: assets/const/base.py:32 audits/const.py:55 -#: terminal/serializers/applet_host.py:32 +#: terminal/serializers/applet_host.py:32 users/models/user.py:686 msgid "Disabled" msgstr "禁用" @@ -1489,6 +1507,8 @@ msgstr "脚本" #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:76 #: settings/serializers/feature.py:49 settings/serializers/msg.py:31 #: terminal/models/component/endpoint.py:13 terminal/serializers/applet.py:17 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:72 +#: xpack/plugins/cloud/manager.py:73 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" msgstr "主机" @@ -1699,6 +1719,7 @@ msgstr "云服务" #: assets/models/asset/common.py:94 assets/models/platform.py:16 #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:77 #: settings/serializers/msg.py:32 terminal/serializers/storage.py:133 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:73 #: xpack/plugins/cloud/serializers/account_attrs.py:73 msgid "Port" msgstr "端口" @@ -1711,7 +1732,8 @@ msgstr "地址" #: assets/models/asset/common.py:161 assets/models/platform.py:134 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:325 +#: perms/serializers/user_permission.py:25 +#: xpack.bak/plugins/cloud/models.py:325 xpack/plugins/cloud/models.py:325 msgid "Platform" msgstr "平台" @@ -1770,7 +1792,8 @@ msgstr "代理" #: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 perms/models/asset_permission.py:72 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:326 +#: tickets/models/ticket/apply_asset.py:14 +#: xpack.bak/plugins/cloud/models.py:326 xpack/plugins/cloud/models.py:326 msgid "Node" msgstr "节点" @@ -1791,7 +1814,7 @@ msgstr "资产自动化任务" # msgstr "备注" #: assets/models/automations/base.py:114 assets/models/cmd_filter.py:41 #: audits/models.py:267 common/db/models.py:34 ops/models/base.py:54 -#: ops/models/job.py:240 users/models/user.py:1103 +#: ops/models/job.py:240 users/models/user.py:1156 msgid "Date created" msgstr "创建日期" @@ -1812,17 +1835,17 @@ msgid "Date verified" msgstr "校验日期" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:66 -#: users/models/group.py:25 users/models/user.py:882 +#: users/models/group.py:25 users/models/user.py:905 msgid "User group" msgstr "用户组" #: assets/models/cmd_filter.py:42 common/db/models.py:35 -#: users/models/user.py:938 +#: users/models/user.py:981 msgid "Date updated" msgstr "更新日期" #: assets/models/cmd_filter.py:44 assets/models/cmd_filter.py:91 -#: common/db/models.py:32 users/models/user.py:919 +#: common/db/models.py:32 users/models/user.py:943 #: users/serializers/group.py:32 msgid "Created by" msgstr "创建者" @@ -1859,7 +1882,7 @@ msgstr "收藏的资产" msgid "Gateway" msgstr "网关" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1088 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1135 msgid "System" msgstr "系统" @@ -1877,8 +1900,8 @@ msgstr "值" #: assets/serializers/cagegory.py:17 assets/serializers/cagegory.py:23 #: assets/serializers/platform.py:144 #: authentication/serializers/connect_token_secret.py:124 -#: common/serializers/common.py:85 labels/models.py:17 labels/models.py:33 -#: labels/serializers.py:45 settings/serializers/msg.py:88 +#: common/serializers/common.py:85 labels/serializers.py:45 +#: settings/serializers/msg.py:88 msgid "Label" msgstr "标签" @@ -1915,6 +1938,8 @@ msgid "Required" msgstr "必须的" #: assets/models/platform.py:19 assets/serializers/platform.py:146 +#: terminal/models/component/storage.py:28 +#: xpack.bak/plugins/cloud/providers/nutanix.py:30 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "默认" @@ -1931,7 +1956,7 @@ msgstr "设置" #: assets/models/platform.py:38 audits/const.py:56 #: authentication/backends/passkey/models.py:11 settings/models.py:38 -#: terminal/serializers/applet_host.py:33 +#: terminal/serializers/applet_host.py:33 users/models/user.py:687 msgid "Enabled" msgstr "启用" @@ -2058,8 +2083,10 @@ msgstr "资产中批量更新平台，不符合平台类型跳过的资产" #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:46 -#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:328 -#: xpack/plugins/cloud/serializers/task.py:33 +#: perms/serializers/user_permission.py:74 +#: xpack.bak/plugins/cloud/models.py:328 +#: xpack.bak/plugins/cloud/serializers/task.py:33 +#: xpack/plugins/cloud/models.py:328 xpack/plugins/cloud/serializers/task.py:34 msgid "Protocols" msgstr "协议组" @@ -2403,6 +2430,7 @@ msgstr "映射目录" #: audits/const.py:23 terminal/api/session/session.py:277 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 +#: xpack/plugins/cloud/manager.py:74 msgid "View" msgstr "查看" @@ -2461,6 +2489,7 @@ msgstr "登录日志" #: audits/const.py:51 terminal/models/applet/host.py:144 #: terminal/models/component/task.py:22 +#: xpack/plugins/cloud/serializers/account.py:55 msgid "Task" msgstr "任务" @@ -2559,7 +2588,7 @@ msgstr "登录 IP" #: audits/models.py:200 audits/serializers.py:52 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:63 users/models/user.py:899 +#: users/forms/profile.py:63 users/models/user.py:921 #: users/serializers/profile.py:102 msgid "MFA" msgstr "MFA" @@ -2613,7 +2642,7 @@ msgstr "用户 %s %s 了当前资源" #: audits/serializers.py:172 authentication/models/connection_token.py:47 #: authentication/models/temp_token.py:13 perms/models/asset_permission.py:80 #: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:917 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:940 msgid "Date expired" msgstr "失效日期" @@ -2647,28 +2676,29 @@ msgstr "认证令牌" #: audits/signal_handlers/login_log.py:37 authentication/notifications.py:73 #: authentication/views/login.py:77 notifications/backends/__init__.py:11 #: settings/serializers/auth/wecom.py:10 settings/serializers/auth/wecom.py:15 -#: users/models/user.py:760 users/models/user.py:932 +#: users/models/user.py:796 users/models/user.py:964 msgid "WeCom" msgstr "企业微信" #: audits/signal_handlers/login_log.py:38 authentication/views/feishu.py:105 #: authentication/views/login.py:89 notifications/backends/__init__.py:14 -#: settings/serializers/auth/feishu.py:10 users/models/user.py:762 -#: users/models/user.py:934 +#: settings/serializers/auth/feishu.py:10 +#: settings/serializers/auth/feishu.py:12 users/models/user.py:798 +#: users/models/user.py:970 msgid "FeiShu" msgstr "飞书" #: audits/signal_handlers/login_log.py:40 authentication/views/login.py:101 #: authentication/views/slack.py:87 notifications/backends/__init__.py:16 #: settings/serializers/auth/slack.py:10 settings/serializers/auth/slack.py:12 -#: users/models/user.py:764 users/models/user.py:936 +#: users/models/user.py:800 users/models/user.py:976 msgid "Slack" msgstr "" #: audits/signal_handlers/login_log.py:41 authentication/views/dingtalk.py:161 #: authentication/views/login.py:83 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:761 -#: users/models/user.py:933 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:797 +#: users/models/user.py:967 msgid "DingTalk" msgstr "钉钉" @@ -3228,7 +3258,8 @@ msgid "Component" msgstr "组件" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:327 +#: perms/serializers/user_permission.py:28 +#: xpack.bak/plugins/cloud/models.py:327 xpack/plugins/cloud/models.py:327 msgid "Domain" msgstr "网域" @@ -3269,7 +3300,7 @@ msgstr "动作" #: authentication/serializers/connection_token.py:42 #: perms/serializers/permission.py:44 perms/serializers/permission.py:65 -#: users/serializers/user.py:103 users/serializers/user.py:192 +#: users/serializers/user.py:125 users/serializers/user.py:270 msgid "Is expired" msgstr "已过期" @@ -3283,8 +3314,8 @@ msgid "Access IP" msgstr "IP 白名单" #: authentication/serializers/token.py:92 perms/serializers/permission.py:43 -#: perms/serializers/permission.py:66 users/serializers/user.py:104 -#: users/serializers/user.py:189 +#: perms/serializers/permission.py:66 users/serializers/user.py:126 +#: users/serializers/user.py:267 msgid "Is valid" msgstr "是否有效" @@ -3309,14 +3340,12 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/const.py:42 users/models/user.py:654 -#: users/templates/users/user_verify_mfa.html:36 +#: users/const.py:42 users/templates/users/user_verify_mfa.html:36 msgid "Disable" msgstr "禁用" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/const.py:43 users/models/user.py:655 -#: users/templates/users/mfa_setting.html:26 +#: users/const.py:43 users/templates/users/mfa_setting.html:26 #: users/templates/users/mfa_setting.html:68 msgid "Enable" msgstr "启用" @@ -3511,7 +3540,7 @@ msgid "Do you want to retry ?" msgstr "是否重试 ？" #: authentication/utils.py:24 common/utils/ip/geoip/utils.py:24 -#: xpack/plugins/cloud/const.py:33 +#: xpack.bak/plugins/cloud/const.py:33 xpack/plugins/cloud/const.py:33 msgid "LAN" msgstr "局域网" @@ -3695,7 +3724,7 @@ msgstr "运行中" msgid "Canceled" msgstr "取消" -#: common/const/common.py:5 +#: common/const/common.py:5 xpack/plugins/cloud/manager.py:380 #, python-format msgid "%(name)s was created successfully" msgstr "%(name)s 创建成功" @@ -3757,6 +3786,9 @@ msgstr "无效的ID，应为列表" #: common/db/fields.py:594 common/db/fields.py:599 #: common/serializers/fields.py:133 tickets/serializers/ticket/common.py:58 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:56 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:79 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:150 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 #: xpack/plugins/cloud/serializers/account_attrs.py:150 @@ -3779,7 +3811,7 @@ msgstr "忽略的" msgid "discard time" msgstr "忽略时间" -#: common/db/models.py:33 users/models/user.py:920 +#: common/db/models.py:33 users/models/user.py:946 msgid "Updated by" msgstr "最后更新者" @@ -3891,7 +3923,8 @@ msgstr "阿里云" msgid "Tencent cloud" msgstr "腾讯云" -#: common/sdk/sms/endpoint.py:18 xpack/plugins/cloud/const.py:13 +#: common/sdk/sms/endpoint.py:18 xpack.bak/plugins/cloud/const.py:13 +#: xpack/plugins/cloud/const.py:13 msgid "Huawei Cloud" msgstr "华为云" @@ -3945,8 +3978,9 @@ msgstr "错误的数据类型，应该是列表" msgid "Invalid choice: {}" msgstr "无效选项: {}" -#: common/serializers/mixin.py:409 -msgid "Labels" +#: common/serializers/mixin.py:441 terminal/models/applet/applet.py:44 +#: terminal/models/virtualapp/virtualapp.py:29 +msgid "Tags" msgstr "标签" # msgid "Labels" @@ -4036,11 +4070,17 @@ msgstr "" msgid "App Labels" msgstr "标签管理" -#: labels/models.py:36 +#: labels/models.py:17 labels/models.py:36 +#, fuzzy +#| msgid "Tags" +msgid "Tag" +msgstr "标签" + +#: labels/models.py:40 msgid "Resource ID" msgstr "资源 ID" -#: labels/models.py:41 +#: labels/models.py:46 msgid "Tagged resource" msgstr "关联的资源" @@ -4330,11 +4370,12 @@ msgid "Date last run" msgstr "最后运行日期" #: ops/models/base.py:51 ops/models/job.py:237 -#: xpack/plugins/cloud/models.py:198 +#: xpack.bak/plugins/cloud/models.py:198 xpack/plugins/cloud/models.py:198 msgid "Result" msgstr "结果" #: ops/models/base.py:52 ops/models/job.py:238 +#: xpack/plugins/cloud/manager.py:77 msgid "Summary" msgstr "汇总" @@ -4730,7 +4771,7 @@ msgstr "资产授权规则将要过期" msgid "asset permissions of organization {}" msgstr "组织 ({}) 的资产授权" -#: perms/serializers/permission.py:34 users/serializers/user.py:181 +#: perms/serializers/permission.py:34 users/serializers/user.py:254 msgid "Groups" msgstr "用户组" @@ -4842,7 +4883,7 @@ msgid "Scope" msgstr "范围" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:886 +#: users/models/user.py:908 msgid "Role" msgstr "角色" @@ -4913,7 +4954,7 @@ msgstr "系统设置" msgid "Session audits" msgstr "会话审计" -#: rbac/tree.py:49 +#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:74 msgid "Cloud import" msgstr "云同步" @@ -5201,13 +5242,13 @@ msgstr "LDAP 地址" msgid "Proxy Server" msgstr "回调地址" -#: settings/serializers/auth/cas.py:19 settings/serializers/auth/oauth2.py:54 -#: settings/serializers/auth/saml2.py:33 +#: settings/serializers/auth/cas.py:19 settings/serializers/auth/oauth2.py:55 +#: settings/serializers/auth/saml2.py:40 msgid "Logout completely" msgstr "同步注销" #: settings/serializers/auth/cas.py:20 -msgid "When the user signs out, they also be logged out from the CAS Server" +msgid "When the user signs out, they also be logged out from the CAS server" msgstr "" #: settings/serializers/auth/cas.py:26 @@ -5219,8 +5260,8 @@ msgid "Enable attributes map" msgstr "启用属性映射" #: settings/serializers/auth/cas.py:32 settings/serializers/auth/ldap.py:64 -#: settings/serializers/auth/oauth2.py:56 settings/serializers/auth/oidc.py:38 -#: settings/serializers/auth/saml2.py:32 +#: settings/serializers/auth/oauth2.py:59 settings/serializers/auth/oidc.py:38 +#: settings/serializers/auth/saml2.py:33 msgid "User attribute" msgstr "映射属性" @@ -5244,17 +5285,9 @@ msgstr "" msgid "Dingtalk" msgstr "启用钉钉认证" -#: settings/serializers/auth/feishu.py:12 -#, fuzzy -#| msgid "FeiShu Auth" -msgid "Enable FeiShu Auth" -msgstr "飞书 认证" - -#: settings/serializers/auth/lark.py:12 -#, fuzzy -#| msgid "Lark Auth" -msgid "Enable Lark Auth" -msgstr "Lark 认证" +#: settings/serializers/auth/lark.py:12 users/models/user.py:799 +msgid "Lark" +msgstr "启用飞书认证" #: settings/serializers/auth/ldap.py:39 settings/serializers/auth/ldap.py:103 msgid "LDAP" @@ -5291,6 +5324,7 @@ msgid "Search filter" msgstr "用户过滤器" #: settings/serializers/auth/ldap.py:61 +#, python-format msgid "Selection could include (cn|uid|sAMAccountName=%(user)s)" msgstr "可能的选项是(cn或uid或sAMAccountName=%(user)s)" @@ -5331,11 +5365,14 @@ msgstr "图标" msgid "Service provider" msgstr "服务提供商" -#: settings/serializers/auth/oauth2.py:30 settings/serializers/auth/oidc.py:20 -msgid "Client Id" +#: settings/serializers/auth/oauth2.py:30 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:35 +#: xpack/plugins/cloud/serializers/account_attrs.py:35 +msgid "Client ID" msgstr "客户端 ID" #: settings/serializers/auth/oauth2.py:33 settings/serializers/auth/oidc.py:23 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:38 #: xpack/plugins/cloud/serializers/account_attrs.py:38 msgid "Client Secret" msgstr "客户端密钥" @@ -5361,8 +5398,18 @@ msgstr "用户信息端点地址" msgid "End session endpoint" msgstr "注销会话端点地址" -#: settings/serializers/auth/oauth2.py:59 settings/serializers/auth/oidc.py:112 -#: settings/serializers/auth/saml2.py:34 +#: settings/serializers/auth/oauth2.py:56 +msgid "When the user signs out, they also be logged out from the OAuth2 server" +msgstr "" + +#: settings/serializers/auth/oauth2.py:61 +msgid "" +"User attribute mapping, where the `key` is the JumpServer user attribute " +"name and the `value` is the OAuth2 service user attribute name" +msgstr "" + +#: settings/serializers/auth/oauth2.py:66 settings/serializers/auth/oidc.py:112 +#: settings/serializers/auth/saml2.py:43 msgid "Always update user" msgstr "总是更新用户信息" @@ -5378,6 +5425,10 @@ msgstr "JumpServer 地址" msgid "The current site's URL is used to construct the callback address" msgstr "" +#: settings/serializers/auth/oidc.py:20 +msgid "Client Id" +msgstr "客户端 ID" + #: settings/serializers/auth/oidc.py:33 msgid "Share session" msgstr "共享会话" @@ -5479,10 +5530,16 @@ msgstr "Passkey 服务名称" msgid "Radius" msgstr "Radius" -#: settings/serializers/auth/radius.py:21 -msgid "OTP in Radius" +#: settings/serializers/auth/radius.py:22 +#, fuzzy +#| msgid "OTP in Radius" +msgid "OTP in RADIUS" msgstr "使用 Radius OTP" +#: settings/serializers/auth/radius.py:23 +msgid "* Using OTP in RADIUS means users can employ RADIUS as a method for MFA" +msgstr "" + #: settings/serializers/auth/saml2.py:10 settings/serializers/auth/saml2.py:13 msgid "SAML2" msgstr "SAML2" @@ -5507,11 +5564,22 @@ msgstr "SP 密钥" msgid "SP cert" msgstr "SP 证书" +#: settings/serializers/auth/saml2.py:35 +msgid "" +"User attribute mapping, where the `key` is the SAML2 service user attribute " +"name and the `value` is the JumpServer user attribute name" +msgstr "" + +#: settings/serializers/auth/saml2.py:41 +msgid "When the user signs out, they also be logged out from the SAML2 server" +msgstr "" + #: settings/serializers/auth/sms.py:18 msgid "Enable Short Message Service (SMS)" msgstr "" -#: settings/serializers/auth/sms.py:21 xpack/plugins/cloud/models.py:34 +#: settings/serializers/auth/sms.py:21 xpack.bak/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:34 msgid "Provider" msgstr "云服务商" @@ -5538,8 +5606,8 @@ msgstr "签名" msgid "Template code" msgstr "模板" -#: settings/serializers/auth/sms.py:40 users/models/user.py:896 -#: users/serializers/user.py:114 +#: settings/serializers/auth/sms.py:40 users/models/user.py:918 +#: users/serializers/user.py:153 msgid "Phone" msgstr "手机" @@ -5603,6 +5671,7 @@ msgid "SSO auth key TTL" msgstr "令牌有效期" #: settings/serializers/auth/sso.py:20 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Unit: second" msgstr "单位: 秒" @@ -5821,7 +5890,9 @@ msgstr "作业中心命令黑名单" #: terminal/models/virtualapp/virtualapp.py:36 #: terminal/models/virtualapp/virtualapp.py:97 #: terminal/serializers/virtualapp.py:32 -msgid "Virtual App" +#, fuzzy +#| msgid "Virtual App" +msgid "Virtual app" msgstr "虚拟应用" #: settings/serializers/feature.py:148 @@ -6192,39 +6263,73 @@ msgid "Auto" msgstr "自动" #: settings/serializers/terminal.py:22 -msgid "Terminal registration" +#, fuzzy +#| msgid "Terminal registration" +msgid "Registration" msgstr "组件注册" #: settings/serializers/terminal.py:24 +#, fuzzy +#| msgid "" +#| "Allow terminal register, after all terminal setup, you should disable " +#| "this for security" msgid "" -"Allow terminal register, after all terminal setup, you should disable this " +"Allow component register, after all component setup, you should disable this " "for security" msgstr "是否允许组件注册，当所有终端启动后，为了安全应该关闭" -#: settings/serializers/terminal.py:27 -msgid "Password auth" -msgstr "密码认证" +#: settings/serializers/terminal.py:30 +msgid "" +"* Allow users to log in to the KoKo component via password authentication" +msgstr "" -#: settings/serializers/terminal.py:29 -msgid "Public key auth" -msgstr "公钥授权" +#: settings/serializers/terminal.py:34 users/forms/profile.py:172 +#: users/models/user.py:931 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:210 +#: xpack/plugins/cloud/serializers/account_attrs.py:210 +msgid "Public key" +msgstr "SSH公钥" -#: settings/serializers/terminal.py:30 +#: settings/serializers/terminal.py:36 msgid "" -"Information: If use other auth method, like AD/LDAP, you should disable this " -"to avoid being able to log in after deleting" +"* Allow users to log in to the KoKo component via Public key " +"authentication
If third-party authentication services, such as AD/LDAP, " +"are enabled, you should disable this option to prevent users from logging in " +"after being deleted from the AD/LDAP server" msgstr "" -"提示：如果你使用其它认证方式，如 AD/LDAP，你应该禁用此项，以避免第三方系统删" -"除后，还可以登录" -#: settings/serializers/terminal.py:34 -msgid "Asset list sorting" +#: settings/serializers/terminal.py:43 +#, fuzzy +#| msgid "Asset list sorting" +msgid "Asset sorting" msgstr "资产列表排序" -#: settings/serializers/terminal.py:37 -msgid "Asset list page size" +#: settings/serializers/terminal.py:46 +#, fuzzy +#| msgid "Asset list page size" +msgid "Asset page size" msgstr "资产列表每页数量" +#: settings/serializers/terminal.py:51 +msgid "" +"* You can individually configure the service address and port in the service " +"endpoint
If enabled, the Luna page will display the DB client launch " +"method when connecting to assets" +msgstr "" + +#: settings/serializers/terminal.py:59 +msgid "" +"* You can individually configure the service address and port in the service " +"endpoint
If enabled, the Luna page will display the download rdp file " +"button and RDP Client launch method when connecting to assets" +msgstr "" + +#: settings/serializers/terminal.py:68 +msgid "" +"* Allow connecting to the KoKo component via SSH client
If enabled, the " +"Luna page will display the SSH client launch method when connecting to assets" +msgstr "" + #: settings/tasks/ldap.py:28 msgid "Periodic import ldap user" msgstr "周期导入 LDAP 用户" @@ -6748,7 +6853,8 @@ msgstr "不支持批量创建" msgid "Storage is invalid" msgstr "存储无效" -#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 +#: terminal/models/applet/applet.py:30 xpack.bak/plugins/license/models.py:88 +#: xpack/plugins/license/models.py:88 msgid "Community edition" msgstr "社区版" @@ -6769,11 +6875,6 @@ msgstr "版本" msgid "Can concurrent" msgstr "可以并发" -#: terminal/models/applet/applet.py:44 -#: terminal/models/virtualapp/virtualapp.py:29 -msgid "Tags" -msgstr "标签" - #: terminal/models/applet/applet.py:48 terminal/serializers/applet_host.py:167 #: terminal/serializers/storage.py:197 msgid "Hosts" @@ -6909,16 +7010,12 @@ msgstr "线程数" msgid "Boot Time" msgstr "运行时间" -#: terminal/models/component/storage.py:28 -msgid "Default storage" -msgstr "默认存储" - -#: terminal/models/component/storage.py:140 +#: terminal/models/component/storage.py:146 #: terminal/models/component/terminal.py:91 msgid "Command storage" msgstr "命令存储" -#: terminal/models/component/storage.py:204 +#: terminal/models/component/storage.py:214 #: terminal/models/component/terminal.py:92 msgid "Replay storage" msgstr "录像存储" @@ -7069,7 +7166,9 @@ msgid "App Provider" msgstr "应用提供商" #: terminal/models/virtualapp/virtualapp.py:102 -msgid "Virtual App publication" +#, fuzzy +#| msgid "Virtual App publication" +msgid "Virtual app publication" msgstr "虚拟应用发布" #: terminal/notifications.py:25 @@ -7334,11 +7433,13 @@ msgid "Access key ID" msgstr "Access key ID(AK)" #: terminal/serializers/storage.py:37 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:20 #: xpack/plugins/cloud/serializers/account_attrs.py:20 msgid "Access key secret" msgstr "Access key secret(SK)" -#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:249 +#: terminal/serializers/storage.py:68 xpack.bak/plugins/cloud/models.py:249 +#: xpack/plugins/cloud/manager.py:90 xpack/plugins/cloud/models.py:249 msgid "Region" msgstr "地域" @@ -7358,7 +7459,8 @@ msgstr "端点后缀" msgid "HOST" msgstr "主机" -#: terminal/serializers/storage.py:146 users/models/user.py:906 +#: terminal/serializers/storage.py:146 users/models/user.py:928 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:213 #: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "ssh私钥" @@ -7399,6 +7501,12 @@ msgstr "索引" msgid "Doc type" msgstr "文档类型" +#: terminal/serializers/storage.py:264 +msgid "" +"set as the default storage, will make new Component use the current storage " +"by default, without affecting existing Component" +msgstr "" + #: terminal/serializers/task.py:9 msgid "Session id" msgstr "会话 ID" @@ -8079,83 +8187,76 @@ msgstr "不能和原来的密钥相同" msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" -#: users/forms/profile.py:172 users/models/user.py:909 -#: xpack/plugins/cloud/serializers/account_attrs.py:210 -msgid "Public key" -msgstr "SSH公钥" - #: users/models/preference.py:38 users/serializers/preference/preference.py:19 msgid "Preference" msgstr "用户设置" -#: users/models/user.py:656 -msgid "Force enable" +#: users/models/user.py:688 +#, fuzzy +#| msgid "Force enable" +msgid "Force enabled" msgstr "强制启用" -#: users/models/user.py:763 -msgid "Lark" -msgstr "启用飞书认证" - -#: users/models/user.py:888 users/serializers/user.py:190 +#: users/models/user.py:911 users/serializers/user.py:268 msgid "Is service account" msgstr "服务账号" -#: users/models/user.py:890 +#: users/models/user.py:913 msgid "Avatar" msgstr "头像" -#: users/models/user.py:893 +#: users/models/user.py:915 msgid "Wechat" msgstr "微信" -#: users/models/user.py:902 +#: users/models/user.py:924 msgid "OTP secret key" msgstr "OTP 密钥" # msgid "Private key" # msgstr "ssh私钥" -#: users/models/user.py:914 users/serializers/profile.py:129 -#: users/serializers/user.py:187 +#: users/models/user.py:934 users/serializers/profile.py:129 +#: users/serializers/user.py:265 msgid "Is first login" msgstr "首次登录" -#: users/models/user.py:923 +#: users/models/user.py:952 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:926 +#: users/models/user.py:955 msgid "Need update password" msgstr "需要更新密码" -#: users/models/user.py:937 +#: users/models/user.py:979 msgid "Date api key used" msgstr "Api key 最后使用日期" -#: users/models/user.py:1059 +#: users/models/user.py:1104 msgid "Can not delete admin user" msgstr "无法删除管理员用户" -#: users/models/user.py:1073 +#: users/models/user.py:1118 msgid "Can invite user" msgstr "可以邀请用户" -#: users/models/user.py:1074 +#: users/models/user.py:1119 msgid "Can remove user" msgstr "可以移除用户" -#: users/models/user.py:1075 +#: users/models/user.py:1120 msgid "Can match user" msgstr "可以匹配用户" -#: users/models/user.py:1084 +#: users/models/user.py:1131 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:1087 +#: users/models/user.py:1134 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" -#: users/models/user.py:1112 +#: users/models/user.py:1166 msgid "User password history" msgstr "用户密码历史" @@ -8304,98 +8405,123 @@ msgstr "打开" msgid "Forced enabled" msgstr "强制启用" -#: users/serializers/user.py:44 +#: users/serializers/user.py:49 msgid "System roles" msgstr "系统角色" -#: users/serializers/user.py:45 +#: users/serializers/user.py:53 msgid "" "System roles are roles at the system level, and they will take effect across " "all organizations" msgstr "" -#: users/serializers/user.py:49 +#: users/serializers/user.py:59 msgid "Org roles" msgstr "组织角色" -#: users/serializers/user.py:52 +#: users/serializers/user.py:64 msgid "" "Org roles are roles at the organization level, and they will only take " "effect within current organization" msgstr "" -#: users/serializers/user.py:54 +#: users/serializers/user.py:68 #, fuzzy #| msgid "Organization role" msgid "Organizations and roles" msgstr "组织角色" -#: users/serializers/user.py:96 +#: users/serializers/user.py:118 msgid "Password setting" msgstr "密码选项" -#: users/serializers/user.py:98 +#: users/serializers/user.py:120 msgid "MFA enabled" msgstr "MFA 已启用" -#: users/serializers/user.py:100 +#: users/serializers/user.py:122 msgid "MFA force enabled" msgstr "强制 MFA" -#: users/serializers/user.py:102 +#: users/serializers/user.py:124 msgid "Login blocked" msgstr "登录被锁定" -#: users/serializers/user.py:105 users/serializers/user.py:196 +#: users/serializers/user.py:128 users/serializers/user.py:274 msgid "Is OTP bound" msgstr "是否绑定了虚拟 MFA" -#: users/serializers/user.py:106 +#: users/serializers/user.py:131 msgid "Super Administrator" msgstr "超级管理员" -#: users/serializers/user.py:107 +#: users/serializers/user.py:134 msgid "Organization Administrator" msgstr "组织管理员" -#: users/serializers/user.py:109 +#: users/serializers/user.py:138 msgid "Can public key authentication" msgstr "可以公钥认证吗" -#: users/serializers/user.py:169 +#: users/serializers/user.py:239 #, fuzzy -#| msgid "Same with user" -msgid "Fullname of user" -msgstr "用户名与用户相同" +#| msgid "Full value" +msgid "Full name" +msgstr "全称" -#: users/serializers/user.py:172 +#: users/serializers/user.py:242 #, fuzzy #| msgid "Login user" msgid "Login username" msgstr "登录用户" -#: users/serializers/user.py:184 +#: users/serializers/user.py:245 +#, fuzzy +#| msgid "Invalid address" +msgid "Email address" +msgstr "无效地址" + +#: users/serializers/user.py:255 +#, fuzzy +#| msgid "User groups amount" +msgid "User groups to join" +msgstr "用户组数量" + +#: users/serializers/user.py:259 +msgid "" +"User source identifies where the user was created, which could be AD or " +"other sources.There are security settings that can restrict users to log in " +"to the system only from the sources." +msgstr "" + +#: users/serializers/user.py:263 msgid "Superuser" msgstr "超级用户" -#: users/serializers/user.py:191 +#: users/serializers/user.py:269 msgid "Is org admin" msgstr "组织管理员" -#: users/serializers/user.py:193 +#: users/serializers/user.py:271 msgid "Avatar url" msgstr "头像路径" -#: users/serializers/user.py:197 +#: users/serializers/user.py:276 msgid "MFA level" msgstr "MFA" -#: users/serializers/user.py:333 +#: users/serializers/user.py:277 +#, fuzzy +#| msgid "Authentication" +msgid "Multi-Factor Authentication" +msgstr "认证" + +#: users/serializers/user.py:416 msgid "" -"For security, only a partial of users is displayed. You can search for more" +"* For security, only a partial of users is displayed. You can search for more" msgstr "" -#: users/serializers/user.py:366 +#: users/serializers/user.py:451 msgid "name not unique" msgstr "名称重复" @@ -8681,537 +8807,627 @@ msgstr "* 新密码不能是最近 {} 次的密码" msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" -#: xpack/apps.py:8 +#: xpack.bak/apps.py:8 xpack/apps.py:8 msgid "XPACK" msgstr "XPack" -#: xpack/exceptions.py:7 +#: xpack.bak/exceptions.py:7 msgid "" "The current task is not synchronized with unmatched policy assets, skipping" msgstr "" -#: xpack/plugins/cloud/api.py:60 +#: xpack.bak/plugins/cloud/api.py:60 xpack/plugins/cloud/api.py:60 msgid "Test connection successful" msgstr "测试成功" -#: xpack/plugins/cloud/api.py:62 +#: xpack.bak/plugins/cloud/api.py:62 xpack/plugins/cloud/api.py:62 msgid "Test connection failed: {}" msgstr "测试连接失败：{}" -#: xpack/plugins/cloud/const.py:8 +#: xpack.bak/plugins/cloud/const.py:8 xpack/plugins/cloud/const.py:8 msgid "Alibaba Cloud" msgstr "阿里云" -#: xpack/plugins/cloud/const.py:9 +#: xpack.bak/plugins/cloud/const.py:9 xpack/plugins/cloud/const.py:9 msgid "AWS (International)" msgstr "AWS (国际)" -#: xpack/plugins/cloud/const.py:10 +#: xpack.bak/plugins/cloud/const.py:10 xpack/plugins/cloud/const.py:10 msgid "AWS (China)" msgstr "AWS (中国)" -#: xpack/plugins/cloud/const.py:11 +#: xpack.bak/plugins/cloud/const.py:11 xpack/plugins/cloud/const.py:11 msgid "Azure (China)" msgstr "Azure (中国)" -#: xpack/plugins/cloud/const.py:12 +#: xpack.bak/plugins/cloud/const.py:12 xpack/plugins/cloud/const.py:12 msgid "Azure (International)" msgstr "Azure (国际)" -#: xpack/plugins/cloud/const.py:14 +#: xpack.bak/plugins/cloud/const.py:14 xpack/plugins/cloud/const.py:14 msgid "Baidu Cloud" msgstr "百度云" -#: xpack/plugins/cloud/const.py:15 +#: xpack.bak/plugins/cloud/const.py:15 xpack/plugins/cloud/const.py:15 msgid "JD Cloud" msgstr "京东云" -#: xpack/plugins/cloud/const.py:16 +#: xpack.bak/plugins/cloud/const.py:16 xpack/plugins/cloud/const.py:16 msgid "KingSoft Cloud" msgstr "金山云" -#: xpack/plugins/cloud/const.py:17 +#: xpack.bak/plugins/cloud/const.py:17 xpack/plugins/cloud/const.py:17 msgid "Tencent Cloud" msgstr "腾讯云" -#: xpack/plugins/cloud/const.py:18 +#: xpack.bak/plugins/cloud/const.py:18 xpack/plugins/cloud/const.py:18 msgid "Tencent Cloud (Lighthouse)" msgstr "腾讯云(轻量服务器应用)" -#: xpack/plugins/cloud/const.py:19 +#: xpack.bak/plugins/cloud/const.py:19 xpack/plugins/cloud/const.py:19 msgid "Google Cloud Platform" msgstr "谷歌云" -#: xpack/plugins/cloud/const.py:20 +#: xpack.bak/plugins/cloud/const.py:20 xpack/plugins/cloud/const.py:20 msgid "UCloud" msgstr "ucloud" -#: xpack/plugins/cloud/const.py:21 +#: xpack.bak/plugins/cloud/const.py:21 xpack/plugins/cloud/const.py:21 msgid "Volcengine" msgstr "火山引擎" -#: xpack/plugins/cloud/const.py:23 +#: xpack.bak/plugins/cloud/const.py:23 xpack/plugins/cloud/const.py:23 msgid "VMware" msgstr "VMware" +#: xpack.bak/plugins/cloud/const.py:24 +#: xpack.bak/plugins/cloud/providers/nutanix.py:15 #: xpack/plugins/cloud/const.py:24 xpack/plugins/cloud/providers/nutanix.py:15 msgid "Nutanix" msgstr "Nutanix" -#: xpack/plugins/cloud/const.py:25 +#: xpack.bak/plugins/cloud/const.py:25 xpack/plugins/cloud/const.py:25 msgid "Huawei Private Cloud" msgstr "华为私有云" -#: xpack/plugins/cloud/const.py:26 +#: xpack.bak/plugins/cloud/const.py:26 xpack/plugins/cloud/const.py:26 msgid "Qingyun Private Cloud" msgstr "青云私有云" -#: xpack/plugins/cloud/const.py:27 +#: xpack.bak/plugins/cloud/const.py:27 xpack/plugins/cloud/const.py:27 msgid "CTYun Private Cloud" msgstr "天翼私有云" -#: xpack/plugins/cloud/const.py:28 +#: xpack.bak/plugins/cloud/const.py:28 xpack/plugins/cloud/const.py:28 msgid "OpenStack" msgstr "OpenStack" +#: xpack.bak/plugins/cloud/const.py:29 +#: xpack.bak/plugins/cloud/providers/zstack.py:21 #: xpack/plugins/cloud/const.py:29 xpack/plugins/cloud/providers/zstack.py:21 msgid "ZStack" msgstr "ZStack" -#: xpack/plugins/cloud/const.py:30 +#: xpack.bak/plugins/cloud/const.py:30 xpack/plugins/cloud/const.py:30 msgid "Fusion Compute" msgstr "融合计算" -#: xpack/plugins/cloud/const.py:31 +#: xpack.bak/plugins/cloud/const.py:31 xpack/plugins/cloud/const.py:31 msgid "SCP" msgstr "深信服SCP" -#: xpack/plugins/cloud/const.py:32 +#: xpack.bak/plugins/cloud/const.py:32 xpack/plugins/cloud/const.py:32 msgid "Apsara Stack" msgstr "阿里云专有云" -#: xpack/plugins/cloud/const.py:37 +#: xpack.bak/plugins/cloud/const.py:37 xpack/plugins/cloud/const.py:37 msgid "Private IP" msgstr "私有IP" -#: xpack/plugins/cloud/const.py:38 +#: xpack.bak/plugins/cloud/const.py:38 xpack/plugins/cloud/const.py:38 msgid "Public IP" msgstr "公网IP" +#: xpack.bak/plugins/cloud/const.py:42 xpack.bak/plugins/cloud/models.py:299 #: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:299 msgid "Instance name" msgstr "实例名称" -#: xpack/plugins/cloud/const.py:43 +#: xpack.bak/plugins/cloud/const.py:43 xpack/plugins/cloud/const.py:43 msgid "Instance name and Partial IP" msgstr "实例名称和部分IP" -#: xpack/plugins/cloud/const.py:48 +#: xpack.bak/plugins/cloud/const.py:48 xpack/plugins/cloud/const.py:48 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:52 +#: xpack.bak/plugins/cloud/const.py:52 xpack/plugins/cloud/const.py:52 +#: xpack/plugins/cloud/manager.py:80 msgid "Unsync" msgstr "未同步" -#: xpack/plugins/cloud/const.py:53 +#: xpack.bak/plugins/cloud/const.py:53 xpack/plugins/cloud/const.py:53 +#: xpack/plugins/cloud/manager.py:79 msgid "New Sync" msgstr "新同步" -#: xpack/plugins/cloud/const.py:54 +#: xpack.bak/plugins/cloud/const.py:54 xpack/plugins/cloud/const.py:54 +#: xpack/plugins/cloud/manager.py:79 msgid "Synced" msgstr "已同步" -#: xpack/plugins/cloud/const.py:55 +#: xpack.bak/plugins/cloud/const.py:55 xpack/plugins/cloud/const.py:55 +#: xpack/plugins/cloud/manager.py:80 msgid "Released" msgstr "已释放" -#: xpack/plugins/cloud/const.py:59 +#: xpack.bak/plugins/cloud/const.py:59 xpack/plugins/cloud/const.py:59 msgid "And" msgstr "与" -#: xpack/plugins/cloud/const.py:60 +#: xpack.bak/plugins/cloud/const.py:60 xpack/plugins/cloud/const.py:60 msgid "Or" msgstr "或" -#: xpack/plugins/cloud/manager.py:55 xpack/plugins/cloud/providers/gcp.py:64 +#: xpack.bak/plugins/cloud/manager.py:55 +#: xpack.bak/plugins/cloud/providers/gcp.py:64 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:34 +#: xpack/plugins/cloud/manager.py:45 xpack/plugins/cloud/manager.py:55 +#: xpack/plugins/cloud/manager.py:57 xpack/plugins/cloud/providers/gcp.py:64 #: xpack/plugins/cloud/providers/huaweicloud.py:34 msgid "Account unavailable" msgstr "账号无效" -#: xpack/plugins/cloud/meta.py:9 +#: xpack.bak/plugins/cloud/meta.py:9 xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "云管中心" +#: xpack.bak/plugins/cloud/models.py:37 +#: xpack.bak/plugins/cloud/serializers/account.py:68 #: xpack/plugins/cloud/models.py:37 -#: xpack/plugins/cloud/serializers/account.py:68 +#: xpack/plugins/cloud/serializers/account.py:69 msgid "Attrs" msgstr "属性" -#: xpack/plugins/cloud/models.py:38 +#: xpack.bak/plugins/cloud/models.py:38 xpack/plugins/cloud/models.py:38 msgid "Validity" msgstr "有效" -#: xpack/plugins/cloud/models.py:43 +#: xpack.bak/plugins/cloud/models.py:43 xpack/plugins/cloud/models.py:43 msgid "Cloud account" msgstr "云账号" -#: xpack/plugins/cloud/models.py:45 +#: xpack.bak/plugins/cloud/models.py:45 xpack/plugins/cloud/models.py:45 msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:159 +#: xpack.bak/plugins/cloud/models.py:88 +#: xpack.bak/plugins/cloud/serializers/task.py:159 +#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:160 msgid "Regions" msgstr "地域" -#: xpack/plugins/cloud/models.py:91 +#: xpack.bak/plugins/cloud/models.py:91 xpack/plugins/cloud/models.py:91 msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:162 +#: xpack.bak/plugins/cloud/models.py:96 +#: xpack.bak/plugins/cloud/serializers/task.py:162 +#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:163 msgid "IP network segment group" msgstr "IP网段组" -#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:167 +#: xpack.bak/plugins/cloud/models.py:99 +#: xpack.bak/plugins/cloud/serializers/task.py:167 +#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:168 msgid "Sync IP type" msgstr "同步IP类型" +#: xpack.bak/plugins/cloud/models.py:102 +#: xpack.bak/plugins/cloud/serializers/task.py:185 #: xpack/plugins/cloud/models.py:102 -#: xpack/plugins/cloud/serializers/task.py:185 +#: xpack/plugins/cloud/serializers/task.py:186 msgid "Always update" msgstr "总是更新" -#: xpack/plugins/cloud/models.py:104 +#: xpack.bak/plugins/cloud/models.py:104 xpack/plugins/cloud/models.py:104 msgid "Fully synchronous" msgstr "完全同步" -#: xpack/plugins/cloud/models.py:109 +#: xpack.bak/plugins/cloud/models.py:109 xpack/plugins/cloud/models.py:109 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:112 xpack/plugins/cloud/models.py:317 -#: xpack/plugins/cloud/models.py:341 +#: xpack.bak/plugins/cloud/models.py:112 xpack.bak/plugins/cloud/models.py:317 +#: xpack.bak/plugins/cloud/models.py:341 xpack/plugins/cloud/models.py:112 +#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/models.py:341 msgid "Strategy" msgstr "策略" +#: xpack.bak/plugins/cloud/models.py:117 xpack.bak/plugins/cloud/models.py:196 #: xpack/plugins/cloud/models.py:117 xpack/plugins/cloud/models.py:196 msgid "Sync instance task" msgstr "同步实例任务" +#: xpack.bak/plugins/cloud/models.py:207 xpack.bak/plugins/cloud/models.py:259 #: xpack/plugins/cloud/models.py:207 xpack/plugins/cloud/models.py:259 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:211 +#: xpack.bak/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:211 msgid "Sync instance snapshot" msgstr "同步实例快照" -#: xpack/plugins/cloud/models.py:215 +#: xpack.bak/plugins/cloud/models.py:215 xpack/plugins/cloud/models.py:215 msgid "Sync instance task execution" msgstr "同步实例任务执行" -#: xpack/plugins/cloud/models.py:239 +#: xpack.bak/plugins/cloud/models.py:239 xpack/plugins/cloud/models.py:239 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:243 +#: xpack.bak/plugins/cloud/models.py:243 xpack/plugins/cloud/models.py:243 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:246 +#: xpack.bak/plugins/cloud/models.py:246 xpack/plugins/cloud/models.py:246 msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:263 +#: xpack.bak/plugins/cloud/models.py:263 xpack/plugins/cloud/models.py:263 msgid "Sync instance detail" msgstr "同步实例详情" -#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/serializers/task.py:72 +#: xpack.bak/plugins/cloud/models.py:275 +#: xpack.bak/plugins/cloud/serializers/task.py:72 +#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/serializers/task.py:73 msgid "Rule relation" msgstr "条件关系" -#: xpack/plugins/cloud/models.py:284 +#: xpack.bak/plugins/cloud/models.py:284 xpack/plugins/cloud/models.py:284 msgid "Task strategy" msgstr "任务策略" -#: xpack/plugins/cloud/models.py:288 +#: xpack.bak/plugins/cloud/models.py:288 xpack/plugins/cloud/models.py:288 msgid "Equal" msgstr "等于" -#: xpack/plugins/cloud/models.py:289 +#: xpack.bak/plugins/cloud/models.py:289 xpack/plugins/cloud/models.py:289 msgid "Not Equal" msgstr "不等于" -#: xpack/plugins/cloud/models.py:290 +#: xpack.bak/plugins/cloud/models.py:290 xpack/plugins/cloud/models.py:290 msgid "In" msgstr "在...中" -#: xpack/plugins/cloud/models.py:291 +#: xpack.bak/plugins/cloud/models.py:291 xpack/plugins/cloud/models.py:291 msgid "Contains" msgstr "包含" -#: xpack/plugins/cloud/models.py:292 +#: xpack.bak/plugins/cloud/models.py:292 xpack/plugins/cloud/models.py:292 msgid "Exclude" msgstr "排除" -#: xpack/plugins/cloud/models.py:293 +#: xpack.bak/plugins/cloud/models.py:293 xpack/plugins/cloud/models.py:293 msgid "Startswith" msgstr "以...开头" -#: xpack/plugins/cloud/models.py:294 +#: xpack.bak/plugins/cloud/models.py:294 xpack/plugins/cloud/models.py:294 msgid "Endswith" msgstr "以...结尾" -#: xpack/plugins/cloud/models.py:300 +#: xpack.bak/plugins/cloud/models.py:300 xpack/plugins/cloud/models.py:300 msgid "Instance platform" msgstr "实例平台" -#: xpack/plugins/cloud/models.py:301 +#: xpack.bak/plugins/cloud/models.py:301 xpack/plugins/cloud/models.py:301 msgid "Instance address" msgstr "实例地址" -#: xpack/plugins/cloud/models.py:308 +#: xpack.bak/plugins/cloud/models.py:308 xpack/plugins/cloud/models.py:308 msgid "Rule attr" msgstr "规则属性" -#: xpack/plugins/cloud/models.py:312 +#: xpack.bak/plugins/cloud/models.py:312 xpack/plugins/cloud/models.py:312 msgid "Rule match" msgstr "规则匹配" -#: xpack/plugins/cloud/models.py:314 +#: xpack.bak/plugins/cloud/models.py:314 xpack/plugins/cloud/models.py:314 msgid "Rule value" msgstr "规则值" -#: xpack/plugins/cloud/models.py:321 xpack/plugins/cloud/serializers/task.py:75 +#: xpack.bak/plugins/cloud/models.py:321 +#: xpack.bak/plugins/cloud/serializers/task.py:75 +#: xpack/plugins/cloud/models.py:321 xpack/plugins/cloud/serializers/task.py:76 msgid "Strategy rule" msgstr "条件" -#: xpack/plugins/cloud/models.py:336 +#: xpack.bak/plugins/cloud/models.py:336 xpack/plugins/cloud/models.py:336 msgid "Action attr" msgstr "动作属性" -#: xpack/plugins/cloud/models.py:338 +#: xpack.bak/plugins/cloud/models.py:338 xpack/plugins/cloud/models.py:338 msgid "Action value" msgstr "动作值" -#: xpack/plugins/cloud/models.py:345 xpack/plugins/cloud/serializers/task.py:78 +#: xpack.bak/plugins/cloud/models.py:345 +#: xpack.bak/plugins/cloud/serializers/task.py:78 +#: xpack/plugins/cloud/models.py:345 xpack/plugins/cloud/serializers/task.py:79 msgid "Strategy action" msgstr "动作" +#: xpack.bak/plugins/cloud/providers/aws_international.py:18 #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" msgstr "中国 (北京)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:19 #: xpack/plugins/cloud/providers/aws_international.py:19 msgid "China (Ningxia)" msgstr "中国 (宁夏)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:22 #: xpack/plugins/cloud/providers/aws_international.py:22 msgid "US East (Ohio)" msgstr "美国东部 (俄亥俄州)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:23 #: xpack/plugins/cloud/providers/aws_international.py:23 msgid "US East (N. Virginia)" msgstr "美国东部 (弗吉尼亚北部)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:24 #: xpack/plugins/cloud/providers/aws_international.py:24 msgid "US West (N. California)" msgstr "美国西部 (加利福尼亚北部)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:25 #: xpack/plugins/cloud/providers/aws_international.py:25 msgid "US West (Oregon)" msgstr "美国西部 (俄勒冈)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:26 #: xpack/plugins/cloud/providers/aws_international.py:26 msgid "Africa (Cape Town)" msgstr "非洲 (开普敦)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:27 #: xpack/plugins/cloud/providers/aws_international.py:27 msgid "Asia Pacific (Hong Kong)" msgstr "亚太地区 (香港)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:28 #: xpack/plugins/cloud/providers/aws_international.py:28 msgid "Asia Pacific (Mumbai)" msgstr "亚太地区 (孟买)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:29 #: xpack/plugins/cloud/providers/aws_international.py:29 msgid "Asia Pacific (Osaka-Local)" msgstr "亚太区域 (大阪当地)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:30 #: xpack/plugins/cloud/providers/aws_international.py:30 msgid "Asia Pacific (Seoul)" msgstr "亚太区域 (首尔)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:31 #: xpack/plugins/cloud/providers/aws_international.py:31 msgid "Asia Pacific (Singapore)" msgstr "亚太区域 (新加坡)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:32 #: xpack/plugins/cloud/providers/aws_international.py:32 msgid "Asia Pacific (Sydney)" msgstr "亚太区域 (悉尼)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:33 #: xpack/plugins/cloud/providers/aws_international.py:33 msgid "Asia Pacific (Tokyo)" msgstr "亚太区域 (东京)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:34 #: xpack/plugins/cloud/providers/aws_international.py:34 msgid "Canada (Central)" msgstr "加拿大 (中部)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:35 #: xpack/plugins/cloud/providers/aws_international.py:35 msgid "Europe (Frankfurt)" msgstr "欧洲 (法兰克福)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:36 #: xpack/plugins/cloud/providers/aws_international.py:36 msgid "Europe (Ireland)" msgstr "欧洲 (爱尔兰)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:37 #: xpack/plugins/cloud/providers/aws_international.py:37 msgid "Europe (London)" msgstr "欧洲 (伦敦)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:38 #: xpack/plugins/cloud/providers/aws_international.py:38 msgid "Europe (Milan)" msgstr "欧洲 (米兰)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:39 #: xpack/plugins/cloud/providers/aws_international.py:39 msgid "Europe (Paris)" msgstr "欧洲 (巴黎)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:40 #: xpack/plugins/cloud/providers/aws_international.py:40 msgid "Europe (Stockholm)" msgstr "欧洲 (斯德哥尔摩)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:41 #: xpack/plugins/cloud/providers/aws_international.py:41 msgid "Middle East (Bahrain)" msgstr "中东 (巴林)" +#: xpack.bak/plugins/cloud/providers/aws_international.py:42 #: xpack/plugins/cloud/providers/aws_international.py:42 msgid "South America (São Paulo)" msgstr "南美洲 (圣保罗)" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:56 +#: xpack.bak/plugins/cloud/providers/jdcloud.py:125 #: xpack/plugins/cloud/providers/baiducloud.py:56 #: xpack/plugins/cloud/providers/jdcloud.py:125 msgid "CN North-Beijing" msgstr "华北-北京" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:57 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:47 +#: xpack.bak/plugins/cloud/providers/jdcloud.py:128 #: xpack/plugins/cloud/providers/baiducloud.py:57 #: xpack/plugins/cloud/providers/huaweicloud.py:47 #: xpack/plugins/cloud/providers/jdcloud.py:128 msgid "CN South-Guangzhou" msgstr "华南-广州" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:58 #: xpack/plugins/cloud/providers/baiducloud.py:58 msgid "CN East-Suzhou" msgstr "华东-苏州" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:59 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:54 #: xpack/plugins/cloud/providers/baiducloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:54 msgid "CN-Hong Kong" msgstr "中国-香港" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:60 #: xpack/plugins/cloud/providers/baiducloud.py:60 msgid "CN Center-Wuhan" msgstr "华中-武汉" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:61 #: xpack/plugins/cloud/providers/baiducloud.py:61 msgid "CN North-Baoding" msgstr "华北-保定" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:62 +#: xpack.bak/plugins/cloud/providers/jdcloud.py:127 #: xpack/plugins/cloud/providers/baiducloud.py:62 #: xpack/plugins/cloud/providers/jdcloud.py:127 msgid "CN East-Shanghai" msgstr "华东-上海" +#: xpack.bak/plugins/cloud/providers/baiducloud.py:63 +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:56 #: xpack/plugins/cloud/providers/baiducloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:56 msgid "AP-Singapore" msgstr "亚太-新加坡" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:44 #: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN North-Beijing1" msgstr "华北-北京1" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:45 #: xpack/plugins/cloud/providers/huaweicloud.py:45 msgid "CN North-Beijing4" msgstr "华北-北京4" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:46 #: xpack/plugins/cloud/providers/huaweicloud.py:46 msgid "CN North-Ulanqab1" msgstr "华北-乌兰察布一" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:48 #: xpack/plugins/cloud/providers/huaweicloud.py:48 msgid "CN South-Shenzhen" msgstr "华南-广州" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:49 #: xpack/plugins/cloud/providers/huaweicloud.py:49 msgid "CN South-Guangzhou-InvitationOnly" msgstr "华南-广州-友好用户环境" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:50 #: xpack/plugins/cloud/providers/huaweicloud.py:50 msgid "CN East-Shanghai2" msgstr "华东-上海2" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:51 #: xpack/plugins/cloud/providers/huaweicloud.py:51 msgid "CN East-Shanghai1" msgstr "华东-上海1" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:53 #: xpack/plugins/cloud/providers/huaweicloud.py:53 msgid "CN Southwest-Guiyang1" msgstr "西南-贵阳1" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:55 #: xpack/plugins/cloud/providers/huaweicloud.py:55 msgid "AP-Bangkok" msgstr "亚太-曼谷" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:58 #: xpack/plugins/cloud/providers/huaweicloud.py:58 msgid "AF-Johannesburg" msgstr "非洲-约翰内斯堡" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:59 msgid "LA-Mexico City1" msgstr "拉美-墨西哥城一" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:60 #: xpack/plugins/cloud/providers/huaweicloud.py:60 msgid "LA-Santiago" msgstr "拉美-圣地亚哥" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:61 #: xpack/plugins/cloud/providers/huaweicloud.py:61 msgid "LA-Sao Paulo1" msgstr "拉美-圣保罗一" +#: xpack.bak/plugins/cloud/providers/huaweicloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:63 msgid "TR-Istanbul" msgstr "TR-Istanbul" +#: xpack.bak/plugins/cloud/providers/jdcloud.py:126 #: xpack/plugins/cloud/providers/jdcloud.py:126 msgid "CN East-Suqian" msgstr "华东-宿迁" -#: xpack/plugins/cloud/serializers/account.py:69 +#: xpack.bak/plugins/cloud/serializers/account.py:69 +#: xpack/plugins/cloud/serializers/account.py:70 msgid "Validity display" msgstr "有效性显示" -#: xpack/plugins/cloud/serializers/account.py:70 +#: xpack.bak/plugins/cloud/serializers/account.py:70 +#: xpack/plugins/cloud/serializers/account.py:71 msgid "Provider display" msgstr "服务商显示" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:17 #: xpack/plugins/cloud/serializers/account_attrs.py:17 msgid "Access key id" msgstr "Access key id" -#: xpack/plugins/cloud/serializers/account_attrs.py:35 -msgid "Client ID" -msgstr "客户端 ID" - +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:41 #: xpack/plugins/cloud/serializers/account_attrs.py:41 msgid "Tenant ID" msgstr "租户 ID" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:44 #: xpack/plugins/cloud/serializers/account_attrs.py:44 msgid "Subscription ID" msgstr "订阅 ID" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:98 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:102 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:126 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:156 +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:206 #: xpack/plugins/cloud/serializers/account_attrs.py:98 #: xpack/plugins/cloud/serializers/account_attrs.py:102 #: xpack/plugins/cloud/serializers/account_attrs.py:126 @@ -9220,42 +9436,52 @@ msgstr "订阅 ID" msgid "API Endpoint" msgstr "API 端点" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:108 #: xpack/plugins/cloud/serializers/account_attrs.py:108 msgid "Auth url" msgstr "认证地址" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:109 #: xpack/plugins/cloud/serializers/account_attrs.py:109 msgid "eg: http://openstack.example.com:5000/v3" msgstr "如: http://openstack.example.com:5000/v3" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:112 #: xpack/plugins/cloud/serializers/account_attrs.py:112 msgid "User domain" msgstr "用户域" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:127 #: xpack/plugins/cloud/serializers/account_attrs.py:127 msgid "Cert File" msgstr "证书文件" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:128 #: xpack/plugins/cloud/serializers/account_attrs.py:128 msgid "Key File" msgstr "密钥文件" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:144 #: xpack/plugins/cloud/serializers/account_attrs.py:144 msgid "Service account key" msgstr "服务账号密钥" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:145 #: xpack/plugins/cloud/serializers/account_attrs.py:145 msgid "The file is in JSON format" msgstr "JSON 格式的文件" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:163 #: xpack/plugins/cloud/serializers/account_attrs.py:163 msgid "IP address invalid `{}`, {}" msgstr "IP 地址无效: `{}`, {}" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:179 #: xpack/plugins/cloud/serializers/account_attrs.py:179 msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" msgstr "例: 192.168.1.0/24,10.0.0.0-10.0.0.255" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:182 #: xpack/plugins/cloud/serializers/account_attrs.py:182 msgid "" "The port is used to detect the validity of the IP address. When the " @@ -9265,27 +9491,33 @@ msgstr "" "端口用来检测 IP 地址的有效性，在同步任务执行时，只会同步有效的 IP 地址。
" "如果端口为 0，则表示所有 IP 地址均有效。" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:190 #: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Hostname prefix" msgstr "主机名前缀" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:193 #: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "IP segment" msgstr "IP 网段" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:197 #: xpack/plugins/cloud/serializers/account_attrs.py:197 msgid "Test port" msgstr "测试端口" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Test timeout" msgstr "测试超时时间" +#: xpack.bak/plugins/cloud/serializers/account_attrs.py:216 #: xpack/plugins/cloud/serializers/account_attrs.py:216 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:151 +#: xpack.bak/plugins/cloud/serializers/task.py:151 +#: xpack/plugins/cloud/serializers/task.py:152 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -9297,101 +9529,276 @@ msgstr "" "到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " "IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:157 +#: xpack.bak/plugins/cloud/serializers/task.py:157 +#: xpack/plugins/cloud/serializers/task.py:158 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:158 +#: xpack.bak/plugins/cloud/serializers/task.py:158 +#: xpack/plugins/cloud/serializers/task.py:159 msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/tasks.py:27 +#: xpack.bak/plugins/cloud/tasks.py:27 xpack/plugins/cloud/tasks.py:27 msgid "Run sync instance task" msgstr "执行同步实例任务" -#: xpack/plugins/cloud/tasks.py:41 +#: xpack.bak/plugins/cloud/tasks.py:41 xpack/plugins/cloud/tasks.py:41 msgid "Period clean sync instance task execution" msgstr "定期清除同步实例任务执行记录" -#: xpack/plugins/interface/api.py:52 +#: xpack.bak/plugins/interface/api.py:52 xpack/plugins/interface/api.py:52 msgid "Restore default successfully." msgstr "恢复默认成功！" -#: xpack/plugins/interface/meta.py:9 +#: xpack.bak/plugins/interface/meta.py:9 xpack/plugins/interface/meta.py:9 +#: xpack/plugins/interface/models.py:45 xpack/plugins/interface/models.py:86 msgid "Interface settings" msgstr "界面设置" -#: xpack/plugins/interface/models.py:23 -msgid "Login title" -msgstr "登录页面标题" +#: xpack.bak/plugins/interface/models.py:23 +msgid "Title of login page" +msgstr "登录页标题" -#: xpack/plugins/interface/models.py:27 -msgid "Login image" -msgstr "登录页面图片" +#: xpack.bak/plugins/interface/models.py:27 +msgid "Image of login page" +msgstr "登录页图片" +#: xpack.bak/plugins/interface/models.py:31 #: xpack/plugins/interface/models.py:31 msgid "Website icon" msgstr "网站图标" -#: xpack/plugins/interface/models.py:35 -msgid "Index logo" +#: xpack.bak/plugins/interface/models.py:35 +msgid "Logo of management page" msgstr "管理页面 Logo" -#: xpack/plugins/interface/models.py:39 -#, fuzzy -#| msgid "Logout" -msgid "Logout logo" -msgstr "注销登录" +#: xpack.bak/plugins/interface/models.py:39 +msgid "Logo of logout page" +msgstr "退出页面小 Logo" +#: xpack.bak/plugins/interface/models.py:41 #: xpack/plugins/interface/models.py:41 #: xpack/plugins/interface/serializers/interface.py:26 msgid "Theme" msgstr "主题" +#: xpack.bak/plugins/interface/models.py:42 #: xpack/plugins/interface/models.py:42 msgid "Footer content" msgstr "页脚内容" -#: xpack/plugins/interface/models.py:45 xpack/plugins/interface/models.py:86 +#: xpack.bak/plugins/interface/models.py:45 +#: xpack.bak/plugins/interface/models.py:86 msgid "Interface setting" msgstr "界面设置" -#: xpack/plugins/interface/serializers/interface.py:37 -msgid "Wide logo on top" -msgstr "顶部宽 Logo" - -#: xpack/plugins/interface/serializers/interface.py:38 -msgid "Small logo without text" -msgstr "方形小 Logo" - -#: xpack/plugins/license/api.py:52 +#: xpack.bak/plugins/license/api.py:52 xpack/plugins/license/api.py:52 msgid "License import successfully" msgstr "许可证导入成功" -#: xpack/plugins/license/api.py:53 +#: xpack.bak/plugins/license/api.py:53 msgid "License is invalid" msgstr "无效的许可证" +#: xpack.bak/plugins/license/meta.py:10 xpack.bak/plugins/license/models.py:144 #: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:144 msgid "License" msgstr "许可证" -#: xpack/plugins/license/models.py:80 +#: xpack.bak/plugins/license/models.py:80 xpack/plugins/license/models.py:80 msgid "Basic edition" msgstr "企业基础版" -#: xpack/plugins/license/models.py:82 +#: xpack.bak/plugins/license/models.py:82 xpack/plugins/license/models.py:82 msgid "Standard edition" msgstr "企业标准版" -#: xpack/plugins/license/models.py:84 +#: xpack.bak/plugins/license/models.py:84 xpack/plugins/license/models.py:84 msgid "Professional edition" msgstr "企业专业版" -#: xpack/plugins/license/models.py:86 +#: xpack.bak/plugins/license/models.py:86 xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "企业旗舰版" +#: xpack/exceptions.py:8 +msgid "" +"Based on the current task configuration, assets that do not match the " +"strategy will skipped." +msgstr "" + +#: xpack/plugins/cloud/manager.py:41 +#, fuzzy, python-format +#| msgid "Task execution id" +msgid "Task \"%s\" starts executing" +msgstr "任务执行 ID" + +#: xpack/plugins/cloud/manager.py:71 +#, fuzzy +#| msgid "View details" +msgid "View the task details path: " +msgstr "查看详情" + +#: xpack/plugins/cloud/manager.py:74 +#, fuzzy +#| msgid "Account " +msgid "Account Details" +msgstr "账号" + +#: xpack/plugins/cloud/manager.py:75 +msgid "Synchronization History List" +msgstr "" + +#: xpack/plugins/cloud/manager.py:75 +msgid "Synchronization Instance List" +msgstr "" + +#: xpack/plugins/cloud/manager.py:83 +#, fuzzy +#| msgid "Task execution id" +msgid "Task execution completed" +msgstr "任务执行 ID" + +#: xpack/plugins/cloud/manager.py:87 +#, fuzzy +#| msgid "No user synchronization required" +msgid "Synchronization regions" +msgstr "没有用户需要同步" + +#: xpack/plugins/cloud/manager.py:110 +#, python-format +msgid "Get instances of region \"%s\" error, error: %s" +msgstr "" + +#: xpack/plugins/cloud/manager.py:128 +#, python-format +msgid "The instance IP \"%s\" is not in network segment \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:164 +#, python-format +msgid "Failed to synchronize the instance \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:316 +#, python-format +msgid "" +"The updated platform of asset \"%s\" is inconsistent with the original " +"platform type. Skip platform and protocol updates" +msgstr "" + +#: xpack/plugins/cloud/manager.py:358 +#, fuzzy, python-format +#| msgid "Name already exists" +msgid "The asset \"%s\" already exists" +msgstr "名称已存在" + +#: xpack/plugins/cloud/manager.py:362 +#, fuzzy, python-format +#| msgid "Gather asset facts" +msgid "Update asset \"%s\"" +msgstr "收集资产信息" + +#: xpack/plugins/cloud/manager.py:365 +#, fuzzy, python-format +#| msgid "Asset has been disabled, skipped: {}" +msgid "Asset \"%s\" has been updated" +msgstr "资产已经被禁用, 跳过: {}" + +#: xpack/plugins/cloud/manager.py:376 +#, python-format +msgid "Prepare to create asset \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:388 +#, python-format +msgid "Set nodes \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:414 +#, fuzzy, python-format +#| msgid "Delete account: %s" +msgid "Set accounts \"%s\"" +msgstr "删除账号: %s" + +#: xpack/plugins/cloud/manager.py:430 +#, fuzzy, python-format +#| msgid "Image protocol" +msgid "Set protocols \"%s\"" +msgstr "镜像协议" + +#: xpack/plugins/cloud/providers/lan.py:79 +#, python-format +msgid "Port \"%(port)s\" of instance IP \"%(ip)s\" is not reachable" +msgstr "" + +#: xpack/plugins/interface/models.py:23 +msgid "Login title" +msgstr "登录页面标题" + +#: xpack/plugins/interface/models.py:27 +msgid "Login image" +msgstr "登录页面图片" + +#: xpack/plugins/interface/models.py:35 +msgid "Index logo" +msgstr "管理页面 Logo" + +#: xpack/plugins/interface/models.py:39 +#, fuzzy +#| msgid "Logout" +msgid "Logout logo" +msgstr "注销登录" + +#: xpack/plugins/interface/serializers/interface.py:37 +msgid "Wide logo on top" +msgstr "顶部宽 Logo" + +#: xpack/plugins/interface/serializers/interface.py:38 +msgid "Small logo without text" +msgstr "方形小 Logo" + +#: xpack/plugins/license/api.py:53 +#, fuzzy +#| msgid "Invalid ip" +msgid "Invalid license" +msgstr "无效 IP" + +#~ msgid "Labels" +#~ msgstr "标签" + +#, fuzzy +#~| msgid "FeiShu Auth" +#~ msgid "Enable FeiShu Auth" +#~ msgstr "飞书 认证" + +#, fuzzy +#~| msgid "Lark Auth" +#~ msgid "Enable Lark Auth" +#~ msgstr "Lark 认证" + +#~ msgid "Password auth" +#~ msgstr "密码认证" + +#~ msgid "Public key auth" +#~ msgstr "公钥授权" + +#~ msgid "" +#~ "Information: If use other auth method, like AD/LDAP, you should disable " +#~ "this to avoid being able to log in after deleting" +#~ msgstr "" +#~ "提示：如果你使用其它认证方式，如 AD/LDAP，你应该禁用此项，以避免第三方系统" +#~ "删除后，还可以登录" + +#~ msgid "Force enable" +#~ msgstr "强制启用" + +#, fuzzy +#~| msgid "Same with user" +#~ msgid "Fullname of user" +#~ msgstr "用户名与用户相同" + #~ msgid "App Applications" #~ msgstr "应用管理" @@ -9572,18 +9979,6 @@ msgstr "企业旗舰版" #~ msgid "Key password" #~ msgstr "密钥密码" -#~ msgid "Title of login page" -#~ msgstr "登录页标题" - -#~ msgid "Image of login page" -#~ msgstr "登录页图片" - -#~ msgid "Logo of management page" -#~ msgstr "管理页面 Logo" - -#~ msgid "Logo of logout page" -#~ msgstr "退出页面小 Logo" - #~ msgid "Organization ID" #~ msgstr "组织 ID" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 054fe32b8..557885e4c 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -989,7 +989,7 @@ "SearchAncestorNodePerm": "Search for authorizations simultaneously on the current node and ancestor nodes", "Secret": "Password", "SecretKey": "Key", - "SubscriptionID": "Subscription authorization ID", + "SubscriptionID": "ID", "SecretKeyStrategy": "Password policy", "Secure": "Security", "Security": "Security", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 6efbba8cf..d08b3902c 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -208,7 +208,7 @@ "BelongAll": "同时包含", "BelongTo": "任意包含", "Bind": "绑定", - "BindLabel": "关联标签", + "BindTag": "关联标签", "BindResource": "关联资源", "BindSuccess": "绑定成功", "BlockedIPS": "已锁定的 IP", @@ -589,7 +589,7 @@ "IsLocked": "是否暂停", "IsSuccess": "成功", "IsSyncAccountHelpText": "收集完成后会把收集的账号同步到资产", - "IsSyncAccountLabel": "同步到资产", + "IsSyncAccountTag": "同步到资产", "JDCloud": "京东云", "Job": "作业", "JobCenter": "作业中心", @@ -603,11 +603,11 @@ "GeneralSetting": "通用配置", "LAN": "局域网", "LDAPUser": "LDAP 用户", - "Label": "标签", - "LabelCreate": "创建标签", - "LabelInputFormatValidation": "标签格式错误，正确格式为：name:value", - "LabelList": "标签列表", - "LabelUpdate": "更新标签", + "Tag": "标签", + "TagCreate": "创建标签", + "TagInputFormatValidation": "标签格式错误，正确格式为：name:value", + "TagList": "标签列表", + "TagUpdate": "更新标签", "Language": "语言", "Last30": "最近 30 次", "Last30Days": "近30天", @@ -981,7 +981,7 @@ "SelectByAttr": "属性筛选", "SelectFile": "选择文件", "SelectKeyOrCreateNew": "选择标签键或创建新的", - "SelectLabelFilter": "选择标签搜索", + "SelectTagFilter": "选择标签搜索", "SelectPlatforms": "选择平台", "SelectProperties": "选择属性", "SelectResource": "选择资源", diff --git a/apps/terminal/migrations/0001_initial.py b/apps/terminal/migrations/0001_initial.py index ebbed9ee2..8ef4d42ee 100644 --- a/apps/terminal/migrations/0001_initial.py +++ b/apps/terminal/migrations/0001_initial.py @@ -1,12 +1,13 @@ # Generated by Django 4.1.13 on 2024-05-09 03:16 -import common.db.fields +import uuid + import django.core.validators -from django.db import migrations, models -import django.db.models.deletion import django.utils.timezone +from django.db import migrations, models + +import common.db.fields import terminal.models.component.terminal -import uuid class Migration(migrations.Migration): @@ -138,7 +139,7 @@ class Migration(migrations.Migration): ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)), ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')), ('meta', common.db.fields.EncryptJsonDictTextField(default={})), - ('is_default', models.BooleanField(default=False, verbose_name='Default storage')), + ('is_default', models.BooleanField(default=False, verbose_name='Default')), ('type', models.CharField(choices=[('null', 'Null'), ('server', 'Server'), ('es', 'Elasticsearch')], default='server', max_length=16, verbose_name='Type')), ], options={ @@ -201,7 +202,7 @@ class Migration(migrations.Migration): ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)), ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')), ('meta', common.db.fields.EncryptJsonDictTextField(default={})), - ('is_default', models.BooleanField(default=False, verbose_name='Default storage')), + ('is_default', models.BooleanField(default=False, verbose_name='Default')), ('type', models.CharField(choices=[('null', 'Null'), ('server', 'Server'), ('s3', 'S3'), ('ceph', 'Ceph'), ('swift', 'Swift'), ('oss', 'OSS'), ('azure', 'Azure'), ('obs', 'OBS'), ('cos', 'COS'), ('sftp', 'SFTP')], default='server', max_length=16, verbose_name='Type')), ], options={ diff --git a/apps/terminal/models/component/storage.py b/apps/terminal/models/component/storage.py index f122c90b3..40c0c0f79 100644 --- a/apps/terminal/models/component/storage.py +++ b/apps/terminal/models/component/storage.py @@ -25,7 +25,7 @@ logger = get_logger(__file__) class CommonStorageModelMixin(models.Model): name = models.CharField(max_length=128, verbose_name=_("Name"), unique=True) meta = EncryptJsonDictTextField(default={}) - is_default = models.BooleanField(default=False, verbose_name=_('Default storage')) + is_default = models.BooleanField(default=False, verbose_name=_("Default")) class Meta: abstract = True @@ -35,17 +35,16 @@ class CommonStorageModelMixin(models.Model): def set_to_default(self): self.is_default = True - self.save(update_fields=['is_default']) - self.__class__.objects.select_for_update() \ - .filter(is_default=True) \ - .exclude(id=self.id) \ - .update(is_default=False) + self.save(update_fields=["is_default"]) + self.__class__.objects.select_for_update().filter(is_default=True).exclude( + id=self.id + ).update(is_default=False) @classmethod def default(cls): objs = cls.objects.filter(is_default=True) if not objs: - objs = cls.objects.filter(name='default', type='server') + objs = cls.objects.filter(name="default", type="server") if not objs: objs = cls.objects.all() return objs.first() @@ -53,8 +52,10 @@ class CommonStorageModelMixin(models.Model): class CommandStorage(CommonStorageModelMixin, JMSBaseModel): type = models.CharField( - max_length=16, choices=const.CommandStorageType.choices, - default=const.CommandStorageType.server.value, verbose_name=_('Type'), + max_length=16, + choices=const.CommandStorageType.choices, + default=const.CommandStorageType.server.value, + verbose_name=_("Type"), ) @property @@ -76,20 +77,20 @@ class CommandStorage(CommonStorageModelMixin, JMSBaseModel): @property def config(self): config = copy.deepcopy(self.meta) - config.update({'TYPE': self.type}) + config.update({"TYPE": self.type}) return config @property def valid_config(self): config = self.config - if self.type_es and config.get('INDEX_BY_DATE'): + if self.type_es and config.get("INDEX_BY_DATE"): engine_mod = import_module(TYPE_ENGINE_MAPPING[self.type]) # 这里使用一个全新的 config, 防止修改当前的 config store = engine_mod.CommandStore(self.config) store._ensure_index_exists() - index_prefix = config.get('INDEX') or 'jumpserver' + index_prefix = config.get("INDEX") or "jumpserver" date = local_now_date_display() - config['INDEX'] = '%s-%s' % (index_prefix, date) + config["INDEX"] = "%s-%s" % (index_prefix, date) return config def is_valid(self): @@ -97,7 +98,7 @@ class CommandStorage(CommonStorageModelMixin, JMSBaseModel): return True if self.type not in TYPE_ENGINE_MAPPING: - logger.error(f'Command storage `{self.type}` not support') + logger.error(f"Command storage `{self.type}` not support") return False engine_mod = import_module(TYPE_ENGINE_MAPPING[self.type]) @@ -105,7 +106,9 @@ class CommandStorage(CommonStorageModelMixin, JMSBaseModel): return store.ping(timeout=3) def is_use(self): - return Terminal.objects.filter(command_storage=self.name, is_deleted=False).exists() + return Terminal.objects.filter( + command_storage=self.name, is_deleted=False + ).exists() def get_command_queryset(self): if self.type_null: @@ -121,14 +124,17 @@ class CommandStorage(CommonStorageModelMixin, JMSBaseModel): qs.model = Command return qs - logger.error(f'Command storage `{self.type}` not support') + logger.error(f"Command storage `{self.type}` not support") return Command.objects.none() - def save(self, force_insert=False, force_update=False, using=None, - update_fields=None): + def save( + self, force_insert=False, force_update=False, using=None, update_fields=None + ): super().save( - force_insert=force_insert, force_update=force_update, - using=using, update_fields=update_fields + force_insert=force_insert, + force_update=force_update, + using=using, + update_fields=update_fields, ) if self.type in TYPE_ENGINE_MAPPING: @@ -142,8 +148,10 @@ class CommandStorage(CommonStorageModelMixin, JMSBaseModel): class ReplayStorage(CommonStorageModelMixin, JMSBaseModel): type = models.CharField( - max_length=16, choices=const.ReplayStorageType.choices, - default=const.ReplayStorageType.server.value, verbose_name=_('Type') + max_length=16, + choices=const.ReplayStorageType.choices, + default=const.ReplayStorageType.server.value, + verbose_name=_("Type"), ) @property @@ -179,11 +187,11 @@ class ReplayStorage(CommonStorageModelMixin, JMSBaseModel): _type = const.ReplayStorageType.s3.value else: _type = self.type - _config.update({'TYPE': _type}) + _config.update({"TYPE": _type}) # add special config if self.type_swift: - _config.update({'signer': 'S3SignerType'}) + _config.update({"signer": "S3SignerType"}) # add meta config _config.update(self.meta) @@ -193,12 +201,14 @@ class ReplayStorage(CommonStorageModelMixin, JMSBaseModel): if self.type_null_or_server: return True storage = jms_storage.get_object_storage(self.config) - target = 'tests.py' - src = os.path.join(settings.BASE_DIR, 'common', target) + target = "tests.py" + src = os.path.join(settings.BASE_DIR, "common", target) return storage.is_valid(src, target) def is_use(self): - return Terminal.objects.filter(replay_storage=self.name, is_deleted=False).exists() + return Terminal.objects.filter( + replay_storage=self.name, is_deleted=False + ).exists() class Meta: verbose_name = _("Replay storage")