From 5a1389a187ae2498472558e1af3ac6d6388d6122 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 25 Jun 2024 19:10:32 +0800 Subject: [PATCH] perf: Translate (#13504) Co-authored-by: feng <1304903146@qq.com> --- apps/i18n/core/en/LC_MESSAGES/django.po | 183 +++++++++++------------ apps/i18n/core/ja/LC_MESSAGES/django.po | 182 +++++++++++------------ apps/i18n/core/zh/LC_MESSAGES/django.po | 189 ++++++++++++------------ apps/i18n/lina/en.json | 6 +- apps/i18n/lina/zh.json | 6 +- apps/settings/serializers/msg.py | 5 +- 6 files changed, 289 insertions(+), 282 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 21f1cd00b..b06fea1a1 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-06-24 16:42+0800\n" +"POT-Creation-Date: 2024-06-25 16:48+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ msgstr "" #: authentication/forms.py:28 #: authentication/templates/authentication/login.html:329 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:50 -#: settings/serializers/msg.py:37 settings/serializers/terminal.py:28 +#: settings/serializers/msg.py:36 settings/serializers/terminal.py:28 #: terminal/serializers/storage.py:123 terminal/serializers/storage.py:142 #: users/forms/profile.py:21 users/serializers/user.py:143 #: users/templates/users/_msg_user_created.html:13 @@ -214,8 +214,8 @@ msgstr "" #: accounts/const/automation.py:103 #: authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 -#: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 -#: settings/serializers/msg.py:59 users/forms/profile.py:100 +#: notifications/backends/__init__.py:10 settings/serializers/msg.py:21 +#: settings/serializers/msg.py:58 users/forms/profile.py:100 #: users/forms/profile.py:108 users/models/user.py:901 #: users/templates/users/forgot_password.html:162 #: users/views/profile/reset.py:94 @@ -284,7 +284,7 @@ msgstr "" #: terminal/serializers/command.py:17 terminal/serializers/session.py:28 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:277 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:276 msgid "Asset" msgstr "" @@ -319,8 +319,9 @@ msgstr "" #: acls/templates/acls/asset_login_reminder.html:10 #: assets/serializers/gateway.py:28 audits/models.py:59 #: authentication/api/connection_token.py:411 ops/models/base.py:18 -#: perms/models/asset_permission.py:75 terminal/backends/command/models.py:18 -#: terminal/models/session/session.py:34 terminal/serializers/command.py:72 +#: perms/models/asset_permission.py:75 settings/serializers/msg.py:33 +#: terminal/backends/command/models.py:18 terminal/models/session/session.py:34 +#: 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 @@ -419,7 +420,7 @@ msgstr "" #: accounts/models/automations/backup_account.py:134 audits/models.py:203 #: terminal/models/session/sharing.py:125 xpack/plugins/cloud/manager.py:158 -#: xpack/plugins/cloud/models.py:229 +#: xpack/plugins/cloud/models.py:228 msgid "Reason" msgstr "" @@ -478,7 +479,7 @@ msgstr "" #: accounts/models/automations/gather_account.py:58 #: accounts/serializers/account/backup.py:40 #: accounts/serializers/automations/change_secret.py:58 -#: settings/serializers/auth/ldap.py:101 settings/serializers/msg.py:45 +#: settings/serializers/auth/ldap.py:101 settings/serializers/msg.py:44 msgid "Recipient" msgstr "Recipients" @@ -514,8 +515,8 @@ msgstr "" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:136 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:281 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:225 -#: xpack/plugins/cloud/models.py:281 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:224 +#: xpack/plugins/cloud/models.py:280 msgid "Status" msgstr "" @@ -638,7 +639,7 @@ msgstr "" #: ops/models/celery.py:80 ops/models/job.py:142 ops/models/playbook.py:28 #: ops/serializers/job.py:18 orgs/models.py:82 #: perms/models/asset_permission.py:61 rbac/models/role.py:29 -#: settings/models.py:34 settings/models.py:183 settings/serializers/msg.py:87 +#: settings/models.py:34 settings/models.py:183 settings/serializers/msg.py:86 #: settings/serializers/terminal.py:9 terminal/models/applet/applet.py:33 #: terminal/models/component/endpoint.py:12 #: terminal/models/component/endpoint.py:109 @@ -648,7 +649,7 @@ msgstr "" #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 #: users/models/preference.py:11 users/models/user.py:900 -#: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:297 +#: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:296 #: xpack/plugins/cloud/serializers/task.py:74 msgid "Name" msgstr "" @@ -677,7 +678,7 @@ msgstr "" msgid "Push params" msgstr "" -#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:378 +#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:377 msgid "Account template" msgstr "" @@ -866,10 +867,10 @@ msgstr "" #: notifications/models/notification.py:12 #: perms/api/user_permission/mixin.py:55 perms/models/asset_permission.py:63 #: rbac/builtin.py:124 rbac/models/rolebinding.py:49 -#: rbac/serializers/rolebinding.py:17 settings/serializers/msg.py:34 -#: terminal/backends/command/models.py:16 terminal/models/session/session.py:30 -#: terminal/models/session/sharing.py:34 terminal/notifications.py:156 -#: terminal/notifications.py:205 terminal/serializers/command.py:16 +#: rbac/serializers/rolebinding.py:17 terminal/backends/command/models.py:16 +#: terminal/models/session/session.py:30 terminal/models/session/sharing.py:34 +#: terminal/notifications.py:156 terminal/notifications.py:205 +#: terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 #: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1110 @@ -961,7 +962,7 @@ msgstr "" #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:295 users/models/user.py:934 -#: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:122 +#: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:121 msgid "Comment" msgstr "Description" @@ -1143,12 +1144,12 @@ msgid "Notify" msgstr "" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:303 +#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:302 msgid "Priority" msgstr "" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:304 +#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:303 msgid "1-100, the lower the value will be match first" msgstr "" @@ -1190,13 +1191,13 @@ msgid "Command" msgstr "" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack/plugins/cloud/models.py:344 +#: xpack/plugins/cloud/models.py:343 msgid "Regex" msgstr "" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:184 settings/serializers/feature.py:19 -#: settings/serializers/msg.py:76 xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:75 xpack/plugins/license/models.py:30 msgid "Content" msgstr "" @@ -1307,7 +1308,7 @@ msgstr "" #: authentication/templates/authentication/_msg_oauth_bind.html:12 #: authentication/templates/authentication/_msg_rest_password_success.html:8 #: authentication/templates/authentication/_msg_rest_public_key_success.html:8 -#: xpack/plugins/cloud/models.py:379 +#: xpack/plugins/cloud/models.py:378 msgid "IP" msgstr "" @@ -1489,7 +1490,7 @@ msgstr "" #: assets/const/category.py:10 assets/models/asset/host.py:8 #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:76 -#: settings/serializers/feature.py:49 settings/serializers/msg.py:31 +#: settings/serializers/feature.py:49 settings/serializers/msg.py:30 #: terminal/models/component/endpoint.py:13 terminal/serializers/applet.py:17 #: xpack/plugins/cloud/manager.py:83 #: xpack/plugins/cloud/serializers/account_attrs.py:72 @@ -1622,7 +1623,7 @@ msgid "We will consider login success when we see this prompt" msgstr "" #: assets/const/protocol.py:128 assets/models/asset/database.py:10 -#: settings/serializers/msg.py:49 +#: settings/serializers/msg.py:48 msgid "Use SSL" msgstr "" @@ -1700,7 +1701,7 @@ msgstr "" #: assets/models/asset/common.py:94 assets/models/platform.py:16 #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:77 -#: settings/serializers/msg.py:32 terminal/serializers/storage.py:133 +#: settings/serializers/msg.py:31 terminal/serializers/storage.py:133 #: xpack/plugins/cloud/serializers/account_attrs.py:73 msgid "Port" msgstr "" @@ -1713,7 +1714,7 @@ msgstr "" #: assets/models/asset/common.py:161 assets/models/platform.py:134 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:374 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:373 msgid "Platform" msgstr "" @@ -1772,7 +1773,7 @@ msgstr "" #: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 perms/models/asset_permission.py:72 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:375 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:374 msgid "Node" msgstr "" @@ -1878,7 +1879,7 @@ msgstr "" #: assets/serializers/platform.py:153 #: authentication/serializers/connect_token_secret.py:124 #: common/serializers/common.py:85 labels/serializers.py:45 -#: settings/serializers/msg.py:88 +#: settings/serializers/msg.py:87 msgid "Label" msgstr "" @@ -2057,7 +2058,7 @@ msgstr "" #: 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 -#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:377 +#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:376 #: xpack/plugins/cloud/serializers/task.py:34 msgid "Protocols" msgstr "" @@ -2502,8 +2503,8 @@ msgstr "" msgid "Filename" msgstr "" -#: audits/models.py:66 common/serializers/common.py:98 -msgid "File" +#: audits/models.py:66 +msgid "Can Download" msgstr "" #: audits/models.py:67 terminal/backends/command/models.py:21 @@ -3133,7 +3134,7 @@ msgstr "" #: authentication/models/connection_token.py:41 #: authentication/serializers/connect_token_secret.py:114 -#: settings/serializers/msg.py:29 terminal/models/applet/applet.py:42 +#: settings/serializers/msg.py:28 terminal/models/applet/applet.py:42 #: terminal/models/virtualapp/virtualapp.py:24 #: terminal/serializers/session.py:21 terminal/serializers/session.py:48 #: terminal/serializers/storage.py:71 @@ -3239,7 +3240,7 @@ msgid "Component" msgstr "" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:376 +#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:375 msgid "Domain" msgstr "" @@ -3931,6 +3932,10 @@ msgstr "" msgid "Children" msgstr "" +#: common/serializers/common.py:98 +msgid "File" +msgstr "" + #: common/serializers/fields.py:135 msgid "Invalid data type" msgstr "" @@ -4338,7 +4343,7 @@ msgid "Date last run" msgstr "" #: ops/models/base.py:51 ops/models/job.py:238 -#: xpack/plugins/cloud/models.py:223 +#: xpack/plugins/cloud/models.py:222 msgid "Result" msgstr "" @@ -5553,7 +5558,7 @@ msgstr "" #: settings/serializers/auth/sms.py:31 settings/serializers/auth/sms.py:54 #: settings/serializers/auth/sms.py:62 settings/serializers/auth/sms.py:71 -#: settings/serializers/auth/sms.py:82 settings/serializers/msg.py:81 +#: settings/serializers/auth/sms.py:82 settings/serializers/msg.py:80 msgid "Signature" msgstr "" @@ -5725,7 +5730,7 @@ msgid "" "database, OSS will not be affected." msgstr "" -#: settings/serializers/feature.py:18 settings/serializers/msg.py:66 +#: settings/serializers/feature.py:18 settings/serializers/msg.py:65 msgid "Subject" msgstr "" @@ -5851,79 +5856,79 @@ msgid "" "application server in remote applications." msgstr "" -#: settings/serializers/msg.py:25 +#: settings/serializers/msg.py:24 msgid "SMTP" msgstr "" -#: settings/serializers/msg.py:26 +#: settings/serializers/msg.py:25 msgid "EXCHANGE" msgstr "" -#: settings/serializers/msg.py:34 +#: settings/serializers/msg.py:33 msgid "The user to be used for email server authentication" msgstr "" -#: settings/serializers/msg.py:38 +#: settings/serializers/msg.py:37 msgid "" "Password to use for the email server. It is used in conjunction with `User` " "when authenticating to the email server" msgstr "" -#: settings/serializers/msg.py:41 -msgid "From" +#: settings/serializers/msg.py:40 +msgid "Sender" msgstr "" -#: settings/serializers/msg.py:42 +#: settings/serializers/msg.py:41 msgid "Sender email address (default to using the `User`)" msgstr "" -#: settings/serializers/msg.py:46 +#: settings/serializers/msg.py:45 msgid "The recipient is used for testing the email server's connectivity" msgstr "" -#: settings/serializers/msg.py:50 +#: settings/serializers/msg.py:49 msgid "" "Whether to use an implicit TLS (secure) connection when talking to the SMTP " "server. In most email documentation this type of TLS connection is referred " "to as SSL. It is generally used on port 465" msgstr "" -#: settings/serializers/msg.py:53 +#: settings/serializers/msg.py:52 msgid "Use TLS" msgstr "" -#: settings/serializers/msg.py:54 +#: settings/serializers/msg.py:53 msgid "" "Whether to use a TLS (secure) connection when talking to the SMTP server. " "This is used for explicit TLS connections, generally on port 587" msgstr "" -#: settings/serializers/msg.py:62 +#: settings/serializers/msg.py:61 msgid "Subject prefix" msgstr "" -#: settings/serializers/msg.py:67 +#: settings/serializers/msg.py:66 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " "successfully)" msgstr "" -#: settings/serializers/msg.py:71 +#: settings/serializers/msg.py:70 msgid "Honorific" msgstr "" -#: settings/serializers/msg.py:72 +#: settings/serializers/msg.py:71 msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "" -#: settings/serializers/msg.py:78 +#: settings/serializers/msg.py:77 #, python-brace-format msgid "" "Tips: When creating a user, send the content of the email, support " "{username} {name} {email} label" msgstr "" -#: settings/serializers/msg.py:82 +#: settings/serializers/msg.py:81 msgid "Tips: Email signature (eg:jumpserver)" msgstr "" @@ -7340,7 +7345,7 @@ msgid "Access key secret" msgstr "" #: terminal/serializers/storage.py:68 xpack/plugins/cloud/manager.py:100 -#: xpack/plugins/cloud/models.py:274 +#: xpack/plugins/cloud/models.py:273 msgid "Region" msgstr "" @@ -8797,7 +8802,7 @@ msgstr "" msgid "Public IP" msgstr "" -#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:348 +#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:347 msgid "Instance name" msgstr "" @@ -8974,124 +8979,120 @@ msgstr "" msgid "Fully synchronous" msgstr "" -#: xpack/plugins/cloud/models.py:120 -msgid "Release assets" -msgstr "" - -#: xpack/plugins/cloud/models.py:125 +#: xpack/plugins/cloud/models.py:124 msgid "Date last sync" msgstr "" -#: xpack/plugins/cloud/models.py:128 xpack/plugins/cloud/models.py:366 -#: xpack/plugins/cloud/models.py:392 +#: xpack/plugins/cloud/models.py:127 xpack/plugins/cloud/models.py:365 +#: xpack/plugins/cloud/models.py:391 msgid "Strategy" msgstr "" -#: xpack/plugins/cloud/models.py:133 xpack/plugins/cloud/models.py:221 +#: xpack/plugins/cloud/models.py:132 xpack/plugins/cloud/models.py:220 msgid "Sync instance task" msgstr "" -#: xpack/plugins/cloud/models.py:232 xpack/plugins/cloud/models.py:284 +#: xpack/plugins/cloud/models.py:231 xpack/plugins/cloud/models.py:283 msgid "Date sync" msgstr "" -#: xpack/plugins/cloud/models.py:236 +#: xpack/plugins/cloud/models.py:235 msgid "Sync instance snapshot" msgstr "" -#: xpack/plugins/cloud/models.py:240 +#: xpack/plugins/cloud/models.py:239 msgid "Sync instance task execution" msgstr "" -#: xpack/plugins/cloud/models.py:264 +#: xpack/plugins/cloud/models.py:263 msgid "Sync task" msgstr "" -#: xpack/plugins/cloud/models.py:268 +#: xpack/plugins/cloud/models.py:267 msgid "Sync instance task history" msgstr "" -#: xpack/plugins/cloud/models.py:271 +#: xpack/plugins/cloud/models.py:270 msgid "Instance" msgstr "" -#: xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/models.py:287 msgid "Sync instance detail" msgstr "" -#: xpack/plugins/cloud/models.py:300 xpack/plugins/cloud/serializers/task.py:76 +#: xpack/plugins/cloud/models.py:299 xpack/plugins/cloud/serializers/task.py:76 msgid "Rule relation" msgstr "" -#: xpack/plugins/cloud/models.py:310 +#: xpack/plugins/cloud/models.py:309 msgid "Task strategy" msgstr "" -#: xpack/plugins/cloud/models.py:337 +#: xpack/plugins/cloud/models.py:336 msgid "Equal" msgstr "" -#: xpack/plugins/cloud/models.py:338 +#: xpack/plugins/cloud/models.py:337 msgid "Not Equal" msgstr "" -#: xpack/plugins/cloud/models.py:339 +#: xpack/plugins/cloud/models.py:338 msgid "In" msgstr "" -#: xpack/plugins/cloud/models.py:340 +#: xpack/plugins/cloud/models.py:339 msgid "Contains" msgstr "" -#: xpack/plugins/cloud/models.py:341 +#: xpack/plugins/cloud/models.py:340 msgid "Exclude" msgstr "" -#: xpack/plugins/cloud/models.py:342 +#: xpack/plugins/cloud/models.py:341 msgid "Startswith" msgstr "" -#: xpack/plugins/cloud/models.py:343 +#: xpack/plugins/cloud/models.py:342 msgid "Endswith" msgstr "" -#: xpack/plugins/cloud/models.py:349 +#: xpack/plugins/cloud/models.py:348 msgid "Instance platform" msgstr "" -#: xpack/plugins/cloud/models.py:350 +#: xpack/plugins/cloud/models.py:349 msgid "Instance address" msgstr "" -#: xpack/plugins/cloud/models.py:357 +#: xpack/plugins/cloud/models.py:356 msgid "Rule attr" msgstr "" -#: xpack/plugins/cloud/models.py:361 +#: xpack/plugins/cloud/models.py:360 msgid "Rule match" msgstr "" -#: xpack/plugins/cloud/models.py:363 +#: xpack/plugins/cloud/models.py:362 msgid "Rule value" msgstr "" -#: xpack/plugins/cloud/models.py:370 xpack/plugins/cloud/serializers/task.py:79 +#: xpack/plugins/cloud/models.py:369 xpack/plugins/cloud/serializers/task.py:79 msgid "Strategy rule" msgstr "" -#: xpack/plugins/cloud/models.py:380 +#: xpack/plugins/cloud/models.py:379 msgid "Name strategy" msgstr "" -#: xpack/plugins/cloud/models.py:387 +#: xpack/plugins/cloud/models.py:386 msgid "Action attr" msgstr "" -#: xpack/plugins/cloud/models.py:389 +#: xpack/plugins/cloud/models.py:388 msgid "Action value" msgstr "" -#: xpack/plugins/cloud/models.py:396 xpack/plugins/cloud/serializers/task.py:82 +#: xpack/plugins/cloud/models.py:395 xpack/plugins/cloud/serializers/task.py:82 msgid "Strategy action" msgstr "" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 3091fc248..622abed15 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-06-24 19:12+0800\n" +"POT-Creation-Date: 2024-06-25 16:48+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ msgstr "成功: %s、失敗: %s、合計: %s" #: authentication/forms.py:28 #: authentication/templates/authentication/login.html:329 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:50 -#: settings/serializers/msg.py:37 settings/serializers/terminal.py:28 +#: settings/serializers/msg.py:36 settings/serializers/terminal.py:28 #: terminal/serializers/storage.py:123 terminal/serializers/storage.py:142 #: users/forms/profile.py:21 users/serializers/user.py:143 #: users/templates/users/_msg_user_created.html:13 @@ -214,8 +214,8 @@ msgstr "作成のみ" #: accounts/const/automation.py:103 #: authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 -#: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 -#: settings/serializers/msg.py:59 users/forms/profile.py:100 +#: notifications/backends/__init__.py:10 settings/serializers/msg.py:21 +#: settings/serializers/msg.py:58 users/forms/profile.py:100 #: users/forms/profile.py:108 users/models/user.py:901 #: users/templates/users/forgot_password.html:162 #: users/views/profile/reset.py:94 @@ -284,7 +284,7 @@ msgstr "ユーザー %s がパスワードを閲覧/導き出しました" #: terminal/serializers/command.py:17 terminal/serializers/session.py:28 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:277 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:276 msgid "Asset" msgstr "資産" @@ -319,8 +319,9 @@ msgstr "ソース ID" #: acls/templates/acls/asset_login_reminder.html:10 #: assets/serializers/gateway.py:28 audits/models.py:59 #: authentication/api/connection_token.py:411 ops/models/base.py:18 -#: perms/models/asset_permission.py:75 terminal/backends/command/models.py:18 -#: terminal/models/session/session.py:34 terminal/serializers/command.py:72 +#: perms/models/asset_permission.py:75 settings/serializers/msg.py:33 +#: terminal/backends/command/models.py:18 terminal/models/session/session.py:34 +#: 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 @@ -419,7 +420,7 @@ msgstr "トリガーモード" #: accounts/models/automations/backup_account.py:134 audits/models.py:203 #: terminal/models/session/sharing.py:125 xpack/plugins/cloud/manager.py:158 -#: xpack/plugins/cloud/models.py:229 +#: xpack/plugins/cloud/models.py:228 msgid "Reason" msgstr "理由" @@ -478,7 +479,7 @@ msgstr "SSHキープッシュ方式" #: accounts/models/automations/gather_account.py:58 #: accounts/serializers/account/backup.py:40 #: accounts/serializers/automations/change_secret.py:58 -#: settings/serializers/auth/ldap.py:101 settings/serializers/msg.py:45 +#: settings/serializers/auth/ldap.py:101 settings/serializers/msg.py:44 msgid "Recipient" msgstr "受信者" @@ -514,8 +515,8 @@ msgstr "終了日" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:136 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:281 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:225 -#: xpack/plugins/cloud/models.py:281 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:224 +#: xpack/plugins/cloud/models.py:280 msgid "Status" msgstr "ステータス" @@ -638,7 +639,7 @@ msgstr "パスワードルール" #: ops/models/celery.py:80 ops/models/job.py:142 ops/models/playbook.py:28 #: ops/serializers/job.py:18 orgs/models.py:82 #: perms/models/asset_permission.py:61 rbac/models/role.py:29 -#: settings/models.py:34 settings/models.py:183 settings/serializers/msg.py:87 +#: settings/models.py:34 settings/models.py:183 settings/serializers/msg.py:86 #: settings/serializers/terminal.py:9 terminal/models/applet/applet.py:33 #: terminal/models/component/endpoint.py:12 #: terminal/models/component/endpoint.py:109 @@ -648,7 +649,7 @@ msgstr "パスワードルール" #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 #: users/models/preference.py:11 users/models/user.py:900 -#: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:297 +#: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:296 #: xpack/plugins/cloud/serializers/task.py:74 msgid "Name" msgstr "名前" @@ -677,7 +678,7 @@ msgstr "プラットフォーム" msgid "Push params" msgstr "パラメータをプッシュする" -#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:378 +#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:377 msgid "Account template" msgstr "アカウント テンプレート" @@ -876,10 +877,10 @@ msgstr "ID" #: notifications/models/notification.py:12 #: perms/api/user_permission/mixin.py:55 perms/models/asset_permission.py:63 #: rbac/builtin.py:124 rbac/models/rolebinding.py:49 -#: rbac/serializers/rolebinding.py:17 settings/serializers/msg.py:34 -#: terminal/backends/command/models.py:16 terminal/models/session/session.py:30 -#: terminal/models/session/sharing.py:34 terminal/notifications.py:156 -#: terminal/notifications.py:205 terminal/serializers/command.py:16 +#: rbac/serializers/rolebinding.py:17 terminal/backends/command/models.py:16 +#: terminal/models/session/session.py:30 terminal/models/session/sharing.py:34 +#: terminal/notifications.py:156 terminal/notifications.py:205 +#: terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 #: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1110 @@ -973,7 +974,7 @@ msgstr "关联平台，可以配置推送参数，如果不关联，则使用默 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:295 users/models/user.py:934 -#: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:122 +#: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:121 msgid "Comment" msgstr "コメント" @@ -1160,12 +1161,12 @@ msgid "Notify" msgstr "通知する" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:303 +#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:302 msgid "Priority" msgstr "優先順位" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:304 +#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:303 msgid "1-100, the lower the value will be match first" msgstr "1-100、低い値は最初に一致します" @@ -1207,13 +1208,13 @@ msgid "Command" msgstr "コマンド" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack/plugins/cloud/models.py:344 +#: xpack/plugins/cloud/models.py:343 msgid "Regex" msgstr "正規情報" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:184 settings/serializers/feature.py:19 -#: settings/serializers/msg.py:76 xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:75 xpack/plugins/license/models.py:30 msgid "Content" msgstr "コンテンツ" @@ -1329,7 +1330,7 @@ msgstr "" #: authentication/templates/authentication/_msg_oauth_bind.html:12 #: authentication/templates/authentication/_msg_rest_password_success.html:8 #: authentication/templates/authentication/_msg_rest_public_key_success.html:8 -#: xpack/plugins/cloud/models.py:379 +#: xpack/plugins/cloud/models.py:378 msgid "IP" msgstr "IP" @@ -1516,7 +1517,7 @@ msgstr "脚本" #: assets/const/category.py:10 assets/models/asset/host.py:8 #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:76 -#: settings/serializers/feature.py:49 settings/serializers/msg.py:31 +#: settings/serializers/feature.py:49 settings/serializers/msg.py:30 #: terminal/models/component/endpoint.py:13 terminal/serializers/applet.py:17 #: xpack/plugins/cloud/manager.py:83 #: xpack/plugins/cloud/serializers/account_attrs.py:72 @@ -1652,7 +1653,7 @@ msgid "We will consider login success when we see this prompt" msgstr "このプロンプトが表示されたらログイン成功とみなします" #: assets/const/protocol.py:128 assets/models/asset/database.py:10 -#: settings/serializers/msg.py:49 +#: settings/serializers/msg.py:48 msgid "Use SSL" msgstr "SSLの使用" @@ -1732,7 +1733,7 @@ msgstr "クラウド サービス" #: assets/models/asset/common.py:94 assets/models/platform.py:16 #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:77 -#: settings/serializers/msg.py:32 terminal/serializers/storage.py:133 +#: settings/serializers/msg.py:31 terminal/serializers/storage.py:133 #: xpack/plugins/cloud/serializers/account_attrs.py:73 msgid "Port" msgstr "ポート" @@ -1745,7 +1746,7 @@ msgstr "アドレス" #: assets/models/asset/common.py:161 assets/models/platform.py:134 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:374 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:373 msgid "Platform" msgstr "プラットフォーム" @@ -1804,7 +1805,7 @@ msgstr "プロキシー" #: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 perms/models/asset_permission.py:72 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:375 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:374 msgid "Node" msgstr "ノード" @@ -1910,7 +1911,7 @@ msgstr "値" #: assets/serializers/platform.py:153 #: authentication/serializers/connect_token_secret.py:124 #: common/serializers/common.py:85 labels/serializers.py:45 -#: settings/serializers/msg.py:88 +#: settings/serializers/msg.py:87 msgid "Label" msgstr "ラベル" @@ -2091,7 +2092,7 @@ msgstr "" #: 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 -#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:377 +#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:376 #: xpack/plugins/cloud/serializers/task.py:34 msgid "Protocols" msgstr "プロトコル" @@ -3199,7 +3200,7 @@ msgstr "カスタムパスワード" #: authentication/models/connection_token.py:41 #: authentication/serializers/connect_token_secret.py:114 -#: settings/serializers/msg.py:29 terminal/models/applet/applet.py:42 +#: settings/serializers/msg.py:28 terminal/models/applet/applet.py:42 #: terminal/models/virtualapp/virtualapp.py:24 #: terminal/serializers/session.py:21 terminal/serializers/session.py:48 #: terminal/serializers/storage.py:71 @@ -3305,7 +3306,7 @@ msgid "Component" msgstr "コンポーネント" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:376 +#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:375 msgid "Domain" msgstr "ドメイン" @@ -4444,7 +4445,7 @@ msgid "Date last run" msgstr "最終実行日" #: ops/models/base.py:51 ops/models/job.py:238 -#: xpack/plugins/cloud/models.py:223 +#: xpack/plugins/cloud/models.py:222 msgid "Result" msgstr "結果" @@ -5672,7 +5673,7 @@ msgstr "確認コードを送信" #: settings/serializers/auth/sms.py:31 settings/serializers/auth/sms.py:54 #: settings/serializers/auth/sms.py:62 settings/serializers/auth/sms.py:71 -#: settings/serializers/auth/sms.py:82 settings/serializers/msg.py:81 +#: settings/serializers/auth/sms.py:82 settings/serializers/msg.py:80 msgid "Signature" msgstr "署名" @@ -5853,7 +5854,7 @@ msgstr "" "この期間を超えるセッション、録音、およびコマンド レコードは削除されます (デー" "タベースのバックアップに影響し、OSS などには影響しません)" -#: settings/serializers/feature.py:18 settings/serializers/msg.py:66 +#: settings/serializers/feature.py:18 settings/serializers/msg.py:65 msgid "Subject" msgstr "件名" @@ -5980,58 +5981,58 @@ msgid "" "application server in remote applications." msgstr "" -#: settings/serializers/msg.py:25 +#: settings/serializers/msg.py:24 msgid "SMTP" msgstr "SMTPホスト" -#: settings/serializers/msg.py:26 +#: settings/serializers/msg.py:25 msgid "EXCHANGE" msgstr "" -#: settings/serializers/msg.py:34 +#: settings/serializers/msg.py:33 msgid "The user to be used for email server authentication" msgstr "これは、SSO認証中にメールが返されない場合にデフォルトで使用されます。" -#: settings/serializers/msg.py:38 +#: settings/serializers/msg.py:37 msgid "" "Password to use for the email server. It is used in conjunction with `User` " "when authenticating to the email server" msgstr "" -#: settings/serializers/msg.py:41 -msgid "From" +#: settings/serializers/msg.py:40 +msgid "Sender" msgstr "" -#: settings/serializers/msg.py:42 +#: settings/serializers/msg.py:41 msgid "Sender email address (default to using the `User`)" msgstr "" -#: settings/serializers/msg.py:46 +#: settings/serializers/msg.py:45 msgid "The recipient is used for testing the email server's connectivity" msgstr "" -#: settings/serializers/msg.py:50 +#: settings/serializers/msg.py:49 msgid "" "Whether to use an implicit TLS (secure) connection when talking to the SMTP " "server. In most email documentation this type of TLS connection is referred " "to as SSL. It is generally used on port 465" msgstr "" -#: settings/serializers/msg.py:53 +#: settings/serializers/msg.py:52 msgid "Use TLS" msgstr "TLSの使用" -#: settings/serializers/msg.py:54 +#: settings/serializers/msg.py:53 msgid "" "Whether to use a TLS (secure) connection when talking to the SMTP server. " "This is used for explicit TLS connections, generally on port 587" msgstr "" -#: settings/serializers/msg.py:62 +#: settings/serializers/msg.py:61 msgid "Subject prefix" msgstr "件名プレフィックス" -#: settings/serializers/msg.py:67 +#: settings/serializers/msg.py:66 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " "successfully)" @@ -6039,16 +6040,16 @@ msgstr "" "ヒント: ユーザーを作成するときに、メールの件名を送信します (例: アカウントを" "正常に作成)" -#: settings/serializers/msg.py:71 +#: settings/serializers/msg.py:70 msgid "Honorific" msgstr "ユーザー敬語の作成" -#: settings/serializers/msg.py:72 +#: settings/serializers/msg.py:71 msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "" "ヒント: ユーザーを作成するときは、メールの敬語を送信します (例: こんにちは)" -#: settings/serializers/msg.py:78 +#: settings/serializers/msg.py:77 #, python-brace-format msgid "" "Tips: When creating a user, send the content of the email, support " @@ -6057,7 +6058,7 @@ msgstr "" "ヒント:ユーザーの作成時にパスワード設定メールの内容を送信し、{username}{name}" "{email}ラベルをサポートします。" -#: settings/serializers/msg.py:82 +#: settings/serializers/msg.py:81 msgid "Tips: Email signature (eg:jumpserver)" msgstr "ヒント: メール署名 (例: jumpserver)" @@ -7556,7 +7557,7 @@ msgid "Access key secret" msgstr "アクセスキーシークレット" #: terminal/serializers/storage.py:68 xpack/plugins/cloud/manager.py:100 -#: xpack/plugins/cloud/models.py:274 +#: xpack/plugins/cloud/models.py:273 msgid "Region" msgstr "リージョン" @@ -9056,7 +9057,7 @@ msgstr "プライベートIP" msgid "Public IP" msgstr "パブリックIP" -#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:348 +#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:347 msgid "Instance name" msgstr "インスタンス名" @@ -9235,126 +9236,120 @@ msgstr "常に更新" msgid "Fully synchronous" msgstr "完全同期" -#: xpack/plugins/cloud/models.py:120 -#, fuzzy -#| msgid "permed assets" -msgid "Release assets" -msgstr "パーマ資産" - -#: xpack/plugins/cloud/models.py:125 +#: xpack/plugins/cloud/models.py:124 msgid "Date last sync" msgstr "最終同期日" -#: xpack/plugins/cloud/models.py:128 xpack/plugins/cloud/models.py:366 -#: xpack/plugins/cloud/models.py:392 +#: xpack/plugins/cloud/models.py:127 xpack/plugins/cloud/models.py:365 +#: xpack/plugins/cloud/models.py:391 msgid "Strategy" msgstr "戦略" -#: xpack/plugins/cloud/models.py:133 xpack/plugins/cloud/models.py:221 +#: xpack/plugins/cloud/models.py:132 xpack/plugins/cloud/models.py:220 msgid "Sync instance task" msgstr "インスタンスの同期タスク" -#: xpack/plugins/cloud/models.py:232 xpack/plugins/cloud/models.py:284 +#: xpack/plugins/cloud/models.py:231 xpack/plugins/cloud/models.py:283 msgid "Date sync" msgstr "日付の同期" -#: xpack/plugins/cloud/models.py:236 +#: xpack/plugins/cloud/models.py:235 msgid "Sync instance snapshot" msgstr "インスタンススナップショットの同期" -#: xpack/plugins/cloud/models.py:240 +#: xpack/plugins/cloud/models.py:239 msgid "Sync instance task execution" msgstr "インスタンスタスクの同期実行" -#: xpack/plugins/cloud/models.py:264 +#: xpack/plugins/cloud/models.py:263 msgid "Sync task" msgstr "同期タスク" -#: xpack/plugins/cloud/models.py:268 +#: xpack/plugins/cloud/models.py:267 msgid "Sync instance task history" msgstr "インスタンスタスク履歴の同期" -#: xpack/plugins/cloud/models.py:271 +#: xpack/plugins/cloud/models.py:270 msgid "Instance" msgstr "インスタンス" -#: xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/models.py:287 msgid "Sync instance detail" msgstr "同期インスタンスの詳細" -#: xpack/plugins/cloud/models.py:300 xpack/plugins/cloud/serializers/task.py:76 +#: xpack/plugins/cloud/models.py:299 xpack/plugins/cloud/serializers/task.py:76 msgid "Rule relation" msgstr "条件関係" -#: xpack/plugins/cloud/models.py:310 +#: xpack/plugins/cloud/models.py:309 msgid "Task strategy" msgstr "ミッション戦略です" -#: xpack/plugins/cloud/models.py:337 +#: xpack/plugins/cloud/models.py:336 msgid "Equal" msgstr "等しい" -#: xpack/plugins/cloud/models.py:338 +#: xpack/plugins/cloud/models.py:337 msgid "Not Equal" msgstr "不等于" -#: xpack/plugins/cloud/models.py:339 +#: xpack/plugins/cloud/models.py:338 msgid "In" msgstr "で..." -#: xpack/plugins/cloud/models.py:340 +#: xpack/plugins/cloud/models.py:339 msgid "Contains" msgstr "含む" -#: xpack/plugins/cloud/models.py:341 +#: xpack/plugins/cloud/models.py:340 msgid "Exclude" msgstr "除外" -#: xpack/plugins/cloud/models.py:342 +#: xpack/plugins/cloud/models.py:341 msgid "Startswith" msgstr "始まる..." -#: xpack/plugins/cloud/models.py:343 +#: xpack/plugins/cloud/models.py:342 msgid "Endswith" msgstr "終わる..." -#: xpack/plugins/cloud/models.py:349 +#: xpack/plugins/cloud/models.py:348 msgid "Instance platform" msgstr "インスタンス名" -#: xpack/plugins/cloud/models.py:350 +#: xpack/plugins/cloud/models.py:349 msgid "Instance address" msgstr "インスタンスアドレス" -#: xpack/plugins/cloud/models.py:357 +#: xpack/plugins/cloud/models.py:356 msgid "Rule attr" msgstr "ルール属性" -#: xpack/plugins/cloud/models.py:361 +#: xpack/plugins/cloud/models.py:360 msgid "Rule match" msgstr "ルール一致" -#: xpack/plugins/cloud/models.py:363 +#: xpack/plugins/cloud/models.py:362 msgid "Rule value" msgstr "ルール値" -#: xpack/plugins/cloud/models.py:370 xpack/plugins/cloud/serializers/task.py:79 +#: xpack/plugins/cloud/models.py:369 xpack/plugins/cloud/serializers/task.py:79 msgid "Strategy rule" msgstr "戦略ルール" -#: xpack/plugins/cloud/models.py:380 +#: xpack/plugins/cloud/models.py:379 msgid "Name strategy" msgstr "ホスト名戦略" -#: xpack/plugins/cloud/models.py:387 +#: xpack/plugins/cloud/models.py:386 msgid "Action attr" msgstr "アクション属性" -#: xpack/plugins/cloud/models.py:389 +#: xpack/plugins/cloud/models.py:388 msgid "Action value" msgstr "アクション値" -#: xpack/plugins/cloud/models.py:396 xpack/plugins/cloud/serializers/task.py:82 +#: xpack/plugins/cloud/models.py:395 xpack/plugins/cloud/serializers/task.py:82 msgid "Strategy action" msgstr "戦略アクション" @@ -9740,6 +9735,11 @@ msgstr "エンタープライズプロフェッショナル版" msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" +#, fuzzy +#~| msgid "permed assets" +#~ msgid "Release assets" +#~ msgstr "パーマ資産" + #~ msgid "Job center" #~ msgstr "タスクセンター" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 4f94680a4..d33cb5585 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-06-24 19:12+0800\n" +"POT-Creation-Date: 2024-06-25 16:48+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -39,7 +39,7 @@ msgstr "成功: %s, 失败: %s, 总数: %s" #: authentication/forms.py:28 #: authentication/templates/authentication/login.html:329 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:50 -#: settings/serializers/msg.py:37 settings/serializers/terminal.py:28 +#: settings/serializers/msg.py:36 settings/serializers/terminal.py:28 #: terminal/serializers/storage.py:123 terminal/serializers/storage.py:142 #: users/forms/profile.py:21 users/serializers/user.py:143 #: users/templates/users/_msg_user_created.html:13 @@ -213,8 +213,8 @@ msgstr "仅创建" #: accounts/const/automation.py:103 #: authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 -#: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 -#: settings/serializers/msg.py:59 users/forms/profile.py:100 +#: notifications/backends/__init__.py:10 settings/serializers/msg.py:21 +#: settings/serializers/msg.py:58 users/forms/profile.py:100 #: users/forms/profile.py:108 users/models/user.py:901 #: users/templates/users/forgot_password.html:162 #: users/views/profile/reset.py:94 @@ -283,7 +283,7 @@ msgstr "用户 %s 查看/导出 了密码" #: terminal/serializers/command.py:17 terminal/serializers/session.py:28 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:277 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:276 msgid "Asset" msgstr "资产" @@ -318,8 +318,9 @@ msgstr "来源 ID" #: acls/templates/acls/asset_login_reminder.html:10 #: assets/serializers/gateway.py:28 audits/models.py:59 #: authentication/api/connection_token.py:411 ops/models/base.py:18 -#: perms/models/asset_permission.py:75 terminal/backends/command/models.py:18 -#: terminal/models/session/session.py:34 terminal/serializers/command.py:72 +#: perms/models/asset_permission.py:75 settings/serializers/msg.py:33 +#: terminal/backends/command/models.py:18 terminal/models/session/session.py:34 +#: 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 @@ -418,7 +419,7 @@ msgstr "触发模式" #: accounts/models/automations/backup_account.py:134 audits/models.py:203 #: terminal/models/session/sharing.py:125 xpack/plugins/cloud/manager.py:158 -#: xpack/plugins/cloud/models.py:229 +#: xpack/plugins/cloud/models.py:228 msgid "Reason" msgstr "原因" @@ -477,7 +478,7 @@ msgstr "SSH 密钥推送方式" #: accounts/models/automations/gather_account.py:58 #: accounts/serializers/account/backup.py:40 #: accounts/serializers/automations/change_secret.py:58 -#: settings/serializers/auth/ldap.py:101 settings/serializers/msg.py:45 +#: settings/serializers/auth/ldap.py:101 settings/serializers/msg.py:44 msgid "Recipient" msgstr "收件人" @@ -513,8 +514,8 @@ msgstr "结束日期" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:136 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:281 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:225 -#: xpack/plugins/cloud/models.py:281 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:224 +#: xpack/plugins/cloud/models.py:280 msgid "Status" msgstr "状态" @@ -637,7 +638,7 @@ msgstr "密码规则" #: ops/models/celery.py:80 ops/models/job.py:142 ops/models/playbook.py:28 #: ops/serializers/job.py:18 orgs/models.py:82 #: perms/models/asset_permission.py:61 rbac/models/role.py:29 -#: settings/models.py:34 settings/models.py:183 settings/serializers/msg.py:87 +#: settings/models.py:34 settings/models.py:183 settings/serializers/msg.py:86 #: settings/serializers/terminal.py:9 terminal/models/applet/applet.py:33 #: terminal/models/component/endpoint.py:12 #: terminal/models/component/endpoint.py:109 @@ -647,7 +648,7 @@ msgstr "密码规则" #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 #: users/models/preference.py:11 users/models/user.py:900 -#: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:297 +#: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:296 #: xpack/plugins/cloud/serializers/task.py:74 msgid "Name" msgstr "名称" @@ -676,7 +677,7 @@ msgstr "平台" msgid "Push params" msgstr "账号推送参数" -#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:378 +#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:377 msgid "Account template" msgstr "账号模板" @@ -874,10 +875,10 @@ msgstr "ID" #: notifications/models/notification.py:12 #: perms/api/user_permission/mixin.py:55 perms/models/asset_permission.py:63 #: rbac/builtin.py:124 rbac/models/rolebinding.py:49 -#: rbac/serializers/rolebinding.py:17 settings/serializers/msg.py:34 -#: terminal/backends/command/models.py:16 terminal/models/session/session.py:30 -#: terminal/models/session/sharing.py:34 terminal/notifications.py:156 -#: terminal/notifications.py:205 terminal/serializers/command.py:16 +#: rbac/serializers/rolebinding.py:17 terminal/backends/command/models.py:16 +#: terminal/models/session/session.py:30 terminal/models/session/sharing.py:34 +#: terminal/notifications.py:156 terminal/notifications.py:205 +#: terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 #: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1110 @@ -971,7 +972,7 @@ msgstr "关联平台，可配置推送参数，如果不关联，将使用默认 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:295 users/models/user.py:934 -#: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:122 +#: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:121 msgid "Comment" msgstr "备注" @@ -1154,12 +1155,12 @@ msgid "Notify" msgstr "通知" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:303 +#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:302 msgid "Priority" msgstr "优先级" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:304 +#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:303 msgid "1-100, the lower the value will be match first" msgstr "优先级可选范围为 1-100 (数值越小越优先)" @@ -1201,13 +1202,13 @@ msgid "Command" msgstr "命令" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack/plugins/cloud/models.py:344 +#: xpack/plugins/cloud/models.py:343 msgid "Regex" msgstr "正则表达式" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:184 settings/serializers/feature.py:19 -#: settings/serializers/msg.py:76 xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:75 xpack/plugins/license/models.py:30 msgid "Content" msgstr "内容" @@ -1322,7 +1323,7 @@ msgstr "" #: authentication/templates/authentication/_msg_oauth_bind.html:12 #: authentication/templates/authentication/_msg_rest_password_success.html:8 #: authentication/templates/authentication/_msg_rest_public_key_success.html:8 -#: xpack/plugins/cloud/models.py:379 +#: xpack/plugins/cloud/models.py:378 msgid "IP" msgstr "IP" @@ -1506,7 +1507,7 @@ msgstr "脚本" #: assets/const/category.py:10 assets/models/asset/host.py:8 #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:76 -#: settings/serializers/feature.py:49 settings/serializers/msg.py:31 +#: settings/serializers/feature.py:49 settings/serializers/msg.py:30 #: terminal/models/component/endpoint.py:13 terminal/serializers/applet.py:17 #: xpack/plugins/cloud/manager.py:83 #: xpack/plugins/cloud/serializers/account_attrs.py:72 @@ -1641,7 +1642,7 @@ msgid "We will consider login success when we see this prompt" msgstr "当我们看到这个提示时，我们将认为登录成功" #: assets/const/protocol.py:128 assets/models/asset/database.py:10 -#: settings/serializers/msg.py:49 +#: settings/serializers/msg.py:48 msgid "Use SSL" msgstr "使用 SSL" @@ -1720,7 +1721,7 @@ msgstr "云服务" #: assets/models/asset/common.py:94 assets/models/platform.py:16 #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:77 -#: settings/serializers/msg.py:32 terminal/serializers/storage.py:133 +#: settings/serializers/msg.py:31 terminal/serializers/storage.py:133 #: xpack/plugins/cloud/serializers/account_attrs.py:73 msgid "Port" msgstr "端口" @@ -1733,7 +1734,7 @@ msgstr "地址" #: assets/models/asset/common.py:161 assets/models/platform.py:134 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:374 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:373 msgid "Platform" msgstr "平台" @@ -1792,7 +1793,7 @@ msgstr "代理" #: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 perms/models/asset_permission.py:72 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:375 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:374 msgid "Node" msgstr "节点" @@ -1900,7 +1901,7 @@ msgstr "值" #: assets/serializers/platform.py:153 #: authentication/serializers/connect_token_secret.py:124 #: common/serializers/common.py:85 labels/serializers.py:45 -#: settings/serializers/msg.py:88 +#: settings/serializers/msg.py:87 msgid "Label" msgstr "标签" @@ -2079,7 +2080,7 @@ msgstr "资产中批量更新平台，不符合平台类型跳过的资产" #: 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 -#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:377 +#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:376 #: xpack/plugins/cloud/serializers/task.py:34 msgid "Protocols" msgstr "协议组" @@ -3164,7 +3165,7 @@ msgstr "自定义密码" #: authentication/models/connection_token.py:41 #: authentication/serializers/connect_token_secret.py:114 -#: settings/serializers/msg.py:29 terminal/models/applet/applet.py:42 +#: settings/serializers/msg.py:28 terminal/models/applet/applet.py:42 #: terminal/models/virtualapp/virtualapp.py:24 #: terminal/serializers/session.py:21 terminal/serializers/session.py:48 #: terminal/serializers/storage.py:71 @@ -3270,7 +3271,7 @@ msgid "Component" msgstr "组件" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:376 +#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:375 msgid "Domain" msgstr "网域" @@ -4385,7 +4386,7 @@ msgid "Date last run" msgstr "最后运行日期" #: ops/models/base.py:51 ops/models/job.py:238 -#: xpack/plugins/cloud/models.py:223 +#: xpack/plugins/cloud/models.py:222 msgid "Result" msgstr "结果" @@ -5622,7 +5623,7 @@ msgstr "发送验证码" #: settings/serializers/auth/sms.py:31 settings/serializers/auth/sms.py:54 #: settings/serializers/auth/sms.py:62 settings/serializers/auth/sms.py:71 -#: settings/serializers/auth/sms.py:82 settings/serializers/msg.py:81 +#: settings/serializers/auth/sms.py:82 settings/serializers/msg.py:80 msgid "Signature" msgstr "签名" @@ -5795,7 +5796,7 @@ msgid "" msgstr "" "会话、录像，命令记录超过该时长将会被清除 (影响数据库存储，OSS 等不受影响)" -#: settings/serializers/feature.py:18 settings/serializers/msg.py:66 +#: settings/serializers/feature.py:18 settings/serializers/msg.py:65 msgid "Subject" msgstr "主题" @@ -5919,38 +5920,38 @@ msgid "" "application server in remote applications." msgstr "虚拟应用，可以使用Linux操作系统作为远程应用中的应用服务器。" -#: settings/serializers/msg.py:25 +#: settings/serializers/msg.py:24 msgid "SMTP" msgstr "SMTP" -#: settings/serializers/msg.py:26 +#: settings/serializers/msg.py:25 msgid "EXCHANGE" -msgstr "交换" +msgstr "" -#: settings/serializers/msg.py:34 +#: settings/serializers/msg.py:33 msgid "The user to be used for email server authentication" msgstr "SSO认证时，如果没有返回邮件地址，将使用该后缀" -#: settings/serializers/msg.py:38 +#: settings/serializers/msg.py:37 msgid "" "Password to use for the email server. It is used in conjunction with `User` " "when authenticating to the email server" msgstr "" "用于电子邮件服务器的密码。在向电子邮件服务器进行身份验证时，它与用户一起使用" -#: settings/serializers/msg.py:41 -msgid "From" -msgstr "表单" +#: settings/serializers/msg.py:40 +msgid "Sender" +msgstr "发件人" -#: settings/serializers/msg.py:42 +#: settings/serializers/msg.py:41 msgid "Sender email address (default to using the `User`)" msgstr "发件人电子邮件地址（默认使用“用户”）" -#: settings/serializers/msg.py:46 +#: settings/serializers/msg.py:45 msgid "The recipient is used for testing the email server's connectivity" msgstr "收件人用于测试电子邮件服务器的连通性" -#: settings/serializers/msg.py:50 +#: settings/serializers/msg.py:49 msgid "" "Whether to use an implicit TLS (secure) connection when talking to the SMTP " "server. In most email documentation this type of TLS connection is referred " @@ -5959,11 +5960,11 @@ msgstr "" "与 SMTP 服务器通信时是否使用隐式 TLS（安全）连接。在大多数电子邮件文档中，这" "种类型的 TLS 连接称为 SSL。它通常在端口 465 上使用" -#: settings/serializers/msg.py:53 +#: settings/serializers/msg.py:52 msgid "Use TLS" msgstr "使用 TLS" -#: settings/serializers/msg.py:54 +#: settings/serializers/msg.py:53 msgid "" "Whether to use a TLS (secure) connection when talking to the SMTP server. " "This is used for explicit TLS connections, generally on port 587" @@ -5971,25 +5972,25 @@ msgstr "" "与 SMTP 服务器通信时是否使用 TLS（安全）连接。这用于显式 TLS 连接，通常在端" "口 587 上" -#: settings/serializers/msg.py:62 +#: settings/serializers/msg.py:61 msgid "Subject prefix" msgstr "主题前缀" -#: settings/serializers/msg.py:67 +#: settings/serializers/msg.py:66 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " "successfully)" msgstr "提示: 创建用户时，发送设置密码邮件的主题 (例如: 创建用户成功)" -#: settings/serializers/msg.py:71 +#: settings/serializers/msg.py:70 msgid "Honorific" msgstr "邮件问候语" -#: settings/serializers/msg.py:72 +#: settings/serializers/msg.py:71 msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "提示: 创建用户时，发送设置密码邮件的敬语 (例如: 你好)" -#: settings/serializers/msg.py:78 +#: settings/serializers/msg.py:77 #, python-brace-format msgid "" "Tips: When creating a user, send the content of the email, support " @@ -5997,7 +5998,7 @@ msgid "" msgstr "" "提示: 创建用户时，发送设置密码邮件的内容, 支持 {username} {name} {email} 标签" -#: settings/serializers/msg.py:82 +#: settings/serializers/msg.py:81 msgid "Tips: Email signature (eg:jumpserver)" msgstr "邮件署名 (如:jumpserver)" @@ -7469,7 +7470,7 @@ msgid "Access key secret" msgstr "Access key secret(SK)" #: terminal/serializers/storage.py:68 xpack/plugins/cloud/manager.py:100 -#: xpack/plugins/cloud/models.py:274 +#: xpack/plugins/cloud/models.py:273 msgid "Region" msgstr "地域" @@ -8944,7 +8945,7 @@ msgstr "私有IP" msgid "Public IP" msgstr "公网IP" -#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:348 +#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:347 msgid "Instance name" msgstr "实例名称" @@ -9122,126 +9123,120 @@ msgstr "总是更新" msgid "Fully synchronous" msgstr "完全同步" -#: xpack/plugins/cloud/models.py:120 -#, fuzzy -#| msgid "permed assets" -msgid "Release assets" -msgstr "授权的资产" - -#: xpack/plugins/cloud/models.py:125 +#: xpack/plugins/cloud/models.py:124 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:128 xpack/plugins/cloud/models.py:366 -#: xpack/plugins/cloud/models.py:392 +#: xpack/plugins/cloud/models.py:127 xpack/plugins/cloud/models.py:365 +#: xpack/plugins/cloud/models.py:391 msgid "Strategy" msgstr "策略" -#: xpack/plugins/cloud/models.py:133 xpack/plugins/cloud/models.py:221 +#: xpack/plugins/cloud/models.py:132 xpack/plugins/cloud/models.py:220 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:232 xpack/plugins/cloud/models.py:284 +#: xpack/plugins/cloud/models.py:231 xpack/plugins/cloud/models.py:283 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:236 +#: xpack/plugins/cloud/models.py:235 msgid "Sync instance snapshot" msgstr "同步实例快照" -#: xpack/plugins/cloud/models.py:240 +#: xpack/plugins/cloud/models.py:239 msgid "Sync instance task execution" msgstr "同步实例任务执行" -#: xpack/plugins/cloud/models.py:264 +#: xpack/plugins/cloud/models.py:263 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:268 +#: xpack/plugins/cloud/models.py:267 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:271 +#: xpack/plugins/cloud/models.py:270 msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/models.py:287 msgid "Sync instance detail" msgstr "同步实例详情" -#: xpack/plugins/cloud/models.py:300 xpack/plugins/cloud/serializers/task.py:76 +#: xpack/plugins/cloud/models.py:299 xpack/plugins/cloud/serializers/task.py:76 msgid "Rule relation" msgstr "条件关系" -#: xpack/plugins/cloud/models.py:310 +#: xpack/plugins/cloud/models.py:309 msgid "Task strategy" msgstr "任务策略" -#: xpack/plugins/cloud/models.py:337 +#: xpack/plugins/cloud/models.py:336 msgid "Equal" msgstr "等于" -#: xpack/plugins/cloud/models.py:338 +#: xpack/plugins/cloud/models.py:337 msgid "Not Equal" msgstr "不等于" -#: xpack/plugins/cloud/models.py:339 +#: xpack/plugins/cloud/models.py:338 msgid "In" msgstr "在...中" -#: xpack/plugins/cloud/models.py:340 +#: xpack/plugins/cloud/models.py:339 msgid "Contains" msgstr "包含" -#: xpack/plugins/cloud/models.py:341 +#: xpack/plugins/cloud/models.py:340 msgid "Exclude" msgstr "排除" -#: xpack/plugins/cloud/models.py:342 +#: xpack/plugins/cloud/models.py:341 msgid "Startswith" msgstr "以...开头" -#: xpack/plugins/cloud/models.py:343 +#: xpack/plugins/cloud/models.py:342 msgid "Endswith" msgstr "以...结尾" -#: xpack/plugins/cloud/models.py:349 +#: xpack/plugins/cloud/models.py:348 msgid "Instance platform" msgstr "实例平台" -#: xpack/plugins/cloud/models.py:350 +#: xpack/plugins/cloud/models.py:349 msgid "Instance address" msgstr "实例地址" -#: xpack/plugins/cloud/models.py:357 +#: xpack/plugins/cloud/models.py:356 msgid "Rule attr" msgstr "规则属性" -#: xpack/plugins/cloud/models.py:361 +#: xpack/plugins/cloud/models.py:360 msgid "Rule match" msgstr "规则匹配" -#: xpack/plugins/cloud/models.py:363 +#: xpack/plugins/cloud/models.py:362 msgid "Rule value" msgstr "规则值" -#: xpack/plugins/cloud/models.py:370 xpack/plugins/cloud/serializers/task.py:79 +#: xpack/plugins/cloud/models.py:369 xpack/plugins/cloud/serializers/task.py:79 msgid "Strategy rule" msgstr "条件" -#: xpack/plugins/cloud/models.py:380 +#: xpack/plugins/cloud/models.py:379 msgid "Name strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:387 +#: xpack/plugins/cloud/models.py:386 msgid "Action attr" msgstr "动作属性" -#: xpack/plugins/cloud/models.py:389 +#: xpack/plugins/cloud/models.py:388 msgid "Action value" msgstr "动作值" -#: xpack/plugins/cloud/models.py:396 xpack/plugins/cloud/serializers/task.py:82 +#: xpack/plugins/cloud/models.py:395 xpack/plugins/cloud/serializers/task.py:82 msgid "Strategy action" msgstr "动作" @@ -9626,6 +9621,14 @@ msgstr "企业专业版" msgid "Ultimate edition" msgstr "企业旗舰版" +#~ msgid "From" +#~ msgstr "表单" + +#, fuzzy +#~| msgid "permed assets" +#~ msgid "Release assets" +#~ msgstr "授权的资产" + #~ msgid "Job center" #~ msgstr "任务中心" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index efc506850..745c25953 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -984,7 +984,7 @@ "SMTP": "Server", "SPECIAL_CHAR_REQUIRED": "Must contain special characters", "SSHKey": "SSH key", - "SSHKeyOfProfileSSHUpdatePage": "You can reset and download the SSH public key by clicking the button below, or copy your SSH public key and submit it.", + "SSHKeyOfProfileSSHUpdatePage": "You can click the button below to reset and download your key, or copy your SSH public key and submit it.", "SSHPort": "SSH Port", "SSHSecretKey": "SSH secret key", "SafeCommand": "Secure command", @@ -1348,5 +1348,7 @@ "Uninstall": "Uninstall", "Summary": "Summary", "removeWarningMsg": "Are you sure you want to remove", - "UnFavoriteSucceed": "Unfavorite Successful" + "UnFavoriteSucceed": "Unfavorite Successful", + "TriggerMode": "Trigger mode", + "CreateUserContent": "Creating User Content" } diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 426e50897..1100dd559 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -984,7 +984,7 @@ "SMTP": "邮件服务器", "SPECIAL_CHAR_REQUIRED": "必须包含特殊字符", "SSHKey": "SSH公钥", - "SSHKeyOfProfileSSHUpdatePage": "你可以点击下面的按钮重置并下载 SSH 公钥，或者复制你的 SSH 公钥并提交。", + "SSHKeyOfProfileSSHUpdatePage": "你可以点击下面的按钮重置并下载密钥，或者复制你的 SSH 公钥并提交。", "SSHPort": "SSH 端口", "SSHSecretKey": "SSH 密钥", "SafeCommand": "安全命令", @@ -1347,5 +1347,7 @@ "Uninstall": "卸载", "Summary": "汇总", "removeWarningMsg": "你确定要移除", - "UnFavoriteSucceed": "取消收藏成功" + "UnFavoriteSucceed": "取消收藏成功", + "TriggerMode": "触发方式", + "CreateUserContent": "创建用户内容" } diff --git a/apps/settings/serializers/msg.py b/apps/settings/serializers/msg.py index 6d2077639..813d2400c 100644 --- a/apps/settings/serializers/msg.py +++ b/apps/settings/serializers/msg.py @@ -6,7 +6,6 @@ from rest_framework import serializers from common.serializers.fields import EncryptedField - __all__ = [ 'MailTestSerializer', 'EmailSettingSerializer', 'EmailContentSettingSerializer', 'SMSBackendSerializer', @@ -31,14 +30,14 @@ class EmailSettingSerializer(serializers.Serializer): EMAIL_HOST = serializers.CharField(max_length=1024, required=True, label=_("Host")) EMAIL_PORT = serializers.CharField(max_length=5, required=True, label=_("Port")) EMAIL_HOST_USER = serializers.CharField( - max_length=128, required=True, label=_("User"), help_text=_("The user to be used for email server authentication") + max_length=128, required=True, label=_("Account"), help_text=_("The user to be used for email server authentication") ) EMAIL_HOST_PASSWORD = EncryptedField( max_length=1024, required=False, label=_("Password"), help_text=_("Password to use for the email server. It is used in conjunction with `User` when authenticating to the email server") ) EMAIL_FROM = serializers.CharField( - max_length=128, allow_blank=True, required=False, label=_('From'), + max_length=128, allow_blank=True, required=False, label=_('Sender'), help_text=_('Sender email address (default to using the `User`)') ) EMAIL_RECIPIENT = serializers.CharField(