diff --git a/apps/accounts/migrations/0006_gatheredaccount.py b/apps/accounts/migrations/0006_gatheredaccount.py index af0b2a048..f7058864e 100644 --- a/apps/accounts/migrations/0006_gatheredaccount.py +++ b/apps/accounts/migrations/0006_gatheredaccount.py @@ -24,9 +24,9 @@ class Migration(migrations.Migration): ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)), ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')), ('present', models.BooleanField(default=True, verbose_name='Present')), - ('date_last_login', models.DateTimeField(null=True, verbose_name='Date last login')), + ('date_last_login', models.DateTimeField(null=True, verbose_name='Date login')), ('username', models.CharField(blank=True, db_index=True, max_length=32, verbose_name='Username')), - ('address_last_login', models.CharField(default='', max_length=39, verbose_name='Address last login')), + ('address_last_login', models.CharField(default='', max_length=39, verbose_name='Address login')), ('asset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.asset', verbose_name='Asset')), ], options={ diff --git a/apps/accounts/models/automations/gather_account.py b/apps/accounts/models/automations/gather_account.py index bc56fa4ec..96e83cbcb 100644 --- a/apps/accounts/models/automations/gather_account.py +++ b/apps/accounts/models/automations/gather_account.py @@ -12,10 +12,10 @@ __all__ = ['GatherAccountsAutomation', 'GatheredAccount'] class GatheredAccount(JMSOrgBaseModel): present = models.BooleanField(default=True, verbose_name=_("Present")) - date_last_login = models.DateTimeField(null=True, verbose_name=_("Date last login")) + date_last_login = models.DateTimeField(null=True, verbose_name=_("Date login")) asset = models.ForeignKey('assets.Asset', on_delete=models.CASCADE, verbose_name=_("Asset")) username = models.CharField(max_length=32, blank=True, db_index=True, verbose_name=_('Username')) - address_last_login = models.CharField(max_length=39, default='', verbose_name=_("Address last login")) + address_last_login = models.CharField(max_length=39, default='', verbose_name=_("Address login")) @property def address(self): diff --git a/apps/accounts/serializers/account/base.py b/apps/accounts/serializers/account/base.py index 23dec0d3e..3b47b7d02 100644 --- a/apps/accounts/serializers/account/base.py +++ b/apps/accounts/serializers/account/base.py @@ -22,7 +22,7 @@ class AuthValidateMixin(serializers.Serializer): ) passphrase = serializers.CharField( allow_blank=True, allow_null=True, required=False, max_length=512, - write_only=True, label=_('Key password') + write_only=True, label=_('Passphrase') ) @staticmethod diff --git a/apps/assets/migrations/0043_auto_20191114_1111.py b/apps/assets/migrations/0043_auto_20191114_1111.py index a07dee6bb..55a3eda47 100644 --- a/apps/assets/migrations/0043_auto_20191114_1111.py +++ b/apps/assets/migrations/0043_auto_20191114_1111.py @@ -13,11 +13,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='gathereduser', name='date_last_login', - field=models.DateTimeField(null=True, verbose_name='Date last login'), + field=models.DateTimeField(null=True, verbose_name='Date login'), ), migrations.AddField( model_name='gathereduser', name='ip_last_login', - field=models.CharField(default='', max_length=39, verbose_name='IP last login'), + field=models.CharField(default='', max_length=39, verbose_name='IP login'), ), ] diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 4a6759ef4..d90b7b535 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-12 16:58+0800\n" +"POT-Creation-Date: 2024-03-28 11:19+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,7 +32,7 @@ msgstr "" #: assets/models/_user.py:24 audits/signal_handlers/login_log.py:34 #: authentication/confirm/password.py:9 authentication/confirm/password.py:24 #: authentication/confirm/password.py:26 authentication/forms.py:32 -#: authentication/templates/authentication/login.html:330 +#: authentication/templates/authentication/login.html:329 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47 #: settings/serializers/msg.py:35 terminal/serializers/storage.py:123 #: terminal/serializers/storage.py:142 users/forms/profile.py:22 @@ -253,7 +253,7 @@ msgstr "" #: accounts/serializers/automations/change_secret.py:126 #: accounts/templates/accounts/asset_account_change_info.html:7 #: acls/serializers/base.py:123 assets/models/asset/common.py:95 -#: assets/models/asset/common.py:350 assets/models/cmd_filter.py:36 +#: assets/models/asset/common.py:349 assets/models/cmd_filter.py:36 #: audits/models.py:58 authentication/models/connection_token.py:36 #: perms/models/asset_permission.py:69 perms/serializers/permission.py:36 #: terminal/backends/command/models.py:17 terminal/models/session/session.py:31 @@ -293,11 +293,11 @@ msgstr "" #: accounts/serializers/automations/change_secret.py:107 #: accounts/serializers/automations/change_secret.py:127 #: acls/serializers/base.py:124 acls/templates/acls/asset_login_reminder.html:7 -#: assets/serializers/asset/common.py:128 assets/serializers/gateway.py:28 -#: audits/models.py:59 authentication/api/connection_token.py:405 -#: ops/models/base.py:18 perms/models/asset_permission.py:75 -#: settings/serializers/msg.py:33 terminal/backends/command/models.py:18 -#: terminal/models/session/session.py:33 terminal/serializers/command.py:72 +#: assets/serializers/gateway.py:28 audits/models.py:59 +#: authentication/api/connection_token.py:405 ops/models/base.py:18 +#: perms/models/asset_permission.py:75 settings/serializers/msg.py:33 +#: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 +#: terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 #: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:89 @@ -513,7 +513,7 @@ msgid "Present" msgstr "" #: accounts/models/automations/gather_account.py:15 -msgid "Date last login" +msgid "Date login" msgstr "" #: accounts/models/automations/gather_account.py:17 @@ -532,7 +532,7 @@ msgid "Username" msgstr "" #: accounts/models/automations/gather_account.py:18 -msgid "Address last login" +msgid "Address login" msgstr "" #: accounts/models/automations/gather_account.py:44 @@ -604,7 +604,7 @@ msgstr "" #: assets/models/domain.py:19 assets/models/group.py:17 #: assets/models/label.py:18 assets/models/platform.py:16 #: assets/models/platform.py:95 assets/serializers/asset/common.py:149 -#: assets/serializers/platform.py:118 assets/serializers/platform.py:228 +#: assets/serializers/platform.py:136 assets/serializers/platform.py:254 #: authentication/backends/passkey/models.py:10 #: authentication/serializers/connect_token_secret.py:113 #: authentication/serializers/connect_token_secret.py:168 labels/models.py:11 @@ -631,7 +631,7 @@ msgstr "" msgid "Privileged" msgstr "" -#: accounts/models/base.py:70 assets/models/asset/common.py:166 +#: accounts/models/base.py:70 assets/models/asset/common.py:165 #: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39 #: assets/models/label.py:22 #: authentication/serializers/connect_token_secret.py:117 @@ -744,7 +744,7 @@ msgstr "" #: accounts/serializers/account/account.py:195 applications/models.py:11 #: assets/models/label.py:21 assets/models/platform.py:96 #: assets/serializers/asset/common.py:125 assets/serializers/cagegory.py:12 -#: assets/serializers/platform.py:140 assets/serializers/platform.py:229 +#: assets/serializers/platform.py:158 assets/serializers/platform.py:255 #: perms/serializers/user_permission.py:26 settings/models.py:36 #: tickets/models/ticket/apply_application.py:13 users/models/preference.py:12 msgid "Category" @@ -755,8 +755,8 @@ msgstr "" #: acls/serializers/command_acl.py:19 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:97 -#: assets/serializers/asset/common.py:126 assets/serializers/platform.py:120 -#: assets/serializers/platform.py:139 audits/serializers.py:53 +#: assets/serializers/asset/common.py:126 assets/serializers/platform.py:138 +#: assets/serializers/platform.py:157 audits/serializers.py:53 #: audits/serializers.py:170 #: authentication/serializers/connect_token_secret.py:126 ops/models/job.py:145 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39 @@ -862,8 +862,8 @@ msgid "Asset type" msgstr "" #: accounts/serializers/account/base.py:25 terminal/serializers/storage.py:149 -msgid "Key password" -msgstr "Passphrase" +msgid "Passphrase" +msgstr "" #: accounts/serializers/account/base.py:78 #: assets/serializers/asset/common.py:384 @@ -939,6 +939,7 @@ msgid "" msgstr "" #: accounts/serializers/automations/base.py:23 +#: assets/models/asset/common.py:164 assets/serializers/asset/common.py:152 #: assets/serializers/automations/base.py:21 msgid "Nodes" msgstr "" @@ -1113,8 +1114,9 @@ msgid "Users" msgstr "" #: acls/models/base.py:98 assets/models/automations/base.py:17 -#: assets/models/cmd_filter.py:38 perms/serializers/permission.py:45 -#: perms/serializers/user_permission.py:75 rbac/tree.py:35 +#: assets/models/cmd_filter.py:38 assets/serializers/asset/common.py:128 +#: perms/serializers/permission.py:45 perms/serializers/user_permission.py:75 +#: rbac/tree.py:35 msgid "Accounts" msgstr "" @@ -1717,35 +1719,28 @@ msgstr "" msgid "Domain" msgstr "" -#: assets/models/asset/common.py:165 assets/models/automations/base.py:18 -#: assets/models/cmd_filter.py:32 assets/models/node.py:549 -#: perms/models/asset_permission.py:72 perms/serializers/permission.py:37 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:330 -msgid "Node" -msgstr "" - -#: assets/models/asset/common.py:167 assets/serializers/asset/common.py:385 +#: assets/models/asset/common.py:166 assets/serializers/asset/common.py:385 #: assets/serializers/asset/host.py:11 msgid "Gathered info" msgstr "" -#: assets/models/asset/common.py:168 assets/serializers/asset/custom.py:14 +#: assets/models/asset/common.py:167 assets/serializers/asset/custom.py:14 msgid "Custom info" msgstr "" -#: assets/models/asset/common.py:353 +#: assets/models/asset/common.py:352 msgid "Can refresh asset hardware info" msgstr "" -#: assets/models/asset/common.py:354 +#: assets/models/asset/common.py:353 msgid "Can test asset connectivity" msgstr "" -#: assets/models/asset/common.py:355 +#: assets/models/asset/common.py:354 msgid "Can match asset" msgstr "" -#: assets/models/asset/common.py:356 +#: assets/models/asset/common.py:355 msgid "Can change asset nodes" msgstr "" @@ -1773,6 +1768,13 @@ msgstr "" msgid "Proxy" msgstr "" +#: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 +#: assets/models/node.py:549 perms/models/asset_permission.py:72 +#: perms/serializers/permission.py:37 tickets/models/ticket/apply_asset.py:14 +#: xpack/plugins/cloud/models.py:330 +msgid "Node" +msgstr "" + #: assets/models/automations/base.py:22 ops/models/job.py:231 #: settings/serializers/auth/sms.py:103 msgid "Parameters" @@ -1836,7 +1838,7 @@ msgstr "" msgid "Favorite asset" msgstr "" -#: assets/models/gateway.py:34 assets/serializers/domain.py:18 +#: assets/models/gateway.py:34 msgid "Gateway" msgstr "" @@ -1845,7 +1847,7 @@ msgid "Asset group" msgstr "" #: assets/models/group.py:31 assets/models/platform.py:20 -#: assets/serializers/platform.py:121 +#: assets/serializers/platform.py:139 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "" @@ -1870,7 +1872,7 @@ msgstr "" #: assets/models/label.py:40 assets/serializers/cagegory.py:10 #: assets/serializers/cagegory.py:17 assets/serializers/cagegory.py:23 -#: assets/serializers/platform.py:119 +#: assets/serializers/platform.py:137 #: authentication/serializers/connect_token_secret.py:124 #: common/serializers/common.py:85 labels/models.py:17 labels/models.py:33 #: labels/serializers.py:45 settings/serializers/msg.py:90 @@ -1913,7 +1915,7 @@ msgstr "" msgid "Public" msgstr "" -#: assets/models/platform.py:22 assets/serializers/platform.py:49 +#: assets/models/platform.py:22 assets/serializers/platform.py:67 #: settings/serializers/settings.py:66 #: users/templates/users/reset_password.html:29 msgid "Setting" @@ -1947,7 +1949,7 @@ msgid "Gather facts enabled" msgstr "" #: assets/models/platform.py:48 assets/models/platform.py:72 -#: assets/serializers/platform.py:36 +#: assets/serializers/platform.py:37 msgid "Gather facts method" msgstr "" @@ -1955,11 +1957,11 @@ msgstr "" msgid "Gather facts params" msgstr "" -#: assets/models/platform.py:52 assets/serializers/platform.py:39 +#: assets/models/platform.py:52 assets/serializers/platform.py:45 msgid "Change secret enabled" msgstr "" -#: assets/models/platform.py:54 assets/serializers/platform.py:40 +#: assets/models/platform.py:54 assets/serializers/platform.py:48 msgid "Change secret method" msgstr "" @@ -1967,11 +1969,11 @@ msgstr "" msgid "Change secret params" msgstr "" -#: assets/models/platform.py:58 assets/serializers/platform.py:41 +#: assets/models/platform.py:58 assets/serializers/platform.py:51 msgid "Push account enabled" msgstr "" -#: assets/models/platform.py:60 assets/serializers/platform.py:42 +#: assets/models/platform.py:60 assets/serializers/platform.py:53 msgid "Push account method" msgstr "" @@ -1979,11 +1981,11 @@ msgstr "" msgid "Push account params" msgstr "" -#: assets/models/platform.py:64 assets/serializers/platform.py:37 +#: assets/models/platform.py:64 msgid "Verify account enabled" msgstr "" -#: assets/models/platform.py:66 assets/serializers/platform.py:38 +#: assets/models/platform.py:66 assets/serializers/platform.py:41 msgid "Verify account method" msgstr "" @@ -2011,23 +2013,23 @@ msgstr "" msgid "Internal" msgstr "Builtin" -#: assets/models/platform.py:103 assets/serializers/platform.py:138 +#: assets/models/platform.py:103 assets/serializers/platform.py:156 msgid "Charset" msgstr "" -#: assets/models/platform.py:105 assets/serializers/platform.py:167 +#: assets/models/platform.py:105 assets/serializers/platform.py:191 msgid "Domain enabled" msgstr "" -#: assets/models/platform.py:107 assets/serializers/platform.py:166 +#: assets/models/platform.py:107 assets/serializers/platform.py:184 msgid "Su enabled" msgstr "Switch enabled" -#: assets/models/platform.py:108 assets/serializers/platform.py:144 +#: assets/models/platform.py:108 assets/serializers/platform.py:162 msgid "Su method" msgstr "Switch method" -#: assets/models/platform.py:109 assets/serializers/platform.py:147 +#: assets/models/platform.py:109 assets/serializers/platform.py:165 msgid "Custom fields" msgstr "" @@ -2042,7 +2044,7 @@ msgid "" "type" msgstr "" -#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:141 +#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:159 #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:46 @@ -2153,6 +2155,10 @@ msgstr "" msgid "Types" msgstr "" +#: assets/serializers/domain.py:18 +msgid "Gateways" +msgstr "" + #: assets/serializers/domain.py:20 orgs/serializers.py:13 #: perms/serializers/permission.py:40 msgid "Assets amount" @@ -2170,59 +2176,94 @@ msgstr "" msgid "Can't contains: /" msgstr "" -#: assets/serializers/platform.py:43 +#: assets/serializers/platform.py:34 +msgid "Enable asset detection" +msgstr "" + +#: assets/serializers/platform.py:38 +msgid "Enable asset information collection" +msgstr "" + +#: assets/serializers/platform.py:42 +msgid "Enable account verification" +msgstr "" + +#: assets/serializers/platform.py:49 +msgid "Enable account secret auto change" +msgstr "" + +#: assets/serializers/platform.py:54 +msgid "Enable account auto push" +msgstr "" + +#: assets/serializers/platform.py:57 msgid "Gather accounts enabled" msgstr "" -#: assets/serializers/platform.py:44 +#: assets/serializers/platform.py:60 msgid "Gather accounts method" msgstr "" -#: assets/serializers/platform.py:50 +#: assets/serializers/platform.py:61 +msgid "Enable account collection" +msgstr "" + +#: assets/serializers/platform.py:68 msgid "Port from addr" msgstr "" -#: assets/serializers/platform.py:62 +#: assets/serializers/platform.py:80 msgid "" "This protocol is primary, and it must be set when adding assets. " "Additionally, there can only be one primary protocol." msgstr "" -#: assets/serializers/platform.py:67 +#: assets/serializers/platform.py:85 msgid "This protocol is required, and it must be set when adding assets." msgstr "" -#: assets/serializers/platform.py:70 +#: assets/serializers/platform.py:88 msgid "" "This protocol is default, when adding assets, it will be displayed by " "default." msgstr "" -#: assets/serializers/platform.py:73 +#: assets/serializers/platform.py:91 msgid "This protocol is public, asset will show this protocol to user" msgstr "" -#: assets/serializers/platform.py:122 +#: assets/serializers/platform.py:140 msgid "Help text" msgstr "" -#: assets/serializers/platform.py:123 +#: assets/serializers/platform.py:141 msgid "Choices" msgstr "" -#: assets/serializers/platform.py:142 +#: assets/serializers/platform.py:160 msgid "Automation" msgstr "" -#: assets/serializers/platform.py:168 +#: assets/serializers/platform.py:186 +msgid "" +"Login with account when accessing assets, then automatically switch to " +"another, similar to logging in with a regular account and then switching to " +"root" +msgstr "" + +#: assets/serializers/platform.py:192 +msgid "Assets can be connected using a domain gateway" +msgstr "" + +#: assets/serializers/platform.py:194 msgid "Default Domain" msgstr "" -#: assets/serializers/platform.py:189 +#: assets/serializers/platform.py:215 msgid "type is required" msgstr "" -#: assets/serializers/platform.py:204 +#: assets/serializers/platform.py:230 msgid "Protocols is required" msgstr "" @@ -2355,7 +2396,7 @@ msgid "Connect" msgstr "" #: audits/const.py:30 authentication/templates/authentication/login.html:296 -#: authentication/templates/authentication/login.html:369 +#: authentication/templates/authentication/login.html:368 #: templates/_header_bar.html:95 msgid "Login" msgstr "" @@ -2680,7 +2721,7 @@ msgid "" msgstr "" #: authentication/api/password.py:65 -#: authentication/templates/authentication/login.html:361 +#: authentication/templates/authentication/login.html:360 #: users/templates/users/forgot_password.html:41 #: users/templates/users/forgot_password.html:42 #: users/templates/users/forgot_password_previewing.html:13 @@ -3375,7 +3416,7 @@ msgstr "" msgid "If you are administrator, you can update the config resolve it, set" msgstr "" -#: authentication/templates/authentication/login.html:376 +#: authentication/templates/authentication/login.html:375 msgid "More login options" msgstr "" @@ -3904,18 +3945,18 @@ msgstr "" msgid "

Flower service unavailable, check it

" msgstr "" -#: jumpserver/views/other.py:26 +#: jumpserver/views/other.py:27 msgid "" "
Luna is a separately deployed program, you need to deploy Luna, koko, " "configure nginx for url distribution,
If you see this page, " "prove that you are not accessing the nginx listening port. Good luck." msgstr "" -#: jumpserver/views/other.py:70 +#: jumpserver/views/other.py:72 msgid "Websocket server run on port: {}, you should proxy it on nginx" msgstr "" -#: jumpserver/views/other.py:84 +#: jumpserver/views/other.py:86 msgid "" "
Koko is a separately deployed program, you need to deploy Koko, " "configure nginx for url distribution,
If you see this page, " @@ -8725,11 +8766,11 @@ msgid "Interface settings" msgstr "" #: xpack/plugins/interface/models.py:23 -msgid "Title of login page" +msgid "Login title" msgstr "" #: xpack/plugins/interface/models.py:27 -msgid "Image of login page" +msgid "Login image" msgstr "" #: xpack/plugins/interface/models.py:31 @@ -8737,11 +8778,11 @@ msgid "Website icon" msgstr "" #: xpack/plugins/interface/models.py:35 -msgid "Logo of management page" +msgid "Index logo" msgstr "" #: xpack/plugins/interface/models.py:39 -msgid "Logo of logout page" +msgid "Logout logo" msgstr "" #: xpack/plugins/interface/models.py:41 @@ -8796,3 +8837,6 @@ msgstr "" #: xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "" + +#~ msgid "Key password" +#~ msgstr "Passphrase" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index ca74a31e1..2776f34d5 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-12 16:58+0800\n" +"POT-Creation-Date: 2024-03-28 11:19+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,7 +32,7 @@ msgstr "成功: %s、失敗: %s、合計: %s" #: assets/models/_user.py:24 audits/signal_handlers/login_log.py:34 #: authentication/confirm/password.py:9 authentication/confirm/password.py:24 #: authentication/confirm/password.py:26 authentication/forms.py:32 -#: authentication/templates/authentication/login.html:330 +#: authentication/templates/authentication/login.html:329 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47 #: settings/serializers/msg.py:35 terminal/serializers/storage.py:123 #: terminal/serializers/storage.py:142 users/forms/profile.py:22 @@ -253,7 +253,7 @@ msgstr "ユーザー %s がパスワードを閲覧/導き出しました" #: accounts/serializers/automations/change_secret.py:126 #: accounts/templates/accounts/asset_account_change_info.html:7 #: acls/serializers/base.py:123 assets/models/asset/common.py:95 -#: assets/models/asset/common.py:350 assets/models/cmd_filter.py:36 +#: assets/models/asset/common.py:349 assets/models/cmd_filter.py:36 #: audits/models.py:58 authentication/models/connection_token.py:36 #: perms/models/asset_permission.py:69 perms/serializers/permission.py:36 #: terminal/backends/command/models.py:17 terminal/models/session/session.py:31 @@ -293,11 +293,11 @@ msgstr "ソース ID" #: accounts/serializers/automations/change_secret.py:107 #: accounts/serializers/automations/change_secret.py:127 #: acls/serializers/base.py:124 acls/templates/acls/asset_login_reminder.html:7 -#: assets/serializers/asset/common.py:128 assets/serializers/gateway.py:28 -#: audits/models.py:59 authentication/api/connection_token.py:405 -#: ops/models/base.py:18 perms/models/asset_permission.py:75 -#: settings/serializers/msg.py:33 terminal/backends/command/models.py:18 -#: terminal/models/session/session.py:33 terminal/serializers/command.py:72 +#: assets/serializers/gateway.py:28 audits/models.py:59 +#: authentication/api/connection_token.py:405 ops/models/base.py:18 +#: perms/models/asset_permission.py:75 settings/serializers/msg.py:33 +#: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 +#: terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 #: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:89 @@ -513,7 +513,9 @@ msgid "Present" msgstr "存在する" #: accounts/models/automations/gather_account.py:15 -msgid "Date last login" +#, fuzzy +#| msgid "Date last login" +msgid "Date login" msgstr "最終ログイン日" #: accounts/models/automations/gather_account.py:17 @@ -532,7 +534,9 @@ msgid "Username" msgstr "ユーザー名" #: accounts/models/automations/gather_account.py:18 -msgid "Address last login" +#, fuzzy +#| msgid "Address last login" +msgid "Address login" msgstr "最終ログインアドレス" #: accounts/models/automations/gather_account.py:44 @@ -604,7 +608,7 @@ msgstr "パスワードルール" #: assets/models/domain.py:19 assets/models/group.py:17 #: assets/models/label.py:18 assets/models/platform.py:16 #: assets/models/platform.py:95 assets/serializers/asset/common.py:149 -#: assets/serializers/platform.py:118 assets/serializers/platform.py:228 +#: assets/serializers/platform.py:136 assets/serializers/platform.py:254 #: authentication/backends/passkey/models.py:10 #: authentication/serializers/connect_token_secret.py:113 #: authentication/serializers/connect_token_secret.py:168 labels/models.py:11 @@ -631,7 +635,7 @@ msgstr "名前" msgid "Privileged" msgstr "特権アカウント" -#: accounts/models/base.py:70 assets/models/asset/common.py:166 +#: accounts/models/base.py:70 assets/models/asset/common.py:165 #: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39 #: assets/models/label.py:22 #: authentication/serializers/connect_token_secret.py:117 @@ -756,7 +760,7 @@ msgstr "アカウントの存在ポリシー" #: accounts/serializers/account/account.py:195 applications/models.py:11 #: assets/models/label.py:21 assets/models/platform.py:96 #: assets/serializers/asset/common.py:125 assets/serializers/cagegory.py:12 -#: assets/serializers/platform.py:140 assets/serializers/platform.py:229 +#: assets/serializers/platform.py:158 assets/serializers/platform.py:255 #: perms/serializers/user_permission.py:26 settings/models.py:36 #: tickets/models/ticket/apply_application.py:13 users/models/preference.py:12 msgid "Category" @@ -767,8 +771,8 @@ msgstr "カテゴリ" #: acls/serializers/command_acl.py:19 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:97 -#: assets/serializers/asset/common.py:126 assets/serializers/platform.py:120 -#: assets/serializers/platform.py:139 audits/serializers.py:53 +#: assets/serializers/asset/common.py:126 assets/serializers/platform.py:138 +#: assets/serializers/platform.py:157 audits/serializers.py:53 #: audits/serializers.py:170 #: authentication/serializers/connect_token_secret.py:126 ops/models/job.py:145 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39 @@ -874,8 +878,8 @@ msgid "Asset type" msgstr "資産タイプ" #: accounts/serializers/account/base.py:25 terminal/serializers/storage.py:149 -msgid "Key password" -msgstr "キーパスワード" +msgid "Passphrase" +msgstr "" #: accounts/serializers/account/base.py:78 #: assets/serializers/asset/common.py:384 @@ -957,6 +961,7 @@ msgstr "" "ください。 " #: accounts/serializers/automations/base.py:23 +#: assets/models/asset/common.py:164 assets/serializers/asset/common.py:152 #: assets/serializers/automations/base.py:21 msgid "Nodes" msgstr "ノード" @@ -1132,8 +1137,9 @@ msgid "Users" msgstr "ユーザー" #: acls/models/base.py:98 assets/models/automations/base.py:17 -#: assets/models/cmd_filter.py:38 perms/serializers/permission.py:45 -#: perms/serializers/user_permission.py:75 rbac/tree.py:35 +#: assets/models/cmd_filter.py:38 assets/serializers/asset/common.py:128 +#: perms/serializers/permission.py:45 perms/serializers/user_permission.py:75 +#: rbac/tree.py:35 msgid "Accounts" msgstr "アカウント" @@ -1757,35 +1763,28 @@ msgstr "プラットフォーム" msgid "Domain" msgstr "ドメイン" -#: assets/models/asset/common.py:165 assets/models/automations/base.py:18 -#: assets/models/cmd_filter.py:32 assets/models/node.py:549 -#: perms/models/asset_permission.py:72 perms/serializers/permission.py:37 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:330 -msgid "Node" -msgstr "ノード" - -#: assets/models/asset/common.py:167 assets/serializers/asset/common.py:385 +#: assets/models/asset/common.py:166 assets/serializers/asset/common.py:385 #: assets/serializers/asset/host.py:11 msgid "Gathered info" msgstr "資産ハードウェア情報の収集" -#: assets/models/asset/common.py:168 assets/serializers/asset/custom.py:14 +#: assets/models/asset/common.py:167 assets/serializers/asset/custom.py:14 msgid "Custom info" msgstr "カスタム属性" -#: assets/models/asset/common.py:353 +#: assets/models/asset/common.py:352 msgid "Can refresh asset hardware info" msgstr "資産ハードウェア情報を更新できます" -#: assets/models/asset/common.py:354 +#: assets/models/asset/common.py:353 msgid "Can test asset connectivity" msgstr "資産接続をテストできます" -#: assets/models/asset/common.py:355 +#: assets/models/asset/common.py:354 msgid "Can match asset" msgstr "アセットを一致させることができます" -#: assets/models/asset/common.py:356 +#: assets/models/asset/common.py:355 msgid "Can change asset nodes" msgstr "資産ノードを変更できます" @@ -1813,6 +1812,13 @@ msgstr "証明書チェックを無視" msgid "Proxy" msgstr "プロキシー" +#: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 +#: assets/models/node.py:549 perms/models/asset_permission.py:72 +#: perms/serializers/permission.py:37 tickets/models/ticket/apply_asset.py:14 +#: xpack/plugins/cloud/models.py:330 +msgid "Node" +msgstr "ノード" + #: assets/models/automations/base.py:22 ops/models/job.py:231 #: settings/serializers/auth/sms.py:103 msgid "Parameters" @@ -1876,7 +1882,7 @@ msgstr "コマンドフィルタルール" msgid "Favorite asset" msgstr "お気に入りのアセット" -#: assets/models/gateway.py:34 assets/serializers/domain.py:18 +#: assets/models/gateway.py:34 msgid "Gateway" msgstr "ゲートウェイ" @@ -1885,7 +1891,7 @@ msgid "Asset group" msgstr "資産グループ" #: assets/models/group.py:31 assets/models/platform.py:20 -#: assets/serializers/platform.py:121 +#: assets/serializers/platform.py:139 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "デフォルト" @@ -1910,7 +1916,7 @@ msgstr "値" #: assets/models/label.py:40 assets/serializers/cagegory.py:10 #: assets/serializers/cagegory.py:17 assets/serializers/cagegory.py:23 -#: assets/serializers/platform.py:119 +#: assets/serializers/platform.py:137 #: authentication/serializers/connect_token_secret.py:124 #: common/serializers/common.py:85 labels/models.py:17 labels/models.py:33 #: labels/serializers.py:45 settings/serializers/msg.py:90 @@ -1953,7 +1959,7 @@ msgstr "必要" msgid "Public" msgstr "開ける" -#: assets/models/platform.py:22 assets/serializers/platform.py:49 +#: assets/models/platform.py:22 assets/serializers/platform.py:67 #: settings/serializers/settings.py:66 #: users/templates/users/reset_password.html:29 msgid "Setting" @@ -1987,7 +1993,7 @@ msgid "Gather facts enabled" msgstr "資産情報の収集を有効にする" #: assets/models/platform.py:48 assets/models/platform.py:72 -#: assets/serializers/platform.py:36 +#: assets/serializers/platform.py:37 msgid "Gather facts method" msgstr "情報収集の方法" @@ -1995,11 +2001,11 @@ msgstr "情報収集の方法" msgid "Gather facts params" msgstr "情報収集パラメータ" -#: assets/models/platform.py:52 assets/serializers/platform.py:39 +#: assets/models/platform.py:52 assets/serializers/platform.py:45 msgid "Change secret enabled" msgstr "パスワードの変更が有効" -#: assets/models/platform.py:54 assets/serializers/platform.py:40 +#: assets/models/platform.py:54 assets/serializers/platform.py:48 msgid "Change secret method" msgstr "パスワード変更モード" @@ -2007,11 +2013,11 @@ msgstr "パスワード変更モード" msgid "Change secret params" msgstr "パスワード変更パラメータ" -#: assets/models/platform.py:58 assets/serializers/platform.py:41 +#: assets/models/platform.py:58 assets/serializers/platform.py:51 msgid "Push account enabled" msgstr "アカウントのプッシュを有効にする" -#: assets/models/platform.py:60 assets/serializers/platform.py:42 +#: assets/models/platform.py:60 assets/serializers/platform.py:53 msgid "Push account method" msgstr "アカウントプッシュ方式" @@ -2019,11 +2025,11 @@ msgstr "アカウントプッシュ方式" msgid "Push account params" msgstr "アカウントプッシュパラメータ" -#: assets/models/platform.py:64 assets/serializers/platform.py:37 +#: assets/models/platform.py:64 msgid "Verify account enabled" msgstr "アカウントの確認をオンにする" -#: assets/models/platform.py:66 assets/serializers/platform.py:38 +#: assets/models/platform.py:66 assets/serializers/platform.py:41 msgid "Verify account method" msgstr "アカウント認証方法" @@ -2051,23 +2057,23 @@ msgstr "メタ" msgid "Internal" msgstr "ビルトイン" -#: assets/models/platform.py:103 assets/serializers/platform.py:138 +#: assets/models/platform.py:103 assets/serializers/platform.py:156 msgid "Charset" msgstr "シャーセット" -#: assets/models/platform.py:105 assets/serializers/platform.py:167 +#: assets/models/platform.py:105 assets/serializers/platform.py:191 msgid "Domain enabled" msgstr "ドメインを有効にする" -#: assets/models/platform.py:107 assets/serializers/platform.py:166 +#: assets/models/platform.py:107 assets/serializers/platform.py:184 msgid "Su enabled" msgstr "アカウントの切り替えを有効にする" -#: assets/models/platform.py:108 assets/serializers/platform.py:144 +#: assets/models/platform.py:108 assets/serializers/platform.py:162 msgid "Su method" msgstr "アカウントの切り替え方法" -#: assets/models/platform.py:109 assets/serializers/platform.py:147 +#: assets/models/platform.py:109 assets/serializers/platform.py:165 msgid "Custom fields" msgstr "カスタムフィールド" @@ -2084,7 +2090,7 @@ msgstr "" "プラットフォームタイプがスキップされた資産に合致しない、資産内の一括更新プ" "ラットフォーム" -#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:141 +#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:159 #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:46 @@ -2197,6 +2203,12 @@ msgstr "制約" msgid "Types" msgstr "タイプ" +#: assets/serializers/domain.py:18 +#, fuzzy +#| msgid "Gateway" +msgid "Gateways" +msgstr "ゲートウェイ" + #: assets/serializers/domain.py:20 orgs/serializers.py:13 #: perms/serializers/permission.py:40 msgid "Assets amount" @@ -2214,19 +2226,51 @@ msgstr "値" msgid "Can't contains: /" msgstr "含まれない:/" -#: assets/serializers/platform.py:43 +#: assets/serializers/platform.py:34 +#, fuzzy +#| msgid "Run ansible task execution" +msgid "Enable asset detection" +msgstr "Ansible タスクの実行を開始する" + +#: assets/serializers/platform.py:38 +msgid "Enable asset information collection" +msgstr "" + +#: assets/serializers/platform.py:42 +#, fuzzy +#| msgid "Ignore SSL verification" +msgid "Enable account verification" +msgstr "Ssl検証を無視する" + +#: assets/serializers/platform.py:49 +msgid "Enable account secret auto change" +msgstr "" + +#: assets/serializers/platform.py:54 +#, fuzzy +#| msgid "Enable SSO auth" +msgid "Enable account auto push" +msgstr "SSO Token認証の有効化" + +#: assets/serializers/platform.py:57 msgid "Gather accounts enabled" msgstr "アカウント収集を有効にする" -#: assets/serializers/platform.py:44 +#: assets/serializers/platform.py:60 msgid "Gather accounts method" msgstr "アカウントの収集方法" -#: assets/serializers/platform.py:50 +#: assets/serializers/platform.py:61 +#, fuzzy +#| msgid "Gather account automation" +msgid "Enable account collection" +msgstr "自動収集アカウント" + +#: assets/serializers/platform.py:68 msgid "Port from addr" msgstr "アドレスからのポート" -#: assets/serializers/platform.py:62 +#: assets/serializers/platform.py:80 msgid "" "This protocol is primary, and it must be set when adding assets. " "Additionally, there can only be one primary protocol." @@ -2234,11 +2278,11 @@ msgstr "" "このプロトコルはプライマリであり、資産を追加するときに設定する必要がありま" "す。また、プライマリプロトコルは1つしかありません" -#: assets/serializers/platform.py:67 +#: assets/serializers/platform.py:85 msgid "This protocol is required, and it must be set when adding assets." msgstr "このプロトコルは必須であり、資産を追加するときに設定する必要があります" -#: assets/serializers/platform.py:70 +#: assets/serializers/platform.py:88 msgid "" "This protocol is default, when adding assets, it will be displayed by " "default." @@ -2246,32 +2290,43 @@ msgstr "" "このプロトコルはデフォルトです。資産を追加するときに、デフォルトで表示されま" "す" -#: assets/serializers/platform.py:73 +#: assets/serializers/platform.py:91 msgid "This protocol is public, asset will show this protocol to user" msgstr "" "このプロトコルは公開されており、資産はこのプロトコルをユーザーに表示します" -#: assets/serializers/platform.py:122 +#: assets/serializers/platform.py:140 msgid "Help text" msgstr "ヘルプ" -#: assets/serializers/platform.py:123 +#: assets/serializers/platform.py:141 msgid "Choices" msgstr "せんたく" -#: assets/serializers/platform.py:142 +#: assets/serializers/platform.py:160 msgid "Automation" msgstr "オートメーション" -#: assets/serializers/platform.py:168 +#: assets/serializers/platform.py:186 +msgid "" +"Login with account when accessing assets, then automatically switch to " +"another, similar to logging in with a regular account and then switching to " +"root" +msgstr "" + +#: assets/serializers/platform.py:192 +msgid "Assets can be connected using a domain gateway" +msgstr "" + +#: assets/serializers/platform.py:194 msgid "Default Domain" msgstr "デフォルト ドメイン" -#: assets/serializers/platform.py:189 +#: assets/serializers/platform.py:215 msgid "type is required" msgstr "タイプ このフィールドは必須です." -#: assets/serializers/platform.py:204 +#: assets/serializers/platform.py:230 msgid "Protocols is required" msgstr "同意が必要です" @@ -2408,7 +2463,7 @@ msgid "Connect" msgstr "接続" #: audits/const.py:30 authentication/templates/authentication/login.html:296 -#: authentication/templates/authentication/login.html:369 +#: authentication/templates/authentication/login.html:368 #: templates/_header_bar.html:95 msgid "Login" msgstr "ログイン" @@ -2738,7 +2793,7 @@ msgstr "" "さい。" #: authentication/api/password.py:65 -#: authentication/templates/authentication/login.html:361 +#: authentication/templates/authentication/login.html:360 #: users/templates/users/forgot_password.html:41 #: users/templates/users/forgot_password.html:42 #: users/templates/users/forgot_password_previewing.html:13 @@ -3459,7 +3514,7 @@ msgstr "" msgid "If you are administrator, you can update the config resolve it, set" msgstr "管理者の場合は、configを更新して解決することができます。" -#: authentication/templates/authentication/login.html:376 +#: authentication/templates/authentication/login.html:375 msgid "More login options" msgstr "その他のログインオプション" @@ -3997,7 +4052,7 @@ msgstr "JumpServer オープンソースの要塞ホスト" msgid "

Flower service unavailable, check it

" msgstr "

フラワーサービス利用不可、チェック

" -#: jumpserver/views/other.py:26 +#: jumpserver/views/other.py:27 msgid "" "
Luna is a separately deployed program, you need to deploy Luna, koko, " "configure nginx for url distribution,
If you see this page, " @@ -4008,13 +4063,13 @@ msgstr "" "ページが表示されている場合は、nginxリスニングポートにアクセスしていないことを" "証明してください。頑張ってください。" -#: jumpserver/views/other.py:70 +#: jumpserver/views/other.py:72 msgid "Websocket server run on port: {}, you should proxy it on nginx" msgstr "" "Websocket サーバーはport: {}で実行されます。nginxでプロキシする必要がありま" "す。" -#: jumpserver/views/other.py:84 +#: jumpserver/views/other.py:86 msgid "" "
Koko is a separately deployed program, you need to deploy Koko, " "configure nginx for url distribution,
If you see this page, " @@ -9064,30 +9119,26 @@ msgid "Interface settings" msgstr "インターフェイスの設定" #: xpack/plugins/interface/models.py:23 -#, fuzzy -#| msgid "MFA in login page" -msgid "Title of login page" -msgstr "ログインページのMFA" +msgid "Login title" +msgstr "ログインページのタイトル" #: xpack/plugins/interface/models.py:27 -#, fuzzy -#| msgid "MFA in login page" -msgid "Image of login page" -msgstr "ログインページのMFA" +msgid "Login image" +msgstr "ログインページのイメージ" #: xpack/plugins/interface/models.py:31 msgid "Website icon" msgstr "ウェブサイトのアイコン" #: xpack/plugins/interface/models.py:35 -msgid "Logo of management page" -msgstr "" +msgid "Index logo" +msgstr "管理ページのロゴ" #: xpack/plugins/interface/models.py:39 #, fuzzy -#| msgid "Logout logo" -msgid "Logo of logout page" -msgstr "ログアウトページのロゴ" +#| msgid "Logout" +msgid "Logout logo" +msgstr "ログアウト" #: xpack/plugins/interface/models.py:41 #: xpack/plugins/interface/serializers/interface.py:26 @@ -9142,21 +9193,30 @@ msgstr "エンタープライズプロフェッショナル版" msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" +#~ msgid "Key password" +#~ msgstr "キーパスワード" + +#, fuzzy +#~| msgid "MFA in login page" +#~ msgid "Title of login page" +#~ msgstr "ログインページのMFA" + +#, fuzzy +#~| msgid "MFA in login page" +#~ msgid "Image of login page" +#~ msgstr "ログインページのMFA" + +#, fuzzy +#~| msgid "Logout logo" +#~ msgid "Logo of logout page" +#~ msgstr "ログアウトページのロゴ" + #~ msgid "Organization ID" #~ msgstr "組織 ID" #~ msgid "Password strategy" #~ msgstr "パスワード戦略" -#~ msgid "Login title" -#~ msgstr "ログインページのタイトル" - -#~ msgid "Login image" -#~ msgstr "ログインページのイメージ" - -#~ msgid "Index logo" -#~ msgstr "管理ページのロゴ" - #~ msgid "Enable database proxy" #~ msgstr "属性マップの有効化" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index f5860e701..58b0b8435 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-12 16:58+0800\n" +"POT-Creation-Date: 2024-03-28 11:19+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -31,7 +31,7 @@ msgstr "成功: %s, 失败: %s, 总数: %s" #: assets/models/_user.py:24 audits/signal_handlers/login_log.py:34 #: authentication/confirm/password.py:9 authentication/confirm/password.py:24 #: authentication/confirm/password.py:26 authentication/forms.py:32 -#: authentication/templates/authentication/login.html:330 +#: authentication/templates/authentication/login.html:329 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47 #: settings/serializers/msg.py:35 terminal/serializers/storage.py:123 #: terminal/serializers/storage.py:142 users/forms/profile.py:22 @@ -252,7 +252,7 @@ msgstr "用户 %s 查看/导出 了密码" #: accounts/serializers/automations/change_secret.py:126 #: accounts/templates/accounts/asset_account_change_info.html:7 #: acls/serializers/base.py:123 assets/models/asset/common.py:95 -#: assets/models/asset/common.py:350 assets/models/cmd_filter.py:36 +#: assets/models/asset/common.py:349 assets/models/cmd_filter.py:36 #: audits/models.py:58 authentication/models/connection_token.py:36 #: perms/models/asset_permission.py:69 perms/serializers/permission.py:36 #: terminal/backends/command/models.py:17 terminal/models/session/session.py:31 @@ -292,11 +292,11 @@ msgstr "来源 ID" #: accounts/serializers/automations/change_secret.py:107 #: accounts/serializers/automations/change_secret.py:127 #: acls/serializers/base.py:124 acls/templates/acls/asset_login_reminder.html:7 -#: assets/serializers/asset/common.py:128 assets/serializers/gateway.py:28 -#: audits/models.py:59 authentication/api/connection_token.py:405 -#: ops/models/base.py:18 perms/models/asset_permission.py:75 -#: settings/serializers/msg.py:33 terminal/backends/command/models.py:18 -#: terminal/models/session/session.py:33 terminal/serializers/command.py:72 +#: assets/serializers/gateway.py:28 audits/models.py:59 +#: authentication/api/connection_token.py:405 ops/models/base.py:18 +#: perms/models/asset_permission.py:75 settings/serializers/msg.py:33 +#: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 +#: terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 #: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:89 @@ -512,7 +512,9 @@ msgid "Present" msgstr "存在" #: accounts/models/automations/gather_account.py:15 -msgid "Date last login" +#, fuzzy +#| msgid "Date last login" +msgid "Date login" msgstr "最后登录日期" #: accounts/models/automations/gather_account.py:17 @@ -531,7 +533,9 @@ msgid "Username" msgstr "用户名" #: accounts/models/automations/gather_account.py:18 -msgid "Address last login" +#, fuzzy +#| msgid "Address last login" +msgid "Address login" msgstr "最后登录地址" #: accounts/models/automations/gather_account.py:44 @@ -603,7 +607,7 @@ msgstr "密码规则" #: assets/models/domain.py:19 assets/models/group.py:17 #: assets/models/label.py:18 assets/models/platform.py:16 #: assets/models/platform.py:95 assets/serializers/asset/common.py:149 -#: assets/serializers/platform.py:118 assets/serializers/platform.py:228 +#: assets/serializers/platform.py:136 assets/serializers/platform.py:254 #: authentication/backends/passkey/models.py:10 #: authentication/serializers/connect_token_secret.py:113 #: authentication/serializers/connect_token_secret.py:168 labels/models.py:11 @@ -630,7 +634,7 @@ msgstr "名称" msgid "Privileged" msgstr "特权账号" -#: accounts/models/base.py:70 assets/models/asset/common.py:166 +#: accounts/models/base.py:70 assets/models/asset/common.py:165 #: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39 #: assets/models/label.py:22 #: authentication/serializers/connect_token_secret.py:117 @@ -752,7 +756,7 @@ msgstr "账号存在策略" #: accounts/serializers/account/account.py:195 applications/models.py:11 #: assets/models/label.py:21 assets/models/platform.py:96 #: assets/serializers/asset/common.py:125 assets/serializers/cagegory.py:12 -#: assets/serializers/platform.py:140 assets/serializers/platform.py:229 +#: assets/serializers/platform.py:158 assets/serializers/platform.py:255 #: perms/serializers/user_permission.py:26 settings/models.py:36 #: tickets/models/ticket/apply_application.py:13 users/models/preference.py:12 msgid "Category" @@ -763,8 +767,8 @@ msgstr "类别" #: acls/serializers/command_acl.py:19 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:97 -#: assets/serializers/asset/common.py:126 assets/serializers/platform.py:120 -#: assets/serializers/platform.py:139 audits/serializers.py:53 +#: assets/serializers/asset/common.py:126 assets/serializers/platform.py:138 +#: assets/serializers/platform.py:157 audits/serializers.py:53 #: audits/serializers.py:170 #: authentication/serializers/connect_token_secret.py:126 ops/models/job.py:145 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39 @@ -870,8 +874,8 @@ msgid "Asset type" msgstr "资产类型" #: accounts/serializers/account/base.py:25 terminal/serializers/storage.py:149 -msgid "Key password" -msgstr "密钥密码" +msgid "Passphrase" +msgstr "" #: accounts/serializers/account/base.py:78 #: assets/serializers/asset/common.py:384 @@ -952,6 +956,7 @@ msgstr "" "CACHE_LOGIN_PASSWORD_ENABLED=true，重启服务才能开启" #: accounts/serializers/automations/base.py:23 +#: assets/models/asset/common.py:164 assets/serializers/asset/common.py:152 #: assets/serializers/automations/base.py:21 msgid "Nodes" msgstr "节点" @@ -1124,8 +1129,9 @@ msgid "Users" msgstr "用户" #: acls/models/base.py:98 assets/models/automations/base.py:17 -#: assets/models/cmd_filter.py:38 perms/serializers/permission.py:45 -#: perms/serializers/user_permission.py:75 rbac/tree.py:35 +#: assets/models/cmd_filter.py:38 assets/serializers/asset/common.py:128 +#: perms/serializers/permission.py:45 perms/serializers/user_permission.py:75 +#: rbac/tree.py:35 msgid "Accounts" msgstr "账号" @@ -1741,35 +1747,28 @@ msgstr "平台" msgid "Domain" msgstr "网域" -#: assets/models/asset/common.py:165 assets/models/automations/base.py:18 -#: assets/models/cmd_filter.py:32 assets/models/node.py:549 -#: perms/models/asset_permission.py:72 perms/serializers/permission.py:37 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:330 -msgid "Node" -msgstr "节点" - -#: assets/models/asset/common.py:167 assets/serializers/asset/common.py:385 +#: assets/models/asset/common.py:166 assets/serializers/asset/common.py:385 #: assets/serializers/asset/host.py:11 msgid "Gathered info" msgstr "收集资产硬件信息" -#: assets/models/asset/common.py:168 assets/serializers/asset/custom.py:14 +#: assets/models/asset/common.py:167 assets/serializers/asset/custom.py:14 msgid "Custom info" msgstr "自定义属性" -#: assets/models/asset/common.py:353 +#: assets/models/asset/common.py:352 msgid "Can refresh asset hardware info" msgstr "可以更新资产硬件信息" -#: assets/models/asset/common.py:354 +#: assets/models/asset/common.py:353 msgid "Can test asset connectivity" msgstr "可以测试资产连接性" -#: assets/models/asset/common.py:355 +#: assets/models/asset/common.py:354 msgid "Can match asset" msgstr "可以匹配资产" -#: assets/models/asset/common.py:356 +#: assets/models/asset/common.py:355 msgid "Can change asset nodes" msgstr "可以修改资产节点" @@ -1797,6 +1796,13 @@ msgstr "忽略证书校验" msgid "Proxy" msgstr "代理" +#: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 +#: assets/models/node.py:549 perms/models/asset_permission.py:72 +#: perms/serializers/permission.py:37 tickets/models/ticket/apply_asset.py:14 +#: xpack/plugins/cloud/models.py:330 +msgid "Node" +msgstr "节点" + #: assets/models/automations/base.py:22 ops/models/job.py:231 #: settings/serializers/auth/sms.py:103 msgid "Parameters" @@ -1860,7 +1866,7 @@ msgstr "命令过滤规则" msgid "Favorite asset" msgstr "收藏的资产" -#: assets/models/gateway.py:34 assets/serializers/domain.py:18 +#: assets/models/gateway.py:34 msgid "Gateway" msgstr "网关" @@ -1869,7 +1875,7 @@ msgid "Asset group" msgstr "资产组" #: assets/models/group.py:31 assets/models/platform.py:20 -#: assets/serializers/platform.py:121 +#: assets/serializers/platform.py:139 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "默认" @@ -1894,7 +1900,7 @@ msgstr "值" #: assets/models/label.py:40 assets/serializers/cagegory.py:10 #: assets/serializers/cagegory.py:17 assets/serializers/cagegory.py:23 -#: assets/serializers/platform.py:119 +#: assets/serializers/platform.py:137 #: authentication/serializers/connect_token_secret.py:124 #: common/serializers/common.py:85 labels/models.py:17 labels/models.py:33 #: labels/serializers.py:45 settings/serializers/msg.py:90 @@ -1937,7 +1943,7 @@ msgstr "必须的" msgid "Public" msgstr "开放的" -#: assets/models/platform.py:22 assets/serializers/platform.py:49 +#: assets/models/platform.py:22 assets/serializers/platform.py:67 #: settings/serializers/settings.py:66 #: users/templates/users/reset_password.html:29 msgid "Setting" @@ -1971,7 +1977,7 @@ msgid "Gather facts enabled" msgstr "启用收集资产信息" #: assets/models/platform.py:48 assets/models/platform.py:72 -#: assets/serializers/platform.py:36 +#: assets/serializers/platform.py:37 msgid "Gather facts method" msgstr "收集信息方式" @@ -1979,11 +1985,11 @@ msgstr "收集信息方式" msgid "Gather facts params" msgstr "收集信息参数" -#: assets/models/platform.py:52 assets/serializers/platform.py:39 +#: assets/models/platform.py:52 assets/serializers/platform.py:45 msgid "Change secret enabled" msgstr "启用改密" -#: assets/models/platform.py:54 assets/serializers/platform.py:40 +#: assets/models/platform.py:54 assets/serializers/platform.py:48 msgid "Change secret method" msgstr "改密方式" @@ -1991,11 +1997,11 @@ msgstr "改密方式" msgid "Change secret params" msgstr "改密参数" -#: assets/models/platform.py:58 assets/serializers/platform.py:41 +#: assets/models/platform.py:58 assets/serializers/platform.py:51 msgid "Push account enabled" msgstr "启用账号推送" -#: assets/models/platform.py:60 assets/serializers/platform.py:42 +#: assets/models/platform.py:60 assets/serializers/platform.py:53 msgid "Push account method" msgstr "账号推送方式" @@ -2003,11 +2009,11 @@ msgstr "账号推送方式" msgid "Push account params" msgstr "账号推送参数" -#: assets/models/platform.py:64 assets/serializers/platform.py:37 +#: assets/models/platform.py:64 msgid "Verify account enabled" msgstr "开启账号验证" -#: assets/models/platform.py:66 assets/serializers/platform.py:38 +#: assets/models/platform.py:66 assets/serializers/platform.py:41 msgid "Verify account method" msgstr "账号验证方式" @@ -2035,23 +2041,23 @@ msgstr "元数据" msgid "Internal" msgstr "内置" -#: assets/models/platform.py:103 assets/serializers/platform.py:138 +#: assets/models/platform.py:103 assets/serializers/platform.py:156 msgid "Charset" msgstr "编码" -#: assets/models/platform.py:105 assets/serializers/platform.py:167 +#: assets/models/platform.py:105 assets/serializers/platform.py:191 msgid "Domain enabled" msgstr "启用网域" -#: assets/models/platform.py:107 assets/serializers/platform.py:166 +#: assets/models/platform.py:107 assets/serializers/platform.py:184 msgid "Su enabled" msgstr "启用账号切换" -#: assets/models/platform.py:108 assets/serializers/platform.py:144 +#: assets/models/platform.py:108 assets/serializers/platform.py:162 msgid "Su method" msgstr "账号切换方式" -#: assets/models/platform.py:109 assets/serializers/platform.py:147 +#: assets/models/platform.py:109 assets/serializers/platform.py:165 msgid "Custom fields" msgstr "自定义属性" @@ -2066,7 +2072,7 @@ msgid "" "type" msgstr "资产中批量更新平台，不符合平台类型跳过的资产" -#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:141 +#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:159 #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:46 @@ -2179,6 +2185,12 @@ msgstr "约束" msgid "Types" msgstr "类型" +#: assets/serializers/domain.py:18 +#, fuzzy +#| msgid "Gateway" +msgid "Gateways" +msgstr "网关" + #: assets/serializers/domain.py:20 orgs/serializers.py:13 #: perms/serializers/permission.py:40 msgid "Assets amount" @@ -2196,59 +2208,102 @@ msgstr "值" msgid "Can't contains: /" msgstr "不能包含: /" -#: assets/serializers/platform.py:43 +#: assets/serializers/platform.py:34 +#, fuzzy +#| msgid "Run ansible task execution" +msgid "Enable asset detection" +msgstr "开始执行 Ansible 任务" + +#: assets/serializers/platform.py:38 +msgid "Enable asset information collection" +msgstr "" + +#: assets/serializers/platform.py:42 +#, fuzzy +#| msgid "Ignore SSL verification" +msgid "Enable account verification" +msgstr "忽略 SSL 证书验证" + +#: assets/serializers/platform.py:49 +msgid "Enable account secret auto change" +msgstr "" + +#: assets/serializers/platform.py:54 +#, fuzzy +#| msgid "Enable SSO auth" +msgid "Enable account auto push" +msgstr "启用 SSO 令牌认证" + +#: assets/serializers/platform.py:57 msgid "Gather accounts enabled" msgstr "启用账号收集" -#: assets/serializers/platform.py:44 +#: assets/serializers/platform.py:60 msgid "Gather accounts method" msgstr "收集账号方式" -#: assets/serializers/platform.py:50 +#: assets/serializers/platform.py:61 +#, fuzzy +#| msgid "Gather account automation" +msgid "Enable account collection" +msgstr "自动化收集账号" + +#: assets/serializers/platform.py:68 msgid "Port from addr" msgstr "端口来自地址" -#: assets/serializers/platform.py:62 +#: assets/serializers/platform.py:80 msgid "" "This protocol is primary, and it must be set when adding assets. " "Additionally, there can only be one primary protocol." msgstr "该协议是主要的，添加资产时必须设置。并且只能有一个主要协议" -#: assets/serializers/platform.py:67 +#: assets/serializers/platform.py:85 msgid "This protocol is required, and it must be set when adding assets." msgstr "该协议是必填的，添加资产时必须设置" -#: assets/serializers/platform.py:70 +#: assets/serializers/platform.py:88 msgid "" "This protocol is default, when adding assets, it will be displayed by " "default." msgstr "该协议是默认的，添加资产时，将默认显示" -#: assets/serializers/platform.py:73 +#: assets/serializers/platform.py:91 msgid "This protocol is public, asset will show this protocol to user" msgstr "该协议是公开的，资产将向用户显示该协议并可以连接使用" -#: assets/serializers/platform.py:122 +#: assets/serializers/platform.py:140 msgid "Help text" msgstr "帮助" -#: assets/serializers/platform.py:123 +#: assets/serializers/platform.py:141 msgid "Choices" msgstr "选择" -#: assets/serializers/platform.py:142 +#: assets/serializers/platform.py:160 msgid "Automation" msgstr "自动化" -#: assets/serializers/platform.py:168 +#: assets/serializers/platform.py:186 +msgid "" +"Login with account when accessing assets, then automatically switch to " +"another, similar to logging in with a regular account and then switching to " +"root" +msgstr "" + +#: assets/serializers/platform.py:192 +msgid "Assets can be connected using a domain gateway" +msgstr "" + +#: assets/serializers/platform.py:194 msgid "Default Domain" msgstr "默认网域" -#: assets/serializers/platform.py:189 +#: assets/serializers/platform.py:215 msgid "type is required" msgstr "类型 该字段是必填项。" -#: assets/serializers/platform.py:204 +#: assets/serializers/platform.py:230 msgid "Protocols is required" msgstr "协议是必填的" @@ -2381,7 +2436,7 @@ msgid "Connect" msgstr "连接" #: audits/const.py:30 authentication/templates/authentication/login.html:296 -#: authentication/templates/authentication/login.html:369 +#: authentication/templates/authentication/login.html:368 #: templates/_header_bar.html:95 msgid "Login" msgstr "登录" @@ -2706,7 +2761,7 @@ msgid "" msgstr "用户来自 {} 请去相应系统修改密码" #: authentication/api/password.py:65 -#: authentication/templates/authentication/login.html:361 +#: authentication/templates/authentication/login.html:360 #: users/templates/users/forgot_password.html:41 #: users/templates/users/forgot_password.html:42 #: users/templates/users/forgot_password_previewing.html:13 @@ -3404,7 +3459,7 @@ msgstr "配置文件有问题，无法登录，请联系管理员或查看最新 msgid "If you are administrator, you can update the config resolve it, set" msgstr "如果你是管理员，可以更新配置文件解决，设置配置项" -#: authentication/templates/authentication/login.html:376 +#: authentication/templates/authentication/login.html:375 msgid "More login options" msgstr "其他方式登录" @@ -3940,7 +3995,7 @@ msgstr "JumpServer 开源堡垒机" msgid "

Flower service unavailable, check it

" msgstr "Flower 服务不可用，请检查" -#: jumpserver/views/other.py:26 +#: jumpserver/views/other.py:27 msgid "" "
Luna is a separately deployed program, you need to deploy Luna, koko, " "configure nginx for url distribution,
If you see this page, " @@ -3949,11 +4004,11 @@ msgstr "" "
Luna是单独部署的一个程序，你需要部署luna，koko,
如果你看到了" "这个页面，证明你访问的不是nginx监听的端口，祝你好运
" -#: jumpserver/views/other.py:70 +#: jumpserver/views/other.py:72 msgid "Websocket server run on port: {}, you should proxy it on nginx" msgstr "Websocket 服务运行在端口: {}, 请检查nginx是否代理是否设置" -#: jumpserver/views/other.py:84 +#: jumpserver/views/other.py:86 msgid "" "
Koko is a separately deployed program, you need to deploy Koko, " "configure nginx for url distribution,
If you see this page, " @@ -8855,24 +8910,26 @@ msgid "Interface settings" msgstr "界面设置" #: xpack/plugins/interface/models.py:23 -msgid "Title of login page" -msgstr "登录页标题" +msgid "Login title" +msgstr "登录页面标题" #: xpack/plugins/interface/models.py:27 -msgid "Image of login page" -msgstr "登录页图片" +msgid "Login image" +msgstr "登录页面图片" #: xpack/plugins/interface/models.py:31 msgid "Website icon" msgstr "网站图标" #: xpack/plugins/interface/models.py:35 -msgid "Logo of management page" +msgid "Index logo" msgstr "管理页面 Logo" #: xpack/plugins/interface/models.py:39 -msgid "Logo of logout page" -msgstr "退出页面小 Logo" +#, fuzzy +#| msgid "Logout" +msgid "Logout logo" +msgstr "注销登录" #: xpack/plugins/interface/models.py:41 #: xpack/plugins/interface/serializers/interface.py:26 @@ -8927,21 +8984,27 @@ msgstr "企业专业版" msgid "Ultimate edition" msgstr "企业旗舰版" +#~ msgid "Key password" +#~ msgstr "密钥密码" + +#~ msgid "Title of login page" +#~ msgstr "登录页标题" + +#~ msgid "Image of login page" +#~ msgstr "登录页图片" + +#~ msgid "Logo of management page" +#~ msgstr "管理页面 Logo" + +#~ msgid "Logo of logout page" +#~ msgstr "退出页面小 Logo" + #~ msgid "Organization ID" #~ msgstr "组织 ID" #~ msgid "Password strategy" #~ msgstr "密码策略" -#~ msgid "Login title" -#~ msgstr "登录页面标题" - -#~ msgid "Login image" -#~ msgstr "登录页面图片" - -#~ msgid "Index logo" -#~ msgstr "管理页面 Logo" - #~ msgid "Enable database proxy" #~ msgstr "启用数据库组件" diff --git a/apps/terminal/serializers/storage.py b/apps/terminal/serializers/storage.py index 4aabc8436..ed75c22ef 100644 --- a/apps/terminal/serializers/storage.py +++ b/apps/terminal/serializers/storage.py @@ -2,8 +2,8 @@ # from urllib.parse import urlparse -from django.db.models import TextChoices from django.core.validators import MaxValueValidator, MinValueValidator, validate_ipv46_address +from django.db.models import TextChoices from django.utils.translation import gettext_lazy as _ from rest_framework import serializers from rest_framework.validators import UniqueValidator @@ -146,7 +146,7 @@ class ReplayStorageTypeSFTPSerializer(serializers.Serializer): write_only=True, label=_('Private key') ) STP_PASSPHRASE = EncryptedField( - allow_blank=True, allow_null=True, required=False, max_length=1024, label=_('Key password') + allow_blank=True, allow_null=True, required=False, max_length=1024, label=_('Passphrase') ) SFTP_ROOT_PATH = serializers.CharField( required=True, max_length=1024, label=_('SFTP Root')