From 37ad7b32e4419117c89f497e67ed1534512cd6b0 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:38:07 +0800 Subject: [PATCH 1/2] perf: Cloud account translate (#13413) Co-authored-by: feng <1304903146@qq.com> --- apps/i18n/lina/en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 9c9266fa3..7a78272bf 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -369,7 +369,7 @@ "DateLastHarfYear": "Last 6 months", "DateLastLogin": "Last login date", "DateLastMonth": "Last month", - "DateLastSync": "Last synchronization date", + "DateLastSync": "Last sync date", "DateLastWeek": "Last week", "DateLastYear": "Last year", "DatePasswordLastUpdated": "Last password update date", @@ -1192,8 +1192,8 @@ "TotalJobFailed": "Failed execution actions", "TotalJobLog": "Total job executions", "TotalJobRunning": "Running jobs", - "TotalSyncAsset": "Number of assets", - "TotalSyncRegion": "Number of regions", + "TotalSyncAsset": "Assets", + "TotalSyncRegion": "Regions", "TotalSyncStrategy": "Number of strategies", "Transfer": "Transfer", "Tuesday": "Tue", From 0c0ec098aebf35c9baffb7cd6c225c053e936ea0 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:38:45 +0800 Subject: [PATCH 2/2] perf: Modify some translations (#13412) Co-authored-by: wangruidong <940853815@qq.com> --- apps/i18n/core/en/LC_MESSAGES/django.po | 74 +++++++-------- apps/i18n/core/ja/LC_MESSAGES/django.po | 113 +++++++++++++---------- apps/i18n/core/zh/LC_MESSAGES/django.po | 115 +++++++++++++----------- apps/i18n/lina/en.json | 4 +- apps/i18n/lina/ja.json | 3 +- apps/i18n/lina/zh.json | 4 +- apps/jumpserver/conf.py | 2 +- apps/terminal/serializers/storage.py | 12 +-- 8 files changed, 181 insertions(+), 146 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index a89e1c5f6..69a9817ad 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-03 10:21+0800\n" +"POT-Creation-Date: 2024-06-12 18:25+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -106,7 +106,7 @@ msgstr "" msgid "Skip" msgstr "" -#: accounts/const/account.py:33 audits/const.py:24 +#: accounts/const/account.py:33 audits/const.py:24 rbac/tree.py:239 #: templates/_csv_import_export.html:18 templates/_csv_update_modal.html:6 msgid "Update" msgstr "" @@ -1679,7 +1679,7 @@ msgstr "" msgid "API mode" msgstr "" -#: assets/const/types.py:251 +#: assets/const/types.py:254 msgid "All types" msgstr "" @@ -2363,6 +2363,7 @@ msgstr "" #: audits/const.py:14 audits/const.py:25 #: authentication/templates/authentication/_access_key_modal.html:65 +#: rbac/tree.py:240 msgid "Delete" msgstr "" @@ -2386,7 +2387,7 @@ msgstr "" msgid "Rename dir" msgstr "" -#: audits/const.py:23 terminal/api/session/session.py:277 +#: audits/const.py:23 rbac/tree.py:238 terminal/api/session/session.py:277 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 #: xpack/plugins/cloud/manager.py:84 @@ -2395,6 +2396,7 @@ msgstr "" #: audits/const.py:26 #: authentication/templates/authentication/_access_key_modal.html:22 +#: rbac/tree.py:237 msgid "Create" msgstr "" @@ -3733,7 +3735,7 @@ msgid "Invalid ids for ids, should be a list" msgstr "" #: common/db/fields.py:594 common/db/fields.py:599 -#: common/serializers/fields.py:133 tickets/serializers/ticket/common.py:58 +#: common/serializers/fields.py:142 tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 #: xpack/plugins/cloud/serializers/account_attrs.py:150 @@ -3904,21 +3906,25 @@ msgstr "" msgid "Children" msgstr "" -#: common/serializers/fields.py:134 +#: common/serializers/fields.py:135 +msgid "Invalid data type" +msgstr "" + +#: common/serializers/fields.py:143 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: common/serializers/fields.py:135 +#: common/serializers/fields.py:144 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: common/serializers/fields.py:209 +#: common/serializers/fields.py:218 msgid "Invalid data type, should be list" msgstr "" -#: common/serializers/fields.py:224 +#: common/serializers/fields.py:233 msgid "Invalid choice: {}" msgstr "" @@ -4007,15 +4013,19 @@ msgstr "" msgid "App Labels" msgstr "Labels" -#: labels/models.py:17 labels/models.py:36 +#: labels/models.py:15 +msgid "Color" +msgstr "" + +#: labels/models.py:20 labels/models.py:39 msgid "Tag" msgstr "" -#: labels/models.py:40 +#: labels/models.py:43 msgid "Resource ID" msgstr "" -#: labels/models.py:46 +#: labels/models.py:49 msgid "Tagged resource" msgstr "" @@ -4941,22 +4951,6 @@ msgstr "" msgid "View permission tree" msgstr "" -#: rbac/tree.py:237 -msgid "create" -msgstr "" - -#: rbac/tree.py:238 terminal/templates/terminal/_msg_command_alert.html:10 -msgid "view" -msgstr "" - -#: rbac/tree.py:239 -msgid "update" -msgstr "" - -#: rbac/tree.py:240 -msgid "delete" -msgstr "" - #: settings/api/chat.py:40 msgid "Chat AI is not enabled" msgstr "" @@ -6755,7 +6749,7 @@ msgid "Can concurrent" msgstr "" #: terminal/models/applet/applet.py:48 terminal/serializers/applet_host.py:167 -#: terminal/serializers/storage.py:197 +#: terminal/serializers/storage.py:193 msgid "Hosts" msgstr "" @@ -7107,7 +7101,7 @@ msgid "" " " msgstr "" -#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:208 +#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:207 msgid "Ignore Certificate Verification" msgstr "" @@ -7339,23 +7333,29 @@ msgstr "" msgid "Port invalid" msgstr "" -#: terminal/serializers/storage.py:200 +#: terminal/serializers/storage.py:194 +msgid "" +"If there are multiple hosts, use a comma (,) to separate them.
(For " +"example: http://www.jumpserver.a.com:9100, http://www.jumpserver.b.com:9100)" +msgstr "" + +#: terminal/serializers/storage.py:199 msgid "Index by date" msgstr "" -#: terminal/serializers/storage.py:201 +#: terminal/serializers/storage.py:200 msgid "Whether to create an index by date" msgstr "" -#: terminal/serializers/storage.py:204 +#: terminal/serializers/storage.py:203 msgid "Index" msgstr "" -#: terminal/serializers/storage.py:206 +#: terminal/serializers/storage.py:205 msgid "Doc type" msgstr "" -#: terminal/serializers/storage.py:264 +#: terminal/serializers/storage.py:263 msgid "" "set as the default storage, will make new Component use the current storage " "by default, without affecting existing Component" @@ -7522,6 +7522,10 @@ msgstr "" msgid "Check command replay storage connectivity" msgstr "" +#: terminal/templates/terminal/_msg_command_alert.html:10 +msgid "view" +msgstr "" + #: terminal/utils/db_port_mapper.py:85 msgid "" "No available port is matched. The number of databases may have exceeded the " diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 64bcc3781..a6265d982 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-03 10:21+0800\n" +"POT-Creation-Date: 2024-06-12 18:25+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -106,7 +106,7 @@ msgstr "テンプレート" msgid "Skip" msgstr "スキップ" -#: accounts/const/account.py:33 audits/const.py:24 +#: accounts/const/account.py:33 audits/const.py:24 rbac/tree.py:239 #: templates/_csv_import_export.html:18 templates/_csv_update_modal.html:6 msgid "Update" msgstr "更新" @@ -1737,7 +1737,7 @@ msgstr "ボタンセレクターを確認する" msgid "API mode" msgstr "APIモード" -#: assets/const/types.py:251 +#: assets/const/types.py:254 msgid "All types" msgstr "いろんなタイプ" @@ -2442,6 +2442,7 @@ msgstr "Rmdir" #: audits/const.py:14 audits/const.py:25 #: authentication/templates/authentication/_access_key_modal.html:65 +#: rbac/tree.py:240 msgid "Delete" msgstr "削除" @@ -2465,7 +2466,7 @@ msgstr "ダウンロード" msgid "Rename dir" msgstr "マップディレクトリ" -#: audits/const.py:23 terminal/api/session/session.py:277 +#: audits/const.py:23 rbac/tree.py:238 terminal/api/session/session.py:277 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 #: xpack/plugins/cloud/manager.py:84 @@ -2474,6 +2475,7 @@ msgstr "表示" #: audits/const.py:26 #: authentication/templates/authentication/_access_key_modal.html:22 +#: rbac/tree.py:237 msgid "Create" msgstr "作成" @@ -3854,7 +3856,7 @@ msgid "Invalid ids for ids, should be a list" msgstr "無効なID、リストでなければなりません" #: common/db/fields.py:594 common/db/fields.py:599 -#: common/serializers/fields.py:133 tickets/serializers/ticket/common.py:58 +#: common/serializers/fields.py:142 tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 #: xpack/plugins/cloud/serializers/account_attrs.py:150 @@ -4027,21 +4029,27 @@ msgstr "{} 秒待ってから送信してください" msgid "Children" msgstr "ノード" -#: common/serializers/fields.py:134 +#: common/serializers/fields.py:135 +#, fuzzy +#| msgid "Invalid data" +msgid "Invalid data type" +msgstr "無効なデータ" + +#: common/serializers/fields.py:143 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "無効な pk \"{pk_value}\" - オブジェクトが存在しません" -#: common/serializers/fields.py:135 +#: common/serializers/fields.py:144 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "エラータイプ。 予想される pk 値、受信 {data_type}。" -#: common/serializers/fields.py:209 +#: common/serializers/fields.py:218 msgid "Invalid data type, should be list" msgstr "間違ったデータ タイプです。リストにする必要があります" -#: common/serializers/fields.py:224 +#: common/serializers/fields.py:233 msgid "Invalid choice: {}" msgstr "無効なオプション: {}" @@ -4142,17 +4150,21 @@ msgstr "" msgid "App Labels" msgstr "ラベル" -#: labels/models.py:17 labels/models.py:36 +#: labels/models.py:15 +msgid "Color" +msgstr "" + +#: labels/models.py:20 labels/models.py:39 #, fuzzy #| msgid "Tags" msgid "Tag" msgstr "ラベル" -#: labels/models.py:40 +#: labels/models.py:43 msgid "Resource ID" msgstr "リソースID" -#: labels/models.py:46 +#: labels/models.py:49 msgid "Tagged resource" msgstr "関連リソース" @@ -5126,28 +5138,6 @@ msgstr "共通設定" msgid "View permission tree" msgstr "権限ツリーの表示" -#: rbac/tree.py:237 -#, fuzzy -#| msgid "Create" -msgid "create" -msgstr "作成" - -#: rbac/tree.py:238 terminal/templates/terminal/_msg_command_alert.html:10 -msgid "view" -msgstr "表示" - -#: rbac/tree.py:239 -#, fuzzy -#| msgid "Update" -msgid "update" -msgstr "更新" - -#: rbac/tree.py:240 -#, fuzzy -#| msgid "Delete" -msgid "delete" -msgstr "削除" - #: settings/api/chat.py:40 msgid "Chat AI is not enabled" msgstr "チャットAIがオンになっていない" @@ -5814,7 +5804,7 @@ msgstr "サイトURL" msgid "" "Site URL is the externally accessible address of the current product service " "and is usually used in links in system emails" -msgstr "" +msgstr "サイトURLは、現在の製品サービスの外部からアクセス可能なアドレスであり、通常はシステムメール内のリンクに使用されます" #: settings/serializers/basic.py:18 msgid "User guide url" @@ -5834,12 +5824,12 @@ msgstr "表示するグローバル組織の名前" #: settings/serializers/basic.py:26 msgid "Document URL" -msgstr "" +msgstr "ドキュメントリンク" #: settings/serializers/basic.py:27 msgid "" "Document URL refers to the address in the top navigation bar Help - Document" -msgstr "" +msgstr "ドキュメントURLは、上部ナビゲーションバーのアドレスを指します。ヘルプ - ドキュメント" #: settings/serializers/basic.py:30 msgid "Support URL" @@ -5848,7 +5838,7 @@ msgstr "サポートリンク" #: settings/serializers/basic.py:31 msgid "" "Support URL refers to the address in the top navigation bar Help - Support" -msgstr "" +msgstr "サポートURLは、上部ナビゲーションバーのアドレスを指します。ヘルプ - サポート" #: settings/serializers/basic.py:44 msgid "Organization name already exists" @@ -5975,11 +5965,11 @@ msgstr "GPTモデル" #: settings/serializers/feature.py:116 msgid "Approval without login" -msgstr "" +msgstr "ログイン承認なし" #: settings/serializers/feature.py:117 msgid "Allow direct approval ticket without login" -msgstr "" +msgstr "ログインせずに直接承認チケットを許可します" #: settings/serializers/feature.py:121 msgid "Period" @@ -6011,7 +6001,7 @@ msgstr "機能" #: settings/serializers/feature.py:135 msgid "" "Allow users to execute batch commands in the Workbench - Job Center - Adhoc" -msgstr "" +msgstr "ユーザーがワークベンチ - ジョブセンター - Adhocでバッチコマンドを実行することを許可します" #: settings/serializers/feature.py:139 msgid "Command blacklist" @@ -7067,7 +7057,7 @@ msgid "Can concurrent" msgstr "同時実行可能" #: terminal/models/applet/applet.py:48 terminal/serializers/applet_host.py:167 -#: terminal/serializers/storage.py:197 +#: terminal/serializers/storage.py:193 msgid "Hosts" msgstr "ホスト" @@ -7426,7 +7416,7 @@ msgstr "" "URL を入力します。
例: https://172.16.10.110 または https://dev." "jumpserver.com" -#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:208 +#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:207 msgid "Ignore Certificate Verification" msgstr "証明書の検証を無視する" @@ -7677,27 +7667,33 @@ msgstr "ホスト無効" msgid "Port invalid" msgstr "ポートが無効" -#: terminal/serializers/storage.py:200 +#: terminal/serializers/storage.py:194 +msgid "" +"If there are multiple hosts, use a comma (,) to separate them.
(For " +"example: http://www.jumpserver.a.com:9100, http://www.jumpserver.b.com:9100)" +msgstr "ホストが複数ある場合は、カンマ (,) で区切ってください。
（例: http://www.jumpserver.a.com:9100, http://www.jumpserver.b.com:9100）" + +#: terminal/serializers/storage.py:199 msgid "Index by date" msgstr "日付による索引付け" -#: terminal/serializers/storage.py:201 +#: terminal/serializers/storage.py:200 msgid "Whether to create an index by date" msgstr "現在の日付に基づいてインデックスを動的に作成するかどうか" -#: terminal/serializers/storage.py:204 +#: terminal/serializers/storage.py:203 msgid "Index" msgstr "インデックス" -#: terminal/serializers/storage.py:206 +#: terminal/serializers/storage.py:205 msgid "Doc type" msgstr "Docタイプ" -#: terminal/serializers/storage.py:264 +#: terminal/serializers/storage.py:263 msgid "" "set as the default storage, will make new Component use the current storage " "by default, without affecting existing Component" -msgstr "" +msgstr "デフォルトのストレージとして設定すると、新しいコンポーネントが現在のストレージをデフォルトで使用するようになりますが、既存のコンポーネントには影響しません" #: terminal/serializers/task.py:9 msgid "Session id" @@ -7866,6 +7862,10 @@ msgstr "リモートアプリケーション上のアカウントを収集する msgid "Check command replay storage connectivity" msgstr "チェックコマンドと録画ストレージの接続性" +#: terminal/templates/terminal/_msg_command_alert.html:10 +msgid "view" +msgstr "表示" + #: terminal/utils/db_port_mapper.py:85 msgid "" "No available port is matched. The number of databases may have exceeded the " @@ -9837,6 +9837,21 @@ msgstr "エンタープライズプロフェッショナル版" msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" +#, fuzzy +#~| msgid "Create" +#~ msgid "create" +#~ msgstr "作成" + +#, fuzzy +#~| msgid "Update" +#~ msgid "update" +#~ msgstr "更新" + +#, fuzzy +#~| msgid "Delete" +#~ msgid "delete" +#~ msgstr "削除" + #~ msgid "Send verification code" #~ msgstr "確認コードを送信" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 1bbbcfbeb..57e4699b5 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-03 10:21+0800\n" +"POT-Creation-Date: 2024-06-12 18:25+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -105,7 +105,7 @@ msgstr "模板" msgid "Skip" msgstr "跳过" -#: accounts/const/account.py:33 audits/const.py:24 +#: accounts/const/account.py:33 audits/const.py:24 rbac/tree.py:239 #: templates/_csv_import_export.html:18 templates/_csv_update_modal.html:6 msgid "Update" msgstr "更新" @@ -1715,7 +1715,7 @@ msgstr "确认按钮选择器" msgid "API mode" msgstr "API 模式" -#: assets/const/types.py:251 +#: assets/const/types.py:254 msgid "All types" msgstr "所有类型" @@ -2413,6 +2413,7 @@ msgstr "删除目录" #: audits/const.py:14 audits/const.py:25 #: authentication/templates/authentication/_access_key_modal.html:65 +#: rbac/tree.py:240 msgid "Delete" msgstr "删除" @@ -2436,7 +2437,7 @@ msgstr "下载" msgid "Rename dir" msgstr "映射目录" -#: audits/const.py:23 terminal/api/session/session.py:277 +#: audits/const.py:23 rbac/tree.py:238 terminal/api/session/session.py:277 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 #: xpack/plugins/cloud/manager.py:84 @@ -2445,6 +2446,7 @@ msgstr "查看" #: audits/const.py:26 #: authentication/templates/authentication/_access_key_modal.html:22 +#: rbac/tree.py:237 msgid "Create" msgstr "创建" @@ -3795,7 +3797,7 @@ msgid "Invalid ids for ids, should be a list" msgstr "无效的ID，应为列表" #: common/db/fields.py:594 common/db/fields.py:599 -#: common/serializers/fields.py:133 tickets/serializers/ticket/common.py:58 +#: common/serializers/fields.py:142 tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 #: xpack/plugins/cloud/serializers/account_attrs.py:150 @@ -3966,21 +3968,27 @@ msgstr "请在 {} 秒后发送" msgid "Children" msgstr "节点" -#: common/serializers/fields.py:134 +#: common/serializers/fields.py:135 +#, fuzzy +#| msgid "Invalid data" +msgid "Invalid data type" +msgstr "无效的数据" + +#: common/serializers/fields.py:143 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "错误的 pk \"{pk_value}\" - 对象不存在" -#: common/serializers/fields.py:135 +#: common/serializers/fields.py:144 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "错误类型。期望 pk 值，收到 {data_type}。" -#: common/serializers/fields.py:209 +#: common/serializers/fields.py:218 msgid "Invalid data type, should be list" msgstr "错误的数据类型，应该是列表" -#: common/serializers/fields.py:224 +#: common/serializers/fields.py:233 msgid "Invalid choice: {}" msgstr "无效选项: {}" @@ -4076,17 +4084,21 @@ msgstr "" msgid "App Labels" msgstr "标签管理" -#: labels/models.py:17 labels/models.py:36 +#: labels/models.py:15 +msgid "Color" +msgstr "" + +#: labels/models.py:20 labels/models.py:39 #, fuzzy #| msgid "Tags" msgid "Tag" msgstr "标签" -#: labels/models.py:40 +#: labels/models.py:43 msgid "Resource ID" msgstr "资源 ID" -#: labels/models.py:46 +#: labels/models.py:49 msgid "Tagged resource" msgstr "关联的资源" @@ -5019,28 +5031,6 @@ msgstr "一般设置" msgid "View permission tree" msgstr "查看授权树" -#: rbac/tree.py:237 -#, fuzzy -#| msgid "Create" -msgid "create" -msgstr "创建" - -#: rbac/tree.py:238 terminal/templates/terminal/_msg_command_alert.html:10 -msgid "view" -msgstr "查看" - -#: rbac/tree.py:239 -#, fuzzy -#| msgid "Update" -msgid "update" -msgstr "更新" - -#: rbac/tree.py:240 -#, fuzzy -#| msgid "Delete" -msgid "delete" -msgstr "删除" - #: settings/api/chat.py:40 msgid "Chat AI is not enabled" msgstr "聊天 AI 没有开启" @@ -5686,7 +5676,7 @@ msgstr "当前站点 URL" msgid "" "Site URL is the externally accessible address of the current product service " "and is usually used in links in system emails" -msgstr "" +msgstr "站点 URL 是当前产品服务的外部可访问地址，通常在系统邮件中的链接中使用" #: settings/serializers/basic.py:18 msgid "User guide url" @@ -5706,23 +5696,21 @@ msgstr "全局组织的显示名称，默认为 全局组织" #: settings/serializers/basic.py:26 msgid "Document URL" -msgstr "" +msgstr "文档链接" #: settings/serializers/basic.py:27 msgid "" "Document URL refers to the address in the top navigation bar Help - Document" -msgstr "" +msgstr "文档 URL 指的是顶级导航栏中的地址，帮助 - 文档" #: settings/serializers/basic.py:30 -#, fuzzy -#| msgid "Help Support URL" msgid "Support URL" msgstr "支持链接" #: settings/serializers/basic.py:31 msgid "" "Support URL refers to the address in the top navigation bar Help - Support" -msgstr "" +msgstr "支持 URL 指的是顶级导航栏中的地址，帮助 - 支持" #: settings/serializers/basic.py:44 msgid "Organization name already exists" @@ -5841,11 +5829,11 @@ msgstr "GPT 模型" #: settings/serializers/feature.py:116 msgid "Approval without login" -msgstr "" +msgstr "免登录审批" #: settings/serializers/feature.py:117 msgid "Allow direct approval ticket without login" -msgstr "" +msgstr "允许无需登录直接批准工单" #: settings/serializers/feature.py:121 msgid "Period" @@ -5875,7 +5863,7 @@ msgstr "功能" #: settings/serializers/feature.py:135 msgid "" "Allow users to execute batch commands in the Workbench - Job Center - Adhoc" -msgstr "" +msgstr "允许用户在工作台 - 作业中心 - Adhoc 中执行批量命令" #: settings/serializers/feature.py:139 msgid "Command blacklist" @@ -6895,7 +6883,7 @@ msgid "Can concurrent" msgstr "可以并发" #: terminal/models/applet/applet.py:48 terminal/serializers/applet_host.py:167 -#: terminal/serializers/storage.py:197 +#: terminal/serializers/storage.py:193 msgid "Hosts" msgstr "主机" @@ -7254,7 +7242,7 @@ msgstr "" "建议填写内网地址，否则填写当前站点 URL
例如：https://172.16.10.110 or " "https://dev.jumpserver.com" -#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:208 +#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:207 msgid "Ignore Certificate Verification" msgstr "忽略证书认证" @@ -7500,27 +7488,33 @@ msgstr "主机无效" msgid "Port invalid" msgstr "端口无效" -#: terminal/serializers/storage.py:200 +#: terminal/serializers/storage.py:194 +msgid "" +"If there are multiple hosts, use a comma (,) to separate them.
(For " +"example: http://www.jumpserver.a.com:9100, http://www.jumpserver.b.com:9100)" +msgstr "如果有多个主机，请用逗号 (,) 分隔它们。
（例如：http://www.jumpserver.a.com:9100，http://www.jumpserver.b.com:9100）" + +#: terminal/serializers/storage.py:199 msgid "Index by date" msgstr "按日期建索引" -#: terminal/serializers/storage.py:201 +#: terminal/serializers/storage.py:200 msgid "Whether to create an index by date" msgstr "是否根据日期动态建立索引" -#: terminal/serializers/storage.py:204 +#: terminal/serializers/storage.py:203 msgid "Index" msgstr "索引" -#: terminal/serializers/storage.py:206 +#: terminal/serializers/storage.py:205 msgid "Doc type" msgstr "文档类型" -#: terminal/serializers/storage.py:264 +#: terminal/serializers/storage.py:263 msgid "" "set as the default storage, will make new Component use the current storage " "by default, without affecting existing Component" -msgstr "" +msgstr "设置为默认存储后，新组件将默认使用当前存储，而不会影响现有组件" #: terminal/serializers/task.py:9 msgid "Session id" @@ -7683,6 +7677,10 @@ msgstr "收集远程应用上的账号" msgid "Check command replay storage connectivity" msgstr "检查命令及录像存储可连接性 " +#: terminal/templates/terminal/_msg_command_alert.html:10 +msgid "view" +msgstr "查看" + #: terminal/utils/db_port_mapper.py:85 msgid "" "No available port is matched. The number of databases may have exceeded the " @@ -9640,6 +9638,21 @@ msgstr "企业专业版" msgid "Ultimate edition" msgstr "企业旗舰版" +#, fuzzy +#~| msgid "Create" +#~ msgid "create" +#~ msgstr "创建" + +#, fuzzy +#~| msgid "Update" +#~ msgid "update" +#~ msgstr "更新" + +#, fuzzy +#~| msgid "Delete" +#~ msgid "delete" +#~ msgstr "删除" + #~ msgid "Send verification code" #~ msgstr "发送验证码" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 7a78272bf..7b90d0b01 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -24,7 +24,7 @@ "AccountGatherList": "Gather accounts", "AccountGatherDetail": "Gather account details", "AccountPushDetail": "Push account details", - "AccountGatherTaskList": "Gather account tasks", + "AccountGatherTaskList": "Gather accounts tasks", "AccountGatherTaskCreate": "Create gather accounts task", "AccountGatherTaskUpdate": "Update the gather accounts task", "AccountList": "Accounts", @@ -672,7 +672,7 @@ "MFAErrorMsg": "MFA errors, please check", "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 login; 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", + "MailRecipient": "Email recipients", "MailSend": "Sending", "ManualAccount": "Manual account", "ManualAccountTip": "Manual input of username/password upon login", diff --git a/apps/i18n/lina/ja.json b/apps/i18n/lina/ja.json index 54339b625..b12e862b0 100644 --- a/apps/i18n/lina/ja.json +++ b/apps/i18n/lina/ja.json @@ -1337,5 +1337,6 @@ "ObjectStorage": "オブジェクトストレージ", "ApplyLoginAsset": "登録資産の申請", "ApplyLoginUser": "ログインユーザーの申請", - "ApplyLoginAccount": "ログインアカウントの申請" + "ApplyLoginAccount": "ログインアカウントの申請", + "Navigation": "ナビゲーション" } diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 9a9755f2a..0dac5c63e 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -1320,5 +1320,7 @@ "ObjectStorage": "对象存储", "ApplyLoginAsset": "登录资产", "ApplyLoginUser": "登录用户", - "ApplyLoginAccount": "登录账号" + "ApplyLoginAccount": "登录账号", + "IsSyncAccountLabel": "同步到资产", + "Navigation": "导航" } diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index 8ac6be94d..71df1aa6b 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -489,7 +489,7 @@ class Config(dict): # 安全配置 'SECURITY_MFA_AUTH': 0, # 0 不开启 1 全局开启 2 管理员开启 'SECURITY_MFA_AUTH_ENABLED_FOR_THIRD_PARTY': True, - 'SECURITY_COMMAND_EXECUTION': True, + 'SECURITY_COMMAND_EXECUTION': False, 'SECURITY_COMMAND_BLACKLIST': [ 'reboot', 'shutdown', 'poweroff', 'halt', 'dd', 'half', 'top' ], diff --git a/apps/terminal/serializers/storage.py b/apps/terminal/serializers/storage.py index 11dbc3e00..38e997615 100644 --- a/apps/terminal/serializers/storage.py +++ b/apps/terminal/serializers/storage.py @@ -188,13 +188,12 @@ def command_storage_es_host_format_validator(host): class CommandStorageTypeESSerializer(serializers.Serializer): - hosts_help_text = ''' - Tip: If there are multiple hosts, use a comma (,) to separate them.
- (eg: http://www.jumpserver.a.com:9100, http://www.jumpserver.b.com:9100) - ''' HOSTS = serializers.ListField( child=serializers.CharField(validators=[command_storage_es_host_format_validator]), - label=_('Hosts'), help_text=_(hosts_help_text), allow_null=True + label=_('Hosts'), help_text=_( + 'If there are multiple hosts, use a comma (,) to separate them.
' + '(For example: http://www.jumpserver.a.com:9100, http://www.jumpserver.b.com:9100)'), + allow_null=True ) INDEX_BY_DATE = serializers.BooleanField( default=False, label=_('Index by date'), @@ -266,6 +265,7 @@ meta_is_default = { ) } + # CommandStorageSerializer class CommandStorageSerializer(BaseStorageSerializer): type = LabeledChoiceField(choices=const.CommandStorageType.choices, label=_('Type')) @@ -286,7 +286,7 @@ class ReplayStorageSerializer(BaseStorageSerializer): class Meta(BaseStorageSerializer.Meta): model = ReplayStorage - extra_kwargs ={ + extra_kwargs = { 'name': {'validators': [UniqueValidator(queryset=ReplayStorage.objects.all())]}, 'is_default': meta_is_default }