From 5b044299b94f9607021dc569c3a4235fa5308b94 Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Fri, 28 Feb 2025 14:52:28 +0800 Subject: [PATCH] fix: Back account translate --- .../serializers/automations/backup.py | 1 + .../accounts/backup_account_report.html | 4 +- apps/i18n/core/zh/LC_MESSAGES/django.po | 357 ++++++++++-------- 3 files changed, 194 insertions(+), 168 deletions(-) diff --git a/apps/accounts/serializers/automations/backup.py b/apps/accounts/serializers/automations/backup.py index eec829663..1f734b3bb 100644 --- a/apps/accounts/serializers/automations/backup.py +++ b/apps/accounts/serializers/automations/backup.py @@ -28,6 +28,7 @@ class BackupAccountSerializer(BaseAutomationSerializer): 'obj_recipients_part_one', 'obj_recipients_part_two', 'zip_encrypt_password' ] extra_kwargs = { + **BaseAutomationSerializer.Meta.extra_kwargs, 'name': {'required': True}, 'obj_recipients_part_one': { 'label': _('Recipient part one'), 'help_text': _( diff --git a/apps/accounts/templates/accounts/backup_account_report.html b/apps/accounts/templates/accounts/backup_account_report.html index d152d7c06..50b39c4b2 100644 --- a/apps/accounts/templates/accounts/backup_account_report.html +++ b/apps/accounts/templates/accounts/backup_account_report.html @@ -36,11 +36,11 @@

{% trans 'Accounts amount' %}: - {{ summary.total_accounts }}s + {{ summary.total_accounts }}

{% trans 'Type count' %}: - {{ summary.total_types }}s + {{ summary.total_types }}

diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 171f3125a..113f29f36 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: 2025-02-27 18:42+0800\n" +"POT-Creation-Date: 2025-02-28 14:43+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -59,6 +59,10 @@ msgstr "花费时间" msgid "Backup file creation completed" msgstr "创建备份文件完成" +#: accounts/automations/backup_account/handlers.py:178 +msgid "Start sending backup emails" +msgstr "" + #: accounts/automations/backup_account/handlers.py:203 msgid "Encrypting files using encryption password" msgstr "使用加密密码对文件进行加密中" @@ -117,6 +121,8 @@ msgstr ">>> 开始执行测试网关账号可连接性任务" #: users/templates/users/_msg_user_created.html:13 #: users/templates/users/user_password_verify.html:18 #: xpack/plugins/cloud/serializers/account_attrs.py:28 +#: xpack/plugins/cloud/serializers/account_attrs.py:89 +#: xpack/plugins/cloud/serializers/account_attrs.py:96 msgid "Password" msgstr "密码" @@ -438,7 +444,7 @@ msgstr "用户 %s 查看/导出 了密码" #: terminal/serializers/command.py:17 terminal/serializers/session.py:30 #: 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:290 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:289 msgid "Asset" msgstr "资产" @@ -563,8 +569,8 @@ msgstr "可以移除账号" #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:33 users/models/group.py:13 #: users/models/preference.py:11 users/models/user/__init__.py:65 -#: xpack/plugins/cloud/models.py:34 xpack/plugins/cloud/models.py:310 -#: xpack/plugins/cloud/serializers/task.py:77 +#: xpack/plugins/cloud/models.py:34 xpack/plugins/cloud/models.py:309 +#: xpack/plugins/cloud/serializers/task.py:75 msgid "Name" msgstr "名称" @@ -626,12 +632,12 @@ msgid "Password divided" msgstr "密钥是否拆分成前后两部分" #: accounts/models/automations/backup_account.py:33 -#: accounts/serializers/automations/backup.py:33 +#: accounts/serializers/automations/backup.py:34 msgid "Recipient part one" msgstr "收件人部分一" #: accounts/models/automations/backup_account.py:37 -#: accounts/serializers/automations/backup.py:37 +#: accounts/serializers/automations/backup.py:38 msgid "Recipient part two" msgstr "收件人部分二" @@ -736,8 +742,8 @@ msgstr "结束日期" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:148 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:284 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:227 -#: xpack/plugins/cloud/models.py:294 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:226 +#: xpack/plugins/cloud/models.py:293 msgid "Status" msgstr "状态" @@ -863,6 +869,8 @@ msgstr "其它" #: users/forms/profile.py:117 users/models/user/__init__.py:64 #: users/templates/users/_msg_user_created.html:12 #: xpack/plugins/cloud/serializers/account_attrs.py:26 +#: xpack/plugins/cloud/serializers/account_attrs.py:87 +#: xpack/plugins/cloud/serializers/account_attrs.py:94 msgid "Username" msgstr "用户名" @@ -1012,7 +1020,7 @@ msgstr "平台" msgid "Push params" msgstr "账号推送参数" -#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:391 +#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:390 msgid "Account template" msgstr "账号模板" @@ -1203,7 +1211,7 @@ msgstr "已修改" #: ops/models/job.py:155 ops/serializers/job.py:21 #: perms/serializers/permission.py:46 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 -#: xpack/plugins/cloud/manager.py:93 +#: xpack/plugins/cloud/manager.py:83 msgid "Assets" msgstr "资产" @@ -1286,7 +1294,7 @@ msgstr "IP 白名单" #: terminal/models/session/session.py:49 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:298 users/models/user/__init__.py:99 -#: xpack/plugins/cloud/models.py:41 xpack/plugins/cloud/models.py:124 +#: xpack/plugins/cloud/models.py:41 xpack/plugins/cloud/models.py:123 msgid "Comment" msgstr "备注" @@ -1364,13 +1372,13 @@ msgstr "" msgid "Zip Encrypt Password" msgstr "文件加密密码" -#: accounts/serializers/automations/backup.py:34 -#: accounts/serializers/automations/backup.py:38 +#: accounts/serializers/automations/backup.py:35 +#: accounts/serializers/automations/backup.py:39 #: accounts/serializers/automations/change_secret.py:60 msgid "Currently only mail sending is supported" msgstr "当前只支持邮件发送" -#: accounts/serializers/automations/backup.py:40 +#: accounts/serializers/automations/backup.py:41 msgid "Asset type" msgstr "资产类型" @@ -1577,7 +1585,7 @@ msgstr "删除账号" msgid "" "The following is a summary of account backup tasks, please review and handle " "them" -msgstr "" +msgstr "以下是账户备份任务的概要，请查阅并处理" #: accounts/templates/accounts/backup_account_report.html:22 #: accounts/templates/accounts/change_secret_failed_info.html:3 @@ -1622,7 +1630,7 @@ msgstr "结束日期" #: accounts/templates/accounts/gather_account_report.html:35 #: accounts/templates/accounts/push_account_report.html:34 msgid "Time using" -msgstr "" +msgstr "耗时" #: accounts/templates/accounts/backup_account_report.html:38 #: accounts/templates/accounts/check_account_report.html:38 @@ -1730,7 +1738,7 @@ msgstr "无密码数" #: accounts/templates/accounts/check_account_report.html:80 #: assets/models/automations/base.py:153 ops/models/base.py:51 -#: ops/models/job.py:235 xpack/plugins/cloud/models.py:225 +#: ops/models/job.py:235 xpack/plugins/cloud/models.py:224 msgid "Result" msgstr "结果" @@ -1799,12 +1807,12 @@ msgid "Face Online" msgstr "人脸在线" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:115 xpack/plugins/cloud/models.py:316 +#: terminal/models/component/endpoint.py:115 xpack/plugins/cloud/models.py:315 msgid "Priority" msgstr "优先级" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:116 xpack/plugins/cloud/models.py:317 +#: terminal/models/component/endpoint.py:116 xpack/plugins/cloud/models.py:316 msgid "1-100, the lower the value will be match first" msgstr "优先级可选范围为 1-100 (数值越小越优先)" @@ -1838,13 +1846,13 @@ msgid "Command" msgstr "命令" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack/plugins/cloud/models.py:357 +#: xpack/plugins/cloud/models.py:356 msgid "Regex" msgstr "正则表达式" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:187 settings/serializers/feature.py:22 -#: settings/serializers/msg.py:78 xpack/plugins/license/models.py:31 +#: settings/serializers/msg.py:78 xpack/plugins/license/models.py:30 msgid "Content" msgstr "内容" @@ -1923,8 +1931,8 @@ msgid "" "10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64 (Domain name " "support)" msgstr "" -"* 表示匹配所有。例如: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:" -"db8:2de::e13, 2001:db8:1a:1110::/64 (支持网域)" +"* 表示匹配所有。例如: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, " +"2001:db8:2de::e13, 2001:db8:1a:1110::/64 (支持网域)" #: acls/serializers/base.py:41 assets/serializers/asset/host.py:19 msgid "IP/Host" @@ -1943,7 +1951,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "所有复核人都不属于组织 `{}`" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:152 +#: xpack/plugins/cloud/serializers/task.py:150 msgid "IP address invalid: `{}`" msgstr "IP 地址无效: `{}`" @@ -1952,14 +1960,14 @@ msgid "" "With * indicating a match all. Such as: 192.168.10.1, 192.168.1.0/24, " "10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64 " msgstr "" -"* 表示匹配所有。例如: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:" -"db8:2de::e13, 2001:db8:1a:1110::/64" +"* 表示匹配所有。例如: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, " +"2001:db8:2de::e13, 2001:db8:1a:1110::/64" #: acls/serializers/rules/rules.py:33 #: 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 -#: common/drf/renders/base.py:150 xpack/plugins/cloud/models.py:393 +#: common/drf/renders/base.py:150 xpack/plugins/cloud/models.py:391 msgid "IP" msgstr "IP" @@ -2153,7 +2161,7 @@ msgstr "脚本" #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:76 #: settings/serializers/feature.py:81 settings/serializers/feature.py:94 #: settings/serializers/msg.py:30 terminal/models/component/endpoint.py:14 -#: terminal/serializers/applet.py:17 xpack/plugins/cloud/manager.py:93 +#: terminal/serializers/applet.py:17 xpack/plugins/cloud/manager.py:83 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" msgstr "主机" @@ -2172,7 +2180,8 @@ msgstr "云服务" msgid "Web" msgstr "Web" -#: assets/const/category.py:15 common/sdk/sms/endpoint.py:20 +#: assets/const/category.py:15 common/sdk/sms/custom_file.py:47 +#: common/sdk/sms/endpoint.py:20 msgid "Custom type" msgstr "自定义类型" @@ -2424,7 +2433,7 @@ msgstr "地址" #: assets/serializers/asset/common.py:150 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:387 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:386 msgid "Platform" msgstr "平台" @@ -2495,7 +2504,7 @@ msgstr "代理" #: assets/models/automations/base.py:23 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 ops/models/job.py:156 #: perms/models/asset_permission.py:72 tickets/models/ticket/apply_asset.py:14 -#: xpack/plugins/cloud/models.py:388 +#: xpack/plugins/cloud/models.py:387 msgid "Node" msgstr "节点" @@ -2521,14 +2530,14 @@ msgid "Date created" msgstr "创建日期" #: assets/models/automations/base.py:150 -#: assets/serializers/automations/base.py:44 xpack/plugins/cloud/models.py:242 -#: xpack/plugins/cloud/serializers/task.py:249 +#: assets/serializers/automations/base.py:44 xpack/plugins/cloud/models.py:241 +#: xpack/plugins/cloud/serializers/task.py:247 msgid "Trigger mode" msgstr "触发模式" #: assets/models/automations/base.py:152 audits/serializers.py:39 #: ops/models/base.py:52 ops/models/job.py:236 -#: xpack/plugins/cloud/manager.py:103 +#: xpack/plugins/cloud/manager.py:87 msgid "Summary" msgstr "汇总" @@ -2615,7 +2624,7 @@ msgstr "值" #: assets/serializers/platform.py:159 #: authentication/serializers/connect_token_secret.py:124 #: common/serializers/common.py:85 labels/serializers.py:45 -#: settings/serializers/msg.py:90 xpack/plugins/cloud/models.py:392 +#: settings/serializers/msg.py:90 msgid "Label" msgstr "标签" @@ -2828,8 +2837,8 @@ 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:56 -#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:390 -#: xpack/plugins/cloud/serializers/task.py:36 +#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:389 +#: xpack/plugins/cloud/serializers/task.py:35 msgid "Protocols" msgstr "协议组" @@ -2855,7 +2864,7 @@ msgstr "端口超出范围 (0-65535)" msgid "Protocol is required: {}" msgstr "协议是必填的: {}" -#: assets/serializers/asset/common.py:350 +#: assets/serializers/asset/common.py:350 labels/api.py:107 msgid "Invalid data" msgstr "无效的数据" @@ -3248,7 +3257,7 @@ msgstr "映射目录" #: audits/const.py:23 rbac/tree.py:268 terminal/api/session/session.py:284 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 -#: xpack/plugins/cloud/manager.py:94 +#: xpack/plugins/cloud/manager.py:84 msgid "View" msgstr "查看" @@ -3402,7 +3411,7 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:204 terminal/models/session/sharing.py:125 -#: xpack/plugins/cloud/manager.py:180 xpack/plugins/cloud/models.py:231 +#: xpack/plugins/cloud/manager.py:158 xpack/plugins/cloud/models.py:230 msgid "Reason" msgstr "原因" @@ -4129,13 +4138,13 @@ msgstr "私有令牌" #: authentication/models/ssh_key.py:15 terminal/serializers/storage.py:146 #: users/models/user/__init__.py:94 -#: xpack/plugins/cloud/serializers/account_attrs.py:214 +#: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "ssh私钥" #: authentication/models/ssh_key.py:18 settings/serializers/terminal.py:34 #: users/forms/profile.py:175 users/models/user/__init__.py:97 -#: xpack/plugins/cloud/serializers/account_attrs.py:211 +#: xpack/plugins/cloud/serializers/account_attrs.py:210 msgid "Public key" msgstr "SSH公钥" @@ -4173,7 +4182,7 @@ msgid "Component" msgstr "组件" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:389 +#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:388 msgid "Domain" msgstr "网域" @@ -4682,26 +4691,27 @@ msgid "Confirmed" msgstr "确认" #: common/const/choices.py:120 terminal/models/applet/applet.py:31 +#: xpack/plugins/license/models.py:88 msgid "Community edition" msgstr "社区版" -#: common/const/choices.py:121 +#: common/const/choices.py:121 xpack/plugins/license/models.py:80 msgid "Basic edition" msgstr "企业基础版" -#: common/const/choices.py:122 +#: common/const/choices.py:122 xpack/plugins/license/models.py:82 msgid "Standard edition" msgstr "企业标准版" -#: common/const/choices.py:123 +#: common/const/choices.py:123 xpack/plugins/license/models.py:84 msgid "Professional edition" msgstr "企业专业版" -#: common/const/choices.py:124 +#: common/const/choices.py:124 xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "企业旗舰版" -#: common/const/common.py:5 xpack/plugins/cloud/manager.py:427 +#: common/const/common.py:5 xpack/plugins/cloud/manager.py:411 #, python-format msgid "%(name)s was created successfully" msgstr "%(name)s 创建成功" @@ -4765,8 +4775,8 @@ msgstr "无效的ID，应为列表" #: common/serializers/fields.py:146 terminal/serializers/session.py:81 #: tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 -#: xpack/plugins/cloud/serializers/account_attrs.py:80 -#: xpack/plugins/cloud/serializers/account_attrs.py:151 +#: xpack/plugins/cloud/serializers/account_attrs.py:79 +#: xpack/plugins/cloud/serializers/account_attrs.py:150 msgid "This field is required." msgstr "该字段是必填项。" @@ -4959,6 +4969,10 @@ msgstr "自定义短信文件无效" msgid "SMS sending failed[%s]: %s" msgstr "短信发送失败[%s]: %s" +#: common/sdk/sms/custom_file.py:47 common/serializers/common.py:98 +msgid "File" +msgstr "文件" + #: common/sdk/sms/endpoint.py:16 msgid "Alibaba cloud" msgstr "阿里云" @@ -5003,10 +5017,6 @@ msgstr "请在 {} 秒后发送" msgid "Children" msgstr "节点" -#: common/serializers/common.py:98 -msgid "File" -msgstr "文件" - #: common/serializers/fields.py:139 msgid "Invalid data type" msgstr "无效的数据" @@ -5127,6 +5137,10 @@ msgstr "你的账号已创建成功" msgid "JumpServer - An open-source PAM" msgstr "JumpServer 开源堡垒机" +#: jumpserver/context_processor.py:28 +msgid "FIT2CLOUD" +msgstr "" + #: jumpserver/views/celery_flower.py:22 msgid "

Flower service unavailable, check it

" msgstr "Flower 服务不可用，请检查" @@ -6206,7 +6220,7 @@ msgstr "系统设置" msgid "Session audits" msgstr "会话审计" -#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:94 +#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:84 msgid "Cloud import" msgstr "云同步" @@ -6245,7 +6259,7 @@ msgid "Appearance" msgstr "界面" #: rbac/tree.py:65 xpack/plugins/license/meta.py:10 -#: xpack/plugins/license/models.py:153 +#: xpack/plugins/license/models.py:144 msgid "License" msgstr "许可证" @@ -6981,7 +6995,7 @@ msgid "SSO auth key TTL" msgstr "令牌有效期" #: settings/serializers/auth/sso.py:20 -#: xpack/plugins/cloud/serializers/account_attrs.py:201 +#: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Unit: second" msgstr "单位: 秒" @@ -7137,8 +7151,8 @@ msgid "Tenant ID" msgstr "租户 ID" #: settings/serializers/feature.py:110 terminal/serializers/storage.py:68 -#: xpack/plugins/cloud/manager.py:111 xpack/plugins/cloud/manager.py:116 -#: xpack/plugins/cloud/models.py:287 +#: xpack/plugins/cloud/manager.py:100 xpack/plugins/cloud/manager.py:131 +#: xpack/plugins/cloud/models.py:286 msgid "Region" msgstr "地域" @@ -8052,7 +8066,7 @@ msgstr "无法删除正在使用的存储: {}" msgid "Command storages" msgstr "命令存储" -#: terminal/api/component/storage.py:84 xpack/plugins/cloud/manager.py:111 +#: terminal/api/component/storage.py:84 msgid "Invalid" msgstr "无效" @@ -8085,7 +8099,7 @@ msgstr "会话不存在: {}" msgid "Session is finished or the protocol not supported" msgstr "会话已经完成或协议不支持" -#: terminal/api/session/session.py:345 +#: terminal/api/session/session.py:345 tickets/api/ticket.py:140 msgid "User does not have permission" msgstr "用户没有权限" @@ -8634,9 +8648,9 @@ msgid "" "days. Detail" msgstr "" -"如果不存在，RDS 将处于试用模式，试用期为 120 天。详情" +"如果不存在，RDS 将处于试用模式，试用期为 120 天。详情" #: terminal/serializers/applet_host.py:55 msgid "RDS License Server" @@ -8870,8 +8884,8 @@ 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）" +"如果有多个主机，请用逗号 (,) 分隔它们。
（例如：http://" +"www.jumpserver.a.com:9100，http://www.jumpserver.b.com:9100）" #: terminal/serializers/storage.py:199 msgid "Index by date" @@ -10402,7 +10416,7 @@ msgstr "私有IP" msgid "Public IP" msgstr "公网IP" -#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:361 +#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:360 msgid "Instance name" msgstr "实例名称" @@ -10414,19 +10428,19 @@ msgstr "实例名称和部分IP" msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:52 xpack/plugins/cloud/manager.py:99 +#: xpack/plugins/cloud/const.py:52 xpack/plugins/cloud/manager.py:90 msgid "Unsync" msgstr "未同步" -#: xpack/plugins/cloud/const.py:53 xpack/plugins/cloud/manager.py:98 +#: xpack/plugins/cloud/const.py:53 xpack/plugins/cloud/manager.py:89 msgid "New Sync" msgstr "新同步" -#: xpack/plugins/cloud/const.py:54 xpack/plugins/cloud/manager.py:98 +#: xpack/plugins/cloud/const.py:54 xpack/plugins/cloud/manager.py:89 msgid "Synced" msgstr "已同步" -#: xpack/plugins/cloud/const.py:55 xpack/plugins/cloud/manager.py:100 +#: xpack/plugins/cloud/const.py:55 xpack/plugins/cloud/manager.py:90 msgid "Released" msgstr "已释放" @@ -10446,97 +10460,92 @@ msgstr "已同步组织" msgid "Imported" msgstr "导入" -#: xpack/plugins/cloud/manager.py:52 +#: xpack/plugins/cloud/manager.py:47 #, python-format msgid "Task \"%s\" starts executing" msgstr "任务 \"%s\" 开始执行" -#: xpack/plugins/cloud/manager.py:91 +#: xpack/plugins/cloud/manager.py:81 msgid "View the task details path: " msgstr "查看详情" -#: xpack/plugins/cloud/manager.py:94 +#: xpack/plugins/cloud/manager.py:84 msgid "Account Details" msgstr "账号" -#: xpack/plugins/cloud/manager.py:95 +#: xpack/plugins/cloud/manager.py:85 msgid "Synchronization History List" msgstr "同步历史列表" -#: xpack/plugins/cloud/manager.py:95 +#: xpack/plugins/cloud/manager.py:85 msgid "Synchronization Instance List" msgstr "同步实例列表" -#: xpack/plugins/cloud/manager.py:99 -msgid "To be released" -msgstr "待释放" - -#: xpack/plugins/cloud/manager.py:103 +#: xpack/plugins/cloud/manager.py:93 msgid "Task execution completed" msgstr "任务执行完成" -#: xpack/plugins/cloud/manager.py:108 +#: xpack/plugins/cloud/manager.py:97 msgid "Synchronization regions" msgstr "同步地区" -#: xpack/plugins/cloud/manager.py:133 +#: xpack/plugins/cloud/manager.py:115 #, python-format msgid "Get instances of region \"%s\" error, error: %s" msgstr "获取区域 \"%s\" 的实例错误，错误：%s" -#: xpack/plugins/cloud/manager.py:179 +#: xpack/plugins/cloud/manager.py:131 xpack/plugins/cloud/models.py:283 +msgid "Instance" +msgstr "实例" + +#: xpack/plugins/cloud/manager.py:157 #, python-format msgid "Failed to synchronize the instance \"%s\"" msgstr "无法同步实例 %s" -#: xpack/plugins/cloud/manager.py:357 +#: xpack/plugins/cloud/manager.py:336 #, python-format msgid "" "The updated platform of asset \"%s\" is inconsistent with the original " "platform type. Skip platform and protocol updates" msgstr "资产 \"%s\" 的更新平台与原平台类型不一致。跳过平台和协议更新" -#: xpack/plugins/cloud/manager.py:409 +#: xpack/plugins/cloud/manager.py:392 #, python-format msgid "The asset \"%s\" already exists" msgstr "资产 \"%s\" 已存在" -#: xpack/plugins/cloud/manager.py:411 +#: xpack/plugins/cloud/manager.py:394 #, python-format msgid "Update asset \"%s\"" msgstr "更新资产 \"%s\"" -#: xpack/plugins/cloud/manager.py:414 +#: xpack/plugins/cloud/manager.py:397 #, python-format msgid "Asset \"%s\" has been updated" msgstr "资产 \"%s\" 已更新" -#: xpack/plugins/cloud/manager.py:423 +#: xpack/plugins/cloud/manager.py:407 #, python-format msgid "Prepare to create asset \"%s\"" msgstr "准备创建资产 %s" -#: xpack/plugins/cloud/manager.py:444 +#: xpack/plugins/cloud/manager.py:428 #, python-format msgid "Set nodes \"%s\"" msgstr "设置节点: \"%s\"" -#: xpack/plugins/cloud/manager.py:470 +#: xpack/plugins/cloud/manager.py:454 #, python-format msgid "Set accounts \"%s\"" msgstr "设置账号: %s" -#: xpack/plugins/cloud/manager.py:486 +#: xpack/plugins/cloud/manager.py:470 #, python-format msgid "Set protocols \"%s\"" msgstr "设置协议 \"%s\"" -#: xpack/plugins/cloud/manager.py:494 -#, python-format -msgid "Set labels \"%s\"" -msgstr "设置标签: \"%s\"" - -#: xpack/plugins/cloud/manager.py:508 xpack/plugins/cloud/tasks.py:31 +#: xpack/plugins/cloud/manager.py:484 xpack/plugins/cloud/tasks.py:31 msgid "Run sync instance task" msgstr "执行同步实例任务" @@ -10563,8 +10572,8 @@ msgstr "测试云账号" #: xpack/plugins/cloud/models.py:104 #: xpack/plugins/cloud/serializers/account.py:76 -#: xpack/plugins/cloud/serializers/task.py:159 -#: xpack/plugins/cloud/serializers/task.py:160 +#: xpack/plugins/cloud/serializers/task.py:157 +#: xpack/plugins/cloud/serializers/task.py:158 msgid "Regions" msgstr "地域" @@ -10577,7 +10586,7 @@ msgid "IP network segment group" msgstr "IP网段组" #: xpack/plugins/cloud/models.py:116 -#: xpack/plugins/cloud/serializers/task.py:163 +#: xpack/plugins/cloud/serializers/task.py:161 msgid "Preferred IP type" msgstr "" @@ -10589,124 +10598,116 @@ msgstr "总是更新" msgid "Fully synchronous" msgstr "完全同步" -#: xpack/plugins/cloud/models.py:122 -msgid "Release assets" -msgstr "发布资产" - -#: xpack/plugins/cloud/models.py:127 +#: xpack/plugins/cloud/models.py:126 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:130 xpack/plugins/cloud/models.py:379 -#: xpack/plugins/cloud/models.py:406 +#: xpack/plugins/cloud/models.py:129 xpack/plugins/cloud/models.py:378 +#: xpack/plugins/cloud/models.py:404 msgid "Strategy" msgstr "策略" -#: xpack/plugins/cloud/models.py:135 xpack/plugins/cloud/models.py:223 +#: xpack/plugins/cloud/models.py:134 xpack/plugins/cloud/models.py:222 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:234 xpack/plugins/cloud/models.py:297 +#: xpack/plugins/cloud/models.py:233 xpack/plugins/cloud/models.py:296 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:238 +#: xpack/plugins/cloud/models.py:237 msgid "Sync instance snapshot" msgstr "同步实例快照" -#: xpack/plugins/cloud/models.py:246 +#: xpack/plugins/cloud/models.py:245 msgid "Sync instance task execution" msgstr "同步实例任务执行" -#: xpack/plugins/cloud/models.py:277 +#: xpack/plugins/cloud/models.py:276 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:281 +#: xpack/plugins/cloud/models.py:280 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:284 -msgid "Instance" -msgstr "实例" - -#: xpack/plugins/cloud/models.py:301 +#: xpack/plugins/cloud/models.py:300 msgid "Sync instance detail" msgstr "同步实例详情" -#: xpack/plugins/cloud/models.py:313 xpack/plugins/cloud/serializers/task.py:79 +#: xpack/plugins/cloud/models.py:312 xpack/plugins/cloud/serializers/task.py:77 msgid "Rule relation" msgstr "条件关系" -#: xpack/plugins/cloud/models.py:323 +#: xpack/plugins/cloud/models.py:322 msgid "Task strategy" msgstr "任务策略" -#: xpack/plugins/cloud/models.py:350 +#: xpack/plugins/cloud/models.py:349 msgid "Equal" msgstr "等于" -#: xpack/plugins/cloud/models.py:351 +#: xpack/plugins/cloud/models.py:350 msgid "Not Equal" msgstr "不等于" -#: xpack/plugins/cloud/models.py:352 +#: xpack/plugins/cloud/models.py:351 msgid "In" msgstr "在...中" -#: xpack/plugins/cloud/models.py:353 +#: xpack/plugins/cloud/models.py:352 msgid "Contains" msgstr "包含" -#: xpack/plugins/cloud/models.py:354 +#: xpack/plugins/cloud/models.py:353 msgid "Exclude" msgstr "排除" -#: xpack/plugins/cloud/models.py:355 +#: xpack/plugins/cloud/models.py:354 msgid "Startswith" msgstr "以...开头" -#: xpack/plugins/cloud/models.py:356 +#: xpack/plugins/cloud/models.py:355 msgid "Endswith" msgstr "以...结尾" -#: xpack/plugins/cloud/models.py:362 +#: xpack/plugins/cloud/models.py:361 msgid "Instance platform" msgstr "实例平台" -#: xpack/plugins/cloud/models.py:363 +#: xpack/plugins/cloud/models.py:362 msgid "Instance address" msgstr "实例地址" -#: xpack/plugins/cloud/models.py:370 +#: xpack/plugins/cloud/models.py:369 msgid "Rule attr" msgstr "规则属性" -#: xpack/plugins/cloud/models.py:374 +#: xpack/plugins/cloud/models.py:373 msgid "Rule match" msgstr "规则匹配" -#: xpack/plugins/cloud/models.py:376 +#: xpack/plugins/cloud/models.py:375 msgid "Rule value" msgstr "规则值" -#: xpack/plugins/cloud/models.py:383 xpack/plugins/cloud/serializers/task.py:82 +#: xpack/plugins/cloud/models.py:382 xpack/plugins/cloud/serializers/task.py:80 msgid "Strategy rule" msgstr "条件" -#: xpack/plugins/cloud/models.py:394 +#: xpack/plugins/cloud/models.py:392 msgid "Name strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:401 +#: xpack/plugins/cloud/models.py:399 msgid "Action attr" msgstr "动作属性" -#: xpack/plugins/cloud/models.py:403 +#: xpack/plugins/cloud/models.py:401 msgid "Action value" msgstr "动作值" -#: xpack/plugins/cloud/models.py:410 xpack/plugins/cloud/serializers/task.py:85 +#: xpack/plugins/cloud/models.py:408 xpack/plugins/cloud/serializers/task.py:83 msgid "Strategy action" msgstr "动作" @@ -10930,55 +10931,57 @@ msgstr "Access key id" msgid "Subscription ID" msgstr "订阅 ID" -#: xpack/plugins/cloud/serializers/account_attrs.py:74 -msgid "Auto node classification" -msgstr "自动节点分类" +#: xpack/plugins/cloud/serializers/account_attrs.py:92 +#, fuzzy +#| msgid "Container name" +msgid "domain_name" +msgstr "容器名称" -#: xpack/plugins/cloud/serializers/account_attrs.py:99 -#: xpack/plugins/cloud/serializers/account_attrs.py:103 -#: xpack/plugins/cloud/serializers/account_attrs.py:127 -#: xpack/plugins/cloud/serializers/account_attrs.py:157 -#: xpack/plugins/cloud/serializers/account_attrs.py:207 +#: xpack/plugins/cloud/serializers/account_attrs.py:98 +#: xpack/plugins/cloud/serializers/account_attrs.py:102 +#: xpack/plugins/cloud/serializers/account_attrs.py:126 +#: xpack/plugins/cloud/serializers/account_attrs.py:156 +#: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "API Endpoint" msgstr "API 端点" -#: xpack/plugins/cloud/serializers/account_attrs.py:109 +#: xpack/plugins/cloud/serializers/account_attrs.py:108 msgid "Auth url" msgstr "认证地址" -#: xpack/plugins/cloud/serializers/account_attrs.py:110 +#: xpack/plugins/cloud/serializers/account_attrs.py:109 msgid "eg: http://openstack.example.com:5000/v3" msgstr "如: http://openstack.example.com:5000/v3" -#: xpack/plugins/cloud/serializers/account_attrs.py:113 +#: xpack/plugins/cloud/serializers/account_attrs.py:112 msgid "User domain" msgstr "用户域" -#: xpack/plugins/cloud/serializers/account_attrs.py:128 +#: xpack/plugins/cloud/serializers/account_attrs.py:127 msgid "Cert File" msgstr "证书文件" -#: xpack/plugins/cloud/serializers/account_attrs.py:129 +#: xpack/plugins/cloud/serializers/account_attrs.py:128 msgid "Key File" msgstr "密钥文件" -#: xpack/plugins/cloud/serializers/account_attrs.py:145 +#: xpack/plugins/cloud/serializers/account_attrs.py:144 msgid "Service account key" msgstr "服务帐号密钥" -#: xpack/plugins/cloud/serializers/account_attrs.py:146 +#: xpack/plugins/cloud/serializers/account_attrs.py:145 msgid "The file is in JSON format" msgstr "JSON 格式的文件" -#: xpack/plugins/cloud/serializers/account_attrs.py:164 +#: xpack/plugins/cloud/serializers/account_attrs.py:163 msgid "IP address invalid `{}`, {}" msgstr "IP 地址无效: `{}`, {}" -#: xpack/plugins/cloud/serializers/account_attrs.py:180 +#: xpack/plugins/cloud/serializers/account_attrs.py:179 msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" msgstr "例: 192.168.1.0/24,10.0.0.0-10.0.0.255" -#: xpack/plugins/cloud/serializers/account_attrs.py:183 +#: xpack/plugins/cloud/serializers/account_attrs.py:182 msgid "" "The port is used to detect the validity of the IP address. When the " "synchronization task is executed, only the valid IP address will be " @@ -10987,31 +10990,31 @@ msgstr "" "端口用来检测 IP 地址的有效性，在同步任务执行时，只会同步有效的 IP 地址。
" "如果端口为 0，则表示所有 IP 地址均有效。" -#: xpack/plugins/cloud/serializers/account_attrs.py:191 +#: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Hostname prefix" msgstr "主机名前缀" -#: xpack/plugins/cloud/serializers/account_attrs.py:194 +#: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "IP segment" msgstr "IP 网段" -#: xpack/plugins/cloud/serializers/account_attrs.py:198 +#: xpack/plugins/cloud/serializers/account_attrs.py:197 msgid "Test port" msgstr "测试端口" -#: xpack/plugins/cloud/serializers/account_attrs.py:201 +#: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Test timeout" msgstr "测试超时时间" -#: xpack/plugins/cloud/serializers/account_attrs.py:217 +#: xpack/plugins/cloud/serializers/account_attrs.py:216 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:157 +#: xpack/plugins/cloud/serializers/task.py:155 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:158 +#: xpack/plugins/cloud/serializers/task.py:156 msgid "Instance count" msgstr "实例个数" @@ -11030,12 +11033,21 @@ msgid "Period clean sync instance task execution" msgstr "定期清除同步实例任务执行记录" #: xpack/plugins/cloud/tasks.py:54 +#, fuzzy +#| msgid "" +#| "Every day, according to the configuration in \"System Settings - Tasks - " +#| "Regular \n" +#| " clean-up - Cloud sync task history retention days\" the system " +#| "will clean up the execution \n" +#| " records generated by cloud synchronization" msgid "" -"Every day, according to the configuration in \"System Settings - Tasks - " -"Regular \n" +"\n" +" Every day, according to the configuration in \"System Settings - " +"Tasks - Regular \n" " clean-up - Cloud sync task history retention days\" the system will " "clean up the execution \n" -" records generated by cloud synchronization" +" records generated by cloud synchronization\n" +" " msgstr "" "每天，系统会根据“系统设置-任务-”中的配置定期清理云同步任务历史保留天数，对云" "同步产生的执行记录进行清理" @@ -11093,3 +11105,16 @@ msgstr "许可证导入成功" #: xpack/plugins/license/api.py:53 msgid "Invalid license" msgstr "许可证无效" + +#~ msgid "To be released" +#~ msgstr "待释放" + +#, python-format +#~ msgid "Set labels \"%s\"" +#~ msgstr "设置标签: \"%s\"" + +#~ msgid "Release assets" +#~ msgstr "发布资产" + +#~ msgid "Auto node classification" +#~ msgstr "自动节点分类"