diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo index 9cd3ce2c1..b71df6d0d 100644 --- a/apps/locale/ja/LC_MESSAGES/django.mo +++ b/apps/locale/ja/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:555045fe297b59d9a9f813738679419f34ae9296013f4576ee1e0037985c0f1c -size 152487 +oid sha256:50d8a03cc8991f92c9e649b4eb1685a9bc862671e013a11ba7683a1b7fcd0ae4 +size 152899 diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 1c315331d..cb98e8c6e 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-08 17:55+0800\n" +"POT-Creation-Date: 2023-08-10 11:06+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,7 +95,7 @@ msgstr "更新" #: accounts/const/account.py:33 #: accounts/serializers/automations/change_secret.py:156 audits/const.py:54 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19 -#: ops/const.py:58 terminal/const.py:77 xpack/plugins/cloud/const.py:43 +#: ops/const.py:61 terminal/const.py:77 xpack/plugins/cloud/const.py:43 msgid "Failed" msgstr "失敗しました" @@ -204,7 +204,7 @@ msgstr "HashiCorp Vault" #: accounts/serializers/automations/change_secret.py:112 #: accounts/serializers/automations/change_secret.py:132 #: acls/serializers/base.py:123 assets/models/asset/common.py:93 -#: assets/models/asset/common.py:331 assets/models/cmd_filter.py:36 +#: assets/models/asset/common.py:334 assets/models/cmd_filter.py:36 #: assets/serializers/domain.py:19 assets/serializers/label.py:27 #: audits/models.py:53 authentication/models/connection_token.py:36 #: perms/models/asset_permission.py:64 perms/serializers/permission.py:34 @@ -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:194 +#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:221 #: ops/templates/ops/celery_task_log.html:75 #: perms/models/asset_permission.py:72 terminal/models/applet/host.py:139 #: 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 "理由" @@ -417,7 +417,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:195 +#: ops/models/celery.py:64 ops/models/job.py:222 #: terminal/models/applet/host.py:140 msgid "Date finished" msgstr "終了日" @@ -503,16 +503,15 @@ 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:94 ops/models/playbook.py:28 ops/serializers/job.py:20 +#: ops/models/job.py:119 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/sms.py:6 #: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12 -#: terminal/models/component/endpoint.py:92 +#: terminal/models/component/endpoint.py:94 #: 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 "名前" @@ -524,12 +523,12 @@ msgstr "特権アカウント" #: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39 #: assets/models/label.py:22 #: authentication/serializers/connect_token_secret.py:114 -#: terminal/models/applet/applet.py:39 -#: terminal/models/component/endpoint.py:103 users/serializers/user.py:169 +#: terminal/models/applet/applet.py:38 +#: terminal/models/component/endpoint.py:105 users/serializers/user.py:169 msgid "Is active" msgstr "アクティブです。" -#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325 +#: accounts/models/template.py:19 msgid "Account template" msgstr "アカウント テンプレート" @@ -635,9 +634,9 @@ 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:105 +#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:130 #: perms/serializers/user_permission.py:27 settings/serializers/vault.py:13 -#: terminal/models/applet/applet.py:38 terminal/models/component/storage.py:57 +#: terminal/models/applet/applet.py:37 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 #: terminal/serializers/storage.py:238 tickets/models/comment.py:26 @@ -670,7 +669,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:107 ops/serializers/job.py:21 +#: ops/models/job.py:132 ops/serializers/job.py:21 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 msgid "Assets" msgstr "資産" @@ -761,14 +760,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:113 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:250 terminal/models/applet/host.py:141 +#: ops/models/job.py:138 ops/models/playbook.py:31 rbac/models/role.py:37 +#: settings/models.py:37 terminal/models/applet/applet.py:43 +#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:141 #: terminal/models/component/endpoint.py:24 -#: terminal/models/component/endpoint.py:102 +#: 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 "コメント" @@ -816,7 +815,7 @@ msgstr "自動タスク実行履歴" #: accounts/serializers/automations/change_secret.py:155 audits/const.py:53 #: audits/models.py:59 audits/signal_handlers/activity_log.py:33 -#: common/const/choices.py:18 ops/const.py:56 ops/serializers/celery.py:40 +#: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40 #: terminal/const.py:76 terminal/models/session/sharing.py:117 #: tickets/views/approve.py:115 msgid "Success" @@ -888,14 +887,12 @@ msgid "Warning" msgstr "警告" #: acls/models/base.py:37 assets/models/_user.py:51 -#: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:95 -#: xpack/plugins/cloud/models.py:275 +#: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:97 msgid "Priority" msgstr "優先順位" #: acls/models/base.py:38 assets/models/_user.py:51 -#: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:96 -#: xpack/plugins/cloud/models.py:276 +#: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:98 msgid "1-100, the lower the value will be match first" msgstr "1-100、低い値は最初に一致します" @@ -932,7 +929,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 "正規情報" @@ -1029,7 +1025,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アドレスが無効: '{}'" @@ -1057,7 +1053,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 "ツールバーの" @@ -1351,7 +1347,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:193 +#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:220 #: users/models/user.py:1018 msgid "Date created" msgstr "作成された日付" @@ -1390,7 +1386,7 @@ msgstr "ユーザーと同じユーザー名" #: assets/models/_user.py:52 authentication/models/connection_token.py:41 #: authentication/serializers/connect_token_secret.py:111 -#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19 +#: terminal/models/applet/applet.py:40 terminal/serializers/session.py:19 #: terminal/serializers/session.py:42 terminal/serializers/storage.py:70 msgid "Protocol" msgstr "プロトコル" @@ -1455,13 +1451,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 "ドメイン" @@ -1478,19 +1475,19 @@ msgstr "資産ハードウェア情報の収集" msgid "Custom info" msgstr "カスタム属性" -#: assets/models/asset/common.py:334 +#: assets/models/asset/common.py:337 msgid "Can refresh asset hardware info" msgstr "資産ハードウェア情報を更新できます" -#: assets/models/asset/common.py:335 +#: assets/models/asset/common.py:338 msgid "Can test asset connectivity" msgstr "資産接続をテストできます" -#: assets/models/asset/common.py:336 +#: assets/models/asset/common.py:339 msgid "Can match asset" msgstr "アセットを一致させることができます" -#: assets/models/asset/common.py:337 +#: assets/models/asset/common.py:340 msgid "Can change asset nodes" msgstr "資産ノードを変更できます" @@ -1518,7 +1515,7 @@ msgstr "証明書チェックを無視" msgid "Proxy" msgstr "プロキシー" -#: assets/models/automations/base.py:22 ops/models/job.py:189 +#: assets/models/automations/base.py:22 ops/models/job.py:216 #: settings/serializers/auth/sms.py:99 msgid "Parameters" msgstr "パラメータ" @@ -1532,13 +1529,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:186 -#: terminal/models/applet/applet.py:249 terminal/models/applet/host.py:138 +#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:213 +#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:138 #: 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 "ステータス" @@ -1602,7 +1599,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 "デフォルト" @@ -1652,7 +1649,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 "ノード" @@ -1793,8 +1790,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 "プロトコル" @@ -2343,29 +2339,29 @@ msgstr "外部ストレージへのFTPファイルのアップロード" msgid "This action require verify your MFA" msgstr "この操作には、MFAを検証する必要があります" -#: authentication/api/connection_token.py:230 +#: authentication/api/connection_token.py:258 msgid "Reusable connection token is not allowed, global setting not enabled" msgstr "" "再使用可能な接続トークンの使用は許可されていません。グローバル設定は有効に" "なっていません" -#: authentication/api/connection_token.py:310 +#: authentication/api/connection_token.py:338 msgid "Anonymous account is not supported for this asset" msgstr "匿名アカウントはこのプロパティではサポートされていません" -#: authentication/api/connection_token.py:329 +#: authentication/api/connection_token.py:357 msgid "Account not found" msgstr "アカウントが見つかりません" -#: authentication/api/connection_token.py:332 +#: authentication/api/connection_token.py:360 msgid "Permission expired" msgstr "承認の有効期限が切れています" -#: authentication/api/connection_token.py:346 +#: authentication/api/connection_token.py:374 msgid "ACL action is reject: {}({})" msgstr "ACL アクションは拒否です: {}({})" -#: authentication/api/connection_token.py:350 +#: authentication/api/connection_token.py:378 msgid "ACL action is review" msgstr "ACL アクションはレビューです" @@ -2932,8 +2928,7 @@ msgid "Show" msgstr "表示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: settings/serializers/security.py:39 users/models/user.py:635 -#: users/serializers/profile.py:116 +#: users/models/user.py:635 users/serializers/profile.py:116 #: users/templates/users/user_verify_mfa.html:36 msgid "Disable" msgstr "無効化" @@ -3293,7 +3288,7 @@ msgstr "の準備を" msgid "Pending" msgstr "未定" -#: common/const/choices.py:17 ops/const.py:55 +#: common/const/choices.py:17 ops/const.py:58 msgid "Running" msgstr "ランニング" @@ -3651,15 +3646,15 @@ msgstr "システムメッセージ" msgid "Publish the station message" msgstr "投稿サイトニュース" -#: ops/ansible/inventory.py:92 +#: ops/ansible/inventory.py:92 ops/models/job.py:60 msgid "No account available" msgstr "利用可能なアカウントがありません" -#: ops/ansible/inventory.py:258 +#: ops/ansible/inventory.py:260 msgid "Ansible disabled" msgstr "Ansible 無効" -#: ops/ansible/inventory.py:274 +#: ops/ansible/inventory.py:276 msgid "Skip hosts below:" msgstr "次のホストをスキップします: " @@ -3723,7 +3718,7 @@ msgstr "VCS" msgid "Adhoc" msgstr "コマンド#コマンド#" -#: ops/const.py:39 ops/models/job.py:103 +#: ops/const.py:39 ops/models/job.py:128 msgid "Playbook" msgstr "Playbook" @@ -3743,7 +3738,25 @@ msgstr "PowerShell" msgid "Python" msgstr "Python" -#: ops/const.py:57 +#: ops/const.py:52 +#, fuzzy +#| msgid "MySQL port" +msgid "MySQL" +msgstr "MySQL ポート" + +#: ops/const.py:53 +#, fuzzy +#| msgid "PostgreSQL port" +msgid "PostgreSQL" +msgstr "PostgreSQL ポート" + +#: ops/const.py:54 +#, fuzzy +#| msgid "Server url" +msgid "SQLServer" +msgstr "サービス側アドレス" + +#: ops/const.py:60 msgid "Timeout" msgstr "タイムアウト" @@ -3780,17 +3793,17 @@ msgstr "定期的または定期的に設定を行う必要があります" msgid "Pattern" msgstr "パターン" -#: ops/models/adhoc.py:23 ops/models/job.py:98 +#: ops/models/adhoc.py:23 ops/models/job.py:123 msgid "Module" msgstr "モジュール" -#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:97 +#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:122 #: 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:106 ops/models/job.py:192 ops/models/playbook.py:30 +#: ops/models/job.py:131 ops/models/job.py:219 ops/models/playbook.py:30 #: terminal/models/session/sharing.py:24 msgid "Creator" msgstr "作成者" @@ -3807,12 +3820,12 @@ msgstr "最後の実行" msgid "Date last run" msgstr "最終実行日" -#: ops/models/base.py:51 ops/models/job.py:190 -#: xpack/plugins/cloud/models.py:199 +#: ops/models/base.py:51 ops/models/job.py:217 +#: xpack/plugins/cloud/models.py:162 msgid "Result" msgstr "結果" -#: ops/models/base.py:52 ops/models/job.py:191 +#: ops/models/base.py:52 ops/models/job.py:218 msgid "Summary" msgstr "概要" @@ -3845,43 +3858,43 @@ msgstr "発売日" msgid "Celery Task Execution" msgstr "Celery タスク実行" -#: ops/models/job.py:100 +#: ops/models/job.py:125 msgid "Chdir" msgstr "実行ディレクトリ" -#: ops/models/job.py:101 +#: ops/models/job.py:126 msgid "Timeout (Seconds)" msgstr "タイムアウト(秒)" -#: ops/models/job.py:108 +#: ops/models/job.py:133 msgid "Use Parameter Define" msgstr "パラメータ定義を使用する" -#: ops/models/job.py:109 +#: ops/models/job.py:134 msgid "Parameters define" msgstr "パラメータ定義" -#: ops/models/job.py:110 +#: ops/models/job.py:135 msgid "Runas" msgstr "ユーザーとして実行" -#: ops/models/job.py:112 +#: ops/models/job.py:137 msgid "Runas policy" msgstr "ユーザー ポリシー" -#: ops/models/job.py:174 +#: ops/models/job.py:201 msgid "Job" msgstr "ジョブ#ジョブ#" -#: ops/models/job.py:197 +#: ops/models/job.py:224 msgid "Material" msgstr "Material" -#: ops/models/job.py:199 +#: ops/models/job.py:226 msgid "Material Type" msgstr "Material を選択してオプションを設定します。" -#: ops/models/job.py:480 +#: ops/models/job.py:526 msgid "Job Execution" msgstr "ジョブ実行" @@ -4049,7 +4062,7 @@ msgstr "デフォルト組織" msgid "SYSTEM" msgstr "システム組織" -#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:39 msgid "Builtin" msgstr "ビルトイン" @@ -4346,8 +4359,8 @@ msgstr "タスクセンター" msgid "My assets" msgstr "私の資産" -#: rbac/tree.py:56 terminal/models/applet/applet.py:51 -#: terminal/models/applet/applet.py:246 terminal/models/applet/host.py:29 +#: rbac/tree.py:56 terminal/models/applet/applet.py:50 +#: terminal/models/applet/applet.py:279 terminal/models/applet/host.py:29 #: terminal/serializers/applet.py:15 msgid "Applet" msgstr "リモートアプリケーション" @@ -5152,6 +5165,12 @@ msgstr "" "ユーザーが限られた回数だけログインできなかった場合、この時間間隔ではログイン" "はできません。" +#: settings/serializers/security.py:39 +#, fuzzy +#| msgid "MFA not enabled" +msgid "Not enabled" +msgstr "MFAが有効化されていません" + #: settings/serializers/security.py:40 msgid "All users" msgstr "すべてのユーザー" @@ -5340,7 +5359,6 @@ msgid "If idle time more than it, disconnect connection." msgstr "この設定以上の操作がない場合、接続は切断されます" #: settings/serializers/security.py:172 - msgid "Session max connection time (hour)" msgstr "セッション最大接続時間(時間)" @@ -5672,8 +5690,8 @@ msgstr "期限切れです。" #, python-format msgid "" "\n" -" Your password has expired, please click this link update password.\n" +" Your password has expired, please click this link update password.\n" " " msgstr "" "\n" @@ -5694,34 +5712,34 @@ msgid "" " " msgstr "" "\n" -" クリックしてください リンク パスワードの更新\n" +" クリックしてください リンク パスワードの更新\n" " " #: templates/_message.html:43 #, python-format msgid "" "\n" -" Your information was incomplete. Please click this link to complete your information.\n" +" Your information was incomplete. Please click this link to complete your information.\n" " " msgstr "" "\n" -" あなたの情報が不完全なので、クリックしてください。 リンク 補完\n" +" あなたの情報が不完全なので、クリックしてください。 リンク 補完\n" " " #: templates/_message.html:56 #, python-format msgid "" "\n" -" Your ssh public key not set or expired. Please click this link to update\n" +" Your ssh public key not set or expired. Please click this link to update\n" " " msgstr "" "\n" -" SSHキーが設定されていないか無効になっている場合は、 リンク 更新\n" +" SSHキーが設定されていないか無効になっている場合は、 リンク 更新\n" " " #: templates/_mfa_login_field.html:28 @@ -5861,10 +5879,38 @@ msgstr "出力" msgid "Risk level" msgstr "リスクレベル" -#: terminal/connect_methods.py:35 +#: terminal/connect_methods.py:29 +#, fuzzy +#| msgid "Client" +msgid "SSH Client" +msgstr "クライアント" + +#: terminal/connect_methods.py:30 +#, fuzzy +#| msgid "SSH key" +msgid "SSH Guide" +msgstr "SSH キー" + +#: terminal/connect_methods.py:31 +#, fuzzy +#| msgid "Client" +msgid "SFTP Client" +msgstr "クライアント" + +#: terminal/connect_methods.py:33 +msgid "DB Guide" +msgstr "" + +#: terminal/connect_methods.py:34 msgid "DB Client" msgstr "データベース クライアント" +#: terminal/connect_methods.py:36 +#, fuzzy +#| msgid "Remote Address" +msgid "Remote Desktop" +msgstr "リモートアドレス" + #: terminal/const.py:12 msgid "Review & Reject" msgstr "レビューと拒否" @@ -5938,7 +5984,7 @@ msgstr "ストレージが無効です" msgid "Community" msgstr "コミュニティ版" -#: terminal/models/applet/applet.py:30 +#: terminal/models/applet/applet.py:30 terminal/models/applet/applet.py:36 msgid "Enterprise" msgstr "エンタープライズ版" @@ -5946,39 +5992,35 @@ msgstr "エンタープライズ版" msgid "Author" msgstr "著者" -#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:30 -msgid "Edition" -msgstr "バージョン" - -#: terminal/models/applet/applet.py:42 +#: terminal/models/applet/applet.py:41 msgid "Can concurrent" msgstr "同時実行可能" -#: terminal/models/applet/applet.py:43 +#: terminal/models/applet/applet.py:42 msgid "Tags" msgstr "ラベル" -#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159 +#: terminal/models/applet/applet.py:46 terminal/serializers/storage.py:159 msgid "Hosts" msgstr "ホスト" -#: terminal/models/applet/applet.py:92 +#: terminal/models/applet/applet.py:91 msgid "Applet pkg not valid, Missing file {}" msgstr "無効なアプレット パッケージ、ファイル {} がありません" -#: terminal/models/applet/applet.py:111 +#: terminal/models/applet/applet.py:110 msgid "Load platform.yml failed: {}" msgstr "platform.ymlのロードに失敗しました:{}" -#: terminal/models/applet/applet.py:114 +#: terminal/models/applet/applet.py:113 msgid "Only support custom platform" msgstr "カスタムプラットフォームのみをサポート" -#: terminal/models/applet/applet.py:119 +#: terminal/models/applet/applet.py:118 msgid "Missing type in platform.yml" msgstr "platform.ymlにタイプがありません" -#: terminal/models/applet/applet.py:248 terminal/models/applet/host.py:35 +#: terminal/models/applet/applet.py:281 terminal/models/applet/host.py:35 #: terminal/models/applet/host.py:136 msgid "Hosting" msgstr "ホスト マシン" @@ -6044,18 +6086,18 @@ msgid "Redis port" msgstr "Redis ポート" #: terminal/models/component/endpoint.py:29 -#: terminal/models/component/endpoint.py:100 +#: terminal/models/component/endpoint.py:102 #: terminal/serializers/endpoint.py:73 terminal/serializers/storage.py:40 #: terminal/serializers/storage.py:52 terminal/serializers/storage.py:82 #: terminal/serializers/storage.py:92 terminal/serializers/storage.py:100 msgid "Endpoint" msgstr "エンドポイント" -#: terminal/models/component/endpoint.py:93 +#: terminal/models/component/endpoint.py:95 msgid "IP group" msgstr "IP グループ" -#: terminal/models/component/endpoint.py:106 +#: terminal/models/component/endpoint.py:108 msgid "Endpoint rule" msgstr "エンドポイントルール" @@ -6470,7 +6512,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 "リージョン" @@ -7028,7 +7070,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 "公開キー" @@ -7057,7 +7099,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秘密鍵" @@ -7496,11 +7538,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 "テスト接続に失敗しました: {}" @@ -7588,7 +7630,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 "インスタンス名" @@ -7616,158 +7658,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 "中国 (北京)" @@ -7876,7 +7838,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 "中国-香港" @@ -7894,65 +7856,65 @@ 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" -msgstr "" +#: 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 +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" @@ -7982,7 +7944,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エンドポイント" @@ -8048,11 +8010,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 " @@ -8066,11 +8028,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 "インスタンス数" @@ -8082,6 +8044,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 "デフォルトの復元に成功しました。" @@ -8146,11 +8112,62 @@ msgstr "究極のエディション" msgid "Community edition" msgstr "コミュニティ版" -#~ msgid "EU-Paris" -#~ msgstr "ヨーロッパ-パリ" +#~ msgid "Edition" +#~ msgstr "バージョン" -#~ msgid "CN Northeast-Dalian" -#~ msgstr "华北-大连" +#~ 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 "華南-広州" #~ msgid "Current only support login from AD/LDAP" #~ msgstr "現在、AD/LDAPからのログインのみサポートしています" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index c9e28a258..fea8bac2a 100644 --- a/apps/locale/zh/LC_MESSAGES/django.mo +++ b/apps/locale/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a49d0a2a96656a3f98a0d13f64d426be5f60110ef629bed8d871c6525c16d82 -size 124739 +oid sha256:7ece6510d9392a16daca6d2729518ed6cf5df3a8c40c6e9e7881207df72a326b +size 125537 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 7eeae8dc5..87fc95037 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-08 17:55+0800\n" +"POT-Creation-Date: 2023-08-10 11:06+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -94,7 +94,7 @@ msgstr "更新" #: accounts/const/account.py:33 #: accounts/serializers/automations/change_secret.py:156 audits/const.py:54 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19 -#: ops/const.py:58 terminal/const.py:77 xpack/plugins/cloud/const.py:43 +#: ops/const.py:61 terminal/const.py:77 xpack/plugins/cloud/const.py:43 msgid "Failed" msgstr "失败" @@ -203,7 +203,7 @@ msgstr "HashiCorp Vault" #: accounts/serializers/automations/change_secret.py:112 #: accounts/serializers/automations/change_secret.py:132 #: acls/serializers/base.py:123 assets/models/asset/common.py:93 -#: assets/models/asset/common.py:331 assets/models/cmd_filter.py:36 +#: assets/models/asset/common.py:334 assets/models/cmd_filter.py:36 #: assets/serializers/domain.py:19 assets/serializers/label.py:27 #: audits/models.py:53 authentication/models/connection_token.py:36 #: perms/models/asset_permission.py:64 perms/serializers/permission.py:34 @@ -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:194 +#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:221 #: ops/templates/ops/celery_task_log.html:75 #: perms/models/asset_permission.py:72 terminal/models/applet/host.py:139 #: 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 "原因" @@ -416,7 +416,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:195 +#: ops/models/celery.py:64 ops/models/job.py:222 #: terminal/models/applet/host.py:140 msgid "Date finished" msgstr "结束日期" @@ -502,16 +502,15 @@ 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:94 ops/models/playbook.py:28 ops/serializers/job.py:20 +#: ops/models/job.py:119 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/sms.py:6 #: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12 -#: terminal/models/component/endpoint.py:92 +#: terminal/models/component/endpoint.py:94 #: 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 "名称" @@ -523,12 +522,12 @@ msgstr "特权账号" #: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39 #: assets/models/label.py:22 #: authentication/serializers/connect_token_secret.py:114 -#: terminal/models/applet/applet.py:39 -#: terminal/models/component/endpoint.py:103 users/serializers/user.py:169 +#: terminal/models/applet/applet.py:38 +#: terminal/models/component/endpoint.py:105 users/serializers/user.py:169 msgid "Is active" msgstr "激活" -#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325 +#: accounts/models/template.py:19 msgid "Account template" msgstr "账号模版" @@ -635,9 +634,9 @@ 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:105 +#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:130 #: perms/serializers/user_permission.py:27 settings/serializers/vault.py:13 -#: terminal/models/applet/applet.py:38 terminal/models/component/storage.py:57 +#: terminal/models/applet/applet.py:37 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 #: terminal/serializers/storage.py:238 tickets/models/comment.py:26 @@ -670,7 +669,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:107 ops/serializers/job.py:21 +#: ops/models/job.py:132 ops/serializers/job.py:21 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 msgid "Assets" msgstr "资产" @@ -761,14 +760,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:113 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:250 terminal/models/applet/host.py:141 +#: ops/models/job.py:138 ops/models/playbook.py:31 rbac/models/role.py:37 +#: settings/models.py:37 terminal/models/applet/applet.py:43 +#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:141 #: terminal/models/component/endpoint.py:24 -#: terminal/models/component/endpoint.py:102 +#: 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 "备注" @@ -816,7 +815,7 @@ msgstr "自动化任务执行历史" #: accounts/serializers/automations/change_secret.py:155 audits/const.py:53 #: audits/models.py:59 audits/signal_handlers/activity_log.py:33 -#: common/const/choices.py:18 ops/const.py:56 ops/serializers/celery.py:40 +#: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40 #: terminal/const.py:76 terminal/models/session/sharing.py:117 #: tickets/views/approve.py:115 msgid "Success" @@ -888,14 +887,12 @@ msgid "Warning" msgstr "告警" #: acls/models/base.py:37 assets/models/_user.py:51 -#: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:95 -#: xpack/plugins/cloud/models.py:275 +#: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:97 msgid "Priority" msgstr "优先级" #: acls/models/base.py:38 assets/models/_user.py:51 -#: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:96 -#: xpack/plugins/cloud/models.py:276 +#: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:98 msgid "1-100, the lower the value will be match first" msgstr "优先级可选范围为 1-100 (数值越小越优先)" @@ -932,7 +929,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 "正则表达式" @@ -1028,7 +1024,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 地址无效: `{}`" @@ -1056,7 +1052,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 "属性" @@ -1349,7 +1345,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:193 +#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:220 #: users/models/user.py:1018 msgid "Date created" msgstr "创建日期" @@ -1388,7 +1384,7 @@ msgstr "用户名与用户相同" #: assets/models/_user.py:52 authentication/models/connection_token.py:41 #: authentication/serializers/connect_token_secret.py:111 -#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19 +#: terminal/models/applet/applet.py:40 terminal/serializers/session.py:19 #: terminal/serializers/session.py:42 terminal/serializers/storage.py:70 msgid "Protocol" msgstr "协议" @@ -1453,13 +1449,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 "网域" @@ -1476,19 +1473,19 @@ msgstr "收集资产硬件信息" msgid "Custom info" msgstr "自定义属性" -#: assets/models/asset/common.py:334 +#: assets/models/asset/common.py:337 msgid "Can refresh asset hardware info" msgstr "可以更新资产硬件信息" -#: assets/models/asset/common.py:335 +#: assets/models/asset/common.py:338 msgid "Can test asset connectivity" msgstr "可以测试资产连接性" -#: assets/models/asset/common.py:336 +#: assets/models/asset/common.py:339 msgid "Can match asset" msgstr "可以匹配资产" -#: assets/models/asset/common.py:337 +#: assets/models/asset/common.py:340 msgid "Can change asset nodes" msgstr "可以修改资产节点" @@ -1516,7 +1513,7 @@ msgstr "忽略证书校验" msgid "Proxy" msgstr "代理" -#: assets/models/automations/base.py:22 ops/models/job.py:189 +#: assets/models/automations/base.py:22 ops/models/job.py:216 #: settings/serializers/auth/sms.py:99 msgid "Parameters" msgstr "参数" @@ -1530,13 +1527,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:186 -#: terminal/models/applet/applet.py:249 terminal/models/applet/host.py:138 +#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:213 +#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:138 #: 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 "状态" @@ -1600,7 +1597,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 "默认" @@ -1650,7 +1647,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 "节点" @@ -1789,8 +1786,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 "协议组" @@ -2332,27 +2328,27 @@ msgstr "上传 FTP 文件到外部存储" msgid "This action require verify your MFA" msgstr "该操作需要验证您的 MFA, 请先开启并配置" -#: authentication/api/connection_token.py:230 +#: authentication/api/connection_token.py:258 msgid "Reusable connection token is not allowed, global setting not enabled" msgstr "不允许使用可重复使用的连接令牌,未启用全局设置" -#: authentication/api/connection_token.py:310 +#: authentication/api/connection_token.py:338 msgid "Anonymous account is not supported for this asset" msgstr "匿名账号不支持当前资产" -#: authentication/api/connection_token.py:329 +#: authentication/api/connection_token.py:357 msgid "Account not found" msgstr "账号未找到" -#: authentication/api/connection_token.py:332 +#: authentication/api/connection_token.py:360 msgid "Permission expired" msgstr "授权已过期" -#: authentication/api/connection_token.py:346 +#: authentication/api/connection_token.py:374 msgid "ACL action is reject: {}({})" msgstr "ACL 动作是拒绝: {}({})" -#: authentication/api/connection_token.py:350 +#: authentication/api/connection_token.py:378 msgid "ACL action is review" msgstr "ACL 动作是复核" @@ -2905,8 +2901,7 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: settings/serializers/security.py:39 users/models/user.py:635 -#: users/serializers/profile.py:116 +#: users/models/user.py:635 users/serializers/profile.py:116 #: users/templates/users/user_verify_mfa.html:36 msgid "Disable" msgstr "禁用" @@ -3258,7 +3253,7 @@ msgstr "准备" msgid "Pending" msgstr "待定的" -#: common/const/choices.py:17 ops/const.py:55 +#: common/const/choices.py:17 ops/const.py:58 msgid "Running" msgstr "运行中" @@ -3609,15 +3604,15 @@ msgstr "系统信息" msgid "Publish the station message" msgstr "发布站内消息" -#: ops/ansible/inventory.py:92 +#: ops/ansible/inventory.py:92 ops/models/job.py:60 msgid "No account available" msgstr "无可用账号" -#: ops/ansible/inventory.py:258 +#: ops/ansible/inventory.py:260 msgid "Ansible disabled" msgstr "Ansible 已禁用" -#: ops/ansible/inventory.py:274 +#: ops/ansible/inventory.py:276 msgid "Skip hosts below:" msgstr "跳过以下主机: " @@ -3681,7 +3676,7 @@ msgstr "VCS" msgid "Adhoc" msgstr "命令" -#: ops/const.py:39 ops/models/job.py:103 +#: ops/const.py:39 ops/models/job.py:128 msgid "Playbook" msgstr "Playbook" @@ -3701,7 +3696,19 @@ msgstr "PowerShell" msgid "Python" msgstr "Python" -#: ops/const.py:57 +#: ops/const.py:52 +msgid "MySQL" +msgstr "MySQL" + +#: ops/const.py:53 +msgid "PostgreSQL" +msgstr "PostgreSQL" + +#: ops/const.py:54 +msgid "SQLServer" +msgstr "SQLServer" + +#: ops/const.py:60 msgid "Timeout" msgstr "超时" @@ -3738,17 +3745,17 @@ msgstr "需要周期或定期设置" msgid "Pattern" msgstr "模式" -#: ops/models/adhoc.py:23 ops/models/job.py:98 +#: ops/models/adhoc.py:23 ops/models/job.py:123 msgid "Module" msgstr "模块" -#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:97 +#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:122 #: 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:106 ops/models/job.py:192 ops/models/playbook.py:30 +#: ops/models/job.py:131 ops/models/job.py:219 ops/models/playbook.py:30 #: terminal/models/session/sharing.py:24 msgid "Creator" msgstr "创建者" @@ -3765,12 +3772,12 @@ msgstr "最后执行" msgid "Date last run" msgstr "最后运行日期" -#: ops/models/base.py:51 ops/models/job.py:190 -#: xpack/plugins/cloud/models.py:199 +#: ops/models/base.py:51 ops/models/job.py:217 +#: xpack/plugins/cloud/models.py:162 msgid "Result" msgstr "结果" -#: ops/models/base.py:52 ops/models/job.py:191 +#: ops/models/base.py:52 ops/models/job.py:218 msgid "Summary" msgstr "汇总" @@ -3803,43 +3810,43 @@ msgstr "发布日期" msgid "Celery Task Execution" msgstr "Celery 任务执行" -#: ops/models/job.py:100 +#: ops/models/job.py:125 msgid "Chdir" msgstr "运行目录" -#: ops/models/job.py:101 +#: ops/models/job.py:126 msgid "Timeout (Seconds)" msgstr "超时时间(秒)" -#: ops/models/job.py:108 +#: ops/models/job.py:133 msgid "Use Parameter Define" msgstr "使用参数定义" -#: ops/models/job.py:109 +#: ops/models/job.py:134 msgid "Parameters define" msgstr "参数定义" -#: ops/models/job.py:110 +#: ops/models/job.py:135 msgid "Runas" msgstr "运行用户" -#: ops/models/job.py:112 +#: ops/models/job.py:137 msgid "Runas policy" msgstr "用户策略" -#: ops/models/job.py:174 +#: ops/models/job.py:201 msgid "Job" msgstr "作业" -#: ops/models/job.py:197 +#: ops/models/job.py:224 msgid "Material" msgstr "Material" -#: ops/models/job.py:199 +#: ops/models/job.py:226 msgid "Material Type" msgstr "Material 类型" -#: ops/models/job.py:480 +#: ops/models/job.py:526 msgid "Job Execution" msgstr "作业执行" @@ -4006,7 +4013,7 @@ msgstr "默认组织" msgid "SYSTEM" msgstr "系统组织" -#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:39 msgid "Builtin" msgstr "内置的" @@ -4302,8 +4309,8 @@ msgstr "任务中心" msgid "My assets" msgstr "我的资产" -#: rbac/tree.py:56 terminal/models/applet/applet.py:51 -#: terminal/models/applet/applet.py:246 terminal/models/applet/host.py:29 +#: rbac/tree.py:56 terminal/models/applet/applet.py:50 +#: terminal/models/applet/applet.py:279 terminal/models/applet/host.py:29 #: terminal/serializers/applet.py:15 msgid "Applet" msgstr "远程应用" @@ -5096,6 +5103,10 @@ msgid "" "allowed during this time interval." msgstr "当用户登录失败次数达到限制后,那么在此时间间隔内禁止登录" +#: settings/serializers/security.py:39 +msgid "Not enabled" +msgstr "未启用" + #: settings/serializers/security.py:40 msgid "All users" msgstr "所有用户" @@ -5595,13 +5606,13 @@ msgstr "过期。" #, python-format msgid "" "\n" -" Your password has expired, please click this link update password.\n" +" Your password has expired, please click this link update password.\n" " " msgstr "" "\n" -" 您的密码已经过期,请点击 链接 更新密码\n" +" 您的密码已经过期,请点击 链接 更新密码\n" " " #: templates/_message.html:30 @@ -5625,8 +5636,8 @@ msgstr "" #, python-format msgid "" "\n" -" Your information was incomplete. Please click this link to complete your information.\n" +" Your information was incomplete. Please click this link to complete your information.\n" " " msgstr "" "\n" @@ -5638,13 +5649,13 @@ msgstr "" #, python-format msgid "" "\n" -" Your ssh public key not set or expired. Please click this link to update\n" +" Your ssh public key not set or expired. Please click this link to update\n" " " msgstr "" "\n" -" 您的SSH密钥没有设置或已失效,请点击 链接 更新\n" +" 您的SSH密钥没有设置或已失效,请点击 链接 更新\n" " " #: templates/_mfa_login_field.html:28 @@ -5779,10 +5790,30 @@ msgstr "输出" msgid "Risk level" msgstr "风险等级" -#: terminal/connect_methods.py:35 +#: terminal/connect_methods.py:29 +msgid "SSH Client" +msgstr "SSH 客户端" + +#: terminal/connect_methods.py:30 +msgid "SSH Guide" +msgstr "SSH 向导" + +#: terminal/connect_methods.py:31 +msgid "SFTP Client" +msgstr "SFTP 客户端" + +#: terminal/connect_methods.py:33 +msgid "DB Guide" +msgstr "DB 连接向导" + +#: terminal/connect_methods.py:34 msgid "DB Client" msgstr "数据库客户端" +#: terminal/connect_methods.py:36 +msgid "Remote Desktop" +msgstr "远程桌面客户端" + #: terminal/const.py:12 msgid "Review & Reject" msgstr "审批 & 拒绝" @@ -5856,7 +5887,7 @@ msgstr "存储无效" msgid "Community" msgstr "社区版" -#: terminal/models/applet/applet.py:30 +#: terminal/models/applet/applet.py:30 terminal/models/applet/applet.py:36 msgid "Enterprise" msgstr "企业版" @@ -5864,39 +5895,35 @@ msgstr "企业版" msgid "Author" msgstr "作者" -#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:30 -msgid "Edition" -msgstr "版本" - -#: terminal/models/applet/applet.py:42 +#: terminal/models/applet/applet.py:41 msgid "Can concurrent" msgstr "可以并发" -#: terminal/models/applet/applet.py:43 +#: terminal/models/applet/applet.py:42 msgid "Tags" msgstr "标签" -#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159 +#: terminal/models/applet/applet.py:46 terminal/serializers/storage.py:159 msgid "Hosts" msgstr "主机" -#: terminal/models/applet/applet.py:92 +#: terminal/models/applet/applet.py:91 msgid "Applet pkg not valid, Missing file {}" msgstr "Applet pkg 无效,缺少文件 {}" -#: terminal/models/applet/applet.py:111 +#: terminal/models/applet/applet.py:110 msgid "Load platform.yml failed: {}" msgstr "加载 platform.yml 失败: {}" -#: terminal/models/applet/applet.py:114 +#: terminal/models/applet/applet.py:113 msgid "Only support custom platform" msgstr "只支持自定义平台" -#: terminal/models/applet/applet.py:119 +#: terminal/models/applet/applet.py:118 msgid "Missing type in platform.yml" msgstr "在 platform.yml 中缺少类型" -#: terminal/models/applet/applet.py:248 terminal/models/applet/host.py:35 +#: terminal/models/applet/applet.py:281 terminal/models/applet/host.py:35 #: terminal/models/applet/host.py:136 msgid "Hosting" msgstr "宿主机" @@ -5962,18 +5989,18 @@ msgid "Redis port" msgstr "Redis 端口" #: terminal/models/component/endpoint.py:29 -#: terminal/models/component/endpoint.py:100 +#: terminal/models/component/endpoint.py:102 #: terminal/serializers/endpoint.py:73 terminal/serializers/storage.py:40 #: terminal/serializers/storage.py:52 terminal/serializers/storage.py:82 #: terminal/serializers/storage.py:92 terminal/serializers/storage.py:100 msgid "Endpoint" msgstr "端点" -#: terminal/models/component/endpoint.py:93 +#: terminal/models/component/endpoint.py:95 msgid "IP group" msgstr "IP 组" -#: terminal/models/component/endpoint.py:106 +#: terminal/models/component/endpoint.py:108 msgid "Endpoint rule" msgstr "端点规则" @@ -6255,10 +6282,10 @@ msgid "" "support multiple open and the special has been used, the public account will " "be used to connect" msgstr "" -"这些账号用于连接发布的应用,账号现在分为两种类型:
" -"一种是专用的,每个用户都有一个专用账号。 " -"另一种是公共的,当应用不支持多开且专用的已经被使用时,会使用公共账号连接;
" -"注意: 如果不开启自动创建账号, 当前发布机仅能被指定标签的资产调度到,默认不会放到调度池中" +"这些账号用于连接发布的应用,账号现在分为两种类型:
一种是专用的,每个用" +"户都有一个专用账号。 另一种是公共的,当应用不支持多开且专用的已经被使用时,会" +"使用公共账号连接;
注意: 如果不开启自动创建账号, 当前发布机仅能被指定标" +"签的资产调度到,默认不会放到调度池中" #: terminal/serializers/applet_host.py:77 msgid "The number of public accounts created automatically" @@ -6382,7 +6409,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 "地域" @@ -6934,7 +6961,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公钥" @@ -6963,7 +6990,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私钥" @@ -7389,11 +7416,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 "测试连接失败:{}" @@ -7481,7 +7508,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 "实例名称" @@ -7509,158 +7536,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 "中国(北京)" @@ -7769,7 +7716,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 "中国-香港" @@ -7787,65 +7734,65 @@ 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" -msgstr "" +#: 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 +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" @@ -7875,7 +7822,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 端点" @@ -7940,11 +7887,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 " @@ -7956,11 +7903,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 "实例个数" @@ -7972,6 +7919,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 "恢复默认成功!" @@ -8036,11 +7987,62 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" -#~ msgid "EU-Paris" -#~ msgstr "欧洲-巴黎" +#~ msgid "Edition" +#~ msgstr "版本" -#~ msgid "CN Northeast-Dalian" -#~ msgstr "华北-大连" +#~ 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 "华南-广州" #~ msgid "Current only support login from AD/LDAP" #~ msgstr "当前仅支持 AD/LDAP 方式登录的用户" diff --git a/apps/ops/migrations/0026_auto_20230810_1039.py b/apps/ops/migrations/0026_auto_20230810_1039.py new file mode 100644 index 000000000..f9bd966a8 --- /dev/null +++ b/apps/ops/migrations/0026_auto_20230810_1039.py @@ -0,0 +1,39 @@ +# Generated by Django 4.1.10 on 2023-08-10 02:36 + +import common.db.encoder +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ops', '0025_auto_20230413_1531'), + ] + + operations = [ + migrations.AlterField( + model_name='adhoc', + name='module', + field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer')], default='shell', max_length=128, verbose_name='Module'), + ), + migrations.AlterField( + model_name='historicaljob', + name='module', + field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer')], default='shell', max_length=128, null=True, verbose_name='Module'), + ), + migrations.AlterField( + model_name='job', + name='module', + field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer')], default='shell', max_length=128, null=True, verbose_name='Module'), + ), + migrations.AlterField( + model_name='jobexecution', + name='result', + field=models.JSONField(blank=True, encoder=common.db.encoder.ModelJSONFieldEncoder, null=True, verbose_name='Result'), + ), + migrations.AlterField( + model_name='jobexecution', + name='summary', + field=models.JSONField(default=dict, encoder=common.db.encoder.ModelJSONFieldEncoder, verbose_name='Summary'), + ), + ] diff --git a/apps/settings/serializers/security.py b/apps/settings/serializers/security.py index e2571415e..bb1e2207c 100644 --- a/apps/settings/serializers/security.py +++ b/apps/settings/serializers/security.py @@ -36,7 +36,7 @@ login_ip_limit_time_help_text = _( class SecurityAuthSerializer(serializers.Serializer): SECURITY_MFA_AUTH = serializers.ChoiceField( choices=( - [0, _('Disable')], + [0, _('Not enabled')], [1, _('All users')], [2, _('Only admin users')], ), diff --git a/apps/terminal/migrations/0066_auto_20230810_1118.py b/apps/terminal/migrations/0066_auto_20230810_1118.py new file mode 100644 index 000000000..8c17fa6cb --- /dev/null +++ b/apps/terminal/migrations/0066_auto_20230810_1118.py @@ -0,0 +1,27 @@ +# Generated by Django 4.1.10 on 2023-08-10 02:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('terminal', '0065_session_command_amount'), + ] + + operations = [ + migrations.RemoveField( + model_name='applet', + name='edition', + ), + migrations.AddField( + model_name='applet', + name='enterprise', + field=models.BooleanField(default=False, verbose_name='Enterprise'), + ), + migrations.AlterField( + model_name='task', + name='name', + field=models.CharField(choices=[('kill_session', 'Kill Session'), ('lock_session', 'Lock Session'), ('unlock_session', 'Unlock Session')], max_length=128, verbose_name='Name'), + ), + ] diff --git a/apps/terminal/models/applet/applet.py b/apps/terminal/models/applet/applet.py index ccd1a8e52..547b89065 100644 --- a/apps/terminal/models/applet/applet.py +++ b/apps/terminal/models/applet/applet.py @@ -33,8 +33,7 @@ class Applet(JMSBaseModel): display_name = models.CharField(max_length=128, verbose_name=_('Display name')) version = models.CharField(max_length=16, verbose_name=_('Version')) author = models.CharField(max_length=128, verbose_name=_('Author')) - edition = models.CharField(max_length=128, choices=Edition.choices, default=Edition.community, - verbose_name=_('Edition')) + enterprise = models.BooleanField(default=False, verbose_name=_('Enterprise')) type = models.CharField(max_length=16, verbose_name=_('Type'), default='general', choices=Type.choices) is_active = models.BooleanField(default=True, verbose_name=_('Is active')) builtin = models.BooleanField(default=False, verbose_name=_('Builtin')) diff --git a/apps/terminal/serializers/applet.py b/apps/terminal/serializers/applet.py index aa3623436..681ff232b 100644 --- a/apps/terminal/serializers/applet.py +++ b/apps/terminal/serializers/applet.py @@ -27,8 +27,6 @@ class AppletPublicationSerializer(serializers.ModelSerializer): class AppletSerializer(serializers.ModelSerializer): icon = serializers.ReadOnlyField(label=_("Icon")) type = LabeledChoiceField(choices=Applet.Type.choices, label=_("Type")) - edition = LabeledChoiceField(choices=Applet.Edition.choices, label=_("Edition"), required=False, - default=Applet.Edition.community) class Meta: model = Applet @@ -37,6 +35,6 @@ class AppletSerializer(serializers.ModelSerializer): 'icon', 'readme', 'date_created', 'date_updated', ] fields = fields_mini + [ - 'version', 'author', 'type', 'edition', + 'version', 'author', 'type', 'enterprise', 'can_concurrent', 'protocols', 'tags', 'comment', ] + read_only_fields