diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index 5e890a007..96e577e58 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.mo +++ b/apps/i18n/core/en/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5fd96f5c4a4a03bb017b500312085eea171ff4b009cfbc84b71f4480a6e97f0 -size 2081 +oid sha256:e2f589794db086991c25ed95a157936d429747823eb873211ad5d04340d780fa +size 2186 diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 1c9015e26..9f497fce5 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-02-22 17:43+0800\n" +"POT-Creation-Date: 2024-02-23 17:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -298,6 +298,7 @@ msgstr "" #: ops/models/base.py:18 perms/models/asset_permission.py:75 #: perms/serializers/permission.py:45 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 @@ -1131,7 +1132,7 @@ msgstr "" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:182 settings/serializers/feature.py:19 -#: xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:78 xpack/plugins/license/models.py:30 msgid "Content" msgstr "" @@ -1426,7 +1427,7 @@ msgstr "" #: assets/const/category.py:16 common/sdk/sms/endpoint.py:20 msgid "Custom type" -msgstr "" +msgstr "Custom" #: assets/const/cloud.py:7 msgid "Public cloud" @@ -1791,7 +1792,7 @@ msgstr "" msgid "Ping asset" msgstr "" -#: assets/models/base.py:19 +#: assets/models/base.py:19 terminal/notifications.py:225 msgid "Connectivity" msgstr "" @@ -2981,8 +2982,9 @@ msgstr "" #: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 -#: settings/serializers/auth/sms.py:32 users/forms/profile.py:104 -#: users/forms/profile.py:109 users/templates/users/forgot_password.html:155 +#: settings/serializers/auth/sms.py:17 settings/serializers/auth/sms.py:32 +#: users/forms/profile.py:104 users/forms/profile.py:109 +#: users/templates/users/forgot_password.html:155 #: users/views/profile/reset.py:100 msgid "SMS" msgstr "" @@ -3792,7 +3794,7 @@ msgstr "" #: common/sdk/sms/endpoint.py:21 msgid "Custom type (File)" -msgstr "" +msgstr "Custom (File)" #: common/sdk/sms/endpoint.py:32 msgid "SMS provider not support: {}" @@ -4243,7 +4245,7 @@ msgstr "" msgid "Runas policy" msgstr "" -#: ops/models/job.py:216 +#: ops/models/job.py:216 terminal/notifications.py:174 msgid "Job" msgstr "" @@ -4267,8 +4269,8 @@ msgstr "" msgid "VCS URL" msgstr "" -#: ops/notifications.py:17 rbac/tree.py:57 -msgid "App ops" +#: ops/notifications.py:17 +msgid "Components" msgstr "" #: ops/notifications.py:18 @@ -4784,6 +4786,10 @@ msgstr "" msgid "My assets" msgstr "" +#: rbac/tree.py:57 +msgid "App ops" +msgstr "" + #: rbac/tree.py:58 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 @@ -5281,10 +5287,6 @@ msgstr "" msgid "Enable Slack Auth" msgstr "" -#: settings/serializers/auth/sms.py:17 -msgid "Enable SMS" -msgstr "" - #: settings/serializers/auth/sms.py:19 msgid "SMS provider / Protocol" msgstr "" @@ -5317,19 +5319,19 @@ msgid "Signature channel number" msgstr "" #: settings/serializers/auth/sms.py:73 -msgid "Enterprise code(SP id)" +msgid "Enterprise code" msgstr "" #: settings/serializers/auth/sms.py:74 -msgid "Shared secret(Shared secret)" +msgid "Shared secret" msgstr "" #: settings/serializers/auth/sms.py:75 -msgid "Original number(Src id)" +msgid "Original number" msgstr "" #: settings/serializers/auth/sms.py:76 -msgid "Business type(Service id)" +msgid "Business type" msgstr "" #: settings/serializers/auth/sms.py:80 @@ -5387,8 +5389,8 @@ msgid "" "External URL, email links or other system callbacks are used to access it, " "eg: http://dev.jumpserver.org:8080" msgstr "" -"Site URL are commonly used in emails sent or as callback addresses for external systems. " -"eg: http://dev.jumpserver.org:8080" +"Site URL are commonly used in emails sent or as callback addresses for " +"external systems. eg: http://dev.jumpserver.org:8080" #: settings/serializers/basic.py:18 msgid "User guide url" @@ -5468,7 +5470,7 @@ msgid "" "database, OSS will not be affected." msgstr "" -#: settings/serializers/feature.py:18 +#: settings/serializers/feature.py:18 settings/serializers/msg.py:68 msgid "Subject" msgstr "" @@ -5585,7 +5587,7 @@ msgid "Tips: Some provider use token except password" msgstr "" #: settings/serializers/msg.py:39 -msgid "Send user" +msgid "Sender" msgstr "" #: settings/serializers/msg.py:40 @@ -5625,10 +5627,6 @@ msgid "" "This is used by default if no email is returned during SSO authentication" msgstr "" -#: settings/serializers/msg.py:68 -msgid "Create user email subject" -msgstr "" - #: settings/serializers/msg.py:69 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " @@ -5636,17 +5634,13 @@ msgid "" msgstr "" #: settings/serializers/msg.py:73 -msgid "Create user honorific" +msgid "Honorific" msgstr "" #: settings/serializers/msg.py:74 msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "" -#: settings/serializers/msg.py:78 -msgid "Create user email content" -msgstr "" - #: settings/serializers/msg.py:80 #, python-brace-format msgid "" @@ -6798,7 +6792,7 @@ msgstr "" msgid "Command warning" msgstr "" -#: terminal/notifications.py:130 +#: terminal/notifications.py:130 terminal/notifications.py:175 msgid "Command reject" msgstr "" @@ -6806,17 +6800,9 @@ msgstr "" msgid "Level" msgstr "" -#: terminal/notifications.py:175 -msgid "Batch danger command alert" -msgstr "" - #: terminal/notifications.py:224 msgid "Command and replay storage" -msgstr "" - -#: terminal/notifications.py:225 -msgid "Connectivity alarm" -msgstr "" +msgstr "Storage" #: terminal/notifications.py:240 terminal/tasks.py:146 msgid "Test failure: Account invalid" @@ -6946,10 +6932,6 @@ msgstr "" msgid "Invalid session id" msgstr "" -#: terminal/serializers/command.py:72 -msgid "Account " -msgstr "" - #: terminal/serializers/command.py:74 msgid "Timestamp" msgstr "" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 8750a637c..5c739fd85 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.mo +++ b/apps/i18n/core/ja/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11f0fb0b7cc4c3187c9e7913be7ca1d310a79a31fc10e950cdb1264b4725562f -size 170524 +oid sha256:25b15c04e4ee68befe30101c371b2b0b1c95e9371e6b85392a77255e91ab75dd +size 170094 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 75754a924..bddfa7fba 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-02-23 17:11+0800\n" +"POT-Creation-Date: 2024-02-23 17:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -298,6 +298,7 @@ msgstr "ソース ID" #: ops/models/base.py:18 perms/models/asset_permission.py:75 #: perms/serializers/permission.py:45 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 @@ -1150,7 +1151,7 @@ msgstr "正規情報" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:182 settings/serializers/feature.py:19 -#: xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:78 xpack/plugins/license/models.py:30 msgid "Content" msgstr "コンテンツ" @@ -1831,7 +1832,7 @@ msgstr "資産情報の収集" msgid "Ping asset" msgstr "テストアセット" -#: assets/models/base.py:19 +#: assets/models/base.py:19 terminal/notifications.py:225 msgid "Connectivity" msgstr "接続性" @@ -3052,8 +3053,9 @@ msgstr "メッセージ検証コードが無効" #: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 -#: settings/serializers/auth/sms.py:32 users/forms/profile.py:104 -#: users/forms/profile.py:109 users/templates/users/forgot_password.html:155 +#: settings/serializers/auth/sms.py:17 settings/serializers/auth/sms.py:32 +#: users/forms/profile.py:104 users/forms/profile.py:109 +#: users/templates/users/forgot_password.html:155 #: users/views/profile/reset.py:100 msgid "SMS" msgstr "メッセージ" @@ -4365,7 +4367,7 @@ msgstr "ユーザーとして実行" msgid "Runas policy" msgstr "ユーザー ポリシー" -#: ops/models/job.py:216 +#: ops/models/job.py:216 terminal/notifications.py:174 msgid "Job" msgstr "ジョブ＃ジョブ＃" @@ -4389,9 +4391,11 @@ msgstr "创建方式" msgid "VCS URL" msgstr "VCS URL" -#: ops/notifications.py:17 rbac/tree.py:57 -msgid "App ops" -msgstr "アプリ操作" +#: ops/notifications.py:17 +#, fuzzy +#| msgid "Component" +msgid "Components" +msgstr "コンポーネント" #: ops/notifications.py:18 msgid "Server performance" @@ -4931,6 +4935,10 @@ msgstr "タスクセンター" msgid "My assets" msgstr "私の資産" +#: rbac/tree.py:57 +msgid "App ops" +msgstr "アプリ操作" + #: rbac/tree.py:58 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 @@ -5443,10 +5451,6 @@ msgstr "SP 証明書" msgid "Enable Slack Auth" msgstr "Slack 認証の有効化" -#: settings/serializers/auth/sms.py:17 -msgid "Enable SMS" -msgstr "SMSの有効化" - #: settings/serializers/auth/sms.py:19 msgid "SMS provider / Protocol" msgstr "SMSプロバイダ / プロトコル" @@ -5479,19 +5483,19 @@ msgid "Signature channel number" msgstr "署名チャネル番号" #: settings/serializers/auth/sms.py:73 -msgid "Enterprise code(SP id)" +msgid "Enterprise code" msgstr "企業コード(SP id)" #: settings/serializers/auth/sms.py:74 -msgid "Shared secret(Shared secret)" +msgid "Shared secret" msgstr "パスワードを共有する(Shared secret)" #: settings/serializers/auth/sms.py:75 -msgid "Original number(Src id)" +msgid "Original number" msgstr "元の番号(Src id)" #: settings/serializers/auth/sms.py:76 -msgid "Business type(Service id)" +msgid "Business type" msgstr "ビジネス・タイプ(Service id)" #: settings/serializers/auth/sms.py:80 @@ -5636,7 +5640,7 @@ msgstr "" "この期間を超えるセッション、録音、およびコマンド レコードは削除されます (デー" "タベースのバックアップに影響し、OSS などには影響しません)" -#: settings/serializers/feature.py:18 +#: settings/serializers/feature.py:18 settings/serializers/msg.py:68 msgid "Subject" msgstr "件名" @@ -5758,7 +5762,7 @@ msgid "Tips: Some provider use token except password" msgstr "ヒント: 一部のプロバイダーはパスワード以外のトークンを使用します" #: settings/serializers/msg.py:39 -msgid "Send user" +msgid "Sender" msgstr "ユーザーを送信" #: settings/serializers/msg.py:40 @@ -5800,10 +5804,6 @@ msgid "" "This is used by default if no email is returned during SSO authentication" msgstr "これは、SSO認証中にメールが返されない場合にデフォルトで使用されます。" -#: settings/serializers/msg.py:68 -msgid "Create user email subject" -msgstr "ユーザーメール件名の作成" - #: settings/serializers/msg.py:69 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " @@ -5813,7 +5813,7 @@ msgstr "" "正常に作成)" #: settings/serializers/msg.py:73 -msgid "Create user honorific" +msgid "Honorific" msgstr "ユーザー敬語の作成" #: settings/serializers/msg.py:74 @@ -5821,10 +5821,6 @@ msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "" "ヒント: ユーザーを作成するときは、メールの敬語を送信します (例: こんにちは)" -#: settings/serializers/msg.py:78 -msgid "Create user email content" -msgstr "ユーザーのメールコンテンツを作成する" - #: settings/serializers/msg.py:80 #, python-brace-format msgid "" @@ -7042,7 +7038,7 @@ msgstr "セッション" msgid "Command warning" msgstr "コマンド警告" -#: terminal/notifications.py:130 +#: terminal/notifications.py:130 terminal/notifications.py:175 msgid "Command reject" msgstr "コマンド拒否" @@ -7050,18 +7046,10 @@ msgstr "コマンド拒否" msgid "Level" msgstr "レベル" -#: terminal/notifications.py:175 -msgid "Batch danger command alert" -msgstr "一括危険コマンド警告" - #: terminal/notifications.py:224 msgid "Command and replay storage" msgstr "コマンド及び録画記憶" -#: terminal/notifications.py:225 -msgid "Connectivity alarm" -msgstr "接続性アラーム" - #: terminal/notifications.py:240 terminal/tasks.py:146 msgid "Test failure: Account invalid" msgstr "テスト失敗: アカウントが無効" @@ -7207,10 +7195,6 @@ msgstr "無効なコマンドグループID" msgid "Invalid session id" msgstr "無効なセッションID" -#: terminal/serializers/command.py:72 -msgid "Account " -msgstr "アカウント" - #: terminal/serializers/command.py:74 msgid "Timestamp" msgstr "タイムスタンプ" @@ -8199,7 +8183,7 @@ msgstr "" #: users/serializers/user.py:169 #, fuzzy -#| msgid "Send user" +#| msgid "Sender" msgid "Superuser" msgstr "ユーザーを送信" @@ -9219,6 +9203,15 @@ msgstr "エンタープライズプロフェッショナル版" msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" +#~ msgid "Email Subject" +#~ msgstr "ユーザーメール件名の作成" + +#~ msgid "Command reject (Job)" +#~ msgstr "一括危険コマンド警告" + +#~ msgid "Account " +#~ msgstr "アカウント" + #~ msgid "Login time" #~ msgstr "ログイン時間" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index 2ea403d17..b5ccd2339 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.mo +++ b/apps/i18n/core/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03746a65d7eff0ef626fad8207b76f3c574b3c81dcac3f05d29b77ea694423e7 -size 141004 +oid sha256:7b7274a5844ea33f2c6117210e0ba8baacbd450f15b1baef2af54dde1d588a55 +size 140636 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 6aca450ee..2574d856e 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-02-22 17:43+0800\n" +"POT-Creation-Date: 2024-02-23 17:56+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -297,6 +297,7 @@ msgstr "来源 ID" #: ops/models/base.py:18 perms/models/asset_permission.py:75 #: perms/serializers/permission.py:45 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 @@ -1142,7 +1143,7 @@ msgstr "正则表达式" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:182 settings/serializers/feature.py:19 -#: xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:78 xpack/plugins/license/models.py:30 msgid "Content" msgstr "内容" @@ -1815,7 +1816,7 @@ msgstr "收集资产信息" msgid "Ping asset" msgstr "测试资产" -#: assets/models/base.py:19 +#: assets/models/base.py:19 terminal/notifications.py:225 msgid "Connectivity" msgstr "连接性" @@ -3010,8 +3011,9 @@ msgstr "短信验证码校验失败" #: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 -#: settings/serializers/auth/sms.py:32 users/forms/profile.py:104 -#: users/forms/profile.py:109 users/templates/users/forgot_password.html:155 +#: settings/serializers/auth/sms.py:17 settings/serializers/auth/sms.py:32 +#: users/forms/profile.py:104 users/forms/profile.py:109 +#: users/templates/users/forgot_password.html:155 #: users/views/profile/reset.py:100 msgid "SMS" msgstr "短信" @@ -4286,7 +4288,7 @@ msgstr "运行用户" msgid "Runas policy" msgstr "用户策略" -#: ops/models/job.py:216 +#: ops/models/job.py:216 terminal/notifications.py:174 msgid "Job" msgstr "作业" @@ -4310,9 +4312,11 @@ msgstr "创建方式" msgid "VCS URL" msgstr "VCS URL" -#: ops/notifications.py:17 rbac/tree.py:57 -msgid "App ops" -msgstr "作业中心" +#: ops/notifications.py:17 +#, fuzzy +#| msgid "Component" +msgid "Components" +msgstr "组件" #: ops/notifications.py:18 msgid "Server performance" @@ -4830,6 +4834,10 @@ msgstr "任务中心" msgid "My assets" msgstr "我的资产" +#: rbac/tree.py:57 +msgid "App ops" +msgstr "作业中心" + #: rbac/tree.py:58 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 @@ -5333,10 +5341,6 @@ msgstr "SP 证书" msgid "Enable Slack Auth" msgstr "启用 Slack 认证" -#: settings/serializers/auth/sms.py:17 -msgid "Enable SMS" -msgstr "启用 SMS" - #: settings/serializers/auth/sms.py:19 msgid "SMS provider / Protocol" msgstr "短信服务商 / 协议" @@ -5369,19 +5373,19 @@ msgid "Signature channel number" msgstr "签名通道号" #: settings/serializers/auth/sms.py:73 -msgid "Enterprise code(SP id)" +msgid "Enterprise code" msgstr "企业代码(SP id)" #: settings/serializers/auth/sms.py:74 -msgid "Shared secret(Shared secret)" +msgid "Shared secret" msgstr "共享密码(Shared secret)" #: settings/serializers/auth/sms.py:75 -msgid "Original number(Src id)" +msgid "Original number" msgstr "原始号码(Src id)" #: settings/serializers/auth/sms.py:76 -msgid "Business type(Service id)" +msgid "Business type" msgstr "业务类型(Service id)" #: settings/serializers/auth/sms.py:80 @@ -5523,7 +5527,7 @@ msgid "" msgstr "" "会话、录像，命令记录超过该时长将会被清除 (影响数据库存储，OSS 等不受影响)" -#: settings/serializers/feature.py:18 +#: settings/serializers/feature.py:18 settings/serializers/msg.py:68 msgid "Subject" msgstr "主题" @@ -5642,7 +5646,7 @@ msgid "Tips: Some provider use token except password" msgstr "提示：一些邮件提供商需要输入的是授权码" #: settings/serializers/msg.py:39 -msgid "Send user" +msgid "Sender" msgstr "发件人" #: settings/serializers/msg.py:40 @@ -5682,10 +5686,6 @@ msgid "" "This is used by default if no email is returned during SSO authentication" msgstr "SSO认证时，如果没有返回邮件地址，将使用该后缀" -#: settings/serializers/msg.py:68 -msgid "Create user email subject" -msgstr "邮件主题" - #: settings/serializers/msg.py:69 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " @@ -5693,17 +5693,13 @@ msgid "" msgstr "提示: 创建用户时，发送设置密码邮件的主题 (例如: 创建用户成功)" #: settings/serializers/msg.py:73 -msgid "Create user honorific" +msgid "Honorific" msgstr "邮件问候语" #: settings/serializers/msg.py:74 msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "提示: 创建用户时，发送设置密码邮件的敬语 (例如: 你好)" -#: settings/serializers/msg.py:78 -msgid "Create user email content" -msgstr "邮件的内容" - #: settings/serializers/msg.py:80 #, python-brace-format msgid "" @@ -6890,7 +6886,7 @@ msgstr "会话" msgid "Command warning" msgstr "命令告警" -#: terminal/notifications.py:130 +#: terminal/notifications.py:130 terminal/notifications.py:175 msgid "Command reject" msgstr "命令拒绝" @@ -6898,18 +6894,10 @@ msgstr "命令拒绝" msgid "Level" msgstr "级别" -#: terminal/notifications.py:175 -msgid "Batch danger command alert" -msgstr "批量危险命令告警" - #: terminal/notifications.py:224 msgid "Command and replay storage" msgstr "命令及录像存储" -#: terminal/notifications.py:225 -msgid "Connectivity alarm" -msgstr "可连接性告警" - #: terminal/notifications.py:240 terminal/tasks.py:146 msgid "Test failure: Account invalid" msgstr "测试失败: 账号无效" @@ -7051,10 +7039,6 @@ msgstr "无效的 命令组 ID" msgid "Invalid session id" msgstr "无效的 Session ID" -#: terminal/serializers/command.py:72 -msgid "Account " -msgstr "账号" - #: terminal/serializers/command.py:74 msgid "Timestamp" msgstr "时间戳" @@ -9019,6 +9003,15 @@ msgstr "企业专业版" msgid "Ultimate edition" msgstr "企业旗舰版" +#~ msgid "Email Subject" +#~ msgstr "邮件主题" + +#~ msgid "Command reject (Job)" +#~ msgstr "批量危险命令告警" + +#~ msgid "Account " +#~ msgstr "账号" + #~ msgid "Wide logo on top" #~ msgstr "顶部宽 Logo" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index f3eec7103..1a4a5f0ca 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -78,7 +78,7 @@ "ApiKey": "API Key", "ApiKeyList": "Authenticate via Api key in the header of each request, which differs from one request to another, offering greater security than Token method. Please consult the documentation for usage.
To minimize the risk of leaks, the Secret can only be viewed upon creation, and each user can create up to 10", "ApiKeyWarning": "To reduce the risk of AccessKey leakage, the Secret is only provided at creation and cannot be queried later, please keep it safe.", - "AppEndpoint": "Application Access Address", + "AppEndpoint": "App Access Address", "AppOps": "Task Center", "AppProvider": "Application Providers", "AppProviderDetail": "Application Provider Details", @@ -206,7 +206,7 @@ "CertificateKey": "Client Key", "ChangeField": "Change Field", "ChangePassword": "Update Password", - "ChangeReceiver": "Modify Message Recipient", + "ChangeReceiver": "Edit Recipient", "ChangeSecretParams": "Change Password Parameters", "ChangeViewHelpText": "Click to Switch Different Views", "Chat": "Chat", @@ -297,7 +297,7 @@ "CreatePlaybook": "Create Playbook", "CreateReplayStorage": "Create Object Storage", "CreateSuccessMsg": "Import Successful, Total: {count}", - "CreateUserSetting": "Create User Content", + "CreateUserSetting": "User creation", "Created": "Created", "CreatedBy": "Creator", "CriticalLoad": "Serious", @@ -390,7 +390,7 @@ "Edit": "Edit", "Edition": "Version", "Email": "Email", - "EmailContent": "Custom Email Content", + "EmailContent": "Custom Content", "EmailTest": "Test Connection", "Empty": "Empty", "Enable": "Enable", @@ -621,7 +621,8 @@ "MFAOfUserFirstLoginPersonalInformationImprovementPage": "Enable multi-factor authentication to make your account more secure.
After enabling, you will enter the multi-factor authentication binding process the next time you log in; you can also directly bind in (Personal Information->Quick Modification->Change Multi-factor Settings)!", "MFAOfUserFirstLoginUserGuidePage": "In order to protect your and the company's security, please carefully safeguard important sensitive information such as your account, password, and key (for example, set a complex password, and enable multi-factor authentication)
Personal information such as email, mobile number, and WeChat are only used for user authentication and platform internal message notifications.", "MailRecipient": "Email Recipient", - "MailSend": "Email Sending", + "MailSend": "Sending", + "Server": "Server", "ManualAccount": "Manual Account", "ManualAccountTip": "Manual input of Username/Password upon Login", "ManualExecutePlan": "Manual Execute Plan", @@ -652,7 +653,7 @@ "More": "More", "MoreActions": "Actions", "MoveAssetToNode": "Move Assets to Nodes", - "MsgSubscribe": "Message Subscription", + "MsgSubscribe": "Subscription", "MyAssets": "My Assets", "MyTickets": "I Initiated", "Name": "Name", @@ -992,7 +993,7 @@ "ShowAssetAllChildrenNode": "Show All Sub-nodes Assets", "ShowAssetOnlyCurrentNode": "Only Show Current Node Assets", "ShowNodeInfo": "Show Node Details", - "SignChannelNum": "Channel Number Signature", + "SignChannelNum": "Channel Signature", "SiteMessage": "Site Message", "SiteMessageList": "Internal Mail", "Skip": "Ignore Current Asset", @@ -1189,7 +1190,7 @@ "VariableHelpText": "You Can Use {{ key }} to Read Built-in Variables in Commands", "VaultHelpText": "1. For security reasons, Vault storage must be enabled in the configuration file.
2. After enabled, fill in other configurations, and perform tests.
3. Carry out data synchronization, which is one-way, only syncing from the local database to the distant Vault, once synchronization is completed, the local database will no longer store passwords, please back up your data.
4. After modifying Vault configuration the second time, you need to restart the service.", "VerificationCodeSent": "Verification code has been sent", - "VerifySignTmpl": "Verification Code SMS Template", + "VerifySignTmpl": "SMS Template", "Version": "Version", "View": "View", "ViewBlockedIPSHelpText": "View List of Locked IPs", diff --git a/apps/ops/notifications.py b/apps/ops/notifications.py index b0c4906e4..c5950228a 100644 --- a/apps/ops/notifications.py +++ b/apps/ops/notifications.py @@ -13,8 +13,8 @@ __all__ = ('ServerPerformanceMessage', 'ServerPerformanceCheckUtil') class ServerPerformanceMessage(SystemMessage): - category = 'Operations' - category_label = _('App ops') + category = 'Components' + category_label = _('Components') message_type_label = _('Server performance') def __init__(self, terms_with_errors): diff --git a/apps/settings/serializers/auth/sms.py b/apps/settings/serializers/auth/sms.py index 1011c9aa6..5a2b8e319 100644 --- a/apps/settings/serializers/auth/sms.py +++ b/apps/settings/serializers/auth/sms.py @@ -14,7 +14,7 @@ __all__ = [ class SMSSettingSerializer(serializers.Serializer): - SMS_ENABLED = serializers.BooleanField(default=False, label=_('Enable SMS')) + SMS_ENABLED = serializers.BooleanField(default=False, label=_('SMS')) SMS_BACKEND = serializers.ChoiceField( choices=BACKENDS.choices, default=BACKENDS.ALIBABA, label=_('SMS provider / Protocol') ) @@ -70,10 +70,10 @@ class HuaweiSMSSettingSerializer(BaseSMSSettingSerializer): class CMPP2SMSSettingSerializer(BaseSMSSettingSerializer): CMPP2_HOST = serializers.CharField(max_length=256, required=True, label=_('Host')) CMPP2_PORT = serializers.IntegerField(default=7890, label=_('Port')) - CMPP2_SP_ID = serializers.CharField(max_length=128, required=True, label=_('Enterprise code(SP id)')) - CMPP2_SP_SECRET = EncryptedField(max_length=256, required=False, label=_('Shared secret(Shared secret)')) - CMPP2_SRC_ID = serializers.CharField(max_length=256, required=False, label=_('Original number(Src id)')) - CMPP2_SERVICE_ID = serializers.CharField(max_length=256, required=True, label=_('Business type(Service id)')) + CMPP2_SP_ID = serializers.CharField(max_length=128, required=True, label=_('Enterprise code')) + CMPP2_SP_SECRET = EncryptedField(max_length=256, required=False, label=_('Shared secret')) + CMPP2_SRC_ID = serializers.CharField(max_length=256, required=False, label=_('Original number')) + CMPP2_SERVICE_ID = serializers.CharField(max_length=256, required=True, label=_('Business type')) CMPP2_VERIFY_SIGN_NAME = serializers.CharField(max_length=256, required=True, label=_('Signature')) CMPP2_VERIFY_TEMPLATE_CODE = serializers.CharField( max_length=69, required=True, label=_('Template'), diff --git a/apps/settings/serializers/msg.py b/apps/settings/serializers/msg.py index ace4ab42c..0a2a222e5 100644 --- a/apps/settings/serializers/msg.py +++ b/apps/settings/serializers/msg.py @@ -36,7 +36,7 @@ class EmailSettingSerializer(serializers.Serializer): help_text=_("Tips: Some provider use token except password") ) EMAIL_FROM = serializers.CharField( - max_length=128, allow_blank=True, required=False, label=_('Send user'), + max_length=128, allow_blank=True, required=False, label=_('Sender'), help_text=_('Tips: Send mail account, default SMTP account as the send account') ) EMAIL_RECIPIENT = serializers.CharField( @@ -65,17 +65,17 @@ class EmailContentSettingSerializer(serializers.Serializer): EMAIL_CUSTOM_USER_CREATED_SUBJECT = serializers.CharField( max_length=1024, allow_blank=True, required=False, - label=_('Create user email subject'), + label=_('Subject'), help_text=_('Tips: When creating a user, send the subject of the email (eg:Create account successfully)') ) EMAIL_CUSTOM_USER_CREATED_HONORIFIC = serializers.CharField( max_length=1024, allow_blank=True, required=False, - label=_('Create user honorific'), + label=_('Honorific'), help_text=_('Tips: When creating a user, send the honorific of the email (eg:Hello)') ) EMAIL_CUSTOM_USER_CREATED_BODY = serializers.CharField( max_length=4096, allow_blank=True, required=False, - label=_('Create user email content'), + label=_('Content'), help_text=_( 'Tips: When creating a user, send the content of the email, support {username} {name} {email} label') ) diff --git a/apps/terminal/notifications.py b/apps/terminal/notifications.py index 0d2501450..ca49f23f2 100644 --- a/apps/terminal/notifications.py +++ b/apps/terminal/notifications.py @@ -170,9 +170,9 @@ class CommandAlertMessage(CommandAlertMixin, SystemMessage): class CommandExecutionAlert(CommandAlertMixin, SystemMessage): - category = CATEGORY - category_label = CATEGORY_LABEL - message_type_label = _('Batch danger command alert') + category = 'Workbench' + category_label = _('Job') + message_type_label = _('Command reject') def __init__(self, command): self.command = command @@ -222,7 +222,7 @@ class CommandExecutionAlert(CommandAlertMixin, SystemMessage): class StorageConnectivityMessage(SystemMessage): category = 'storage' category_label = _('Command and replay storage') - message_type_label = _('Connectivity alarm') + message_type_label = _('Connectivity') def __init__(self, errors): self.errors = errors diff --git a/apps/terminal/serializers/command.py b/apps/terminal/serializers/command.py index 11b16f5ad..907c1fe7c 100644 --- a/apps/terminal/serializers/command.py +++ b/apps/terminal/serializers/command.py @@ -69,7 +69,7 @@ class SessionCommandSerializerMixin(serializers.Serializer): """使用这个类作为基础Command Log Serializer类, 用来序列化""" id = serializers.UUIDField(read_only=True) # 限制 64 字符，不能直接迁移成 128 字符，命令表数据量会比较大 - account = serializers.CharField(label=_("Account ")) + account = serializers.CharField(label=_("Account")) output = serializers.CharField(max_length=2048, allow_blank=True, label=_("Output")) timestamp = serializers.IntegerField(label=_('Timestamp')) timestamp_display = serializers.DateTimeField(read_only=True, label=_('Datetime'))