From 769d5fbd96f1065dda99c403be0918802d69deae Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 17 Aug 2023 10:54:35 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20applet=20=E4=B8=8A=E4=BC=A0=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/ja/LC_MESSAGES/django.po | 518 ++++++++++++++------------- apps/locale/zh/LC_MESSAGES/django.po | 518 ++++++++++++++------------- apps/terminal/api/applet/applet.py | 4 + 3 files changed, 526 insertions(+), 514 deletions(-) diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 98f9f02bb..c406683cc 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/apps/locale/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: 2023-08-15 16:45+0800\n" +"POT-Creation-Date: 2023-08-17 10:41+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,7 @@ msgid "Access key" msgstr "アクセスキー" #: accounts/const/account.py:9 assets/models/_user.py:48 -#: authentication/models/sso_token.py:14 settings/serializers/feature.py:48 +#: authentication/models/sso_token.py:14 settings/serializers/feature.py:52 msgid "Token" msgstr "トークン" @@ -213,7 +213,7 @@ msgstr "HashiCorp Vault" #: terminal/serializers/session.py:26 #: 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:253 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:212 msgid "Asset" msgstr "資産" @@ -248,7 +248,7 @@ msgstr "ソース ID" #: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 #: 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:89 +#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:85 msgid "Account" msgstr "アカウント" @@ -287,7 +287,7 @@ msgstr "アカウントバックアップ計画" #: accounts/models/automations/backup_account.py:91 #: assets/models/automations/base.py:115 audits/models.py:60 -#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:221 +#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:228 #: ops/templates/ops/celery_task_log.html:75 #: perms/models/asset_permission.py:72 terminal/models/applet/host.py:140 #: terminal/models/session/session.py:44 @@ -315,7 +315,7 @@ msgid "Trigger mode" msgstr "トリガーモード" #: accounts/models/automations/backup_account.py:105 audits/models.py:194 -#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205 +#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:168 msgid "Reason" msgstr "理由" @@ -420,7 +420,7 @@ msgstr "開始日" #: accounts/models/automations/change_secret.py:91 #: assets/models/automations/base.py:116 ops/models/base.py:56 -#: ops/models/celery.py:64 ops/models/job.py:222 +#: ops/models/celery.py:64 ops/models/job.py:229 #: terminal/models/applet/host.py:141 msgid "Date finished" msgstr "終了日" @@ -506,7 +506,7 @@ msgstr "アカウントの確認" #: assets/serializers/platform.py:110 assets/serializers/platform.py:223 #: authentication/serializers/connect_token_secret.py:110 ops/mixin.py:21 #: ops/models/adhoc.py:20 ops/models/celery.py:15 ops/models/celery.py:57 -#: ops/models/job.py:119 ops/models/playbook.py:28 ops/serializers/job.py:20 +#: ops/models/job.py:126 ops/models/playbook.py:28 ops/serializers/job.py:20 #: orgs/models.py:82 perms/models/asset_permission.py:56 rbac/models/role.py:29 #: settings/models.py:32 settings/serializers/msg.py:82 #: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12 @@ -514,8 +514,7 @@ msgstr "アカウントの確認" #: terminal/models/component/storage.py:26 terminal/models/component/task.py:13 #: terminal/models/component/terminal.py:84 users/forms/profile.py:33 #: users/models/group.py:13 users/models/user.py:787 -#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:273 -#: xpack/plugins/cloud/serializers/task.py:68 +#: xpack/plugins/cloud/models.py:28 msgid "Name" msgstr "名前" @@ -532,7 +531,7 @@ msgstr "特権アカウント" msgid "Is active" msgstr "アクティブです。" -#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325 +#: accounts/models/template.py:19 msgid "Account template" msgstr "アカウント テンプレート" @@ -638,8 +637,8 @@ msgstr "カテゴリ" #: assets/models/cmd_filter.py:74 assets/models/platform.py:90 #: assets/serializers/asset/common.py:122 assets/serializers/platform.py:112 #: assets/serializers/platform.py:127 audits/serializers.py:49 -#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:130 -#: perms/serializers/user_permission.py:27 settings/serializers/feature.py:42 +#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:137 +#: perms/serializers/user_permission.py:27 settings/serializers/feature.py:46 #: terminal/models/applet/applet.py:38 terminal/models/component/storage.py:57 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 #: terminal/serializers/session.py:21 terminal/serializers/storage.py:226 @@ -673,7 +672,7 @@ msgstr "編集済み" #: accounts/serializers/automations/base.py:22 acls/models/base.py:97 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 ops/models/base.py:17 -#: ops/models/job.py:132 ops/serializers/job.py:21 +#: ops/models/job.py:139 ops/serializers/job.py:21 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 msgid "Assets" msgstr "資産" @@ -764,14 +763,14 @@ msgstr "" #: accounts/serializers/account/virtual.py:19 assets/models/_user.py:27 #: assets/models/cmd_filter.py:40 assets/models/cmd_filter.py:88 #: assets/models/group.py:20 common/db/models.py:36 ops/models/adhoc.py:26 -#: ops/models/job.py:138 ops/models/playbook.py:31 rbac/models/role.py:37 +#: ops/models/job.py:145 ops/models/playbook.py:31 rbac/models/role.py:37 #: settings/models.py:37 terminal/models/applet/applet.py:44 #: terminal/models/applet/applet.py:284 terminal/models/applet/host.py:142 #: terminal/models/component/endpoint.py:24 #: terminal/models/component/endpoint.py:104 #: terminal/models/session/session.py:46 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:297 users/models/user.py:826 -#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:109 +#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:111 msgid "Comment" msgstr "コメント" @@ -892,13 +891,11 @@ msgstr "警告" #: acls/models/base.py:37 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:97 -#: xpack/plugins/cloud/models.py:275 msgid "Priority" msgstr "優先順位" #: acls/models/base.py:38 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:98 -#: xpack/plugins/cloud/models.py:276 msgid "1-100, the lower the value will be match first" msgstr "1-100、低い値は最初に一致します" @@ -935,7 +932,6 @@ msgid "Command" msgstr "コマンド" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack/plugins/cloud/models.py:291 msgid "Regex" msgstr "正規情報" @@ -1032,7 +1028,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "いずれのレビューアも組織 '{}' に属していません" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:133 +#: xpack/plugins/cloud/serializers/task.py:22 msgid "IP address invalid: `{}`" msgstr "IPアドレスが無効: '{}'" @@ -1060,7 +1056,7 @@ msgstr "期間" msgid "Applications" msgstr "アプリケーション" -#: applications/models.py:16 xpack/plugins/cloud/models.py:37 +#: applications/models.py:16 xpack/plugins/cloud/models.py:33 #: xpack/plugins/cloud/serializers/account.py:63 msgid "Attrs" msgstr "ツールバーの" @@ -1169,7 +1165,7 @@ msgstr "脚本" #: assets/const/category.py:10 assets/models/asset/host.py:8 #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:67 -#: settings/serializers/feature.py:45 terminal/models/component/endpoint.py:13 +#: settings/serializers/feature.py:49 terminal/models/component/endpoint.py:13 #: terminal/serializers/applet.py:17 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" @@ -1354,7 +1350,7 @@ msgstr "SSHパブリックキー" #: assets/models/_user.py:28 assets/models/automations/base.py:114 #: assets/models/cmd_filter.py:41 assets/models/group.py:19 -#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:220 +#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:227 #: users/models/user.py:1018 msgid "Date created" msgstr "作成された日付" @@ -1458,13 +1454,14 @@ msgstr "アドレス" #: assets/models/asset/common.py:151 assets/models/platform.py:119 #: authentication/serializers/connect_token_secret.py:115 -#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321 +#: perms/serializers/user_permission.py:24 +#: xpack/plugins/cloud/serializers/account_attrs.py:196 msgid "Platform" msgstr "プラットフォーム" #: assets/models/asset/common.py:153 assets/models/domain.py:21 #: authentication/serializers/connect_token_secret.py:133 -#: perms/serializers/user_permission.py:29 xpack/plugins/cloud/models.py:323 +#: perms/serializers/user_permission.py:29 msgid "Domain" msgstr "ドメイン" @@ -1521,7 +1518,7 @@ msgstr "証明書チェックを無視" msgid "Proxy" msgstr "プロキシー" -#: assets/models/automations/base.py:22 ops/models/job.py:216 +#: assets/models/automations/base.py:22 ops/models/job.py:223 #: settings/serializers/auth/sms.py:99 msgid "Parameters" msgstr "パラメータ" @@ -1535,13 +1532,13 @@ msgid "Asset automation task" msgstr "アセットの自動化タスク" #: assets/models/automations/base.py:113 audits/models.py:199 -#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:213 +#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:220 #: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:139 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:201 -#: xpack/plugins/cloud/models.py:257 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:164 +#: xpack/plugins/cloud/models.py:216 msgid "Status" msgstr "ステータス" @@ -1605,7 +1602,7 @@ msgstr "資産グループ" #: assets/models/group.py:31 assets/models/platform.py:19 #: assets/serializers/platform.py:113 -#: xpack/plugins/cloud/providers/nutanix.py:30 +#: xpack/plugins/cloud/providers/nutanix.py:32 msgid "Default" msgstr "デフォルト" @@ -1655,7 +1652,7 @@ msgid "Parent key" msgstr "親キー" #: assets/models/node.py:558 perms/serializers/permission.py:35 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:322 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:96 msgid "Node" msgstr "ノード" @@ -1676,7 +1673,7 @@ msgid "Public" msgstr "開ける" #: assets/models/platform.py:21 assets/serializers/platform.py:48 -#: settings/serializers/settings.py:66 +#: settings/serializers/settings.py:65 #: users/templates/users/reset_password.html:29 msgid "Setting" msgstr "設定" @@ -1796,8 +1793,7 @@ msgstr "" #: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:72 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324 -#: xpack/plugins/cloud/serializers/task.py:31 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:99 msgid "Protocols" msgstr "プロトコル" @@ -2299,7 +2295,7 @@ msgstr "ユーザー %s が現在のリソースでタスク (%s) を実行し msgid "SSH Key" msgstr "SSHキー" -#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:10 +#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:13 msgid "SSO" msgstr "SSO" @@ -2986,7 +2982,7 @@ msgstr "コードエラー" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:441 +#: jumpserver/conf.py:444 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -3581,11 +3577,11 @@ msgstr "検索のエクスポート: %s" msgid "User %s view/export secret" msgstr "ユーザー %s がパスワードを閲覧/導き出しました" -#: jumpserver/conf.py:440 +#: jumpserver/conf.py:443 msgid "Create account successfully" msgstr "アカウントを正常に作成" -#: jumpserver/conf.py:442 +#: jumpserver/conf.py:445 msgid "Your account has been created successfully" msgstr "アカウントが正常に作成されました" @@ -3725,7 +3721,7 @@ msgstr "VCS" msgid "Adhoc" msgstr "コマンド#コマンド#" -#: ops/const.py:39 ops/models/job.py:128 +#: ops/const.py:39 ops/models/job.py:135 msgid "Playbook" msgstr "Playbook" @@ -3794,17 +3790,17 @@ msgstr "定期的または定期的に設定を行う必要があります" msgid "Pattern" msgstr "パターン" -#: ops/models/adhoc.py:23 ops/models/job.py:123 +#: ops/models/adhoc.py:23 ops/models/job.py:130 msgid "Module" msgstr "モジュール" -#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:122 +#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:129 #: terminal/models/component/task.py:14 msgid "Args" msgstr "アルグ" #: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53 -#: ops/models/job.py:131 ops/models/job.py:219 ops/models/playbook.py:30 +#: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30 #: terminal/models/session/sharing.py:24 msgid "Creator" msgstr "作成者" @@ -3821,12 +3817,12 @@ msgstr "最後の実行" msgid "Date last run" msgstr "最終実行日" -#: ops/models/base.py:51 ops/models/job.py:217 -#: xpack/plugins/cloud/models.py:199 +#: ops/models/base.py:51 ops/models/job.py:224 +#: xpack/plugins/cloud/models.py:162 msgid "Result" msgstr "結果" -#: ops/models/base.py:52 ops/models/job.py:218 +#: ops/models/base.py:52 ops/models/job.py:225 msgid "Summary" msgstr "概要" @@ -3859,43 +3855,43 @@ msgstr "発売日" msgid "Celery Task Execution" msgstr "Celery タスク実行" -#: ops/models/job.py:125 +#: ops/models/job.py:132 msgid "Chdir" msgstr "実行ディレクトリ" -#: ops/models/job.py:126 +#: ops/models/job.py:133 msgid "Timeout (Seconds)" msgstr "タイムアウト(秒)" -#: ops/models/job.py:133 +#: ops/models/job.py:140 msgid "Use Parameter Define" msgstr "パラメータ定義を使用する" -#: ops/models/job.py:134 +#: ops/models/job.py:141 msgid "Parameters define" msgstr "パラメータ定義" -#: ops/models/job.py:135 +#: ops/models/job.py:142 msgid "Runas" msgstr "ユーザーとして実行" -#: ops/models/job.py:137 +#: ops/models/job.py:144 msgid "Runas policy" msgstr "ユーザー ポリシー" -#: ops/models/job.py:201 +#: ops/models/job.py:208 msgid "Job" msgstr "ジョブ#ジョブ#" -#: ops/models/job.py:224 +#: ops/models/job.py:231 msgid "Material" msgstr "Material" -#: ops/models/job.py:226 +#: ops/models/job.py:233 msgid "Material Type" msgstr "Material を選択してオプションを設定します。" -#: ops/models/job.py:526 +#: ops/models/job.py:533 msgid "Job Execution" msgstr "ジョブ実行" @@ -4370,7 +4366,8 @@ msgstr "リモートアプリケーション" msgid "Ticket comment" msgstr "チケットコメント" -#: rbac/tree.py:124 tickets/models/ticket/general.py:307 +#: rbac/tree.py:124 settings/serializers/feature.py:64 +#: tickets/models/ticket/general.py:307 msgid "Ticket" msgstr "チケット" @@ -4472,42 +4469,54 @@ msgid "Can change other setting" msgstr "他の設定を変えることができます" #: settings/serializers/auth/base.py:12 +#, fuzzy +#| msgid "MFA Auth" +msgid "LDAP Auth" +msgstr "MFA マルチファクタ認証" + +#: settings/serializers/auth/base.py:13 msgid "CAS Auth" msgstr "CAS 認証" -#: settings/serializers/auth/base.py:13 +#: settings/serializers/auth/base.py:14 msgid "OPENID Auth" msgstr "OPENID 認証" -#: settings/serializers/auth/base.py:14 -msgid "RADIUS Auth" -msgstr "RADIUS 認証" - #: settings/serializers/auth/base.py:15 -msgid "DingTalk Auth" -msgstr "くぎ 認証" - -#: settings/serializers/auth/base.py:16 -msgid "FeiShu Auth" -msgstr "飛本 認証" - -#: settings/serializers/auth/base.py:17 -msgid "WeCom Auth" -msgstr "企業微信 認証" - -#: settings/serializers/auth/base.py:18 -msgid "SSO Auth" -msgstr "SSO Token 認証" - -#: settings/serializers/auth/base.py:19 msgid "SAML2 Auth" msgstr "SAML2 認証" -#: settings/serializers/auth/base.py:22 settings/serializers/basic.py:17 +#: settings/serializers/auth/base.py:16 +#, fuzzy +#| msgid "Enable OAuth2 Auth" +msgid "OAuth2 Auth" +msgstr "OAuth2認証の有効化" + +#: settings/serializers/auth/base.py:17 +msgid "RADIUS Auth" +msgstr "RADIUS 認証" + +#: settings/serializers/auth/base.py:18 +msgid "DingTalk Auth" +msgstr "くぎ 認証" + +#: settings/serializers/auth/base.py:19 +msgid "FeiShu Auth" +msgstr "飛本 認証" + +#: settings/serializers/auth/base.py:20 +msgid "WeCom Auth" +msgstr "企業微信 認証" + +#: settings/serializers/auth/base.py:21 +msgid "SSO Auth" +msgstr "SSO Token 認証" + +#: settings/serializers/auth/base.py:24 msgid "Forgot password url" msgstr "パスワードのURLを忘れた" -#: settings/serializers/auth/base.py:28 +#: settings/serializers/auth/base.py:30 msgid "Enable login redirect msg" msgstr "ログインリダイレクトの有効化msg" @@ -4864,20 +4873,20 @@ msgstr "請求方法です" msgid "The value in the parameter must contain %s" msgstr "パラメータの値には必ず %s が含まれます" -#: settings/serializers/auth/sso.py:13 +#: settings/serializers/auth/sso.py:16 msgid "Enable SSO auth" msgstr "SSO Token認証の有効化" -#: settings/serializers/auth/sso.py:14 +#: settings/serializers/auth/sso.py:17 msgid "Other service can using SSO token login to JumpServer without password" msgstr "" "他のサービスはパスワードなしでJumpServerへのSSOトークンログインを使用できます" -#: settings/serializers/auth/sso.py:17 +#: settings/serializers/auth/sso.py:20 msgid "SSO auth key TTL" msgstr "Token有効期間" -#: settings/serializers/auth/sso.py:17 +#: settings/serializers/auth/sso.py:20 #: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "Unit: second" msgstr "単位: 秒" @@ -4904,35 +4913,27 @@ msgstr "ユーザーガイドurl" msgid "User first login update profile done redirect to it" msgstr "ユーザーの最初のログイン更新プロファイルがリダイレクトされました" -#: settings/serializers/basic.py:18 -msgid "" -"The forgot password url on login page, If you use ldap or cas external " -"authentication, you can set it" -msgstr "" -"ログインページでパスワードのURLを忘れてしまいました。ldapまたはcasの外部認証" -"を使用している場合は、設定できます。" - -#: settings/serializers/basic.py:22 +#: settings/serializers/basic.py:17 msgid "Global organization name" msgstr "グローバル組織名" -#: settings/serializers/basic.py:23 +#: settings/serializers/basic.py:18 msgid "The name of global organization to display" msgstr "表示するグローバル組織の名前" -#: settings/serializers/basic.py:26 +#: settings/serializers/basic.py:21 msgid "Help Docs URL" msgstr "ドキュメントリンク" -#: settings/serializers/basic.py:27 +#: settings/serializers/basic.py:22 msgid "default: http://docs.jumpserver.org" msgstr "デフォルト: http://docs.jumpserver.org" -#: settings/serializers/basic.py:30 +#: settings/serializers/basic.py:25 msgid "Help Support URL" msgstr "サポートリンク" -#: settings/serializers/basic.py:31 +#: settings/serializers/basic.py:26 msgid "default: http://www.jumpserver.org/support/" msgstr "デフォルト: http://www.jumpserver.org/support/" @@ -4984,51 +4985,63 @@ msgstr "件名" msgid "More url" msgstr "もっとURL" -#: settings/serializers/feature.py:35 -msgid "Enable announcement" -msgstr "アナウンスの有効化" - -#: settings/serializers/feature.py:36 +#: settings/serializers/feature.py:35 settings/serializers/feature.py:38 msgid "Announcement" msgstr "発表" -#: settings/serializers/feature.py:51 +#: settings/serializers/feature.py:37 +msgid "Enable announcement" +msgstr "アナウンスの有効化" + +#: settings/serializers/feature.py:42 +#, fuzzy +#| msgid "HCP Vault" +msgid "Vault" +msgstr "HashiCorp Vault" + +#: settings/serializers/feature.py:55 msgid "Mount Point" msgstr "" -#: settings/serializers/feature.py:60 +#: settings/serializers/feature.py:66 msgid "Enable tickets" msgstr "チケットを有効にする" -#: settings/serializers/feature.py:63 +#: settings/serializers/feature.py:69 msgid "Ticket authorize default time" msgstr "デフォルト製造オーダ承認時間" -#: settings/serializers/feature.py:66 +#: settings/serializers/feature.py:72 msgid "day" msgstr "日" -#: settings/serializers/feature.py:66 +#: settings/serializers/feature.py:72 msgid "hour" msgstr "時" -#: settings/serializers/feature.py:67 +#: settings/serializers/feature.py:73 msgid "Ticket authorize default time unit" msgstr "デフォルト製造オーダ承認時間単位" -#: settings/serializers/feature.py:73 +#: settings/serializers/feature.py:78 +#, fuzzy +#| msgid "Signature" +msgid "Feature" +msgstr "署名" + +#: settings/serializers/feature.py:81 msgid "Operation center" msgstr "職業センター" -#: settings/serializers/feature.py:74 +#: settings/serializers/feature.py:82 msgid "Allow user run batch command or not using ansible" msgstr "ユーザー実行バッチコマンドを許可するか、ansibleを使用しない" -#: settings/serializers/feature.py:78 +#: settings/serializers/feature.py:86 msgid "Operation center command blacklist" msgstr "オペレーション センター コマンド ブラックリスト" -#: settings/serializers/feature.py:79 +#: settings/serializers/feature.py:87 msgid "Commands that are not allowed execute." msgstr "実行が許可されていないコマンド" @@ -5427,7 +5440,7 @@ msgstr "メール受信者" msgid "Multiple user using , split" msgstr "複数のユーザーを使用して、分割" -#: settings/serializers/settings.py:70 +#: settings/serializers/settings.py:69 #, python-format msgid "[%s] %s" msgstr "[%s] %s" @@ -5813,6 +5826,10 @@ msgstr "オフラインビデオプレーヤー" msgid "Invalid zip file" msgstr "zip ファイルが無効です" +#: terminal/api/applet/applet.py:65 +msgid "This is enterprise edition applet" +msgstr "これはエンタープライズ版アプレットです" + #: terminal/api/component/endpoint.py:32 msgid "Not found protocol query params" msgstr "プロトコルクエリパラメータが見つかりません" @@ -6512,7 +6529,7 @@ msgstr "アクセスキー" msgid "Access key secret" msgstr "アクセスキーシークレット" -#: terminal/serializers/storage.py:67 xpack/plugins/cloud/models.py:250 +#: terminal/serializers/storage.py:67 xpack/plugins/cloud/models.py:209 msgid "Region" msgstr "リージョン" @@ -7074,7 +7091,7 @@ msgid "Not a valid ssh public key" msgstr "有効なssh公開鍵ではありません" #: users/forms/profile.py:173 users/models/user.py:820 -#: xpack/plugins/cloud/serializers/account_attrs.py:203 +#: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "Public key" msgstr "公開キー" @@ -7103,7 +7120,7 @@ msgid "OTP secret key" msgstr "OTP 秘密" #: users/models/user.py:817 -#: xpack/plugins/cloud/serializers/account_attrs.py:206 +#: xpack/plugins/cloud/serializers/account_attrs.py:209 msgid "Private key" msgstr "ssh秘密鍵" @@ -7542,11 +7559,11 @@ msgstr "パスワードの成功をリセットし、ログインページに戻 msgid "XPACK" msgstr "XPack" -#: xpack/plugins/cloud/api.py:56 +#: xpack/plugins/cloud/api.py:38 msgid "Test connection successful" msgstr "テスト接続成功" -#: xpack/plugins/cloud/api.py:58 +#: xpack/plugins/cloud/api.py:40 msgid "Test connection failed: {}" msgstr "テスト接続に失敗しました: {}" @@ -7634,7 +7651,7 @@ msgstr "プライベートIP" msgid "Public IP" msgstr "パブリックIP" -#: xpack/plugins/cloud/const.py:38 xpack/plugins/cloud/models.py:295 +#: xpack/plugins/cloud/const.py:38 msgid "Instance name" msgstr "インスタンス名" @@ -7662,158 +7679,78 @@ msgstr "同期済み" msgid "Released" msgstr "リリース済み" -#: xpack/plugins/cloud/manager.py:53 -msgid "Account unavailable" -msgstr "利用できないアカウント" - #: xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "クラウドセンター" -#: xpack/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:30 msgid "Provider" msgstr "プロバイダー" -#: xpack/plugins/cloud/models.py:38 +#: xpack/plugins/cloud/models.py:34 msgid "Validity" msgstr "有効性" -#: xpack/plugins/cloud/models.py:43 +#: xpack/plugins/cloud/models.py:39 msgid "Cloud account" msgstr "クラウドアカウント" -#: xpack/plugins/cloud/models.py:45 +#: xpack/plugins/cloud/models.py:41 msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147 +#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:36 msgid "Regions" msgstr "リージョン" -#: xpack/plugins/cloud/models.py:95 +#: xpack/plugins/cloud/models.py:91 msgid "Hostname strategy" msgstr "ホスト名戦略" -#: xpack/plugins/cloud/models.py:100 -#: xpack/plugins/cloud/serializers/task.py:150 +#: xpack/plugins/cloud/models.py:102 xpack/plugins/cloud/serializers/task.py:39 msgid "IP network segment group" msgstr "IPネットワークセグメントグループ" -#: xpack/plugins/cloud/models.py:103 -#: xpack/plugins/cloud/serializers/task.py:155 +#: xpack/plugins/cloud/models.py:105 xpack/plugins/cloud/serializers/task.py:44 msgid "Sync IP type" msgstr "同期IPタイプ" -#: xpack/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/serializers/task.py:173 +#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:61 msgid "Always update" msgstr "常に更新" -#: xpack/plugins/cloud/models.py:112 +#: xpack/plugins/cloud/models.py:114 msgid "Date last sync" msgstr "最終同期日" -#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/models.py:313 -#: xpack/plugins/cloud/models.py:337 -msgid "Strategy" -msgstr "戦略" - -#: xpack/plugins/cloud/models.py:120 xpack/plugins/cloud/models.py:197 +#: xpack/plugins/cloud/models.py:119 xpack/plugins/cloud/models.py:160 msgid "Sync instance task" msgstr "インスタンスの同期タスク" -#: xpack/plugins/cloud/models.py:208 xpack/plugins/cloud/models.py:260 +#: xpack/plugins/cloud/models.py:171 xpack/plugins/cloud/models.py:219 msgid "Date sync" msgstr "日付の同期" -#: xpack/plugins/cloud/models.py:212 -msgid "Sync instance snapshot" -msgstr "インスタンススナップショットの同期" - -#: xpack/plugins/cloud/models.py:216 +#: xpack/plugins/cloud/models.py:175 msgid "Sync instance task execution" msgstr "インスタンスタスクの同期実行" -#: xpack/plugins/cloud/models.py:240 +#: xpack/plugins/cloud/models.py:199 msgid "Sync task" msgstr "同期タスク" -#: xpack/plugins/cloud/models.py:244 +#: xpack/plugins/cloud/models.py:203 msgid "Sync instance task history" msgstr "インスタンスタスク履歴の同期" -#: xpack/plugins/cloud/models.py:247 +#: xpack/plugins/cloud/models.py:206 msgid "Instance" msgstr "インスタンス" -#: xpack/plugins/cloud/models.py:264 +#: xpack/plugins/cloud/models.py:223 msgid "Sync instance detail" msgstr "同期インスタンスの詳細" -#: xpack/plugins/cloud/models.py:281 -msgid "Task strategy" -msgstr "ミッション戦略です" - -#: xpack/plugins/cloud/models.py:285 -msgid "Exact" -msgstr "" - -#: xpack/plugins/cloud/models.py:286 -msgid "Not" -msgstr "否" - -#: xpack/plugins/cloud/models.py:287 -msgid "In" -msgstr "イン" - -#: xpack/plugins/cloud/models.py:288 -msgid "Contains" -msgstr "含む" - -#: xpack/plugins/cloud/models.py:289 -msgid "Startswith" -msgstr "始まる" - -#: xpack/plugins/cloud/models.py:290 -msgid "Endswith" -msgstr "終わる" - -#: xpack/plugins/cloud/models.py:296 -msgid "Instance platform" -msgstr "インスタンス名" - -#: xpack/plugins/cloud/models.py:297 -msgid "Instance address" -msgstr "インスタンスアドレス" - -#: xpack/plugins/cloud/models.py:304 -msgid "Rule attr" -msgstr "ルール属性" - -#: xpack/plugins/cloud/models.py:308 -msgid "Rule match" -msgstr "ルール一致" - -#: xpack/plugins/cloud/models.py:310 -msgid "Rule value" -msgstr "ルール値" - -#: xpack/plugins/cloud/models.py:317 -msgid "Strategy rule" -msgstr "戦略ルール" - -#: xpack/plugins/cloud/models.py:332 -msgid "Action attr" -msgstr "アクション属性" - -#: xpack/plugins/cloud/models.py:334 -msgid "Action value" -msgstr "アクション値" - -#: xpack/plugins/cloud/models.py:341 -msgid "Strategy action" -msgstr "戦略アクション" - #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" msgstr "中国 (北京)" @@ -7922,7 +7859,7 @@ msgid "CN East-Suzhou" msgstr "華東-蘇州" #: xpack/plugins/cloud/providers/baiducloud.py:57 -#: xpack/plugins/cloud/providers/huaweicloud.py:49 +#: xpack/plugins/cloud/providers/huaweicloud.py:50 msgid "CN-Hong Kong" msgstr "中国-香港" @@ -7940,66 +7877,68 @@ msgid "CN East-Shanghai" msgstr "華東-上海" #: xpack/plugins/cloud/providers/baiducloud.py:61 -#: xpack/plugins/cloud/providers/huaweicloud.py:51 +#: xpack/plugins/cloud/providers/huaweicloud.py:49 msgid "AP-Singapore" msgstr "アジア太平洋-シンガポール" +#: xpack/plugins/cloud/providers/huaweicloud.py:37 +msgid "AF-Johannesburg" +msgstr "アフリカ-ヨハネスブルク" + +#: xpack/plugins/cloud/providers/huaweicloud.py:38 +msgid "CN North-Beijing4" +msgstr "華北-北京4" + #: xpack/plugins/cloud/providers/huaweicloud.py:39 msgid "CN North-Beijing1" msgstr "華北-北京1" #: xpack/plugins/cloud/providers/huaweicloud.py:40 -msgid "CN North-Beijing4" -msgstr "華北-北京4" - -#: xpack/plugins/cloud/providers/huaweicloud.py:41 -msgid "CN North-Ulanqab1" -msgstr "華北-ウランチャブ一" - -#: xpack/plugins/cloud/providers/huaweicloud.py:43 -msgid "CN South-Shenzhen" -msgstr "華南-広州" - -#: xpack/plugins/cloud/providers/huaweicloud.py:44 -msgid "CN South-Guangzhou-InvitationOnly" -msgstr "華南-広州-友好ユーザー環境" - -#: xpack/plugins/cloud/providers/huaweicloud.py:45 msgid "CN East-Shanghai2" msgstr "華東-上海2" -#: xpack/plugins/cloud/providers/huaweicloud.py:46 +#: xpack/plugins/cloud/providers/huaweicloud.py:41 msgid "CN East-Shanghai1" msgstr "華東-上海1" -#: xpack/plugins/cloud/providers/huaweicloud.py:48 -msgid "CN Southwest-Guiyang1" -msgstr "南西-貴陽1" - -#: xpack/plugins/cloud/providers/huaweicloud.py:50 -msgid "AP-Bangkok" -msgstr "アジア太平洋-バンコク" - -#: xpack/plugins/cloud/providers/huaweicloud.py:53 -msgid "AF-Johannesburg" -msgstr "アフリカ-ヨハネスブルク" - -#: xpack/plugins/cloud/providers/huaweicloud.py:54 +#: xpack/plugins/cloud/providers/huaweicloud.py:43 msgid "LA-Mexico City1" msgstr "LA-メキシコCity1" -#: xpack/plugins/cloud/providers/huaweicloud.py:55 +#: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "LA-Santiago" msgstr "ラテンアメリカ-サンディエゴ" -#: xpack/plugins/cloud/providers/huaweicloud.py:56 +#: xpack/plugins/cloud/providers/huaweicloud.py:45 msgid "LA-Sao Paulo1" msgstr "ラミー・サンパウロ1" -#: xpack/plugins/cloud/providers/huaweicloud.py:58 -msgid "TR-Istanbul" +#: xpack/plugins/cloud/providers/huaweicloud.py:46 +msgid "EU-Paris" msgstr "" +#: xpack/plugins/cloud/providers/huaweicloud.py:47 +msgid "CN Southwest-Guiyang1" +msgstr "南西-貴陽1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:48 +msgid "AP-Bangkok" +msgstr "アジア太平洋-バンコク" + +#: xpack/plugins/cloud/providers/huaweicloud.py:52 +#, fuzzy +#| msgid "CN North-Baoding" +msgid "CN Northeast-Dalian" +msgstr "華北-保定" + +#: xpack/plugins/cloud/providers/huaweicloud.py:53 +msgid "CN North-Ulanqab1" +msgstr "華北-ウランチャブ一" + +#: xpack/plugins/cloud/providers/huaweicloud.py:54 +msgid "CN South-Guangzhou-InvitationOnly" +msgstr "華南-広州-友好ユーザー環境" + #: xpack/plugins/cloud/providers/jdcloud.py:126 msgid "CN East-Suqian" msgstr "華東-宿遷" @@ -8028,7 +7967,7 @@ msgstr "サブスクリプションID" #: xpack/plugins/cloud/serializers/account_attrs.py:103 #: xpack/plugins/cloud/serializers/account_attrs.py:119 #: xpack/plugins/cloud/serializers/account_attrs.py:149 -#: xpack/plugins/cloud/serializers/account_attrs.py:199 +#: xpack/plugins/cloud/serializers/account_attrs.py:202 msgid "API Endpoint" msgstr "APIエンドポイント" @@ -8094,11 +8033,11 @@ msgstr "テストポート" msgid "Test timeout" msgstr "テストタイムアウト" -#: xpack/plugins/cloud/serializers/account_attrs.py:209 +#: xpack/plugins/cloud/serializers/account_attrs.py:212 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:139 +#: xpack/plugins/cloud/serializers/task.py:28 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 " @@ -8112,11 +8051,11 @@ msgstr "" "ドレスをランダムに一致させることを意味します。
例: " "192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:145 +#: xpack/plugins/cloud/serializers/task.py:34 msgid "History count" msgstr "実行回数" -#: xpack/plugins/cloud/serializers/task.py:146 +#: xpack/plugins/cloud/serializers/task.py:35 msgid "Instance count" msgstr "インスタンス数" @@ -8128,6 +8067,10 @@ msgstr "同期インスタンス タスクを実行する" msgid "Period clean sync instance task execution" msgstr "同期インスタンス タスクの実行記録を定期的にクリアする" +#: xpack/plugins/cloud/utils.py:68 +msgid "Account unavailable" +msgstr "利用できないアカウント" + #: xpack/plugins/interface/api.py:52 msgid "Restore default successfully." msgstr "デフォルトの復元に成功しました。" @@ -8191,3 +8134,64 @@ msgstr "究極のエディション" #: xpack/plugins/license/models.py:86 msgid "Community edition" msgstr "コミュニティ版" + +#~ msgid "" +#~ "The forgot password url on login page, If you use ldap or cas external " +#~ "authentication, you can set it" +#~ msgstr "" +#~ "ログインページでパスワードのURLを忘れてしまいました。ldapまたはcasの外部認" +#~ "証を使用している場合は、設定できます。" + +#~ msgid "Strategy" +#~ msgstr "戦略" + +#~ msgid "Sync instance snapshot" +#~ msgstr "インスタンススナップショットの同期" + +#~ msgid "Task strategy" +#~ msgstr "ミッション戦略です" + +#~ msgid "Not" +#~ msgstr "否" + +#~ msgid "In" +#~ msgstr "イン" + +#~ msgid "Contains" +#~ msgstr "含む" + +#~ msgid "Startswith" +#~ msgstr "始まる" + +#~ msgid "Endswith" +#~ msgstr "終わる" + +#~ msgid "Instance platform" +#~ msgstr "インスタンス名" + +#~ msgid "Instance address" +#~ msgstr "インスタンスアドレス" + +#~ msgid "Rule attr" +#~ msgstr "ルール属性" + +#~ msgid "Rule match" +#~ msgstr "ルール一致" + +#~ msgid "Rule value" +#~ msgstr "ルール値" + +#~ msgid "Strategy rule" +#~ msgstr "戦略ルール" + +#~ msgid "Action attr" +#~ msgstr "アクション属性" + +#~ msgid "Action value" +#~ msgstr "アクション値" + +#~ msgid "Strategy action" +#~ msgstr "戦略アクション" + +#~ msgid "CN South-Shenzhen" +#~ msgstr "華南-広州" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 17302daba..1e5a836b4 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/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: 2023-08-15 16:44+0800\n" +"POT-Creation-Date: 2023-08-17 10:41+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -44,7 +44,7 @@ msgid "Access key" msgstr "Access key" #: accounts/const/account.py:9 assets/models/_user.py:48 -#: authentication/models/sso_token.py:14 settings/serializers/feature.py:48 +#: authentication/models/sso_token.py:14 settings/serializers/feature.py:52 msgid "Token" msgstr "Token" @@ -212,7 +212,7 @@ msgstr "HashiCorp Vault" #: terminal/serializers/session.py:26 #: 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:253 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:212 msgid "Asset" msgstr "资产" @@ -247,7 +247,7 @@ msgstr "来源 ID" #: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 #: 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:89 +#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:85 msgid "Account" msgstr "账号" @@ -286,7 +286,7 @@ msgstr "账号备份计划" #: accounts/models/automations/backup_account.py:91 #: assets/models/automations/base.py:115 audits/models.py:60 -#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:221 +#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:228 #: ops/templates/ops/celery_task_log.html:75 #: perms/models/asset_permission.py:72 terminal/models/applet/host.py:140 #: terminal/models/session/session.py:44 @@ -314,7 +314,7 @@ msgid "Trigger mode" msgstr "触发模式" #: accounts/models/automations/backup_account.py:105 audits/models.py:194 -#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205 +#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:168 msgid "Reason" msgstr "原因" @@ -419,7 +419,7 @@ msgstr "开始日期" #: accounts/models/automations/change_secret.py:91 #: assets/models/automations/base.py:116 ops/models/base.py:56 -#: ops/models/celery.py:64 ops/models/job.py:222 +#: ops/models/celery.py:64 ops/models/job.py:229 #: terminal/models/applet/host.py:141 msgid "Date finished" msgstr "结束日期" @@ -505,7 +505,7 @@ msgstr "账号验证" #: assets/serializers/platform.py:110 assets/serializers/platform.py:223 #: authentication/serializers/connect_token_secret.py:110 ops/mixin.py:21 #: ops/models/adhoc.py:20 ops/models/celery.py:15 ops/models/celery.py:57 -#: ops/models/job.py:119 ops/models/playbook.py:28 ops/serializers/job.py:20 +#: ops/models/job.py:126 ops/models/playbook.py:28 ops/serializers/job.py:20 #: orgs/models.py:82 perms/models/asset_permission.py:56 rbac/models/role.py:29 #: settings/models.py:32 settings/serializers/msg.py:82 #: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12 @@ -513,8 +513,7 @@ msgstr "账号验证" #: terminal/models/component/storage.py:26 terminal/models/component/task.py:13 #: terminal/models/component/terminal.py:84 users/forms/profile.py:33 #: users/models/group.py:13 users/models/user.py:787 -#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:273 -#: xpack/plugins/cloud/serializers/task.py:68 +#: xpack/plugins/cloud/models.py:28 msgid "Name" msgstr "名称" @@ -531,7 +530,7 @@ msgstr "特权账号" msgid "Is active" msgstr "激活" -#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325 +#: accounts/models/template.py:19 msgid "Account template" msgstr "账号模版" @@ -638,8 +637,8 @@ msgstr "类别" #: assets/models/cmd_filter.py:74 assets/models/platform.py:90 #: assets/serializers/asset/common.py:122 assets/serializers/platform.py:112 #: assets/serializers/platform.py:127 audits/serializers.py:49 -#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:130 -#: perms/serializers/user_permission.py:27 settings/serializers/feature.py:42 +#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:137 +#: perms/serializers/user_permission.py:27 settings/serializers/feature.py:46 #: terminal/models/applet/applet.py:38 terminal/models/component/storage.py:57 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 #: terminal/serializers/session.py:21 terminal/serializers/storage.py:226 @@ -673,7 +672,7 @@ msgstr "已修改" #: accounts/serializers/automations/base.py:22 acls/models/base.py:97 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 ops/models/base.py:17 -#: ops/models/job.py:132 ops/serializers/job.py:21 +#: ops/models/job.py:139 ops/serializers/job.py:21 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 msgid "Assets" msgstr "资产" @@ -764,14 +763,14 @@ msgstr "" #: accounts/serializers/account/virtual.py:19 assets/models/_user.py:27 #: assets/models/cmd_filter.py:40 assets/models/cmd_filter.py:88 #: assets/models/group.py:20 common/db/models.py:36 ops/models/adhoc.py:26 -#: ops/models/job.py:138 ops/models/playbook.py:31 rbac/models/role.py:37 +#: ops/models/job.py:145 ops/models/playbook.py:31 rbac/models/role.py:37 #: settings/models.py:37 terminal/models/applet/applet.py:44 #: terminal/models/applet/applet.py:284 terminal/models/applet/host.py:142 #: terminal/models/component/endpoint.py:24 #: terminal/models/component/endpoint.py:104 #: terminal/models/session/session.py:46 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:297 users/models/user.py:826 -#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:109 +#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:111 msgid "Comment" msgstr "备注" @@ -892,13 +891,11 @@ msgstr "告警" #: acls/models/base.py:37 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:97 -#: xpack/plugins/cloud/models.py:275 msgid "Priority" msgstr "优先级" #: acls/models/base.py:38 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:98 -#: xpack/plugins/cloud/models.py:276 msgid "1-100, the lower the value will be match first" msgstr "优先级可选范围为 1-100 (数值越小越优先)" @@ -935,7 +932,6 @@ msgid "Command" msgstr "命令" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack/plugins/cloud/models.py:291 msgid "Regex" msgstr "正则表达式" @@ -1031,7 +1027,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "所有复核人都不属于组织 `{}`" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:133 +#: xpack/plugins/cloud/serializers/task.py:22 msgid "IP address invalid: `{}`" msgstr "IP 地址无效: `{}`" @@ -1059,7 +1055,7 @@ msgstr "时段" msgid "Applications" msgstr "应用管理" -#: applications/models.py:16 xpack/plugins/cloud/models.py:37 +#: applications/models.py:16 xpack/plugins/cloud/models.py:33 #: xpack/plugins/cloud/serializers/account.py:63 msgid "Attrs" msgstr "属性" @@ -1166,7 +1162,7 @@ msgstr "脚本" #: assets/const/category.py:10 assets/models/asset/host.py:8 #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:67 -#: settings/serializers/feature.py:45 terminal/models/component/endpoint.py:13 +#: settings/serializers/feature.py:49 terminal/models/component/endpoint.py:13 #: terminal/serializers/applet.py:17 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" @@ -1352,7 +1348,7 @@ msgstr "SSH公钥" # msgstr "备注" #: assets/models/_user.py:28 assets/models/automations/base.py:114 #: assets/models/cmd_filter.py:41 assets/models/group.py:19 -#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:220 +#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:227 #: users/models/user.py:1018 msgid "Date created" msgstr "创建日期" @@ -1456,13 +1452,14 @@ msgstr "地址" #: assets/models/asset/common.py:151 assets/models/platform.py:119 #: authentication/serializers/connect_token_secret.py:115 -#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321 +#: perms/serializers/user_permission.py:24 +#: xpack/plugins/cloud/serializers/account_attrs.py:196 msgid "Platform" msgstr "系统平台" #: assets/models/asset/common.py:153 assets/models/domain.py:21 #: authentication/serializers/connect_token_secret.py:133 -#: perms/serializers/user_permission.py:29 xpack/plugins/cloud/models.py:323 +#: perms/serializers/user_permission.py:29 msgid "Domain" msgstr "网域" @@ -1519,7 +1516,7 @@ msgstr "忽略证书校验" msgid "Proxy" msgstr "代理" -#: assets/models/automations/base.py:22 ops/models/job.py:216 +#: assets/models/automations/base.py:22 ops/models/job.py:223 #: settings/serializers/auth/sms.py:99 msgid "Parameters" msgstr "参数" @@ -1533,13 +1530,13 @@ msgid "Asset automation task" msgstr "资产自动化任务" #: assets/models/automations/base.py:113 audits/models.py:199 -#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:213 +#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:220 #: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:139 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:201 -#: xpack/plugins/cloud/models.py:257 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:164 +#: xpack/plugins/cloud/models.py:216 msgid "Status" msgstr "状态" @@ -1603,7 +1600,7 @@ msgstr "资产组" #: assets/models/group.py:31 assets/models/platform.py:19 #: assets/serializers/platform.py:113 -#: xpack/plugins/cloud/providers/nutanix.py:30 +#: xpack/plugins/cloud/providers/nutanix.py:32 msgid "Default" msgstr "默认" @@ -1653,7 +1650,7 @@ msgid "Parent key" msgstr "ssh私钥" #: assets/models/node.py:558 perms/serializers/permission.py:35 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:322 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:96 msgid "Node" msgstr "节点" @@ -1674,7 +1671,7 @@ msgid "Public" msgstr "开放的" #: assets/models/platform.py:21 assets/serializers/platform.py:48 -#: settings/serializers/settings.py:66 +#: settings/serializers/settings.py:65 #: users/templates/users/reset_password.html:29 msgid "Setting" msgstr "设置" @@ -1792,8 +1789,7 @@ msgstr "资产中批量更新平台,不符合平台类型跳过的资产" #: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:72 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324 -#: xpack/plugins/cloud/serializers/task.py:31 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:99 msgid "Protocols" msgstr "协议组" @@ -2288,7 +2284,7 @@ msgstr "用户 %s 在当前资源, 执行了任务 (%s)" msgid "SSH Key" msgstr "SSH 密钥" -#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:10 +#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:13 msgid "SSO" msgstr "SSO" @@ -2959,7 +2955,7 @@ msgstr "代码错误" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:441 +#: jumpserver/conf.py:444 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -3544,11 +3540,11 @@ msgstr "导出搜素: %s" msgid "User %s view/export secret" msgstr "用户 %s 查看/导出 了密码" -#: jumpserver/conf.py:440 +#: jumpserver/conf.py:443 msgid "Create account successfully" msgstr "创建账号成功" -#: jumpserver/conf.py:442 +#: jumpserver/conf.py:445 msgid "Your account has been created successfully" msgstr "你的账号已创建成功" @@ -3683,7 +3679,7 @@ msgstr "VCS" msgid "Adhoc" msgstr "命令" -#: ops/const.py:39 ops/models/job.py:128 +#: ops/const.py:39 ops/models/job.py:135 msgid "Playbook" msgstr "Playbook" @@ -3752,17 +3748,17 @@ msgstr "需要周期或定期设置" msgid "Pattern" msgstr "模式" -#: ops/models/adhoc.py:23 ops/models/job.py:123 +#: ops/models/adhoc.py:23 ops/models/job.py:130 msgid "Module" msgstr "模块" -#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:122 +#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:129 #: terminal/models/component/task.py:14 msgid "Args" msgstr "参数" #: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53 -#: ops/models/job.py:131 ops/models/job.py:219 ops/models/playbook.py:30 +#: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30 #: terminal/models/session/sharing.py:24 msgid "Creator" msgstr "创建者" @@ -3779,12 +3775,12 @@ msgstr "最后执行" msgid "Date last run" msgstr "最后运行日期" -#: ops/models/base.py:51 ops/models/job.py:217 -#: xpack/plugins/cloud/models.py:199 +#: ops/models/base.py:51 ops/models/job.py:224 +#: xpack/plugins/cloud/models.py:162 msgid "Result" msgstr "结果" -#: ops/models/base.py:52 ops/models/job.py:218 +#: ops/models/base.py:52 ops/models/job.py:225 msgid "Summary" msgstr "汇总" @@ -3817,43 +3813,43 @@ msgstr "发布日期" msgid "Celery Task Execution" msgstr "Celery 任务执行" -#: ops/models/job.py:125 +#: ops/models/job.py:132 msgid "Chdir" msgstr "运行目录" -#: ops/models/job.py:126 +#: ops/models/job.py:133 msgid "Timeout (Seconds)" msgstr "超时时间 (秒)" -#: ops/models/job.py:133 +#: ops/models/job.py:140 msgid "Use Parameter Define" msgstr "使用参数定义" -#: ops/models/job.py:134 +#: ops/models/job.py:141 msgid "Parameters define" msgstr "参数定义" -#: ops/models/job.py:135 +#: ops/models/job.py:142 msgid "Runas" msgstr "运行用户" -#: ops/models/job.py:137 +#: ops/models/job.py:144 msgid "Runas policy" msgstr "用户策略" -#: ops/models/job.py:201 +#: ops/models/job.py:208 msgid "Job" msgstr "作业" -#: ops/models/job.py:224 +#: ops/models/job.py:231 msgid "Material" msgstr "Material" -#: ops/models/job.py:226 +#: ops/models/job.py:233 msgid "Material Type" msgstr "Material 类型" -#: ops/models/job.py:526 +#: ops/models/job.py:533 msgid "Job Execution" msgstr "作业执行" @@ -4326,7 +4322,8 @@ msgstr "远程应用" msgid "Ticket comment" msgstr "工单评论" -#: rbac/tree.py:124 tickets/models/ticket/general.py:307 +#: rbac/tree.py:124 settings/serializers/feature.py:64 +#: tickets/models/ticket/general.py:307 msgid "Ticket" msgstr "工单管理" @@ -4428,42 +4425,54 @@ msgid "Can change other setting" msgstr "其它设置" #: settings/serializers/auth/base.py:12 +#, fuzzy +#| msgid "MFA Auth" +msgid "LDAP Auth" +msgstr "MFA 多因子认证" + +#: settings/serializers/auth/base.py:13 msgid "CAS Auth" msgstr "CAS 认证" -#: settings/serializers/auth/base.py:13 +#: settings/serializers/auth/base.py:14 msgid "OPENID Auth" msgstr "OIDC 认证" -#: settings/serializers/auth/base.py:14 -msgid "RADIUS Auth" -msgstr "RADIUS 认证" - #: settings/serializers/auth/base.py:15 -msgid "DingTalk Auth" -msgstr "钉钉 认证" - -#: settings/serializers/auth/base.py:16 -msgid "FeiShu Auth" -msgstr "飞书 认证" - -#: settings/serializers/auth/base.py:17 -msgid "WeCom Auth" -msgstr "企业微信 认证" - -#: settings/serializers/auth/base.py:18 -msgid "SSO Auth" -msgstr "SSO 令牌认证" - -#: settings/serializers/auth/base.py:19 msgid "SAML2 Auth" msgstr "SAML2 认证" -#: settings/serializers/auth/base.py:22 settings/serializers/basic.py:17 +#: settings/serializers/auth/base.py:16 +#, fuzzy +#| msgid "Enable OAuth2 Auth" +msgid "OAuth2 Auth" +msgstr "启用 OAuth2 认证" + +#: settings/serializers/auth/base.py:17 +msgid "RADIUS Auth" +msgstr "RADIUS 认证" + +#: settings/serializers/auth/base.py:18 +msgid "DingTalk Auth" +msgstr "钉钉 认证" + +#: settings/serializers/auth/base.py:19 +msgid "FeiShu Auth" +msgstr "飞书 认证" + +#: settings/serializers/auth/base.py:20 +msgid "WeCom Auth" +msgstr "企业微信 认证" + +#: settings/serializers/auth/base.py:21 +msgid "SSO Auth" +msgstr "SSO 令牌认证" + +#: settings/serializers/auth/base.py:24 msgid "Forgot password url" msgstr "忘记密码 URL" -#: settings/serializers/auth/base.py:28 +#: settings/serializers/auth/base.py:30 msgid "Enable login redirect msg" msgstr "启用登录跳转提示" @@ -4819,19 +4828,19 @@ msgstr "请求方式" msgid "The value in the parameter must contain %s" msgstr "参数中的值必须包含 %s" -#: settings/serializers/auth/sso.py:13 +#: settings/serializers/auth/sso.py:16 msgid "Enable SSO auth" msgstr "启用 SSO 令牌认证" -#: settings/serializers/auth/sso.py:14 +#: settings/serializers/auth/sso.py:17 msgid "Other service can using SSO token login to JumpServer without password" msgstr "其它系统可以使用 SSO Token 对接 JumpServer, 免去登录的过程" -#: settings/serializers/auth/sso.py:17 +#: settings/serializers/auth/sso.py:20 msgid "SSO auth key TTL" msgstr "令牌有效期" -#: settings/serializers/auth/sso.py:17 +#: settings/serializers/auth/sso.py:20 #: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "Unit: second" msgstr "单位: 秒" @@ -4858,35 +4867,27 @@ msgstr "用户向导URL" msgid "User first login update profile done redirect to it" msgstr "用户第一次登录,修改profile后重定向到地址, 可以是 wiki 或 其他说明文档" -#: settings/serializers/basic.py:18 -msgid "" -"The forgot password url on login page, If you use ldap or cas external " -"authentication, you can set it" -msgstr "" -"登录页面忘记密码URL, 如果使用了 LDAP, OPENID 等外部认证系统,可以自定义用户重" -"置密码访问的地址" - -#: settings/serializers/basic.py:22 +#: settings/serializers/basic.py:17 msgid "Global organization name" msgstr "全局组织名" -#: settings/serializers/basic.py:23 +#: settings/serializers/basic.py:18 msgid "The name of global organization to display" msgstr "全局组织的显示名称,默认为 全局组织" -#: settings/serializers/basic.py:26 +#: settings/serializers/basic.py:21 msgid "Help Docs URL" msgstr "文档链接" -#: settings/serializers/basic.py:27 +#: settings/serializers/basic.py:22 msgid "default: http://docs.jumpserver.org" msgstr "默认: http://dev.jumpserver.org:8080" -#: settings/serializers/basic.py:30 +#: settings/serializers/basic.py:25 msgid "Help Support URL" msgstr "支持链接" -#: settings/serializers/basic.py:31 +#: settings/serializers/basic.py:26 msgid "default: http://www.jumpserver.org/support/" msgstr "默认: http://www.jumpserver.org/support/" @@ -4937,51 +4938,63 @@ msgstr "主题" msgid "More url" msgstr "更多信息 URL" -#: settings/serializers/feature.py:35 -msgid "Enable announcement" -msgstr "启用公告" - -#: settings/serializers/feature.py:36 +#: settings/serializers/feature.py:35 settings/serializers/feature.py:38 msgid "Announcement" msgstr "公告" -#: settings/serializers/feature.py:51 +#: settings/serializers/feature.py:37 +msgid "Enable announcement" +msgstr "启用公告" + +#: settings/serializers/feature.py:42 +#, fuzzy +#| msgid "HCP Vault" +msgid "Vault" +msgstr "HashiCorp Vault" + +#: settings/serializers/feature.py:55 msgid "Mount Point" msgstr "" -#: settings/serializers/feature.py:60 +#: settings/serializers/feature.py:66 msgid "Enable tickets" msgstr "启用工单" -#: settings/serializers/feature.py:63 +#: settings/serializers/feature.py:69 msgid "Ticket authorize default time" msgstr "默认工单授权时间" -#: settings/serializers/feature.py:66 +#: settings/serializers/feature.py:72 msgid "day" msgstr "天" -#: settings/serializers/feature.py:66 +#: settings/serializers/feature.py:72 msgid "hour" msgstr "时" -#: settings/serializers/feature.py:67 +#: settings/serializers/feature.py:73 msgid "Ticket authorize default time unit" msgstr "默认工单授权时间单位" -#: settings/serializers/feature.py:73 +#: settings/serializers/feature.py:78 +#, fuzzy +#| msgid "Signature" +msgid "Feature" +msgstr "签名" + +#: settings/serializers/feature.py:81 msgid "Operation center" msgstr "作业中心" -#: settings/serializers/feature.py:74 +#: settings/serializers/feature.py:82 msgid "Allow user run batch command or not using ansible" msgstr "是否允许用户使用 ansible 执行批量命令" -#: settings/serializers/feature.py:78 +#: settings/serializers/feature.py:86 msgid "Operation center command blacklist" msgstr "作业中心命令黑名单" -#: settings/serializers/feature.py:79 +#: settings/serializers/feature.py:87 msgid "Commands that are not allowed execute." msgstr "不允许执行的命令" @@ -5358,7 +5371,7 @@ msgstr "邮件收件人" msgid "Multiple user using , split" msgstr "多个用户,使用 , 分割" -#: settings/serializers/settings.py:70 +#: settings/serializers/settings.py:69 #, python-format msgid "[%s] %s" msgstr "[%s] %s" @@ -5730,6 +5743,10 @@ msgstr "离线录像播放器" msgid "Invalid zip file" msgstr "无效的 zip 文件" +#: terminal/api/applet/applet.py:65 +msgid "This is enterprise edition applet" +msgstr "企业版远程应用,在社区版中不能使用" + #: terminal/api/component/endpoint.py:32 msgid "Not found protocol query params" msgstr "未发现 protocol 查询参数" @@ -6423,7 +6440,7 @@ msgstr "Access key ID(AK)" msgid "Access key secret" msgstr "Access key secret(SK)" -#: terminal/serializers/storage.py:67 xpack/plugins/cloud/models.py:250 +#: terminal/serializers/storage.py:67 xpack/plugins/cloud/models.py:209 msgid "Region" msgstr "地域" @@ -6979,7 +6996,7 @@ msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" #: users/forms/profile.py:173 users/models/user.py:820 -#: xpack/plugins/cloud/serializers/account_attrs.py:203 +#: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "Public key" msgstr "SSH公钥" @@ -7008,7 +7025,7 @@ msgid "OTP secret key" msgstr "OTP 密钥" #: users/models/user.py:817 -#: xpack/plugins/cloud/serializers/account_attrs.py:206 +#: xpack/plugins/cloud/serializers/account_attrs.py:209 msgid "Private key" msgstr "ssh私钥" @@ -7434,11 +7451,11 @@ msgstr "重置密码成功,返回到登录页面" msgid "XPACK" msgstr "XPack" -#: xpack/plugins/cloud/api.py:56 +#: xpack/plugins/cloud/api.py:38 msgid "Test connection successful" msgstr "测试成功" -#: xpack/plugins/cloud/api.py:58 +#: xpack/plugins/cloud/api.py:40 msgid "Test connection failed: {}" msgstr "测试连接失败:{}" @@ -7526,7 +7543,7 @@ msgstr "私有IP" msgid "Public IP" msgstr "公网IP" -#: xpack/plugins/cloud/const.py:38 xpack/plugins/cloud/models.py:295 +#: xpack/plugins/cloud/const.py:38 msgid "Instance name" msgstr "实例名称" @@ -7554,158 +7571,78 @@ msgstr "已同步" msgid "Released" msgstr "已释放" -#: xpack/plugins/cloud/manager.py:53 -msgid "Account unavailable" -msgstr "账号无效" - #: xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "云管中心" -#: xpack/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:30 msgid "Provider" msgstr "云服务商" -#: xpack/plugins/cloud/models.py:38 +#: xpack/plugins/cloud/models.py:34 msgid "Validity" msgstr "有效" -#: xpack/plugins/cloud/models.py:43 +#: xpack/plugins/cloud/models.py:39 msgid "Cloud account" msgstr "云账号" -#: xpack/plugins/cloud/models.py:45 +#: xpack/plugins/cloud/models.py:41 msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147 +#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:36 msgid "Regions" msgstr "地域" -#: xpack/plugins/cloud/models.py:95 +#: xpack/plugins/cloud/models.py:91 msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:100 -#: xpack/plugins/cloud/serializers/task.py:150 +#: xpack/plugins/cloud/models.py:102 xpack/plugins/cloud/serializers/task.py:39 msgid "IP network segment group" msgstr "IP网段组" -#: xpack/plugins/cloud/models.py:103 -#: xpack/plugins/cloud/serializers/task.py:155 +#: xpack/plugins/cloud/models.py:105 xpack/plugins/cloud/serializers/task.py:44 msgid "Sync IP type" msgstr "同步IP类型" -#: xpack/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/serializers/task.py:173 +#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:61 msgid "Always update" msgstr "总是更新" -#: xpack/plugins/cloud/models.py:112 +#: xpack/plugins/cloud/models.py:114 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/models.py:313 -#: xpack/plugins/cloud/models.py:337 -msgid "Strategy" -msgstr "策略" - -#: xpack/plugins/cloud/models.py:120 xpack/plugins/cloud/models.py:197 +#: xpack/plugins/cloud/models.py:119 xpack/plugins/cloud/models.py:160 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:208 xpack/plugins/cloud/models.py:260 +#: xpack/plugins/cloud/models.py:171 xpack/plugins/cloud/models.py:219 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:212 -msgid "Sync instance snapshot" -msgstr "同步实例快照" - -#: xpack/plugins/cloud/models.py:216 +#: xpack/plugins/cloud/models.py:175 msgid "Sync instance task execution" msgstr "同步实例任务执行" -#: xpack/plugins/cloud/models.py:240 +#: xpack/plugins/cloud/models.py:199 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:244 +#: xpack/plugins/cloud/models.py:203 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:247 +#: xpack/plugins/cloud/models.py:206 msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:264 +#: xpack/plugins/cloud/models.py:223 msgid "Sync instance detail" msgstr "同步实例详情" -#: xpack/plugins/cloud/models.py:281 -msgid "Task strategy" -msgstr "任务策略" - -#: xpack/plugins/cloud/models.py:285 -msgid "Exact" -msgstr "" - -#: xpack/plugins/cloud/models.py:286 -msgid "Not" -msgstr "否" - -#: xpack/plugins/cloud/models.py:287 -msgid "In" -msgstr "在..里面" - -#: xpack/plugins/cloud/models.py:288 -msgid "Contains" -msgstr "包含" - -#: xpack/plugins/cloud/models.py:289 -msgid "Startswith" -msgstr "以..开头" - -#: xpack/plugins/cloud/models.py:290 -msgid "Endswith" -msgstr "以..结尾" - -#: xpack/plugins/cloud/models.py:296 -msgid "Instance platform" -msgstr "实例平台" - -#: xpack/plugins/cloud/models.py:297 -msgid "Instance address" -msgstr "实例地址" - -#: xpack/plugins/cloud/models.py:304 -msgid "Rule attr" -msgstr "规则属性" - -#: xpack/plugins/cloud/models.py:308 -msgid "Rule match" -msgstr "规则匹配" - -#: xpack/plugins/cloud/models.py:310 -msgid "Rule value" -msgstr "规则值" - -#: xpack/plugins/cloud/models.py:317 -msgid "Strategy rule" -msgstr "策略规则" - -#: xpack/plugins/cloud/models.py:332 -msgid "Action attr" -msgstr "动作属性" - -#: xpack/plugins/cloud/models.py:334 -msgid "Action value" -msgstr "动作值" - -#: xpack/plugins/cloud/models.py:341 -msgid "Strategy action" -msgstr "策略动作" - #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" msgstr "中国 (北京)" @@ -7814,7 +7751,7 @@ msgid "CN East-Suzhou" msgstr "华东-苏州" #: xpack/plugins/cloud/providers/baiducloud.py:57 -#: xpack/plugins/cloud/providers/huaweicloud.py:49 +#: xpack/plugins/cloud/providers/huaweicloud.py:50 msgid "CN-Hong Kong" msgstr "中国-香港" @@ -7832,66 +7769,68 @@ msgid "CN East-Shanghai" msgstr "华东-上海" #: xpack/plugins/cloud/providers/baiducloud.py:61 -#: xpack/plugins/cloud/providers/huaweicloud.py:51 +#: xpack/plugins/cloud/providers/huaweicloud.py:49 msgid "AP-Singapore" msgstr "亚太-新加坡" +#: xpack/plugins/cloud/providers/huaweicloud.py:37 +msgid "AF-Johannesburg" +msgstr "非洲-约翰内斯堡" + +#: xpack/plugins/cloud/providers/huaweicloud.py:38 +msgid "CN North-Beijing4" +msgstr "华北-北京4" + #: xpack/plugins/cloud/providers/huaweicloud.py:39 msgid "CN North-Beijing1" msgstr "华北-北京1" #: xpack/plugins/cloud/providers/huaweicloud.py:40 -msgid "CN North-Beijing4" -msgstr "华北-北京4" - -#: xpack/plugins/cloud/providers/huaweicloud.py:41 -msgid "CN North-Ulanqab1" -msgstr "华北-乌兰察布一" - -#: xpack/plugins/cloud/providers/huaweicloud.py:43 -msgid "CN South-Shenzhen" -msgstr "华南-广州" - -#: xpack/plugins/cloud/providers/huaweicloud.py:44 -msgid "CN South-Guangzhou-InvitationOnly" -msgstr "华南-广州-友好用户环境" - -#: xpack/plugins/cloud/providers/huaweicloud.py:45 msgid "CN East-Shanghai2" msgstr "华东-上海2" -#: xpack/plugins/cloud/providers/huaweicloud.py:46 +#: xpack/plugins/cloud/providers/huaweicloud.py:41 msgid "CN East-Shanghai1" msgstr "华东-上海1" -#: xpack/plugins/cloud/providers/huaweicloud.py:48 -msgid "CN Southwest-Guiyang1" -msgstr "西南-贵阳1" - -#: xpack/plugins/cloud/providers/huaweicloud.py:50 -msgid "AP-Bangkok" -msgstr "亚太-曼谷" - -#: xpack/plugins/cloud/providers/huaweicloud.py:53 -msgid "AF-Johannesburg" -msgstr "非洲-约翰内斯堡" - -#: xpack/plugins/cloud/providers/huaweicloud.py:54 +#: xpack/plugins/cloud/providers/huaweicloud.py:43 msgid "LA-Mexico City1" msgstr "拉美-墨西哥城一" -#: xpack/plugins/cloud/providers/huaweicloud.py:55 +#: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "LA-Santiago" msgstr "拉美-圣地亚哥" -#: xpack/plugins/cloud/providers/huaweicloud.py:56 +#: xpack/plugins/cloud/providers/huaweicloud.py:45 msgid "LA-Sao Paulo1" msgstr "拉美-圣保罗一" -#: xpack/plugins/cloud/providers/huaweicloud.py:58 -msgid "TR-Istanbul" +#: xpack/plugins/cloud/providers/huaweicloud.py:46 +msgid "EU-Paris" msgstr "" +#: xpack/plugins/cloud/providers/huaweicloud.py:47 +msgid "CN Southwest-Guiyang1" +msgstr "西南-贵阳1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:48 +msgid "AP-Bangkok" +msgstr "亚太-曼谷" + +#: xpack/plugins/cloud/providers/huaweicloud.py:52 +#, fuzzy +#| msgid "CN North-Baoding" +msgid "CN Northeast-Dalian" +msgstr "华北-保定" + +#: xpack/plugins/cloud/providers/huaweicloud.py:53 +msgid "CN North-Ulanqab1" +msgstr "华北-乌兰察布一" + +#: xpack/plugins/cloud/providers/huaweicloud.py:54 +msgid "CN South-Guangzhou-InvitationOnly" +msgstr "华南-广州-友好用户环境" + #: xpack/plugins/cloud/providers/jdcloud.py:126 msgid "CN East-Suqian" msgstr "华东-宿迁" @@ -7920,7 +7859,7 @@ msgstr "订阅 ID" #: xpack/plugins/cloud/serializers/account_attrs.py:103 #: xpack/plugins/cloud/serializers/account_attrs.py:119 #: xpack/plugins/cloud/serializers/account_attrs.py:149 -#: xpack/plugins/cloud/serializers/account_attrs.py:199 +#: xpack/plugins/cloud/serializers/account_attrs.py:202 msgid "API Endpoint" msgstr "API 端点" @@ -7985,11 +7924,11 @@ msgstr "测试端口" msgid "Test timeout" msgstr "测试超时时间" -#: xpack/plugins/cloud/serializers/account_attrs.py:209 +#: xpack/plugins/cloud/serializers/account_attrs.py:212 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:139 +#: xpack/plugins/cloud/serializers/task.py:28 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 " @@ -8001,11 +7940,11 @@ msgstr "" "到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " "IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:145 +#: xpack/plugins/cloud/serializers/task.py:34 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:146 +#: xpack/plugins/cloud/serializers/task.py:35 msgid "Instance count" msgstr "实例个数" @@ -8017,6 +7956,10 @@ msgstr "执行同步实例任务" msgid "Period clean sync instance task execution" msgstr "定期清除同步实例任务执行记录" +#: xpack/plugins/cloud/utils.py:68 +msgid "Account unavailable" +msgstr "账号无效" + #: xpack/plugins/interface/api.py:52 msgid "Restore default successfully." msgstr "恢复默认成功!" @@ -8080,3 +8023,64 @@ msgstr "旗舰版" #: xpack/plugins/license/models.py:86 msgid "Community edition" msgstr "社区版" + +#~ msgid "" +#~ "The forgot password url on login page, If you use ldap or cas external " +#~ "authentication, you can set it" +#~ msgstr "" +#~ "登录页面忘记密码URL, 如果使用了 LDAP, OPENID 等外部认证系统,可以自定义用" +#~ "户重置密码访问的地址" + +#~ msgid "Strategy" +#~ msgstr "策略" + +#~ msgid "Sync instance snapshot" +#~ msgstr "同步实例快照" + +#~ msgid "Task strategy" +#~ msgstr "任务策略" + +#~ msgid "Not" +#~ msgstr "否" + +#~ msgid "In" +#~ msgstr "在..里面" + +#~ msgid "Contains" +#~ msgstr "包含" + +#~ msgid "Startswith" +#~ msgstr "以..开头" + +#~ msgid "Endswith" +#~ msgstr "以..结尾" + +#~ msgid "Instance platform" +#~ msgstr "实例平台" + +#~ msgid "Instance address" +#~ msgstr "实例地址" + +#~ msgid "Rule attr" +#~ msgstr "规则属性" + +#~ msgid "Rule match" +#~ msgstr "规则匹配" + +#~ msgid "Rule value" +#~ msgstr "规则值" + +#~ msgid "Strategy rule" +#~ msgstr "策略规则" + +#~ msgid "Action attr" +#~ msgstr "动作属性" + +#~ msgid "Action value" +#~ msgstr "动作值" + +#~ msgid "Strategy action" +#~ msgstr "策略动作" + +#~ msgid "CN South-Shenzhen" +#~ msgstr "华南-广州" diff --git a/apps/terminal/api/applet/applet.py b/apps/terminal/api/applet/applet.py index ae984ba2f..90b4f162c 100644 --- a/apps/terminal/api/applet/applet.py +++ b/apps/terminal/api/applet/applet.py @@ -60,6 +60,10 @@ class DownloadUploadMixin: name = manifest['name'] update = request.query_params.get('update') + is_enterprise = manifest.get('edition') == Applet.Edition.enterprise + if is_enterprise and not settings.XPACK_ENABLED: + raise ValidationError({'error': _('This is enterprise edition applet')}) + instance = Applet.objects.filter(name=name).first() if instance and not update: return Response({'error': 'Applet already exists: {}'.format(name)}, status=400)