diff --git a/apps/accounts/const/automation.py b/apps/accounts/const/automation.py index 5671f50f5..791527078 100644 --- a/apps/accounts/const/automation.py +++ b/apps/accounts/const/automation.py @@ -48,7 +48,7 @@ class SecretStrategy(models.TextChoices): class SSHKeyStrategy(models.TextChoices): add = 'add', _('Append SSH KEY') set = 'set', _('Empty and append SSH KEY') - set_jms = 'set_jms', _('Replace (The key generated by JumpServer) ') + set_jms = 'set_jms', _('Replace (Replace only keys pushed by JumpServer) ') class TriggerChoice(models.TextChoices, TreeChoices): diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo index b55f21643..7d2f91c61 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:a4ef9ccfeccf8f45c8753bc901ff6efe970486565c3bcf2d46042657ffa49f42 -size 139618 +oid sha256:24858bf247f7af58abda5adb5be733b7b995df2e26de7c91caf43f7aa0dd3be0 +size 139654 diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 1aee33de2..c113ce8ee 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-04-20 17:31+0800\n" +"POT-Creation-Date: 2023-04-21 14:05+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -128,8 +128,8 @@ msgid "Empty and append SSH KEY" msgstr "すべてクリアして追加" #: accounts/const/automation.py:51 ops/const.py:15 -msgid "Replace (The key generated by JumpServer) " -msgstr "置換(JumpServerによって生成された鍵)" +msgid "Replace (Replace only keys pushed by JumpServer) " +msgstr "置換(JumpServer によってプッシュされたキーのみを置換)" #: accounts/const/automation.py:56 msgid "On asset create" @@ -221,7 +221,7 @@ msgstr "ソース ID" #: accounts/serializers/automations/change_secret.py:113 #: accounts/serializers/automations/change_secret.py:133 #: acls/models/base.py:102 acls/serializers/base.py:57 -#: assets/serializers/asset/common.py:124 assets/serializers/gateway.py:28 +#: assets/serializers/asset/common.py:125 assets/serializers/gateway.py:28 #: audits/models.py:49 ops/models/base.py:18 #: perms/models/asset_permission.py:70 perms/serializers/permission.py:39 #: terminal/backends/command/models.py:21 terminal/models/session/session.py:34 @@ -262,7 +262,7 @@ msgid "Can change asset account template secret" msgstr "アセット アカウント テンプレートのパスワードを変更できます" #: accounts/models/automations/backup_account.py:27 -#: accounts/models/automations/change_secret.py:65 +#: accounts/models/automations/change_secret.py:64 #: accounts/serializers/account/backup.py:34 #: accounts/serializers/automations/change_secret.py:57 msgid "Recipient" @@ -363,7 +363,7 @@ msgid "Secret type" msgstr "鍵の種類" #: accounts/models/automations/change_secret.py:20 -#: accounts/models/automations/change_secret.py:90 accounts/models/base.py:38 +#: accounts/models/automations/change_secret.py:89 accounts/models/base.py:38 #: accounts/serializers/account/base.py:19 #: authentication/models/temp_token.py:10 #: authentication/templates/authentication/_access_key_modal.html:31 @@ -384,32 +384,32 @@ msgstr "パスワードルール" msgid "SSH key change strategy" msgstr "SSHキープッシュ方式" -#: accounts/models/automations/change_secret.py:72 +#: accounts/models/automations/change_secret.py:71 msgid "Change secret automation" msgstr "自動暗号化" -#: accounts/models/automations/change_secret.py:89 +#: accounts/models/automations/change_secret.py:88 msgid "Old secret" msgstr "以前のパスワード" -#: accounts/models/automations/change_secret.py:91 +#: accounts/models/automations/change_secret.py:90 msgid "Date started" msgstr "開始日" -#: accounts/models/automations/change_secret.py:92 +#: 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:193 #: terminal/models/applet/host.py:110 msgid "Date finished" msgstr "終了日" -#: accounts/models/automations/change_secret.py:94 +#: accounts/models/automations/change_secret.py:93 #: accounts/serializers/account/account.py:234 assets/const/automation.py:8 #: common/const/choices.py:20 msgid "Error" msgstr "間違い" -#: accounts/models/automations/change_secret.py:98 +#: accounts/models/automations/change_secret.py:97 msgid "Change secret record" msgstr "パスワード レコードの変更" @@ -456,7 +456,7 @@ msgid "Triggers" msgstr "トリガー方式" #: accounts/models/automations/push_account.py:16 acls/models/base.py:81 -#: acls/serializers/base.py:81 acls/serializers/login_acl.py:25 +#: acls/serializers/base.py:81 acls/serializers/login_acl.py:26 #: assets/models/cmd_filter.py:81 audits/models.py:65 audits/serializers.py:82 #: authentication/serializers/connect_token_secret.py:108 #: authentication/templates/authentication/_access_key_modal.html:34 @@ -478,8 +478,8 @@ msgstr "アカウントの確認" #: assets/models/cmd_filter.py:21 assets/models/domain.py:18 #: assets/models/group.py:20 assets/models/label.py:18 #: assets/models/platform.py:13 assets/models/platform.py:89 -#: assets/serializers/asset/common.py:144 assets/serializers/platform.py:99 -#: assets/serializers/platform.py:200 +#: assets/serializers/asset/common.py:145 assets/serializers/platform.py:92 +#: assets/serializers/platform.py:193 #: authentication/serializers/connect_token_secret.py:102 ops/mixin.py:21 #: ops/models/adhoc.py:21 ops/models/celery.py:15 ops/models/celery.py:57 #: ops/models/job.py:92 ops/models/playbook.py:23 ops/serializers/job.py:20 @@ -557,8 +557,8 @@ msgstr "アカウントの存在ポリシー" #: accounts/serializers/account/account.py:179 applications/models.py:11 #: assets/models/label.py:21 assets/models/platform.py:90 -#: assets/serializers/asset/common.py:120 assets/serializers/cagegory.py:8 -#: assets/serializers/platform.py:117 assets/serializers/platform.py:201 +#: assets/serializers/asset/common.py:121 assets/serializers/cagegory.py:8 +#: assets/serializers/platform.py:110 assets/serializers/platform.py:194 #: perms/serializers/user_permission.py:26 settings/models.py:35 #: tickets/models/ticket/apply_application.py:13 msgid "Category" @@ -569,8 +569,8 @@ msgstr "カテゴリ" #: acls/serializers/command_acl.py:18 applications/models.py:14 #: assets/models/_user.py:50 assets/models/automations/base.py:20 #: assets/models/cmd_filter.py:74 assets/models/platform.py:91 -#: assets/serializers/asset/common.py:121 assets/serializers/platform.py:101 -#: assets/serializers/platform.py:116 audits/serializers.py:48 +#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:94 +#: assets/serializers/platform.py:109 audits/serializers.py:48 #: authentication/serializers/connect_token_secret.py:115 ops/models/job.py:103 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:31 #: terminal/models/component/storage.py:57 @@ -634,7 +634,7 @@ msgstr "ID" #: accounts/serializers/account/account.py:402 acls/models/base.py:98 #: acls/models/login_acl.py:13 acls/serializers/base.py:55 -#: acls/serializers/login_acl.py:21 assets/models/cmd_filter.py:24 +#: acls/serializers/login_acl.py:22 assets/models/cmd_filter.py:24 #: assets/models/label.py:16 audits/models.py:44 audits/models.py:63 #: audits/models.py:141 authentication/models/connection_token.py:30 #: authentication/models/sso_token.py:16 @@ -682,7 +682,7 @@ msgid "Key password" msgstr "キーパスワード" #: accounts/serializers/account/base.py:80 -#: assets/serializers/asset/common.py:304 +#: assets/serializers/asset/common.py:305 msgid "Spec info" msgstr "特別情報" @@ -796,7 +796,7 @@ msgid "1-100, the lower the value will be match first" msgstr "1-100、低い値は最初に一致します" #: acls/models/base.py:82 acls/serializers/base.py:75 -#: acls/serializers/login_acl.py:23 assets/models/cmd_filter.py:86 +#: acls/serializers/login_acl.py:24 assets/models/cmd_filter.py:86 #: authentication/serializers/connect_token_secret.py:80 msgid "Reviewers" msgstr "レビュー担当者" @@ -852,7 +852,7 @@ msgstr "コマンドフィルタリング" msgid "Command confirm" msgstr "コマンドの確認" -#: acls/models/login_acl.py:16 acls/serializers/login_acl.py:29 +#: acls/models/login_acl.py:16 acls/serializers/login_acl.py:30 msgid "Rule" msgstr "ルール" @@ -872,7 +872,7 @@ msgstr "ログインasset acl" msgid "Login asset confirm" msgstr "ログイン資産の確認" -#: acls/serializers/base.py:10 acls/serializers/login_acl.py:16 +#: acls/serializers/base.py:10 acls/serializers/login_acl.py:17 msgid "With * indicating a match all. " msgstr "* はすべて一致することを示します。" @@ -906,7 +906,7 @@ msgstr "資産(住所)" msgid "Account (username)" msgstr "アカウント (ユーザー名)" -#: acls/serializers/base.py:78 acls/serializers/login_acl.py:27 +#: acls/serializers/base.py:78 acls/serializers/login_acl.py:28 msgid "Reviewers amount" msgstr "承認者数" @@ -964,7 +964,7 @@ msgstr "アプリケーション" msgid "Can match application" msgstr "アプリケーションを一致させることができます" -#: assets/api/asset/asset.py:141 +#: assets/api/asset/asset.py:140 msgid "Cannot create asset directly, you should create a host or other" msgstr "" "資産を直接作成することはできません。ホストまたはその他を作成する必要がありま" @@ -1102,7 +1102,7 @@ msgstr "ファイアウォール" msgid "Other" msgstr "その他" -#: assets/const/types.py:215 +#: assets/const/types.py:218 msgid "All types" msgstr "いろんなタイプ" @@ -1249,7 +1249,7 @@ msgstr "クラウド サービス" msgid "Port" msgstr "ポート" -#: assets/models/asset/common.py:124 assets/serializers/asset/common.py:145 +#: assets/models/asset/common.py:124 assets/serializers/asset/common.py:146 msgid "Address" msgstr "アドレス" @@ -1270,13 +1270,12 @@ msgstr "ドメイン" msgid "Labels" msgstr "ラベル" -#: assets/models/asset/common.py:132 assets/serializers/asset/common.py:305 +#: assets/models/asset/common.py:132 assets/serializers/asset/common.py:306 #: assets/serializers/asset/host.py:11 msgid "Gathered info" msgstr "資産ハードウェア情報の収集" #: assets/models/asset/common.py:133 assets/serializers/asset/custom.py:14 -#: assets/serializers/asset/custom.py:22 msgid "Custom info" msgstr "自动化信息" @@ -1338,7 +1337,7 @@ msgid "Submit selector" msgstr "ボタンセレクターを確認する" #: assets/models/automations/base.py:17 assets/models/cmd_filter.py:38 -#: assets/serializers/asset/common.py:303 rbac/tree.py:35 +#: assets/serializers/asset/common.py:304 rbac/tree.py:35 msgid "Accounts" msgstr "アカウント" @@ -1424,7 +1423,7 @@ msgid "Asset group" msgstr "資産グループ" #: assets/models/group.py:34 assets/models/platform.py:17 -#: assets/serializers/platform.py:102 +#: assets/serializers/platform.py:95 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "デフォルト" @@ -1445,9 +1444,9 @@ msgstr "システム" msgid "Value" msgstr "値" -#: assets/models/label.py:40 assets/serializers/asset/common.py:122 +#: assets/models/label.py:40 assets/serializers/asset/common.py:123 #: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13 -#: assets/serializers/platform.py:100 +#: assets/serializers/platform.py:93 #: authentication/serializers/connect_token_secret.py:113 #: common/serializers/common.py:85 settings/serializers/sms.py:7 msgid "Label" @@ -1578,23 +1577,23 @@ msgstr "メタ" msgid "Internal" msgstr "ビルトイン" -#: assets/models/platform.py:97 assets/serializers/platform.py:115 +#: assets/models/platform.py:97 assets/serializers/platform.py:108 msgid "Charset" msgstr "シャーセット" -#: assets/models/platform.py:99 assets/serializers/platform.py:142 +#: assets/models/platform.py:99 assets/serializers/platform.py:135 msgid "Domain enabled" msgstr "ドメインを有効にする" -#: assets/models/platform.py:101 assets/serializers/platform.py:141 +#: assets/models/platform.py:101 assets/serializers/platform.py:134 msgid "Su enabled" msgstr "アカウントの切り替えを有効にする" -#: assets/models/platform.py:102 assets/serializers/platform.py:121 +#: assets/models/platform.py:102 assets/serializers/platform.py:114 msgid "Su method" msgstr "アカウントの切り替え方法" -#: assets/models/platform.py:103 assets/serializers/platform.py:124 +#: assets/models/platform.py:103 assets/serializers/platform.py:117 msgid "Custom fields" msgstr "カスタムフィールド" @@ -1611,32 +1610,32 @@ msgstr "" "プラットフォームタイプがスキップされた資産に合致しない、資産内の一括更新プ" "ラットフォーム" -#: assets/serializers/asset/common.py:123 assets/serializers/platform.py:118 +#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:111 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:64 #: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:99 msgid "Protocols" msgstr "プロトコル" -#: assets/serializers/asset/common.py:125 -#: assets/serializers/asset/common.py:146 +#: assets/serializers/asset/common.py:126 +#: assets/serializers/asset/common.py:147 msgid "Node path" msgstr "ノードパスです" -#: assets/serializers/asset/common.py:143 -#: assets/serializers/asset/common.py:306 +#: assets/serializers/asset/common.py:144 +#: assets/serializers/asset/common.py:307 msgid "Auto info" msgstr "自動情報" -#: assets/serializers/asset/common.py:225 +#: assets/serializers/asset/common.py:226 msgid "Platform not exist" msgstr "プラットフォームが存在しません" -#: assets/serializers/asset/common.py:261 +#: assets/serializers/asset/common.py:262 msgid "port out of range (1-65535)" msgstr "ポート番号が範囲外です (1-65535)" -#: assets/serializers/asset/common.py:268 +#: assets/serializers/asset/common.py:269 msgid "Protocol is required: {}" msgstr "プロトコルが必要です: {}" @@ -1746,27 +1745,27 @@ msgstr "アカウント収集を有効にする" msgid "Gather accounts method" msgstr "アカウントの収集方法" -#: assets/serializers/platform.py:103 +#: assets/serializers/platform.py:96 msgid "Help text" msgstr "ヘルプ" -#: assets/serializers/platform.py:104 +#: assets/serializers/platform.py:97 msgid "Choices" msgstr "" -#: assets/serializers/platform.py:119 +#: assets/serializers/platform.py:112 msgid "Automation" msgstr "オートメーション" -#: assets/serializers/platform.py:143 +#: assets/serializers/platform.py:136 msgid "Default Domain" msgstr "デフォルト ドメイン" -#: assets/serializers/platform.py:152 +#: assets/serializers/platform.py:145 msgid "type is required" msgstr "タイプ このフィールドは必須です." -#: assets/serializers/platform.py:189 +#: assets/serializers/platform.py:182 msgid "Protocols is required" msgstr "同意が必要です" @@ -7474,7 +7473,8 @@ msgstr "" "IP範囲に一致するインスタンスのみが同期されます。
インスタンスに複数のIPア" "ドレスが含まれている場合、一致する最初のIPアドレスが作成されたアセットのIPと" "して使用されます。
デフォルト値の*は、すべてのインスタンスを同期し、IPア" -"ドレスをランダムに一致させることを意味します。
例:192.168.1.0/24,10.1.1.1-10.1.1.20" +"ドレスをランダムに一致させることを意味します。
例:" +"192.168.1.0/24,10.1.1.1-10.1.1.20" #: xpack/plugins/cloud/serializers/task.py:34 msgid "History count" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 20231b06d..521993edd 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:591b458d6f8ea8d125bd584ca57768cd5aa5a7103b42e345eaadac744a73d475 -size 114412 +oid sha256:0788b48bc50cffe3e7ff83803ef0edadfc120c9165bfe6bccd1f896d8bf39397 +size 114419 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index fce65d116..4683b46c6 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-04-20 17:31+0800\n" +"POT-Creation-Date: 2023-04-21 14:05+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -127,8 +127,8 @@ msgid "Empty and append SSH KEY" msgstr "清空所有并添加" #: accounts/const/automation.py:51 ops/const.py:15 -msgid "Replace (The key generated by JumpServer) " -msgstr "替换 (仅替换由 JumpServer 生成的密钥)" +msgid "Replace (Replace only keys pushed by JumpServer) " +msgstr "替换 (只替换由 JumpServer 推送的密钥)" #: accounts/const/automation.py:56 msgid "On asset create" @@ -220,7 +220,7 @@ msgstr "来源 ID" #: accounts/serializers/automations/change_secret.py:113 #: accounts/serializers/automations/change_secret.py:133 #: acls/models/base.py:102 acls/serializers/base.py:57 -#: assets/serializers/asset/common.py:124 assets/serializers/gateway.py:28 +#: assets/serializers/asset/common.py:125 assets/serializers/gateway.py:28 #: audits/models.py:49 ops/models/base.py:18 #: perms/models/asset_permission.py:70 perms/serializers/permission.py:39 #: terminal/backends/command/models.py:21 terminal/models/session/session.py:34 @@ -261,7 +261,7 @@ msgid "Can change asset account template secret" msgstr "可以更改资产账号模版密码" #: accounts/models/automations/backup_account.py:27 -#: accounts/models/automations/change_secret.py:65 +#: accounts/models/automations/change_secret.py:64 #: accounts/serializers/account/backup.py:34 #: accounts/serializers/automations/change_secret.py:57 msgid "Recipient" @@ -362,7 +362,7 @@ msgid "Secret type" msgstr "密文类型" #: accounts/models/automations/change_secret.py:20 -#: accounts/models/automations/change_secret.py:90 accounts/models/base.py:38 +#: accounts/models/automations/change_secret.py:89 accounts/models/base.py:38 #: accounts/serializers/account/base.py:19 #: authentication/models/temp_token.py:10 #: authentication/templates/authentication/_access_key_modal.html:31 @@ -383,32 +383,32 @@ msgstr "密码规则" msgid "SSH key change strategy" msgstr "SSH 密钥推送方式" -#: accounts/models/automations/change_secret.py:72 +#: accounts/models/automations/change_secret.py:71 msgid "Change secret automation" msgstr "自动化改密" -#: accounts/models/automations/change_secret.py:89 +#: accounts/models/automations/change_secret.py:88 msgid "Old secret" msgstr "原密码" -#: accounts/models/automations/change_secret.py:91 +#: accounts/models/automations/change_secret.py:90 msgid "Date started" msgstr "开始日期" -#: accounts/models/automations/change_secret.py:92 +#: 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:193 #: terminal/models/applet/host.py:110 msgid "Date finished" msgstr "结束日期" -#: accounts/models/automations/change_secret.py:94 +#: accounts/models/automations/change_secret.py:93 #: accounts/serializers/account/account.py:234 assets/const/automation.py:8 #: common/const/choices.py:20 msgid "Error" msgstr "错误" -#: accounts/models/automations/change_secret.py:98 +#: accounts/models/automations/change_secret.py:97 msgid "Change secret record" msgstr "改密记录" @@ -455,7 +455,7 @@ msgid "Triggers" msgstr "触发方式" #: accounts/models/automations/push_account.py:16 acls/models/base.py:81 -#: acls/serializers/base.py:81 acls/serializers/login_acl.py:25 +#: acls/serializers/base.py:81 acls/serializers/login_acl.py:26 #: assets/models/cmd_filter.py:81 audits/models.py:65 audits/serializers.py:82 #: authentication/serializers/connect_token_secret.py:108 #: authentication/templates/authentication/_access_key_modal.html:34 @@ -477,8 +477,8 @@ msgstr "账号验证" #: assets/models/cmd_filter.py:21 assets/models/domain.py:18 #: assets/models/group.py:20 assets/models/label.py:18 #: assets/models/platform.py:13 assets/models/platform.py:89 -#: assets/serializers/asset/common.py:144 assets/serializers/platform.py:99 -#: assets/serializers/platform.py:200 +#: assets/serializers/asset/common.py:145 assets/serializers/platform.py:92 +#: assets/serializers/platform.py:193 #: authentication/serializers/connect_token_secret.py:102 ops/mixin.py:21 #: ops/models/adhoc.py:21 ops/models/celery.py:15 ops/models/celery.py:57 #: ops/models/job.py:92 ops/models/playbook.py:23 ops/serializers/job.py:20 @@ -553,8 +553,8 @@ msgstr "账号存在策略" #: accounts/serializers/account/account.py:179 applications/models.py:11 #: assets/models/label.py:21 assets/models/platform.py:90 -#: assets/serializers/asset/common.py:120 assets/serializers/cagegory.py:8 -#: assets/serializers/platform.py:117 assets/serializers/platform.py:201 +#: assets/serializers/asset/common.py:121 assets/serializers/cagegory.py:8 +#: assets/serializers/platform.py:110 assets/serializers/platform.py:194 #: perms/serializers/user_permission.py:26 settings/models.py:35 #: tickets/models/ticket/apply_application.py:13 msgid "Category" @@ -565,8 +565,8 @@ msgstr "类别" #: acls/serializers/command_acl.py:18 applications/models.py:14 #: assets/models/_user.py:50 assets/models/automations/base.py:20 #: assets/models/cmd_filter.py:74 assets/models/platform.py:91 -#: assets/serializers/asset/common.py:121 assets/serializers/platform.py:101 -#: assets/serializers/platform.py:116 audits/serializers.py:48 +#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:94 +#: assets/serializers/platform.py:109 audits/serializers.py:48 #: authentication/serializers/connect_token_secret.py:115 ops/models/job.py:103 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:31 #: terminal/models/component/storage.py:57 @@ -630,7 +630,7 @@ msgstr "ID" #: accounts/serializers/account/account.py:402 acls/models/base.py:98 #: acls/models/login_acl.py:13 acls/serializers/base.py:55 -#: acls/serializers/login_acl.py:21 assets/models/cmd_filter.py:24 +#: acls/serializers/login_acl.py:22 assets/models/cmd_filter.py:24 #: assets/models/label.py:16 audits/models.py:44 audits/models.py:63 #: audits/models.py:141 authentication/models/connection_token.py:30 #: authentication/models/sso_token.py:16 @@ -678,7 +678,7 @@ msgid "Key password" msgstr "密钥密码" #: accounts/serializers/account/base.py:80 -#: assets/serializers/asset/common.py:304 +#: assets/serializers/asset/common.py:305 msgid "Spec info" msgstr "特殊信息" @@ -792,7 +792,7 @@ msgid "1-100, the lower the value will be match first" msgstr "优先级可选范围为 1-100 (数值越小越优先)" #: acls/models/base.py:82 acls/serializers/base.py:75 -#: acls/serializers/login_acl.py:23 assets/models/cmd_filter.py:86 +#: acls/serializers/login_acl.py:24 assets/models/cmd_filter.py:86 #: authentication/serializers/connect_token_secret.py:80 msgid "Reviewers" msgstr "审批人" @@ -848,7 +848,7 @@ msgstr "命令过滤" msgid "Command confirm" msgstr "命令复核" -#: acls/models/login_acl.py:16 acls/serializers/login_acl.py:29 +#: acls/models/login_acl.py:16 acls/serializers/login_acl.py:30 msgid "Rule" msgstr "规则" @@ -868,7 +868,7 @@ msgstr "登录资产访问控制" msgid "Login asset confirm" msgstr "登录资产复核" -#: acls/serializers/base.py:10 acls/serializers/login_acl.py:16 +#: acls/serializers/base.py:10 acls/serializers/login_acl.py:17 msgid "With * indicating a match all. " msgstr "* 表示匹配所有. " @@ -901,7 +901,7 @@ msgstr "资产(地址)" msgid "Account (username)" msgstr "账号(用户名)" -#: acls/serializers/base.py:78 acls/serializers/login_acl.py:27 +#: acls/serializers/base.py:78 acls/serializers/login_acl.py:28 msgid "Reviewers amount" msgstr "审批人数量" @@ -959,7 +959,7 @@ msgstr "应用程序" msgid "Can match application" msgstr "匹配应用" -#: assets/api/asset/asset.py:141 +#: assets/api/asset/asset.py:140 msgid "Cannot create asset directly, you should create a host or other" msgstr "不能直接创建资产, 你应该创建主机或其他资产" @@ -1095,7 +1095,7 @@ msgstr "防火墙" msgid "Other" msgstr "其它" -#: assets/const/types.py:215 +#: assets/const/types.py:218 msgid "All types" msgstr "所有类型" @@ -1242,7 +1242,7 @@ msgstr "云服务" msgid "Port" msgstr "端口" -#: assets/models/asset/common.py:124 assets/serializers/asset/common.py:145 +#: assets/models/asset/common.py:124 assets/serializers/asset/common.py:146 msgid "Address" msgstr "地址" @@ -1263,13 +1263,12 @@ msgstr "网域" msgid "Labels" msgstr "标签管理" -#: assets/models/asset/common.py:132 assets/serializers/asset/common.py:305 +#: assets/models/asset/common.py:132 assets/serializers/asset/common.py:306 #: assets/serializers/asset/host.py:11 msgid "Gathered info" msgstr "收集资产硬件信息" #: assets/models/asset/common.py:133 assets/serializers/asset/custom.py:14 -#: assets/serializers/asset/custom.py:22 msgid "Custom info" msgstr "自动化信息" @@ -1331,7 +1330,7 @@ msgid "Submit selector" msgstr "确认按钮选择器" #: assets/models/automations/base.py:17 assets/models/cmd_filter.py:38 -#: assets/serializers/asset/common.py:303 rbac/tree.py:35 +#: assets/serializers/asset/common.py:304 rbac/tree.py:35 msgid "Accounts" msgstr "账号管理" @@ -1417,7 +1416,7 @@ msgid "Asset group" msgstr "资产组" #: assets/models/group.py:34 assets/models/platform.py:17 -#: assets/serializers/platform.py:102 +#: assets/serializers/platform.py:95 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "默认" @@ -1438,9 +1437,9 @@ msgstr "系统" msgid "Value" msgstr "值" -#: assets/models/label.py:40 assets/serializers/asset/common.py:122 +#: assets/models/label.py:40 assets/serializers/asset/common.py:123 #: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13 -#: assets/serializers/platform.py:100 +#: assets/serializers/platform.py:93 #: authentication/serializers/connect_token_secret.py:113 #: common/serializers/common.py:85 settings/serializers/sms.py:7 msgid "Label" @@ -1571,23 +1570,23 @@ msgstr "元数据" msgid "Internal" msgstr "内置" -#: assets/models/platform.py:97 assets/serializers/platform.py:115 +#: assets/models/platform.py:97 assets/serializers/platform.py:108 msgid "Charset" msgstr "编码" -#: assets/models/platform.py:99 assets/serializers/platform.py:142 +#: assets/models/platform.py:99 assets/serializers/platform.py:135 msgid "Domain enabled" msgstr "启用网域" -#: assets/models/platform.py:101 assets/serializers/platform.py:141 +#: assets/models/platform.py:101 assets/serializers/platform.py:134 msgid "Su enabled" msgstr "启用账号切换" -#: assets/models/platform.py:102 assets/serializers/platform.py:121 +#: assets/models/platform.py:102 assets/serializers/platform.py:114 msgid "Su method" msgstr "账号切换方式" -#: assets/models/platform.py:103 assets/serializers/platform.py:124 +#: assets/models/platform.py:103 assets/serializers/platform.py:117 msgid "Custom fields" msgstr "自定义属性" @@ -1602,32 +1601,32 @@ msgid "" "type" msgstr "资产中批量更新平台,不符合平台类型跳过的资产" -#: assets/serializers/asset/common.py:123 assets/serializers/platform.py:118 +#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:111 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:64 #: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:99 msgid "Protocols" msgstr "协议组" -#: assets/serializers/asset/common.py:125 -#: assets/serializers/asset/common.py:146 +#: assets/serializers/asset/common.py:126 +#: assets/serializers/asset/common.py:147 msgid "Node path" msgstr "节点路径" -#: assets/serializers/asset/common.py:143 -#: assets/serializers/asset/common.py:306 +#: assets/serializers/asset/common.py:144 +#: assets/serializers/asset/common.py:307 msgid "Auto info" msgstr "自动化信息" -#: assets/serializers/asset/common.py:225 +#: assets/serializers/asset/common.py:226 msgid "Platform not exist" msgstr "平台不存在" -#: assets/serializers/asset/common.py:261 +#: assets/serializers/asset/common.py:262 msgid "port out of range (1-65535)" msgstr "端口超出范围 (1-65535)" -#: assets/serializers/asset/common.py:268 +#: assets/serializers/asset/common.py:269 msgid "Protocol is required: {}" msgstr "协议是必填的: {}" @@ -1737,27 +1736,27 @@ msgstr "启用账号收集" msgid "Gather accounts method" msgstr "收集账号方式" -#: assets/serializers/platform.py:103 +#: assets/serializers/platform.py:96 msgid "Help text" msgstr "帮助" -#: assets/serializers/platform.py:104 +#: assets/serializers/platform.py:97 msgid "Choices" msgstr "" -#: assets/serializers/platform.py:119 +#: assets/serializers/platform.py:112 msgid "Automation" msgstr "自动化" -#: assets/serializers/platform.py:143 +#: assets/serializers/platform.py:136 msgid "Default Domain" msgstr "默认网域" -#: assets/serializers/platform.py:152 +#: assets/serializers/platform.py:145 msgid "type is required" msgstr "类型 该字段是必填项。" -#: assets/serializers/platform.py:189 +#: assets/serializers/platform.py:182 msgid "Protocols is required" msgstr "协议是必填的" diff --git a/apps/ops/const.py b/apps/ops/const.py index fb394b6bf..5f31bb00d 100644 --- a/apps/ops/const.py +++ b/apps/ops/const.py @@ -12,7 +12,7 @@ class StrategyChoice(models.TextChoices): class SSHKeyStrategy(models.TextChoices): add = 'add', _('Append SSH KEY') set = 'set', _('Empty and append SSH KEY') - set_jms = 'set_jms', _('Replace (The key generated by JumpServer) ') + set_jms = 'set_jms', _('Replace (Replace only keys pushed by JumpServer) ') class PasswordStrategy(models.TextChoices):