diff --git a/apps/acls/migrations/0017_alter_connectmethodacl_options.py b/apps/acls/migrations/0017_alter_connectmethodacl_options.py new file mode 100644 index 000000000..39132b450 --- /dev/null +++ b/apps/acls/migrations/0017_alter_connectmethodacl_options.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.19 on 2023-06-13 07:49 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('acls', '0016_auto_20230606_1857'), + ] + + operations = [ + migrations.AlterModelOptions( + name='connectmethodacl', + options={'ordering': ('priority', 'name'), 'verbose_name': 'Connect method acl'}, + ), + ] diff --git a/apps/acls/models/connect_method.py b/apps/acls/models/connect_method.py index 2ae61a13c..5ee9c9cfb 100644 --- a/apps/acls/models/connect_method.py +++ b/apps/acls/models/connect_method.py @@ -8,3 +8,7 @@ __all__ = ['ConnectMethodACL'] class ConnectMethodACL(UserBaseACL): connect_methods = models.JSONField(default=list, verbose_name=_('Connect methods')) + + class Meta(UserBaseACL.Meta): + verbose_name = _('Connect method acl') + abstract = False diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo index 30c105fcf..09f2ef0d4 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:7db1805061d28a0ba931846140e9f106b71ed5ebeb414f741b68d6c3d93130be -size 142961 +oid sha256:70eb1665cc86e50cf78d3b80730aadf7963b51640b80fde21b4e207b7cbb5d0c +size 144416 diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index b32824b18..97fd54244 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-06-09 10:59+0800\n" +"POT-Creation-Date: 2023-06-13 15:47+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -70,7 +70,7 @@ msgstr "ローカル" msgid "Collected" msgstr "集めました" -#: accounts/const/account.py:21 accounts/serializers/account/account.py:26 +#: accounts/const/account.py:21 accounts/serializers/account/account.py:27 #: settings/serializers/auth/sms.py:75 msgid "Template" msgstr "テンプレート" @@ -181,15 +181,15 @@ msgstr "作成のみ" #: accounts/models/account.py:49 #: accounts/models/automations/gather_account.py:16 -#: accounts/serializers/account/account.py:203 -#: accounts/serializers/account/account.py:236 +#: accounts/serializers/account/account.py:200 +#: accounts/serializers/account/account.py:237 #: accounts/serializers/account/gathered_account.py:10 #: accounts/serializers/automations/change_secret.py:112 #: accounts/serializers/automations/change_secret.py:132 #: acls/serializers/base.py:118 assets/models/asset/common.py:93 #: assets/models/asset/common.py:332 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:34 +#: audits/models.py:53 authentication/models/connection_token.py:35 #: perms/models/asset_permission.py:64 perms/serializers/permission.py:34 #: terminal/backends/command/models.py:20 terminal/models/session/session.py:32 #: terminal/notifications.py:95 terminal/serializers/command.py:17 @@ -199,7 +199,7 @@ msgstr "資産" #: accounts/models/account.py:53 accounts/models/account.py:113 #: accounts/serializers/account/account.py:208 -#: accounts/serializers/account/account.py:246 +#: accounts/serializers/account/account.py:247 #: accounts/serializers/account/template.py:16 #: authentication/serializers/connect_token_secret.py:49 msgid "Su from" @@ -210,7 +210,7 @@ msgstr "から切り替え" msgid "Version" msgstr "バージョン" -#: accounts/models/account.py:57 accounts/serializers/account/account.py:204 +#: accounts/models/account.py:57 accounts/serializers/account/account.py:203 #: users/models/user.py:804 msgid "Source" msgstr "ソース" @@ -356,7 +356,7 @@ msgid "Can add push account execution" msgstr "プッシュ アカウントの作成の実行" #: accounts/models/automations/change_secret.py:18 accounts/models/base.py:36 -#: accounts/serializers/account/account.py:416 +#: accounts/serializers/account/account.py:419 #: accounts/serializers/account/base.py:16 #: accounts/serializers/automations/change_secret.py:46 #: authentication/serializers/connect_token_secret.py:41 @@ -406,7 +406,7 @@ msgid "Date finished" msgstr "終了日" #: accounts/models/automations/change_secret.py:93 -#: accounts/serializers/account/account.py:238 assets/const/automation.py:8 +#: accounts/serializers/account/account.py:239 assets/const/automation.py:8 #: authentication/views/base.py:29 authentication/views/base.py:30 #: authentication/views/base.py:31 common/const/choices.py:20 msgid "Error" @@ -458,7 +458,7 @@ msgstr "アカウントのコレクション" msgid "Triggers" msgstr "トリガー方式" -#: accounts/models/automations/push_account.py:16 acls/models/base.py:43 +#: accounts/models/automations/push_account.py:16 acls/models/base.py:46 #: acls/serializers/base.py:56 assets/models/cmd_filter.py:81 #: audits/models.py:87 audits/serializers.py:82 #: authentication/serializers/connect_token_secret.py:116 @@ -474,7 +474,7 @@ msgstr "アカウントプッシュ" msgid "Verify asset account" msgstr "アカウントの確認" -#: accounts/models/base.py:33 acls/models/base.py:37 acls/models/base.py:97 +#: accounts/models/base.py:33 acls/models/base.py:40 acls/models/base.py:101 #: acls/models/command_acl.py:21 acls/serializers/base.py:34 #: applications/models.py:9 assets/models/_user.py:22 #: assets/models/asset/common.py:91 assets/models/asset/common.py:149 @@ -486,7 +486,7 @@ msgstr "アカウントの確認" #: authentication/serializers/connect_token_secret.py:110 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 -#: orgs/models.py:69 perms/models/asset_permission.py:56 rbac/models/role.py:29 +#: orgs/models.py:80 perms/models/asset_permission.py:56 rbac/models/role.py:29 #: settings/models.py:33 settings/serializers/sms.py:6 #: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12 #: terminal/models/component/endpoint.py:90 @@ -505,7 +505,7 @@ 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:38 users/serializers/user.py:170 +#: terminal/models/applet/applet.py:39 users/serializers/user.py:170 msgid "Is active" msgstr "アクティブです。" @@ -550,15 +550,15 @@ msgstr "" "{} -暗号化変更タスクが完了しました: 暗号化パスワードが設定されていません-個人" "情報にアクセスしてください-> ファイル暗号化パスワードを設定してください" -#: accounts/serializers/account/account.py:29 +#: accounts/serializers/account/account.py:30 msgid "Push now" msgstr "今すぐプッシュ" -#: accounts/serializers/account/account.py:36 +#: accounts/serializers/account/account.py:37 msgid "Exist policy" msgstr "アカウントの存在ポリシー" -#: accounts/serializers/account/account.py:183 applications/models.py:11 +#: accounts/serializers/account/account.py:180 applications/models.py:11 #: assets/models/label.py:21 assets/models/platform.py:82 #: assets/serializers/asset/common.py:121 assets/serializers/cagegory.py:8 #: assets/serializers/platform.py:110 assets/serializers/platform.py:193 @@ -567,7 +567,7 @@ msgstr "アカウントの存在ポリシー" msgid "Category" msgstr "カテゴリ" -#: accounts/serializers/account/account.py:184 +#: accounts/serializers/account/account.py:181 #: accounts/serializers/automations/base.py:54 acls/models/command_acl.py:24 #: acls/serializers/command_acl.py:18 applications/models.py:14 #: assets/models/_user.py:50 assets/models/automations/base.py:20 @@ -575,7 +575,7 @@ msgstr "カテゴリ" #: 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:123 ops/models/job.py:103 -#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:37 +#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:38 #: terminal/models/component/storage.py:57 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 #: terminal/serializers/session.py:22 terminal/serializers/storage.py:224 @@ -586,28 +586,28 @@ msgstr "カテゴリ" msgid "Type" msgstr "タイプ" -#: accounts/serializers/account/account.py:199 +#: accounts/serializers/account/account.py:196 msgid "Asset not found" msgstr "資産が存在しません" -#: accounts/serializers/account/account.py:205 +#: accounts/serializers/account/account.py:201 #: accounts/serializers/account/base.py:64 msgid "Has secret" msgstr "エスクローされたパスワード" -#: accounts/serializers/account/account.py:237 ops/models/celery.py:60 +#: accounts/serializers/account/account.py:238 ops/models/celery.py:60 #: tickets/models/comment.py:13 tickets/models/ticket/general.py:45 #: tickets/models/ticket/general.py:279 tickets/serializers/super_ticket.py:14 #: tickets/serializers/ticket/ticket.py:21 msgid "State" msgstr "状態" -#: accounts/serializers/account/account.py:239 +#: accounts/serializers/account/account.py:240 msgid "Changed" msgstr "編集済み" -#: accounts/serializers/account/account.py:249 -#: accounts/serializers/automations/base.py:22 acls/models/base.py:98 +#: accounts/serializers/account/account.py:250 +#: accounts/serializers/automations/base.py:22 acls/models/base.py:102 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 ops/models/base.py:17 #: ops/models/job.py:105 ops/serializers/job.py:21 @@ -615,30 +615,30 @@ msgstr "編集済み" msgid "Assets" msgstr "資産" -#: accounts/serializers/account/account.py:301 +#: accounts/serializers/account/account.py:305 msgid "Account already exists" msgstr "アカウントはすでに存在しています" -#: accounts/serializers/account/account.py:351 +#: accounts/serializers/account/account.py:355 #, python-format msgid "Asset does not support this secret type: %s" msgstr "アセットはアカウント タイプをサポートしていません: %s" -#: accounts/serializers/account/account.py:383 +#: accounts/serializers/account/account.py:387 msgid "Account has exist" msgstr "アカウントはすでに存在しています" -#: accounts/serializers/account/account.py:417 +#: accounts/serializers/account/account.py:420 #: authentication/serializers/connect_token_secret.py:156 #: authentication/templates/authentication/_access_key_modal.html:30 #: perms/models/perm_node.py:21 users/serializers/group.py:33 msgid "ID" msgstr "ID" -#: accounts/serializers/account/account.py:424 acls/serializers/base.py:111 +#: accounts/serializers/account/account.py:427 acls/serializers/base.py:111 #: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:49 #: audits/models.py:85 audits/models.py:163 -#: authentication/models/connection_token.py:30 +#: authentication/models/connection_token.py:31 #: authentication/models/sso_token.py:16 #: notifications/models/notification.py:12 #: perms/api/user_permission/mixin.py:55 perms/models/asset_permission.py:58 @@ -652,7 +652,7 @@ msgstr "ID" msgid "User" msgstr "ユーザー" -#: accounts/serializers/account/account.py:425 +#: accounts/serializers/account/account.py:428 #: authentication/templates/authentication/_access_key_modal.html:33 #: terminal/notifications.py:98 terminal/notifications.py:146 msgid "Date" @@ -778,47 +778,47 @@ msgstr "秘密鍵が無効またはpassphraseエラー" msgid "Acls" msgstr "Acls" -#: acls/models/base.py:17 tickets/const.py:45 +#: acls/models/base.py:20 tickets/const.py:45 #: tickets/templates/tickets/approve_check_password.html:49 msgid "Reject" msgstr "拒否" -#: acls/models/base.py:18 +#: acls/models/base.py:21 msgid "Accept" msgstr "受け入れられる" -#: acls/models/base.py:19 +#: acls/models/base.py:22 msgid "Review" msgstr "レビュー担当者" -#: acls/models/base.py:39 assets/models/_user.py:51 +#: acls/models/base.py:42 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:93 msgid "Priority" msgstr "優先順位" -#: acls/models/base.py:40 assets/models/_user.py:51 +#: acls/models/base.py:43 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:94 msgid "1-100, the lower the value will be match first" msgstr "1-100、低い値は最初に一致します" -#: acls/models/base.py:44 assets/models/cmd_filter.py:86 +#: acls/models/base.py:47 assets/models/cmd_filter.py:86 #: authentication/serializers/connect_token_secret.py:88 msgid "Reviewers" msgstr "レビュー担当者" -#: acls/models/base.py:45 authentication/models/access_key.py:17 -#: authentication/models/connection_token.py:51 +#: acls/models/base.py:48 authentication/models/access_key.py:17 +#: authentication/models/connection_token.py:52 #: authentication/templates/authentication/_access_key_modal.html:32 #: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:27 #: tickets/const.py:37 msgid "Active" msgstr "アクティブ" -#: acls/models/base.py:83 users/apps.py:9 +#: acls/models/base.py:86 users/apps.py:9 msgid "Users" msgstr "ユーザー" -#: acls/models/base.py:99 assets/models/automations/base.py:17 +#: acls/models/base.py:103 assets/models/automations/base.py:17 #: assets/models/cmd_filter.py:38 assets/serializers/asset/common.py:305 #: rbac/tree.py:35 msgid "Accounts" @@ -837,7 +837,7 @@ msgid "Regex" msgstr "正規情報" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 -#: settings/serializers/basic.py:10 xpack/plugins/license/models.py:29 +#: settings/serializers/basic.py:10 xpack/plugins/license/models.py:30 msgid "Content" msgstr "コンテンツ" @@ -868,11 +868,13 @@ msgid "Command confirm" msgstr "コマンドの確認" #: acls/models/connect_method.py:10 -#, fuzzy -#| msgid "Connect method" msgid "Connect methods" msgstr "接続方法" +#: acls/models/connect_method.py:13 +msgid "Connect method acl" +msgstr "接続方法acl" + #: acls/models/login_acl.py:11 acls/models/login_asset_acl.py:9 #: acls/serializers/login_acl.py:15 acls/serializers/login_asset_acl.py:13 msgid "Rule" @@ -1001,7 +1003,7 @@ msgid "{} disabled" msgstr "{} 無効" #: assets/automations/ping_gateway/manager.py:33 -#: authentication/models/connection_token.py:116 +#: authentication/models/connection_token.py:117 msgid "No account" msgstr "アカウントなし" @@ -1146,7 +1148,7 @@ msgstr "SSHパブリックキー" #: assets/models/cmd_filter.py:88 assets/models/group.py:23 #: common/db/models.py:36 ops/models/adhoc.py:27 ops/models/job.py:111 #: ops/models/playbook.py:26 rbac/models/role.py:37 settings/models.py:38 -#: terminal/models/applet/applet.py:43 terminal/models/applet/applet.py:242 +#: terminal/models/applet/applet.py:44 terminal/models/applet/applet.py:243 #: terminal/models/applet/host.py:139 terminal/models/component/endpoint.py:24 #: terminal/models/component/endpoint.py:100 #: terminal/models/session/session.py:47 tickets/models/comment.py:32 @@ -1194,9 +1196,9 @@ msgstr "管理ユーザー" msgid "Username same with user" msgstr "ユーザーと同じユーザー名" -#: assets/models/_user.py:52 authentication/models/connection_token.py:39 +#: assets/models/_user.py:52 authentication/models/connection_token.py:40 #: authentication/serializers/connect_token_secret.py:111 -#: terminal/models/applet/applet.py:40 terminal/serializers/session.py:20 +#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:20 #: terminal/serializers/session.py:41 terminal/serializers/storage.py:68 msgid "Protocol" msgstr "プロトコル" @@ -1262,7 +1264,7 @@ msgstr "アドレス" #: assets/models/asset/common.py:151 assets/models/platform.py:112 #: authentication/serializers/connect_token_secret.py:115 #: perms/serializers/user_permission.py:24 -#: xpack/plugins/cloud/serializers/account_attrs.py:187 +#: xpack/plugins/cloud/serializers/account_attrs.py:196 msgid "Platform" msgstr "プラットフォーム" @@ -1357,7 +1359,7 @@ msgstr "アセットの自動化タスク" #: assets/models/automations/base.py:113 audits/models.py:199 #: audits/serializers.py:49 ops/models/base.py:49 ops/models/job.py:184 -#: terminal/models/applet/applet.py:241 terminal/models/applet/host.py:136 +#: terminal/models/applet/applet.py:242 terminal/models/applet/host.py:136 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:103 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 @@ -1440,7 +1442,7 @@ msgstr "システム" #: assets/models/label.py:19 assets/models/node.py:557 #: assets/serializers/cagegory.py:7 assets/serializers/cagegory.py:14 -#: authentication/models/connection_token.py:27 +#: authentication/models/connection_token.py:28 #: authentication/serializers/connect_token_secret.py:122 #: common/serializers/common.py:86 settings/models.py:34 msgid "Value" @@ -1646,7 +1648,8 @@ msgstr "プロトコルが必要です: {}" msgid "Default database" msgstr "デフォルト・データベース" -#: assets/serializers/asset/database.py:28 common/serializers/fields.py:104 +#: assets/serializers/asset/database.py:28 common/db/fields.py:557 +#: common/db/fields.py:562 common/serializers/fields.py:104 #: tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 @@ -1883,10 +1886,8 @@ msgid "Download" msgstr "ダウンロード" #: audits/const.py:19 -#, fuzzy -#| msgid "Rename attr" msgid "Rename dir" -msgstr "マッピングのプロパティ" +msgstr "マップディレクトリ" #: audits/const.py:23 rbac/tree.py:228 msgid "View" @@ -1939,11 +1940,11 @@ msgstr "タスク" msgid "-" msgstr "-" -#: audits/handler.py:114 +#: audits/handler.py:112 msgid "Yes" msgstr "是" -#: audits/handler.py:114 +#: audits/handler.py:112 msgid "No" msgstr "否" @@ -2119,10 +2120,8 @@ msgid "Clean audits session task log" msgstr "監査セッション タスク ログのクリーンアップ" #: audits/tasks.py:114 -#, fuzzy -#| msgid "Upload session replay to external storage" msgid "Upload FTP file to external storage" -msgstr "セッションの記録を外部ストレージにアップロードする" +msgstr "外部ストレージへのFTPファイルのアップロード" #: authentication/api/confirm.py:40 msgid "This action require verify your MFA" @@ -2521,80 +2520,78 @@ msgstr "MFAタイプ ({}) が有効になっていない" msgid "Please change your password" msgstr "パスワードを変更してください" -#: authentication/models/connection_token.py:36 +#: authentication/models/connection_token.py:37 #: terminal/serializers/storage.py:111 msgid "Account name" msgstr "アカウント名" -#: authentication/models/connection_token.py:37 +#: authentication/models/connection_token.py:38 msgid "Input username" msgstr "カスタム ユーザー名" -#: authentication/models/connection_token.py:38 +#: authentication/models/connection_token.py:39 #: authentication/serializers/connection_token.py:20 msgid "Input secret" msgstr "カスタムパスワード" -#: authentication/models/connection_token.py:40 +#: authentication/models/connection_token.py:41 msgid "Connect method" msgstr "接続方法" -#: authentication/models/connection_token.py:41 -#, fuzzy -#| msgid "Connections" -msgid "Connect options" -msgstr "接続" - #: authentication/models/connection_token.py:42 +msgid "Connect options" +msgstr "接続アイテム" + +#: authentication/models/connection_token.py:43 #: rbac/serializers/rolebinding.py:21 msgid "User display" msgstr "ユーザー表示" -#: authentication/models/connection_token.py:43 +#: authentication/models/connection_token.py:44 msgid "Asset display" msgstr "アセット名" -#: authentication/models/connection_token.py:44 +#: authentication/models/connection_token.py:45 msgid "Reusable" msgstr "再利用可能" -#: authentication/models/connection_token.py:45 +#: authentication/models/connection_token.py:46 #: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 #: tickets/models/ticket/apply_application.py:31 #: tickets/models/ticket/apply_asset.py:20 users/models/user.py:797 msgid "Date expired" msgstr "期限切れの日付" -#: authentication/models/connection_token.py:49 +#: authentication/models/connection_token.py:50 #: perms/models/asset_permission.py:77 msgid "From ticket" msgstr "チケットから" -#: authentication/models/connection_token.py:55 +#: authentication/models/connection_token.py:56 msgid "Connection token" msgstr "接続トークン" -#: authentication/models/connection_token.py:57 +#: authentication/models/connection_token.py:58 msgid "Can view connection token secret" msgstr "接続トークンの秘密を表示できます" -#: authentication/models/connection_token.py:104 +#: authentication/models/connection_token.py:105 msgid "Connection token inactive" msgstr "接続トークンがアクティブ化されていません" -#: authentication/models/connection_token.py:107 +#: authentication/models/connection_token.py:108 msgid "Connection token expired at: {}" msgstr "接続トークンの有効期限: {}" -#: authentication/models/connection_token.py:110 +#: authentication/models/connection_token.py:111 msgid "No user or invalid user" msgstr "ユーザーなしまたは期限切れのユーザー" -#: authentication/models/connection_token.py:113 +#: authentication/models/connection_token.py:114 msgid "No asset or inactive asset" msgstr "アセットがないか、有効化されていないアセット" -#: authentication/models/connection_token.py:265 +#: authentication/models/connection_token.py:267 msgid "Super connection token" msgstr "スーパー接続トークン" @@ -2758,7 +2755,7 @@ msgstr "コードエラー" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:423 +#: jumpserver/conf.py:426 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -3116,26 +3113,26 @@ msgstr "テキストフィールドへのマーシャルデータ" msgid "Encrypt field using Secret Key" msgstr "Secret Keyを使用したフィールドの暗号化" -#: common/db/fields.py:539 +#: common/db/fields.py:545 msgid "" "Invalid JSON data for JSONManyToManyField, should be like {'type': 'all'} or " "{'type': 'ids', 'ids': []} or {'type': 'attrs', 'attrs': [{'name': 'ip', " "'match': 'exact', 'value': '1.1.1.1'}}" msgstr "" -#: common/db/fields.py:546 +#: common/db/fields.py:552 msgid "Invalid type, should be \"all\", \"ids\" or \"attrs\"" msgstr "無効なタイプです。all、ids、またはattrsでなければなりません" -#: common/db/fields.py:549 +#: common/db/fields.py:555 msgid "Invalid ids for ids, should be a list" msgstr "無効なID、リストでなければなりません" -#: common/db/fields.py:552 common/db/fields.py:555 +#: common/db/fields.py:560 common/db/fields.py:565 msgid "Invalid attrs, should be a list of dict" msgstr "無効な属性、dictリストでなければなりません" -#: common/db/fields.py:557 +#: common/db/fields.py:567 msgid "Invalid attrs, should be has name and value" msgstr "名前と値が必要な無効な属性" @@ -3353,11 +3350,11 @@ msgstr "検索のエクスポート: %s" msgid "User %s view/export secret" msgstr "ユーザー %s がパスワードを閲覧/導き出しました" -#: jumpserver/conf.py:422 +#: jumpserver/conf.py:425 msgid "Create account successfully" msgstr "アカウントを正常に作成" -#: jumpserver/conf.py:424 +#: jumpserver/conf.py:427 msgid "Your account has been created successfully" msgstr "アカウントが正常に作成されました" @@ -3798,7 +3795,7 @@ msgstr "組織のリソース ({}) は削除できません" msgid "App organizations" msgstr "アプリ組織" -#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:84 +#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:89 #: rbac/const.py:7 rbac/models/rolebinding.py:56 #: rbac/serializers/rolebinding.py:40 settings/serializers/auth/ldap.py:63 #: tickets/models/ticket/general.py:302 tickets/serializers/ticket/ticket.py:60 @@ -3809,27 +3806,27 @@ msgstr "組織" msgid "Org name" msgstr "組織名" -#: orgs/models.py:70 rbac/models/role.py:36 terminal/models/applet/applet.py:39 -msgid "Builtin" -msgstr "ビルトイン" - -#: orgs/models.py:76 +#: orgs/models.py:13 msgid "GLOBAL" msgstr "グローバル組織" -#: orgs/models.py:78 +#: orgs/models.py:15 msgid "DEFAULT" msgstr "デフォルト組織" -#: orgs/models.py:80 +#: orgs/models.py:17 msgid "SYSTEM" msgstr "システム組織" -#: orgs/models.py:86 +#: orgs/models.py:81 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +msgid "Builtin" +msgstr "ビルトイン" + +#: orgs/models.py:91 msgid "Can view root org" msgstr "グローバル組織を表示できます" -#: orgs/models.py:87 +#: orgs/models.py:92 msgid "Can view all joined org" msgstr "参加しているすべての組織を表示できます" @@ -4118,8 +4115,8 @@ msgstr "タスクセンター" msgid "My assets" msgstr "私の資産" -#: rbac/tree.py:56 terminal/models/applet/applet.py:50 -#: terminal/models/applet/applet.py:238 terminal/models/applet/host.py:28 +#: rbac/tree.py:56 terminal/models/applet/applet.py:51 +#: terminal/models/applet/applet.py:239 terminal/models/applet/host.py:28 #: terminal/serializers/applet.py:15 msgid "Applet" msgstr "リモートアプリケーション" @@ -4448,7 +4445,7 @@ msgstr "有効 PKCE" #: settings/serializers/auth/oidc.py:43 msgid "Code challenge method" -msgstr "接続方法" +msgstr "検証コード方式" #: settings/serializers/auth/oidc.py:51 msgid "Use Keycloak" @@ -4632,7 +4629,7 @@ msgid "SSO auth key TTL" msgstr "Token有効期間" #: settings/serializers/auth/sso.py:17 -#: xpack/plugins/cloud/serializers/account_attrs.py:184 +#: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "Unit: second" msgstr "単位: 秒" @@ -5675,14 +5672,10 @@ msgid "Storage is invalid" msgstr "ストレージが無効です" #: terminal/models/applet/applet.py:29 -#, fuzzy -#| msgid "Comment" msgid "Community" -msgstr "コメント" +msgstr "コミュニティ版" #: terminal/models/applet/applet.py:30 -#, fuzzy -#| msgid "Enterprise edition" msgid "Enterprise" msgstr "エンタープライズ版" @@ -5690,41 +5683,39 @@ msgstr "エンタープライズ版" msgid "Author" msgstr "著者" -#: terminal/models/applet/applet.py:36 -#, fuzzy -#| msgid "Action" +#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:30 msgid "Edition" -msgstr "アクション" +msgstr "バージョン" -#: terminal/models/applet/applet.py:41 +#: terminal/models/applet/applet.py:42 msgid "Can concurrent" msgstr "同時実行可能" -#: terminal/models/applet/applet.py:42 +#: terminal/models/applet/applet.py:43 msgid "Tags" msgstr "ラベル" -#: terminal/models/applet/applet.py:46 terminal/serializers/storage.py:157 +#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:157 msgid "Hosts" msgstr "ホスト" -#: terminal/models/applet/applet.py:91 +#: terminal/models/applet/applet.py:92 msgid "Applet pkg not valid, Missing file {}" msgstr "無効なアプレット パッケージ、ファイル {} がありません" -#: terminal/models/applet/applet.py:110 +#: terminal/models/applet/applet.py:111 msgid "Load platform.yml failed: {}" msgstr "" -#: terminal/models/applet/applet.py:113 +#: terminal/models/applet/applet.py:114 msgid "Only support custom platform" msgstr "" -#: terminal/models/applet/applet.py:118 +#: terminal/models/applet/applet.py:119 msgid "Missing type in platform.yml" msgstr "" -#: terminal/models/applet/applet.py:240 terminal/models/applet/host.py:34 +#: terminal/models/applet/applet.py:241 terminal/models/applet/host.py:34 #: terminal/models/applet/host.py:134 msgid "Hosting" msgstr "ホスト マシン" @@ -7311,7 +7302,7 @@ msgstr "クラウドアカウント" msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:37 +#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:36 msgid "Regions" msgstr "リージョン" @@ -7319,15 +7310,15 @@ msgstr "リージョン" msgid "Hostname strategy" msgstr "ホスト名戦略" -#: xpack/plugins/cloud/models.py:102 xpack/plugins/cloud/serializers/task.py:40 +#: 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:105 xpack/plugins/cloud/serializers/task.py:45 +#: xpack/plugins/cloud/models.py:105 xpack/plugins/cloud/serializers/task.py:44 msgid "Sync IP type" msgstr "同期IPタイプ" -#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:62 +#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:61 msgid "Always update" msgstr "常に更新" @@ -7612,15 +7603,11 @@ msgstr "ファイルはJSON形式です。" msgid "IP address invalid `{}`, {}" msgstr "IPアドレスが無効: '{}', {}" -#: xpack/plugins/cloud/serializers/account_attrs.py:162 -#, fuzzy -#| msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" -msgid "" -"Format for comma-delimited string,Such as: 192.168.1.0/24, " -"10.0.0.0-10.0.0.255" -msgstr "例: 192.168.1.0/24,10.0.0.0-10.0.0.255" +#: xpack/plugins/cloud/serializers/account_attrs.py:172 +msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" +msgstr "例:192.168.1.0/24、10.0.0.0.0-10.0.0.255" -#: xpack/plugins/cloud/serializers/account_attrs.py:166 +#: xpack/plugins/cloud/serializers/account_attrs.py:175 msgid "" "The port is used to detect the validity of the IP address. When the " "synchronization task is executed, only the valid IP address will be " @@ -7630,48 +7617,41 @@ msgstr "" "実行されると、有効な IP アドレスのみが同期されます。
ポートが0の場合、す" "べてのIPアドレスが有効です。" -#: xpack/plugins/cloud/serializers/account_attrs.py:174 +#: xpack/plugins/cloud/serializers/account_attrs.py:183 msgid "Hostname prefix" msgstr "ホスト名プレフィックス" -#: xpack/plugins/cloud/serializers/account_attrs.py:177 +#: xpack/plugins/cloud/serializers/account_attrs.py:186 msgid "IP segment" msgstr "IP セグメント" -#: xpack/plugins/cloud/serializers/account_attrs.py:181 +#: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Test port" msgstr "テストポート" -#: xpack/plugins/cloud/serializers/account_attrs.py:184 +#: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "Test timeout" msgstr "テストタイムアウト" #: xpack/plugins/cloud/serializers/task.py:28 -#, fuzzy -#| 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 " -#| "used as the IP for the created asset.
The default value of * means " -#| "sync all instances and randomly match IP addresses.
Such as: " -#| "192.168.1.0/24, 10.1.1.1-10.1.1.20" 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 " "used as the IP for the created asset.
The default value of * means sync " -"all instances and randomly match IP addresses.
Format for comma-" -"delimited string, Such as: 192.168.1.0/24, 10.1.1.1-10.1.1.20" +"all instances and randomly match IP addresses.
Such as: 192.168.1.0/24, " +"10.1.1.1-10.1.1.20" 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:35 +#: xpack/plugins/cloud/serializers/task.py:34 msgid "History count" msgstr "実行回数" -#: xpack/plugins/cloud/serializers/task.py:36 +#: xpack/plugins/cloud/serializers/task.py:35 msgid "Instance count" msgstr "インスタンス数" @@ -7731,23 +7711,23 @@ msgstr "ライセンスのインポートに成功" msgid "License is invalid" msgstr "ライセンスが無効です" -#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:135 +#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:138 msgid "License" msgstr "ライセンス" -#: xpack/plugins/license/models.py:79 +#: xpack/plugins/license/models.py:80 msgid "Standard edition" msgstr "標準版" -#: xpack/plugins/license/models.py:81 +#: xpack/plugins/license/models.py:82 msgid "Enterprise edition" msgstr "エンタープライズ版" -#: xpack/plugins/license/models.py:83 +#: xpack/plugins/license/models.py:84 msgid "Ultimate edition" msgstr "究極のエディション" -#: xpack/plugins/license/models.py:85 +#: xpack/plugins/license/models.py:86 msgid "Community edition" msgstr "コミュニティ版" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index ad2f7c7f8..ad1bb99ae 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:4a22b436e9707729e51614e9942bb9715084ddf613152fa35be7a092a77daca7 -size 117063 +oid sha256:1ba7d3f3f44c44ef691d93294e8e0ac61cee48a35cdc32baf45f772b4997520b +size 118115 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 3b99bfe8d..47ed71d81 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-06-09 10:59+0800\n" +"POT-Creation-Date: 2023-06-13 15:47+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -69,7 +69,7 @@ msgstr "数据库" msgid "Collected" msgstr "收集" -#: accounts/const/account.py:21 accounts/serializers/account/account.py:26 +#: accounts/const/account.py:21 accounts/serializers/account/account.py:27 #: settings/serializers/auth/sms.py:75 msgid "Template" msgstr "模板" @@ -180,15 +180,15 @@ msgstr "仅创建" #: accounts/models/account.py:49 #: accounts/models/automations/gather_account.py:16 -#: accounts/serializers/account/account.py:203 -#: accounts/serializers/account/account.py:236 +#: accounts/serializers/account/account.py:200 +#: accounts/serializers/account/account.py:237 #: accounts/serializers/account/gathered_account.py:10 #: accounts/serializers/automations/change_secret.py:112 #: accounts/serializers/automations/change_secret.py:132 #: acls/serializers/base.py:118 assets/models/asset/common.py:93 #: assets/models/asset/common.py:332 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:34 +#: audits/models.py:53 authentication/models/connection_token.py:35 #: perms/models/asset_permission.py:64 perms/serializers/permission.py:34 #: terminal/backends/command/models.py:20 terminal/models/session/session.py:32 #: terminal/notifications.py:95 terminal/serializers/command.py:17 @@ -198,7 +198,7 @@ msgstr "资产" #: accounts/models/account.py:53 accounts/models/account.py:113 #: accounts/serializers/account/account.py:208 -#: accounts/serializers/account/account.py:246 +#: accounts/serializers/account/account.py:247 #: accounts/serializers/account/template.py:16 #: authentication/serializers/connect_token_secret.py:49 msgid "Su from" @@ -209,7 +209,7 @@ msgstr "切换自" msgid "Version" msgstr "版本" -#: accounts/models/account.py:57 accounts/serializers/account/account.py:204 +#: accounts/models/account.py:57 accounts/serializers/account/account.py:203 #: users/models/user.py:804 msgid "Source" msgstr "来源" @@ -355,7 +355,7 @@ msgid "Can add push account execution" msgstr "创建推送账号执行" #: accounts/models/automations/change_secret.py:18 accounts/models/base.py:36 -#: accounts/serializers/account/account.py:416 +#: accounts/serializers/account/account.py:419 #: accounts/serializers/account/base.py:16 #: accounts/serializers/automations/change_secret.py:46 #: authentication/serializers/connect_token_secret.py:41 @@ -405,7 +405,7 @@ msgid "Date finished" msgstr "结束日期" #: accounts/models/automations/change_secret.py:93 -#: accounts/serializers/account/account.py:238 assets/const/automation.py:8 +#: accounts/serializers/account/account.py:239 assets/const/automation.py:8 #: authentication/views/base.py:29 authentication/views/base.py:30 #: authentication/views/base.py:31 common/const/choices.py:20 msgid "Error" @@ -457,7 +457,7 @@ msgstr "收集账号" msgid "Triggers" msgstr "触发方式" -#: accounts/models/automations/push_account.py:16 acls/models/base.py:43 +#: accounts/models/automations/push_account.py:16 acls/models/base.py:46 #: acls/serializers/base.py:56 assets/models/cmd_filter.py:81 #: audits/models.py:87 audits/serializers.py:82 #: authentication/serializers/connect_token_secret.py:116 @@ -473,7 +473,7 @@ msgstr "账号推送" msgid "Verify asset account" msgstr "账号验证" -#: accounts/models/base.py:33 acls/models/base.py:37 acls/models/base.py:97 +#: accounts/models/base.py:33 acls/models/base.py:40 acls/models/base.py:101 #: acls/models/command_acl.py:21 acls/serializers/base.py:34 #: applications/models.py:9 assets/models/_user.py:22 #: assets/models/asset/common.py:91 assets/models/asset/common.py:149 @@ -485,7 +485,7 @@ msgstr "账号验证" #: authentication/serializers/connect_token_secret.py:110 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 -#: orgs/models.py:69 perms/models/asset_permission.py:56 rbac/models/role.py:29 +#: orgs/models.py:80 perms/models/asset_permission.py:56 rbac/models/role.py:29 #: settings/models.py:33 settings/serializers/sms.py:6 #: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12 #: terminal/models/component/endpoint.py:90 @@ -504,7 +504,7 @@ 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:38 users/serializers/user.py:170 +#: terminal/models/applet/applet.py:39 users/serializers/user.py:170 msgid "Is active" msgstr "激活" @@ -546,15 +546,15 @@ msgstr "" "{} - 改密任务已完成: 未设置加密密码 - 请前往个人信息 -> 文件加密密码中设置加" "密密码" -#: accounts/serializers/account/account.py:29 +#: accounts/serializers/account/account.py:30 msgid "Push now" msgstr "立即推送" -#: accounts/serializers/account/account.py:36 +#: accounts/serializers/account/account.py:37 msgid "Exist policy" msgstr "账号存在策略" -#: accounts/serializers/account/account.py:183 applications/models.py:11 +#: accounts/serializers/account/account.py:180 applications/models.py:11 #: assets/models/label.py:21 assets/models/platform.py:82 #: assets/serializers/asset/common.py:121 assets/serializers/cagegory.py:8 #: assets/serializers/platform.py:110 assets/serializers/platform.py:193 @@ -563,7 +563,7 @@ msgstr "账号存在策略" msgid "Category" msgstr "类别" -#: accounts/serializers/account/account.py:184 +#: accounts/serializers/account/account.py:181 #: accounts/serializers/automations/base.py:54 acls/models/command_acl.py:24 #: acls/serializers/command_acl.py:18 applications/models.py:14 #: assets/models/_user.py:50 assets/models/automations/base.py:20 @@ -571,7 +571,7 @@ msgstr "类别" #: 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:123 ops/models/job.py:103 -#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:37 +#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:38 #: terminal/models/component/storage.py:57 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 #: terminal/serializers/session.py:22 terminal/serializers/storage.py:224 @@ -582,28 +582,28 @@ msgstr "类别" msgid "Type" msgstr "类型" -#: accounts/serializers/account/account.py:199 +#: accounts/serializers/account/account.py:196 msgid "Asset not found" msgstr "资产不存在" -#: accounts/serializers/account/account.py:205 +#: accounts/serializers/account/account.py:201 #: accounts/serializers/account/base.py:64 msgid "Has secret" msgstr "已托管密码" -#: accounts/serializers/account/account.py:237 ops/models/celery.py:60 +#: accounts/serializers/account/account.py:238 ops/models/celery.py:60 #: tickets/models/comment.py:13 tickets/models/ticket/general.py:45 #: tickets/models/ticket/general.py:279 tickets/serializers/super_ticket.py:14 #: tickets/serializers/ticket/ticket.py:21 msgid "State" msgstr "状态" -#: accounts/serializers/account/account.py:239 +#: accounts/serializers/account/account.py:240 msgid "Changed" msgstr "已修改" -#: accounts/serializers/account/account.py:249 -#: accounts/serializers/automations/base.py:22 acls/models/base.py:98 +#: accounts/serializers/account/account.py:250 +#: accounts/serializers/automations/base.py:22 acls/models/base.py:102 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 ops/models/base.py:17 #: ops/models/job.py:105 ops/serializers/job.py:21 @@ -611,30 +611,30 @@ msgstr "已修改" msgid "Assets" msgstr "资产" -#: accounts/serializers/account/account.py:301 +#: accounts/serializers/account/account.py:305 msgid "Account already exists" msgstr "账号已存在" -#: accounts/serializers/account/account.py:351 +#: accounts/serializers/account/account.py:355 #, python-format msgid "Asset does not support this secret type: %s" msgstr "资产不支持账号类型: %s" -#: accounts/serializers/account/account.py:383 +#: accounts/serializers/account/account.py:387 msgid "Account has exist" msgstr "账号已存在" -#: accounts/serializers/account/account.py:417 +#: accounts/serializers/account/account.py:420 #: authentication/serializers/connect_token_secret.py:156 #: authentication/templates/authentication/_access_key_modal.html:30 #: perms/models/perm_node.py:21 users/serializers/group.py:33 msgid "ID" msgstr "ID" -#: accounts/serializers/account/account.py:424 acls/serializers/base.py:111 +#: accounts/serializers/account/account.py:427 acls/serializers/base.py:111 #: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:49 #: audits/models.py:85 audits/models.py:163 -#: authentication/models/connection_token.py:30 +#: authentication/models/connection_token.py:31 #: authentication/models/sso_token.py:16 #: notifications/models/notification.py:12 #: perms/api/user_permission/mixin.py:55 perms/models/asset_permission.py:58 @@ -648,7 +648,7 @@ msgstr "ID" msgid "User" msgstr "用户" -#: accounts/serializers/account/account.py:425 +#: accounts/serializers/account/account.py:428 #: authentication/templates/authentication/_access_key_modal.html:33 #: terminal/notifications.py:98 terminal/notifications.py:146 msgid "Date" @@ -774,47 +774,47 @@ msgstr "密钥不合法或密钥密码错误" msgid "Acls" msgstr "访问控制" -#: acls/models/base.py:17 tickets/const.py:45 +#: acls/models/base.py:20 tickets/const.py:45 #: tickets/templates/tickets/approve_check_password.html:49 msgid "Reject" msgstr "拒绝" -#: acls/models/base.py:18 +#: acls/models/base.py:21 msgid "Accept" msgstr "接受" -#: acls/models/base.py:19 +#: acls/models/base.py:22 msgid "Review" msgstr "审批" -#: acls/models/base.py:39 assets/models/_user.py:51 +#: acls/models/base.py:42 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:93 msgid "Priority" msgstr "优先级" -#: acls/models/base.py:40 assets/models/_user.py:51 +#: acls/models/base.py:43 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:94 msgid "1-100, the lower the value will be match first" msgstr "优先级可选范围为 1-100 (数值越小越优先)" -#: acls/models/base.py:44 assets/models/cmd_filter.py:86 +#: acls/models/base.py:47 assets/models/cmd_filter.py:86 #: authentication/serializers/connect_token_secret.py:88 msgid "Reviewers" msgstr "审批人" -#: acls/models/base.py:45 authentication/models/access_key.py:17 -#: authentication/models/connection_token.py:51 +#: acls/models/base.py:48 authentication/models/access_key.py:17 +#: authentication/models/connection_token.py:52 #: authentication/templates/authentication/_access_key_modal.html:32 #: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:27 #: tickets/const.py:37 msgid "Active" msgstr "激活中" -#: acls/models/base.py:83 users/apps.py:9 +#: acls/models/base.py:86 users/apps.py:9 msgid "Users" msgstr "用户管理" -#: acls/models/base.py:99 assets/models/automations/base.py:17 +#: acls/models/base.py:103 assets/models/automations/base.py:17 #: assets/models/cmd_filter.py:38 assets/serializers/asset/common.py:305 #: rbac/tree.py:35 msgid "Accounts" @@ -833,7 +833,7 @@ msgid "Regex" msgstr "正则表达式" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 -#: settings/serializers/basic.py:10 xpack/plugins/license/models.py:29 +#: settings/serializers/basic.py:10 xpack/plugins/license/models.py:30 msgid "Content" msgstr "内容" @@ -864,11 +864,13 @@ msgid "Command confirm" msgstr "命令复核" #: acls/models/connect_method.py:10 -#, fuzzy -#| msgid "Connect method" msgid "Connect methods" msgstr "连接方式" +#: acls/models/connect_method.py:13 +msgid "Connect method acl" +msgstr "连接方式控制" + #: acls/models/login_acl.py:11 acls/models/login_asset_acl.py:9 #: acls/serializers/login_acl.py:15 acls/serializers/login_asset_acl.py:13 msgid "Rule" @@ -994,7 +996,7 @@ msgid "{} disabled" msgstr "{} 已禁用" #: assets/automations/ping_gateway/manager.py:33 -#: authentication/models/connection_token.py:116 +#: authentication/models/connection_token.py:117 msgid "No account" msgstr "没有账号" @@ -1139,7 +1141,7 @@ msgstr "SSH公钥" #: assets/models/cmd_filter.py:88 assets/models/group.py:23 #: common/db/models.py:36 ops/models/adhoc.py:27 ops/models/job.py:111 #: ops/models/playbook.py:26 rbac/models/role.py:37 settings/models.py:38 -#: terminal/models/applet/applet.py:43 terminal/models/applet/applet.py:242 +#: terminal/models/applet/applet.py:44 terminal/models/applet/applet.py:243 #: terminal/models/applet/host.py:139 terminal/models/component/endpoint.py:24 #: terminal/models/component/endpoint.py:100 #: terminal/models/session/session.py:47 tickets/models/comment.py:32 @@ -1187,9 +1189,9 @@ msgstr "特权用户" msgid "Username same with user" msgstr "用户名与用户相同" -#: assets/models/_user.py:52 authentication/models/connection_token.py:39 +#: assets/models/_user.py:52 authentication/models/connection_token.py:40 #: authentication/serializers/connect_token_secret.py:111 -#: terminal/models/applet/applet.py:40 terminal/serializers/session.py:20 +#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:20 #: terminal/serializers/session.py:41 terminal/serializers/storage.py:68 msgid "Protocol" msgstr "协议" @@ -1255,7 +1257,7 @@ msgstr "地址" #: assets/models/asset/common.py:151 assets/models/platform.py:112 #: authentication/serializers/connect_token_secret.py:115 #: perms/serializers/user_permission.py:24 -#: xpack/plugins/cloud/serializers/account_attrs.py:187 +#: xpack/plugins/cloud/serializers/account_attrs.py:196 msgid "Platform" msgstr "系统平台" @@ -1350,7 +1352,7 @@ msgstr "资产自动化任务" #: assets/models/automations/base.py:113 audits/models.py:199 #: audits/serializers.py:49 ops/models/base.py:49 ops/models/job.py:184 -#: terminal/models/applet/applet.py:241 terminal/models/applet/host.py:136 +#: terminal/models/applet/applet.py:242 terminal/models/applet/host.py:136 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:103 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 @@ -1433,7 +1435,7 @@ msgstr "系统" #: assets/models/label.py:19 assets/models/node.py:557 #: assets/serializers/cagegory.py:7 assets/serializers/cagegory.py:14 -#: authentication/models/connection_token.py:27 +#: authentication/models/connection_token.py:28 #: authentication/serializers/connect_token_secret.py:122 #: common/serializers/common.py:86 settings/models.py:34 msgid "Value" @@ -1637,7 +1639,8 @@ msgstr "协议是必填的: {}" msgid "Default database" msgstr "默认数据库" -#: assets/serializers/asset/database.py:28 common/serializers/fields.py:104 +#: assets/serializers/asset/database.py:28 common/db/fields.py:557 +#: common/db/fields.py:562 common/serializers/fields.py:104 #: tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 @@ -1872,10 +1875,8 @@ msgid "Download" msgstr "下载" #: audits/const.py:19 -#, fuzzy -#| msgid "Rename attr" msgid "Rename dir" -msgstr "映射属性" +msgstr "映射目录" #: audits/const.py:23 rbac/tree.py:228 msgid "View" @@ -1928,11 +1929,11 @@ msgstr "任务" msgid "-" msgstr "-" -#: audits/handler.py:114 +#: audits/handler.py:112 msgid "Yes" msgstr "是" -#: audits/handler.py:114 +#: audits/handler.py:112 msgid "No" msgstr "否" @@ -2108,10 +2109,8 @@ msgid "Clean audits session task log" msgstr "清理审计会话任务日志" #: audits/tasks.py:114 -#, fuzzy -#| msgid "Upload session replay to external storage" msgid "Upload FTP file to external storage" -msgstr "上传会话录像到外部存储" +msgstr "上传 FTP 文件到外部存储" #: authentication/api/confirm.py:40 msgid "This action require verify your MFA" @@ -2496,80 +2495,78 @@ msgstr "该 MFA ({}) 方式没有启用" msgid "Please change your password" msgstr "请修改密码" -#: authentication/models/connection_token.py:36 +#: authentication/models/connection_token.py:37 #: terminal/serializers/storage.py:111 msgid "Account name" msgstr "账号名称" -#: authentication/models/connection_token.py:37 +#: authentication/models/connection_token.py:38 msgid "Input username" msgstr "自定义用户名" -#: authentication/models/connection_token.py:38 +#: authentication/models/connection_token.py:39 #: authentication/serializers/connection_token.py:20 msgid "Input secret" msgstr "自定义密码" -#: authentication/models/connection_token.py:40 +#: authentication/models/connection_token.py:41 msgid "Connect method" msgstr "连接方式" -#: authentication/models/connection_token.py:41 -#, fuzzy -#| msgid "Connections" -msgid "Connect options" -msgstr "连接数" - #: authentication/models/connection_token.py:42 +msgid "Connect options" +msgstr "连接项" + +#: authentication/models/connection_token.py:43 #: rbac/serializers/rolebinding.py:21 msgid "User display" msgstr "用户名称" -#: authentication/models/connection_token.py:43 +#: authentication/models/connection_token.py:44 msgid "Asset display" msgstr "资产名称" -#: authentication/models/connection_token.py:44 +#: authentication/models/connection_token.py:45 msgid "Reusable" msgstr "可以重复使用" -#: authentication/models/connection_token.py:45 +#: authentication/models/connection_token.py:46 #: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 #: tickets/models/ticket/apply_application.py:31 #: tickets/models/ticket/apply_asset.py:20 users/models/user.py:797 msgid "Date expired" msgstr "失效日期" -#: authentication/models/connection_token.py:49 +#: authentication/models/connection_token.py:50 #: perms/models/asset_permission.py:77 msgid "From ticket" msgstr "来自工单" -#: authentication/models/connection_token.py:55 +#: authentication/models/connection_token.py:56 msgid "Connection token" msgstr "连接令牌" -#: authentication/models/connection_token.py:57 +#: authentication/models/connection_token.py:58 msgid "Can view connection token secret" msgstr "可以查看连接令牌密文" -#: authentication/models/connection_token.py:104 +#: authentication/models/connection_token.py:105 msgid "Connection token inactive" msgstr "连接令牌未激活" -#: authentication/models/connection_token.py:107 +#: authentication/models/connection_token.py:108 msgid "Connection token expired at: {}" msgstr "连接令牌过期: {}" -#: authentication/models/connection_token.py:110 +#: authentication/models/connection_token.py:111 msgid "No user or invalid user" msgstr "没有用户或用户失效" -#: authentication/models/connection_token.py:113 +#: authentication/models/connection_token.py:114 msgid "No asset or inactive asset" msgstr "没有资产或资产未激活" -#: authentication/models/connection_token.py:265 +#: authentication/models/connection_token.py:267 msgid "Super connection token" msgstr "超级连接令牌" @@ -2733,7 +2730,7 @@ msgstr "代码错误" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:423 +#: jumpserver/conf.py:426 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -3083,26 +3080,26 @@ msgstr "编码数据为 text" msgid "Encrypt field using Secret Key" msgstr "加密的字段" -#: common/db/fields.py:539 +#: common/db/fields.py:545 msgid "" "Invalid JSON data for JSONManyToManyField, should be like {'type': 'all'} or " "{'type': 'ids', 'ids': []} or {'type': 'attrs', 'attrs': [{'name': 'ip', " "'match': 'exact', 'value': '1.1.1.1'}}" msgstr "" -#: common/db/fields.py:546 +#: common/db/fields.py:552 msgid "Invalid type, should be \"all\", \"ids\" or \"attrs\"" msgstr "无效类型,应为 all、ids 或 attrs" -#: common/db/fields.py:549 +#: common/db/fields.py:555 msgid "Invalid ids for ids, should be a list" msgstr "无效的ID,应为列表" -#: common/db/fields.py:552 common/db/fields.py:555 +#: common/db/fields.py:560 common/db/fields.py:565 msgid "Invalid attrs, should be a list of dict" msgstr "无效的属性,应为dict列表" -#: common/db/fields.py:557 +#: common/db/fields.py:567 msgid "Invalid attrs, should be has name and value" msgstr "无效属性,应具有名称和值" @@ -3318,11 +3315,11 @@ msgstr "导出搜素: %s" msgid "User %s view/export secret" msgstr "用户 %s 查看/导出 了密码" -#: jumpserver/conf.py:422 +#: jumpserver/conf.py:425 msgid "Create account successfully" msgstr "创建账号成功" -#: jumpserver/conf.py:424 +#: jumpserver/conf.py:427 msgid "Your account has been created successfully" msgstr "你的账号已创建成功" @@ -3757,7 +3754,7 @@ msgstr "组织存在资源 ({}) 不能被删除" msgid "App organizations" msgstr "组织管理" -#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:84 +#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:89 #: rbac/const.py:7 rbac/models/rolebinding.py:56 #: rbac/serializers/rolebinding.py:40 settings/serializers/auth/ldap.py:63 #: tickets/models/ticket/general.py:302 tickets/serializers/ticket/ticket.py:60 @@ -3768,27 +3765,27 @@ msgstr "组织" msgid "Org name" msgstr "组织名称" -#: orgs/models.py:70 rbac/models/role.py:36 terminal/models/applet/applet.py:39 -msgid "Builtin" -msgstr "内置的" - -#: orgs/models.py:76 +#: orgs/models.py:13 msgid "GLOBAL" msgstr "全局组织" -#: orgs/models.py:78 +#: orgs/models.py:15 msgid "DEFAULT" msgstr "默认组织" -#: orgs/models.py:80 +#: orgs/models.py:17 msgid "SYSTEM" msgstr "系统组织" -#: orgs/models.py:86 +#: orgs/models.py:81 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +msgid "Builtin" +msgstr "内置的" + +#: orgs/models.py:91 msgid "Can view root org" msgstr "可以查看全局组织" -#: orgs/models.py:87 +#: orgs/models.py:92 msgid "Can view all joined org" msgstr "可以查看所有加入的组织" @@ -4076,8 +4073,8 @@ msgstr "任务中心" msgid "My assets" msgstr "我的资产" -#: rbac/tree.py:56 terminal/models/applet/applet.py:50 -#: terminal/models/applet/applet.py:238 terminal/models/applet/host.py:28 +#: rbac/tree.py:56 terminal/models/applet/applet.py:51 +#: terminal/models/applet/applet.py:239 terminal/models/applet/host.py:28 #: terminal/serializers/applet.py:15 msgid "Applet" msgstr "远程应用" @@ -4406,7 +4403,7 @@ msgstr "启用 PKCE" #: settings/serializers/auth/oidc.py:43 msgid "Code challenge method" -msgstr "连接方式" +msgstr "验证校验码方式" #: settings/serializers/auth/oidc.py:51 msgid "Use Keycloak" @@ -4588,7 +4585,7 @@ msgid "SSO auth key TTL" msgstr "令牌有效期" #: settings/serializers/auth/sso.py:17 -#: xpack/plugins/cloud/serializers/account_attrs.py:184 +#: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "Unit: second" msgstr "单位: 秒" @@ -5606,39 +5603,39 @@ msgstr "企业版" msgid "Author" msgstr "作者" -#: terminal/models/applet/applet.py:36 +#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:30 msgid "Edition" msgstr "版本" -#: terminal/models/applet/applet.py:41 +#: terminal/models/applet/applet.py:42 msgid "Can concurrent" msgstr "可以并发" -#: terminal/models/applet/applet.py:42 +#: terminal/models/applet/applet.py:43 msgid "Tags" msgstr "标签" -#: terminal/models/applet/applet.py:46 terminal/serializers/storage.py:157 +#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:157 msgid "Hosts" msgstr "主机" -#: terminal/models/applet/applet.py:91 +#: terminal/models/applet/applet.py:92 msgid "Applet pkg not valid, Missing file {}" msgstr "Applet pkg 无效,缺少文件 {}" -#: terminal/models/applet/applet.py:110 +#: terminal/models/applet/applet.py:111 msgid "Load platform.yml failed: {}" msgstr "" -#: terminal/models/applet/applet.py:113 +#: terminal/models/applet/applet.py:114 msgid "Only support custom platform" msgstr "" -#: terminal/models/applet/applet.py:118 +#: terminal/models/applet/applet.py:119 msgid "Missing type in platform.yml" msgstr "" -#: terminal/models/applet/applet.py:240 terminal/models/applet/host.py:34 +#: terminal/models/applet/applet.py:241 terminal/models/applet/host.py:34 #: terminal/models/applet/host.py:134 msgid "Hosting" msgstr "宿主机" @@ -7201,7 +7198,7 @@ msgstr "云账号" msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:37 +#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:36 msgid "Regions" msgstr "地域" @@ -7209,15 +7206,15 @@ msgstr "地域" msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:102 xpack/plugins/cloud/serializers/task.py:40 +#: 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:105 xpack/plugins/cloud/serializers/task.py:45 +#: xpack/plugins/cloud/models.py:105 xpack/plugins/cloud/serializers/task.py:44 msgid "Sync IP type" msgstr "同步IP类型" -#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:62 +#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:61 msgid "Always update" msgstr "总是更新" @@ -7502,15 +7499,11 @@ msgstr "JSON 格式的文件" msgid "IP address invalid `{}`, {}" msgstr "IP 地址无效: `{}`, {}" -#: xpack/plugins/cloud/serializers/account_attrs.py:162 -#, fuzzy -#| msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" -msgid "" -"Format for comma-delimited string,Such as: 192.168.1.0/24, " -"10.0.0.0-10.0.0.255" -msgstr "如: 192.168.1.0/24,10.0.0.0-10.0.0.255" +#: xpack/plugins/cloud/serializers/account_attrs.py:172 +msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" +msgstr "例: 192.168.1.0/24,10.0.0.0-10.0.0.255" -#: xpack/plugins/cloud/serializers/account_attrs.py:166 +#: xpack/plugins/cloud/serializers/account_attrs.py:175 msgid "" "The port is used to detect the validity of the IP address. When the " "synchronization task is executed, only the valid IP address will be " @@ -7519,46 +7512,39 @@ msgstr "" "端口用来检测 IP 地址的有效性,在同步任务执行时,只会同步有效的 IP 地址。
" "如果端口为 0,则表示所有 IP 地址均有效。" -#: xpack/plugins/cloud/serializers/account_attrs.py:174 +#: xpack/plugins/cloud/serializers/account_attrs.py:183 msgid "Hostname prefix" msgstr "主机名前缀" -#: xpack/plugins/cloud/serializers/account_attrs.py:177 +#: xpack/plugins/cloud/serializers/account_attrs.py:186 msgid "IP segment" msgstr "IP 网段" -#: xpack/plugins/cloud/serializers/account_attrs.py:181 +#: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Test port" msgstr "测试端口" -#: xpack/plugins/cloud/serializers/account_attrs.py:184 +#: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "Test timeout" msgstr "测试超时时间" #: xpack/plugins/cloud/serializers/task.py:28 -#, fuzzy -#| 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 " -#| "used as the IP for the created asset.
The default value of * means " -#| "sync all instances and randomly match IP addresses.
Such as: " -#| "192.168.1.0/24, 10.1.1.1-10.1.1.20" 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 " "used as the IP for the created asset.
The default value of * means sync " -"all instances and randomly match IP addresses.
Format for comma-" -"delimited string, Such as: 192.168.1.0/24, 10.1.1.1-10.1.1.20" +"all instances and randomly match IP addresses.
Such as: 192.168.1.0/24, " +"10.1.1.1-10.1.1.20" msgstr "" "只有匹配到 IP 段的实例会被同步。
如果实例包含多个 IP 地址,那么第一个匹配" "到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " -"IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20" +"IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:35 +#: xpack/plugins/cloud/serializers/task.py:34 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:36 +#: xpack/plugins/cloud/serializers/task.py:35 msgid "Instance count" msgstr "实例个数" @@ -7618,23 +7604,23 @@ msgstr "许可证导入成功" msgid "License is invalid" msgstr "无效的许可证" -#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:135 +#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:138 msgid "License" msgstr "许可证" -#: xpack/plugins/license/models.py:79 +#: xpack/plugins/license/models.py:80 msgid "Standard edition" msgstr "标准版" -#: xpack/plugins/license/models.py:81 +#: xpack/plugins/license/models.py:82 msgid "Enterprise edition" msgstr "企业版" -#: xpack/plugins/license/models.py:83 +#: xpack/plugins/license/models.py:84 msgid "Ultimate edition" msgstr "旗舰版" -#: xpack/plugins/license/models.py:85 +#: xpack/plugins/license/models.py:86 msgid "Community edition" msgstr "社区版"