feat: 添加配置项 KoKo SSH Client 方式

pull/8091/head
Jiangjie.Bai 2022-04-19 16:01:05 +08:00 committed by Jiangjie.Bai
parent be2708f83d
commit f8fade4cf2
8 changed files with 159 additions and 174 deletions

View File

@ -317,6 +317,7 @@ class Config(dict):
'TERMINAL_RDP_ADDR': '',
# 保留(Luna还在用)
'TERMINAL_MAGNUS_ENABLED': True,
'TERMINAL_KOKO_SSH_ENABLED': True,
# 保留(Luna还在用)
'XRDP_ENABLED': True,

View File

@ -140,6 +140,7 @@ CLOUD_SYNC_TASK_EXECUTION_KEEP_DAYS = CONFIG.CLOUD_SYNC_TASK_EXECUTION_KEEP_DAYS
XRDP_ENABLED = CONFIG.XRDP_ENABLED
TERMINAL_MAGNUS_ENABLED = CONFIG.TERMINAL_MAGNUS_ENABLED
TERMINAL_KOKO_SSH_ENABLED = CONFIG.TERMINAL_KOKO_SSH_ENABLED
# SMS enabled
SMS_ENABLED = CONFIG.SMS_ENABLED

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:54be66877253eed7bec1db706604af83a48f1c5fbc95eef1132c7f880fef154a
size 125598
oid sha256:4e6962699271d0f5402223321e65211f1c7ad0b7a9b43524f3a0fac7ea2541d9
size 125623

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-04-19 11:24+0800\n"
"POT-Creation-Date: 2022-04-19 15:57+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -33,7 +33,7 @@ msgstr "Acls"
#: terminal/models/storage.py:23 terminal/models/task.py:16
#: terminal/models/terminal.py:100 users/forms/profile.py:32
#: users/models/group.py:15 users/models/user.py:661
#: xpack/plugins/cloud/models.py:27
#: xpack/plugins/cloud/models.py:28
msgid "Name"
msgstr "名前"
@ -66,7 +66,7 @@ msgstr "アクティブ"
#: tickets/models/comment.py:24 tickets/models/ticket.py:154
#: users/models/group.py:16 users/models/user.py:698
#: xpack/plugins/change_auth_plan/models/base.py:44
#: xpack/plugins/cloud/models.py:34 xpack/plugins/cloud/models.py:115
#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:116
#: xpack/plugins/gathered_user/models.py:26
msgid "Comment"
msgstr "コメント"
@ -88,7 +88,7 @@ msgstr "ログイン確認"
#: assets/models/cmd_filter.py:30 assets/models/label.py:15 audits/models.py:37
#: audits/models.py:60 audits/models.py:85 audits/serializers.py:100
#: authentication/models.py:51 orgs/models.py:214 perms/models/base.py:84
#: rbac/builtin.py:107 rbac/models/rolebinding.py:40
#: rbac/builtin.py:110 rbac/models/rolebinding.py:40
#: terminal/backends/command/models.py:20
#: terminal/backends/command/serializers.py:12 terminal/models/session.py:44
#: terminal/notifications.py:91 terminal/notifications.py:139
@ -134,7 +134,7 @@ msgstr "システムユーザー"
#: terminal/notifications.py:90
#: xpack/plugins/change_auth_plan/models/asset.py:199
#: xpack/plugins/change_auth_plan/serializers/asset.py:180
#: xpack/plugins/cloud/models.py:222
#: xpack/plugins/cloud/models.py:223
msgid "Asset"
msgstr "資産"
@ -318,8 +318,8 @@ msgstr "タイプ"
msgid "Domain"
msgstr "ドメイン"
#: applications/models/application.py:228 xpack/plugins/cloud/models.py:32
#: xpack/plugins/cloud/serializers/account.py:58
#: applications/models/application.py:228 xpack/plugins/cloud/models.py:33
#: xpack/plugins/cloud/serializers/account.py:59
msgid "Attrs"
msgstr "ツールバーの"
@ -357,7 +357,7 @@ msgstr "タイプ表示"
#: common/mixins/models.py:50 ops/models/adhoc.py:39 ops/models/command.py:30
#: orgs/models.py:67 orgs/models.py:217 perms/models/base.py:92
#: users/models/group.py:18 users/models/user.py:915
#: xpack/plugins/cloud/models.py:124
#: xpack/plugins/cloud/models.py:125
msgid "Date created"
msgstr "作成された日付"
@ -572,7 +572,7 @@ msgstr "ホスト名生"
#: assets/models/asset.py:215 assets/serializers/account.py:16
#: assets/serializers/asset.py:65 perms/serializers/asset/user_permission.py:41
#: xpack/plugins/cloud/models.py:106 xpack/plugins/cloud/serializers/task.py:42
#: xpack/plugins/cloud/models.py:107 xpack/plugins/cloud/serializers/task.py:42
msgid "Protocols"
msgstr "プロトコル"
@ -612,7 +612,7 @@ msgstr "ラベル"
#: orgs/models.py:219 perms/models/base.py:91 users/models/user.py:706
#: users/serializers/group.py:33
#: xpack/plugins/change_auth_plan/models/base.py:48
#: xpack/plugins/cloud/models.py:121 xpack/plugins/gathered_user/models.py:30
#: xpack/plugins/cloud/models.py:122 xpack/plugins/gathered_user/models.py:30
msgid "Created by"
msgstr "によって作成された"
@ -716,7 +716,7 @@ msgstr "トリガーモード"
#: xpack/plugins/change_auth_plan/models/base.py:201
#: xpack/plugins/change_auth_plan/serializers/app.py:66
#: xpack/plugins/change_auth_plan/serializers/asset.py:179
#: xpack/plugins/cloud/models.py:178
#: xpack/plugins/cloud/models.py:179
msgid "Reason"
msgstr "理由"
@ -744,7 +744,7 @@ msgstr "OK"
#: assets/models/base.py:32 audits/models.py:116
#: xpack/plugins/change_auth_plan/serializers/app.py:88
#: xpack/plugins/change_auth_plan/serializers/asset.py:198
#: xpack/plugins/cloud/const.py:30
#: xpack/plugins/cloud/const.py:31
msgid "Failed"
msgstr "失敗しました"
@ -954,7 +954,7 @@ msgid "Parent key"
msgstr "親キー"
#: assets/models/node.py:559 assets/serializers/system_user.py:263
#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers/task.py:69
#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:69
msgid "Node"
msgstr "ノード"
@ -1486,8 +1486,8 @@ msgid "MFA"
msgstr "MFA"
#: audits/models.py:126 terminal/models/status.py:33
#: tickets/models/ticket.py:140 xpack/plugins/cloud/models.py:174
#: xpack/plugins/cloud/models.py:226
#: tickets/models/ticket.py:140 xpack/plugins/cloud/models.py:175
#: xpack/plugins/cloud/models.py:227
msgid "Status"
msgstr "ステータス"
@ -1524,7 +1524,7 @@ msgid "Hosts display"
msgstr "ホスト表示"
#: audits/serializers.py:96 ops/models/command.py:27
#: xpack/plugins/cloud/models.py:172
#: xpack/plugins/cloud/models.py:173
msgid "Result"
msgstr "結果"
@ -3126,27 +3126,27 @@ msgstr "{} 少なくとも1つのシステムロール"
msgid "RBAC"
msgstr "RBAC"
#: rbac/builtin.py:98
#: rbac/builtin.py:101
msgid "SystemAdmin"
msgstr "システム管理者"
#: rbac/builtin.py:101
#: rbac/builtin.py:104
msgid "SystemAuditor"
msgstr "システム監査人"
#: rbac/builtin.py:104
#: rbac/builtin.py:107
msgid "SystemComponent"
msgstr "システムコンポーネント"
#: rbac/builtin.py:110
#: rbac/builtin.py:113
msgid "OrgAdmin"
msgstr "組織管理者"
#: rbac/builtin.py:113
#: rbac/builtin.py:116
msgid "OrgAuditor"
msgstr "監査員を組織する"
#: rbac/builtin.py:116
#: rbac/builtin.py:119
msgid "OrgUser"
msgstr "組織ユーザー"
@ -4225,10 +4225,10 @@ msgstr "Telnetログインregex"
#: settings/serializers/terminal.py:33
msgid ""
"The login success message varies with devices. if you cannot log in to the "
"device through Telnet, set this parameter"
"Tips: The login success message varies with devices. if you cannot log in to "
"the device through Telnet, set this parameter"
msgstr ""
"ログイン成功メッセージはデバイスによって異なります。Telnet経由でデバイスにロ"
"ヒント: ログイン成功メッセージはデバイスによって異なります。Telnet経由でデバイスにロ"
"グインできない場合は、このパラメーターを設定します。"
#: settings/serializers/terminal.py:36
@ -4239,6 +4239,10 @@ msgstr "属性マップの有効化"
msgid "Enable XRDP"
msgstr "XRDPの有効化"
#: settings/serializers/terminal.py:38
msgid "Enable KoKo SSH"
msgstr "KoKo SSHの有効化"
#: settings/utils/ldap.py:417
msgid "ldap:// or ldaps:// protocol is used."
msgstr "ldap:// または ldaps:// プロトコルが使用されます。"
@ -4953,7 +4957,7 @@ msgstr "バケット"
msgid "Secret key"
msgstr "秘密キー"
#: terminal/serializers/storage.py:64 xpack/plugins/cloud/models.py:219
#: terminal/serializers/storage.py:64 xpack/plugins/cloud/models.py:220
msgid "Region"
msgstr "リージョン"
@ -6225,58 +6229,62 @@ msgid "Baidu Cloud"
msgstr "百度雲"
#: xpack/plugins/cloud/const.py:15
msgid "JD Cloud"
msgstr "京東雲"
#: xpack/plugins/cloud/const.py:16
msgid "Tencent Cloud"
msgstr "テンセント雲"
#: xpack/plugins/cloud/const.py:16
#: xpack/plugins/cloud/const.py:17
msgid "VMware"
msgstr "VMware"
#: xpack/plugins/cloud/const.py:17 xpack/plugins/cloud/providers/nutanix.py:13
#: xpack/plugins/cloud/const.py:18 xpack/plugins/cloud/providers/nutanix.py:13
msgid "Nutanix"
msgstr "Nutanix"
#: xpack/plugins/cloud/const.py:18
#: xpack/plugins/cloud/const.py:19
msgid "Huawei Private Cloud"
msgstr "華為私有雲"
#: xpack/plugins/cloud/const.py:19
#: xpack/plugins/cloud/const.py:20
msgid "Qingyun Private Cloud"
msgstr "青雲私有雲"
#: xpack/plugins/cloud/const.py:20
#: xpack/plugins/cloud/const.py:21
msgid "OpenStack"
msgstr "OpenStack"
#: xpack/plugins/cloud/const.py:21
#: xpack/plugins/cloud/const.py:22
msgid "Google Cloud Platform"
msgstr "谷歌雲"
#: xpack/plugins/cloud/const.py:25
#: xpack/plugins/cloud/const.py:26
msgid "Instance name"
msgstr "インスタンス名"
#: xpack/plugins/cloud/const.py:26
#: xpack/plugins/cloud/const.py:27
msgid "Instance name and Partial IP"
msgstr "インスタンス名と部分IP"
#: xpack/plugins/cloud/const.py:31
#: xpack/plugins/cloud/const.py:32
msgid "Succeed"
msgstr "成功"
#: xpack/plugins/cloud/const.py:35
#: xpack/plugins/cloud/const.py:36
msgid "Unsync"
msgstr "同期していません"
#: xpack/plugins/cloud/const.py:36
#: xpack/plugins/cloud/const.py:37
msgid "New Sync"
msgstr "新しい同期"
#: xpack/plugins/cloud/const.py:37
#: xpack/plugins/cloud/const.py:38
msgid "Synced"
msgstr "同期済み"
#: xpack/plugins/cloud/const.py:38
#: xpack/plugins/cloud/const.py:39
msgid "Released"
msgstr "リリース済み"
@ -6284,79 +6292,79 @@ msgstr "リリース済み"
msgid "Cloud center"
msgstr "クラウドセンター"
#: xpack/plugins/cloud/models.py:29
#: xpack/plugins/cloud/models.py:30
msgid "Provider"
msgstr "プロバイダー"
#: xpack/plugins/cloud/models.py:33
#: xpack/plugins/cloud/models.py:34
msgid "Validity"
msgstr "有効性"
#: xpack/plugins/cloud/models.py:38
#: xpack/plugins/cloud/models.py:39
msgid "Cloud account"
msgstr "クラウドアカウント"
#: xpack/plugins/cloud/models.py:40
#: xpack/plugins/cloud/models.py:41
msgid "Test cloud account"
msgstr "クラウドアカウントのテスト"
#: xpack/plugins/cloud/models.py:84 xpack/plugins/cloud/serializers/task.py:66
#: xpack/plugins/cloud/models.py:85 xpack/plugins/cloud/serializers/task.py:66
msgid "Account"
msgstr "アカウント"
#: xpack/plugins/cloud/models.py:87 xpack/plugins/cloud/serializers/task.py:37
#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:37
msgid "Regions"
msgstr "リージョン"
#: xpack/plugins/cloud/models.py:90
#: xpack/plugins/cloud/models.py:91
msgid "Hostname strategy"
msgstr "ホスト名戦略"
#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:67
#: xpack/plugins/cloud/models.py:100 xpack/plugins/cloud/serializers/task.py:67
msgid "Unix admin user"
msgstr "Unix adminユーザー"
#: xpack/plugins/cloud/models.py:103 xpack/plugins/cloud/serializers/task.py:68
#: xpack/plugins/cloud/models.py:104 xpack/plugins/cloud/serializers/task.py:68
msgid "Windows admin user"
msgstr "Windows管理者"
#: xpack/plugins/cloud/models.py:109 xpack/plugins/cloud/serializers/task.py:45
#: xpack/plugins/cloud/models.py:110 xpack/plugins/cloud/serializers/task.py:45
msgid "IP network segment group"
msgstr "IPネットワークセグメントグループ"
#: xpack/plugins/cloud/models.py:112 xpack/plugins/cloud/serializers/task.py:71
#: xpack/plugins/cloud/models.py:113 xpack/plugins/cloud/serializers/task.py:71
msgid "Always update"
msgstr "常に更新"
#: xpack/plugins/cloud/models.py:118
#: xpack/plugins/cloud/models.py:119
msgid "Date last sync"
msgstr "最終同期日"
#: xpack/plugins/cloud/models.py:129 xpack/plugins/cloud/models.py:170
#: xpack/plugins/cloud/models.py:130 xpack/plugins/cloud/models.py:171
msgid "Sync instance task"
msgstr "インスタンスの同期タスク"
#: xpack/plugins/cloud/models.py:181 xpack/plugins/cloud/models.py:229
#: xpack/plugins/cloud/models.py:182 xpack/plugins/cloud/models.py:230
msgid "Date sync"
msgstr "日付の同期"
#: xpack/plugins/cloud/models.py:185
#: xpack/plugins/cloud/models.py:186
msgid "Sync instance task execution"
msgstr "インスタンスタスクの同期実行"
#: xpack/plugins/cloud/models.py:209
#: xpack/plugins/cloud/models.py:210
msgid "Sync task"
msgstr "同期タスク"
#: xpack/plugins/cloud/models.py:213
#: xpack/plugins/cloud/models.py:214
msgid "Sync instance task history"
msgstr "インスタンスタスク履歴の同期"
#: xpack/plugins/cloud/models.py:216
#: xpack/plugins/cloud/models.py:217
msgid "Instance"
msgstr "インスタンス"
#: xpack/plugins/cloud/models.py:233
#: xpack/plugins/cloud/models.py:234
msgid "Sync instance detail"
msgstr "同期インスタンスの詳細"
@ -6453,11 +6461,13 @@ msgid "South America (São Paulo)"
msgstr "南米 (サンパウロ)"
#: xpack/plugins/cloud/providers/baiducloud.py:54
#: xpack/plugins/cloud/providers/jdcloud.py:127
msgid "CN North-Beijing"
msgstr "華北-北京"
#: xpack/plugins/cloud/providers/baiducloud.py:55
#: xpack/plugins/cloud/providers/huaweicloud.py:40
#: xpack/plugins/cloud/providers/jdcloud.py:130
msgid "CN South-Guangzhou"
msgstr "華南-広州"
@ -6479,6 +6489,7 @@ msgid "CN North-Baoding"
msgstr "華北-保定"
#: xpack/plugins/cloud/providers/baiducloud.py:60
#: xpack/plugins/cloud/providers/jdcloud.py:129
msgid "CN East-Shanghai"
msgstr "華東-上海"
@ -6543,11 +6554,15 @@ msgstr "華北-ウランチャブ一"
msgid "CN South-Guangzhou-InvitationOnly"
msgstr "華南-広州-友好ユーザー環境"
#: xpack/plugins/cloud/serializers/account.py:59
#: xpack/plugins/cloud/providers/jdcloud.py:128
msgid "CN East-Suqian"
msgstr "華東-宿遷"
#: xpack/plugins/cloud/serializers/account.py:60
msgid "Validity display"
msgstr "有効表示"
#: xpack/plugins/cloud/serializers/account.py:60
#: xpack/plugins/cloud/serializers/account.py:61
msgid "Provider display"
msgstr "プロバイダ表示"
@ -6710,26 +6725,3 @@ msgstr "究極のエディション"
#: xpack/plugins/license/models.py:77
msgid "Community edition"
msgstr "コミュニティ版"
#~ msgid "JD Cloud"
#~ msgstr "京東雲"
#~ msgid "CN East-Suqian"
#~ msgstr "華東-宿遷"
#~ msgid "Inherit"
#~ msgstr "継承"
#~ msgid "Include"
#~ msgstr "含める"
#~ msgid "Exclude"
#~ msgstr "除外"
#~ msgid "DatabaseApp"
#~ msgstr "データベースの適用"
#, fuzzy
#~| msgid "Connection token"
#~ msgid "One time token"
#~ msgstr "接続トークン"

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa084dd92472110d4bea1674d1e9a96599f42f094aab92f8d34152fdf5726321
size 103771
oid sha256:3462a9a3eef8f372bf341f2066a33d85e1f01aca5a8fe506528a1cd0a37e98b4
size 103951

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-04-19 11:24+0800\n"
"POT-Creation-Date: 2022-04-19 15:57+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -32,7 +32,7 @@ msgstr "访问控制"
#: terminal/models/storage.py:23 terminal/models/task.py:16
#: terminal/models/terminal.py:100 users/forms/profile.py:32
#: users/models/group.py:15 users/models/user.py:661
#: xpack/plugins/cloud/models.py:27
#: xpack/plugins/cloud/models.py:28
msgid "Name"
msgstr "名称"
@ -65,7 +65,7 @@ msgstr "激活中"
#: tickets/models/comment.py:24 tickets/models/ticket.py:154
#: users/models/group.py:16 users/models/user.py:698
#: xpack/plugins/change_auth_plan/models/base.py:44
#: xpack/plugins/cloud/models.py:34 xpack/plugins/cloud/models.py:115
#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:116
#: xpack/plugins/gathered_user/models.py:26
msgid "Comment"
msgstr "备注"
@ -87,7 +87,7 @@ msgstr "登录复核"
#: assets/models/cmd_filter.py:30 assets/models/label.py:15 audits/models.py:37
#: audits/models.py:60 audits/models.py:85 audits/serializers.py:100
#: authentication/models.py:51 orgs/models.py:214 perms/models/base.py:84
#: rbac/builtin.py:107 rbac/models/rolebinding.py:40
#: rbac/builtin.py:110 rbac/models/rolebinding.py:40
#: terminal/backends/command/models.py:20
#: terminal/backends/command/serializers.py:12 terminal/models/session.py:44
#: terminal/notifications.py:91 terminal/notifications.py:139
@ -133,7 +133,7 @@ msgstr "系统用户"
#: terminal/notifications.py:90
#: xpack/plugins/change_auth_plan/models/asset.py:199
#: xpack/plugins/change_auth_plan/serializers/asset.py:180
#: xpack/plugins/cloud/models.py:222
#: xpack/plugins/cloud/models.py:223
msgid "Asset"
msgstr "资产"
@ -313,8 +313,8 @@ msgstr "类型"
msgid "Domain"
msgstr "网域"
#: applications/models/application.py:228 xpack/plugins/cloud/models.py:32
#: xpack/plugins/cloud/serializers/account.py:58
#: applications/models/application.py:228 xpack/plugins/cloud/models.py:33
#: xpack/plugins/cloud/serializers/account.py:59
msgid "Attrs"
msgstr "属性"
@ -352,7 +352,7 @@ msgstr "类型名称"
#: common/mixins/models.py:50 ops/models/adhoc.py:39 ops/models/command.py:30
#: orgs/models.py:67 orgs/models.py:217 perms/models/base.py:92
#: users/models/group.py:18 users/models/user.py:915
#: xpack/plugins/cloud/models.py:124
#: xpack/plugins/cloud/models.py:125
msgid "Date created"
msgstr "创建日期"
@ -567,7 +567,7 @@ msgstr "主机名原始"
#: assets/models/asset.py:215 assets/serializers/account.py:16
#: assets/serializers/asset.py:65 perms/serializers/asset/user_permission.py:41
#: xpack/plugins/cloud/models.py:106 xpack/plugins/cloud/serializers/task.py:42
#: xpack/plugins/cloud/models.py:107 xpack/plugins/cloud/serializers/task.py:42
msgid "Protocols"
msgstr "协议组"
@ -607,7 +607,7 @@ msgstr "标签管理"
#: orgs/models.py:219 perms/models/base.py:91 users/models/user.py:706
#: users/serializers/group.py:33
#: xpack/plugins/change_auth_plan/models/base.py:48
#: xpack/plugins/cloud/models.py:121 xpack/plugins/gathered_user/models.py:30
#: xpack/plugins/cloud/models.py:122 xpack/plugins/gathered_user/models.py:30
msgid "Created by"
msgstr "创建者"
@ -711,7 +711,7 @@ msgstr "触发模式"
#: xpack/plugins/change_auth_plan/models/base.py:201
#: xpack/plugins/change_auth_plan/serializers/app.py:66
#: xpack/plugins/change_auth_plan/serializers/asset.py:179
#: xpack/plugins/cloud/models.py:178
#: xpack/plugins/cloud/models.py:179
msgid "Reason"
msgstr "原因"
@ -739,7 +739,7 @@ msgstr "成功"
#: assets/models/base.py:32 audits/models.py:116
#: xpack/plugins/change_auth_plan/serializers/app.py:88
#: xpack/plugins/change_auth_plan/serializers/asset.py:198
#: xpack/plugins/cloud/const.py:30
#: xpack/plugins/cloud/const.py:31
msgid "Failed"
msgstr "失败"
@ -949,7 +949,7 @@ msgid "Parent key"
msgstr "ssh私钥"
#: assets/models/node.py:559 assets/serializers/system_user.py:263
#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers/task.py:69
#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:69
msgid "Node"
msgstr "节点"
@ -1474,8 +1474,8 @@ msgid "MFA"
msgstr "MFA"
#: audits/models.py:126 terminal/models/status.py:33
#: tickets/models/ticket.py:140 xpack/plugins/cloud/models.py:174
#: xpack/plugins/cloud/models.py:226
#: tickets/models/ticket.py:140 xpack/plugins/cloud/models.py:175
#: xpack/plugins/cloud/models.py:227
msgid "Status"
msgstr "状态"
@ -1512,7 +1512,7 @@ msgid "Hosts display"
msgstr "主机名称"
#: audits/serializers.py:96 ops/models/command.py:27
#: xpack/plugins/cloud/models.py:172
#: xpack/plugins/cloud/models.py:173
msgid "Result"
msgstr "结果"
@ -3089,27 +3089,27 @@ msgstr "{} 至少有一个系统角色"
msgid "RBAC"
msgstr "RBAC"
#: rbac/builtin.py:98
#: rbac/builtin.py:101
msgid "SystemAdmin"
msgstr "系统管理员"
#: rbac/builtin.py:101
#: rbac/builtin.py:104
msgid "SystemAuditor"
msgstr "系统审计员"
#: rbac/builtin.py:104
#: rbac/builtin.py:107
msgid "SystemComponent"
msgstr "系统组件"
#: rbac/builtin.py:110
#: rbac/builtin.py:113
msgid "OrgAdmin"
msgstr "组织管理员"
#: rbac/builtin.py:113
#: rbac/builtin.py:116
msgid "OrgAuditor"
msgstr "组织审计员"
#: rbac/builtin.py:116
#: rbac/builtin.py:119
msgid "OrgUser"
msgstr "组织用户"
@ -4165,9 +4165,9 @@ msgstr "Telnet 成功正则表达式"
#: settings/serializers/terminal.py:33
msgid ""
"The login success message varies with devices. if you cannot log in to the "
"device through Telnet, set this parameter"
msgstr "不同设备登录成功提示不一样,所以如果 telnet 不能正常登录,可以这里设置"
"Tips: The login success message varies with devices. if you cannot log in to "
"the device through Telnet, set this parameter"
msgstr "提示: 不同设备登录成功提示不一样,所以如果 telnet 不能正常登录,可以这里设置"
#: settings/serializers/terminal.py:36
msgid "Enable database proxy"
@ -4177,6 +4177,10 @@ msgstr "启用数据库组件"
msgid "Enable XRDP"
msgstr "启用 XRDP 服务"
#: settings/serializers/terminal.py:38
msgid "Enable KoKo SSH"
msgstr "启用 KoKo SSH"
#: settings/utils/ldap.py:417
msgid "ldap:// or ldaps:// protocol is used."
msgstr "使用 ldap:// 或 ldaps:// 协议"
@ -4879,7 +4883,7 @@ msgstr "桶名称"
msgid "Secret key"
msgstr "密钥"
#: terminal/serializers/storage.py:64 xpack/plugins/cloud/models.py:219
#: terminal/serializers/storage.py:64 xpack/plugins/cloud/models.py:220
msgid "Region"
msgstr "地域"
@ -6134,58 +6138,62 @@ msgid "Baidu Cloud"
msgstr "百度云"
#: xpack/plugins/cloud/const.py:15
msgid "JD Cloud"
msgstr "京东云"
#: xpack/plugins/cloud/const.py:16
msgid "Tencent Cloud"
msgstr "腾讯云"
#: xpack/plugins/cloud/const.py:16
#: xpack/plugins/cloud/const.py:17
msgid "VMware"
msgstr "VMware"
#: xpack/plugins/cloud/const.py:17 xpack/plugins/cloud/providers/nutanix.py:13
#: xpack/plugins/cloud/const.py:18 xpack/plugins/cloud/providers/nutanix.py:13
msgid "Nutanix"
msgstr "Nutanix"
#: xpack/plugins/cloud/const.py:18
#: xpack/plugins/cloud/const.py:19
msgid "Huawei Private Cloud"
msgstr "华为私有云"
#: xpack/plugins/cloud/const.py:19
#: xpack/plugins/cloud/const.py:20
msgid "Qingyun Private Cloud"
msgstr "青云私有云"
#: xpack/plugins/cloud/const.py:20
#: xpack/plugins/cloud/const.py:21
msgid "OpenStack"
msgstr "OpenStack"
#: xpack/plugins/cloud/const.py:21
#: xpack/plugins/cloud/const.py:22
msgid "Google Cloud Platform"
msgstr "谷歌云"
#: xpack/plugins/cloud/const.py:25
#: xpack/plugins/cloud/const.py:26
msgid "Instance name"
msgstr "实例名称"
#: xpack/plugins/cloud/const.py:26
#: xpack/plugins/cloud/const.py:27
msgid "Instance name and Partial IP"
msgstr "实例名称和部分IP"
#: xpack/plugins/cloud/const.py:31
#: xpack/plugins/cloud/const.py:32
msgid "Succeed"
msgstr "成功"
#: xpack/plugins/cloud/const.py:35
#: xpack/plugins/cloud/const.py:36
msgid "Unsync"
msgstr "未同步"
#: xpack/plugins/cloud/const.py:36
#: xpack/plugins/cloud/const.py:37
msgid "New Sync"
msgstr "新同步"
#: xpack/plugins/cloud/const.py:37
#: xpack/plugins/cloud/const.py:38
msgid "Synced"
msgstr "已同步"
#: xpack/plugins/cloud/const.py:38
#: xpack/plugins/cloud/const.py:39
msgid "Released"
msgstr "已释放"
@ -6193,79 +6201,79 @@ msgstr "已释放"
msgid "Cloud center"
msgstr "云管中心"
#: xpack/plugins/cloud/models.py:29
#: xpack/plugins/cloud/models.py:30
msgid "Provider"
msgstr "云服务商"
#: xpack/plugins/cloud/models.py:33
#: xpack/plugins/cloud/models.py:34
msgid "Validity"
msgstr "有效"
#: xpack/plugins/cloud/models.py:38
#: xpack/plugins/cloud/models.py:39
msgid "Cloud account"
msgstr "云账号"
#: xpack/plugins/cloud/models.py:40
#: xpack/plugins/cloud/models.py:41
msgid "Test cloud account"
msgstr "测试云账号"
#: xpack/plugins/cloud/models.py:84 xpack/plugins/cloud/serializers/task.py:66
#: xpack/plugins/cloud/models.py:85 xpack/plugins/cloud/serializers/task.py:66
msgid "Account"
msgstr "账号"
#: xpack/plugins/cloud/models.py:87 xpack/plugins/cloud/serializers/task.py:37
#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:37
msgid "Regions"
msgstr "地域"
#: xpack/plugins/cloud/models.py:90
#: xpack/plugins/cloud/models.py:91
msgid "Hostname strategy"
msgstr "主机名策略"
#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:67
#: xpack/plugins/cloud/models.py:100 xpack/plugins/cloud/serializers/task.py:67
msgid "Unix admin user"
msgstr "Unix 管理员"
#: xpack/plugins/cloud/models.py:103 xpack/plugins/cloud/serializers/task.py:68
#: xpack/plugins/cloud/models.py:104 xpack/plugins/cloud/serializers/task.py:68
msgid "Windows admin user"
msgstr "Windows 管理员"
#: xpack/plugins/cloud/models.py:109 xpack/plugins/cloud/serializers/task.py:45
#: xpack/plugins/cloud/models.py:110 xpack/plugins/cloud/serializers/task.py:45
msgid "IP network segment group"
msgstr "IP网段组"
#: xpack/plugins/cloud/models.py:112 xpack/plugins/cloud/serializers/task.py:71
#: xpack/plugins/cloud/models.py:113 xpack/plugins/cloud/serializers/task.py:71
msgid "Always update"
msgstr "总是更新"
#: xpack/plugins/cloud/models.py:118
#: xpack/plugins/cloud/models.py:119
msgid "Date last sync"
msgstr "最后同步日期"
#: xpack/plugins/cloud/models.py:129 xpack/plugins/cloud/models.py:170
#: xpack/plugins/cloud/models.py:130 xpack/plugins/cloud/models.py:171
msgid "Sync instance task"
msgstr "同步实例任务"
#: xpack/plugins/cloud/models.py:181 xpack/plugins/cloud/models.py:229
#: xpack/plugins/cloud/models.py:182 xpack/plugins/cloud/models.py:230
msgid "Date sync"
msgstr "同步日期"
#: xpack/plugins/cloud/models.py:185
#: xpack/plugins/cloud/models.py:186
msgid "Sync instance task execution"
msgstr "同步实例任务执行"
#: xpack/plugins/cloud/models.py:209
#: xpack/plugins/cloud/models.py:210
msgid "Sync task"
msgstr "同步任务"
#: xpack/plugins/cloud/models.py:213
#: xpack/plugins/cloud/models.py:214
msgid "Sync instance task history"
msgstr "同步实例任务历史"
#: xpack/plugins/cloud/models.py:216
#: xpack/plugins/cloud/models.py:217
msgid "Instance"
msgstr "实例"
#: xpack/plugins/cloud/models.py:233
#: xpack/plugins/cloud/models.py:234
msgid "Sync instance detail"
msgstr "同步实例详情"
@ -6362,11 +6370,13 @@ msgid "South America (São Paulo)"
msgstr "南美洲(圣保罗)"
#: xpack/plugins/cloud/providers/baiducloud.py:54
#: xpack/plugins/cloud/providers/jdcloud.py:127
msgid "CN North-Beijing"
msgstr "华北-北京"
#: xpack/plugins/cloud/providers/baiducloud.py:55
#: xpack/plugins/cloud/providers/huaweicloud.py:40
#: xpack/plugins/cloud/providers/jdcloud.py:130
msgid "CN South-Guangzhou"
msgstr "华南-广州"
@ -6388,6 +6398,7 @@ msgid "CN North-Baoding"
msgstr "华北-保定"
#: xpack/plugins/cloud/providers/baiducloud.py:60
#: xpack/plugins/cloud/providers/jdcloud.py:129
msgid "CN East-Shanghai"
msgstr "华东-上海"
@ -6452,11 +6463,15 @@ msgstr "华北-乌兰察布一"
msgid "CN South-Guangzhou-InvitationOnly"
msgstr "华南-广州-友好用户环境"
#: xpack/plugins/cloud/serializers/account.py:59
#: xpack/plugins/cloud/providers/jdcloud.py:128
msgid "CN East-Suqian"
msgstr "华东-宿迁"
#: xpack/plugins/cloud/serializers/account.py:60
msgid "Validity display"
msgstr "有效性显示"
#: xpack/plugins/cloud/serializers/account.py:60
#: xpack/plugins/cloud/serializers/account.py:61
msgid "Provider display"
msgstr "服务商显示"
@ -6618,29 +6633,3 @@ msgstr "旗舰版"
#: xpack/plugins/license/models.py:77
msgid "Community edition"
msgstr "社区版"
#~ msgid "JD Cloud"
#~ msgstr "京东云"
#~ msgid "CN East-Suqian"
#~ msgstr "华东-宿迁"
#~ msgid "Inherit"
#~ msgstr "继承"
#~ msgid "Include"
#~ msgstr "包含"
#~ msgid "Exclude"
#~ msgstr "不包含"
#~ msgid "DatabaseApp"
#~ msgstr "数据库应用"
#~ msgid "Database proxy MySQL protocol listen port"
#~ msgstr "MySQL 协议监听的端口"
#, fuzzy
#~| msgid "Database proxy PostgreSQL port"
#~ msgid "Database proxy PostgreSQL listen port"
#~ msgstr "数据库组件 PostgreSQL 协议监听的端口"

View File

@ -65,6 +65,7 @@ class PublicSettingApi(generics.RetrieveAPIView):
# Terminal
"XRDP_ENABLED": settings.XRDP_ENABLED,
"TERMINAL_MAGNUS_ENABLED": settings.TERMINAL_MAGNUS_ENABLED,
"TERMINAL_KOKO_SSH_ENABLED": settings.TERMINAL_KOKO_SSH_ENABLED,
# Announcement
"ANNOUNCEMENT_ENABLED": settings.ANNOUNCEMENT_ENABLED,
"ANNOUNCEMENT": settings.ANNOUNCEMENT,

View File

@ -30,8 +30,9 @@ class TerminalSettingSerializer(serializers.Serializer):
)
TERMINAL_TELNET_REGEX = serializers.CharField(
allow_blank=True, max_length=1024, required=False, label=_('Telnet login regex'),
help_text=_("The login success message varies with devices. "
help_text=_("Tips: The login success message varies with devices. "
"if you cannot log in to the device through Telnet, set this parameter")
)
TERMINAL_MAGNUS_ENABLED = serializers.BooleanField(label=_("Enable database proxy"))
XRDP_ENABLED = serializers.BooleanField(label=_("Enable XRDP"))
TERMINAL_KOKO_SSH_ENABLED = serializers.BooleanField(label=_("Enable KoKo SSH"))