Skip to content

J
jumpserver
Unverified Commit a3bd7cee authored by 老广's avatar 老广 Committed by GitHub
Browse files
Options

Merge pull request #1912 from jumpserver/dev_cloud_manager 

[Update] 修改文案
parents d2c574fe 8d73cd43
Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 119 deletions
apps/locale/zh/LC_MESSAGES/django.po
View file @ a3bd7cee
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Jumpserver 0.3.3\n" "Project-Id-Version: Jumpserver 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-13 22:36+0800\n" "POT-Creation-Date: 2018-10-15 15:30+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: Jumpserver team<ibuler@qq.com>\n" "Language-Team: Jumpserver team<ibuler@qq.com>\n"
...@@ -44,8 +44,8 @@ msgstr "节点管理" ...@@ -44,8 +44,8 @@ msgstr "节点管理"
#: assets/forms/asset.py:116 assets/models/asset.py:87 #: assets/forms/asset.py:116 assets/models/asset.py:87
#: assets/models/cluster.py:19 assets/models/user.py:72 #: assets/models/cluster.py:19 assets/models/user.py:72
#: assets/templates/assets/asset_detail.html:73 templates/_nav.html:24 #: assets/templates/assets/asset_detail.html:73 templates/_nav.html:24
#: xpack/plugins/cloud/models.py:128 #: xpack/plugins/cloud/models.py:133
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:67 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:67
#: xpack/plugins/orgs/templates/orgs/org_list.html:18 #: xpack/plugins/orgs/templates/orgs/org_list.html:18
msgid "Admin user" msgid "Admin user"
msgstr "管理用户" msgstr "管理用户"
...@@ -75,9 +75,9 @@ msgstr "网域" ...@@ -75,9 +75,9 @@ msgstr "网域"
#: perms/forms.py:44 perms/models.py:79 #: perms/forms.py:44 perms/models.py:79
#: perms/templates/perms/asset_permission_list.html:57 #: perms/templates/perms/asset_permission_list.html:57
#: perms/templates/perms/asset_permission_list.html:151 #: perms/templates/perms/asset_permission_list.html:151
#: xpack/plugins/cloud/models.py:127 #: xpack/plugins/cloud/models.py:132
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:63 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:63
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:66 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:66
msgid "Node" msgid "Node"
msgstr "节点" msgstr "节点"
...@@ -130,8 +130,8 @@ msgstr "端口" ...@@ -130,8 +130,8 @@ msgstr "端口"
#: terminal/templates/terminal/command_list.html:73 #: terminal/templates/terminal/command_list.html:73
#: terminal/templates/terminal/session_list.html:41 #: terminal/templates/terminal/session_list.html:41
#: terminal/templates/terminal/session_list.html:72 #: terminal/templates/terminal/session_list.html:72
#: xpack/plugins/cloud/models.py:191 #: xpack/plugins/cloud/models.py:199
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:65 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65
#: xpack/plugins/orgs/templates/orgs/org_list.html:16 #: xpack/plugins/orgs/templates/orgs/org_list.html:16
msgid "Asset" msgid "Asset"
msgstr "资产" msgstr "资产"
...@@ -170,14 +170,13 @@ msgstr "不能包含特殊字符" ...@@ -170,14 +170,13 @@ msgstr "不能包含特殊字符"
#: users/templates/users/user_list.html:23 #: users/templates/users/user_list.html:23
#: users/templates/users/user_profile.html:51 #: users/templates/users/user_profile.html:51
#: users/templates/users/user_pubkey_update.html:53 #: users/templates/users/user_pubkey_update.html:53
#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:123 #: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:128
#: xpack/plugins/cloud/templates/cloud/account_detail.html:52 #: xpack/plugins/cloud/templates/cloud/account_detail.html:52
#: xpack/plugins/cloud/templates/cloud/account_list.html:12 #: xpack/plugins/cloud/templates/cloud/account_list.html:12
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:55 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:55
#: xpack/plugins/cloud/templates/cloud/sync_task_list.html:12 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:12
#: xpack/plugins/orgs/templates/orgs/org_detail.html:52 #: xpack/plugins/orgs/templates/orgs/org_detail.html:52
#: xpack/plugins/orgs/templates/orgs/org_list.html:12 #: xpack/plugins/orgs/templates/orgs/org_list.html:12
#: xpack/templates/orgs/org_list.html:12
msgid "Name" msgid "Name"
msgstr "名称" msgstr "名称"
...@@ -385,7 +384,7 @@ msgstr "标签管理" ...@@ -385,7 +384,7 @@ msgstr "标签管理"
#: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:15 perms/models.py:37 #: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:15 perms/models.py:37
#: perms/models.py:84 perms/templates/perms/asset_permission_detail.html:98 #: perms/models.py:84 perms/templates/perms/asset_permission_detail.html:98
#: users/models/user.py:92 users/templates/users/user_detail.html:111 #: users/models/user.py:92 users/templates/users/user_detail.html:111
#: xpack/plugins/cloud/models.py:41 xpack/plugins/cloud/models.py:131 #: xpack/plugins/cloud/models.py:46 xpack/plugins/cloud/models.py:136
msgid "Created by" msgid "Created by"
msgstr "创建者" msgstr "创建者"
...@@ -400,9 +399,9 @@ msgstr "创建者" ...@@ -400,9 +399,9 @@ msgstr "创建者"
#: perms/templates/perms/asset_permission_detail.html:94 #: perms/templates/perms/asset_permission_detail.html:94
#: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17 #: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17
#: users/templates/users/user_group_detail.html:63 #: users/templates/users/user_group_detail.html:63
#: xpack/plugins/cloud/models.py:42 xpack/plugins/cloud/models.py:132 #: xpack/plugins/cloud/models.py:47 xpack/plugins/cloud/models.py:137
#: xpack/plugins/cloud/templates/cloud/account_detail.html:68 #: xpack/plugins/cloud/templates/cloud/account_detail.html:68
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:79 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:79
#: xpack/plugins/orgs/templates/orgs/org_detail.html:60 #: xpack/plugins/orgs/templates/orgs/org_detail.html:60
msgid "Date created" msgid "Date created"
msgstr "创建日期" msgstr "创建日期"
...@@ -430,15 +429,14 @@ msgstr "创建日期" ...@@ -430,15 +429,14 @@ msgstr "创建日期"
#: users/templates/users/user_detail.html:123 #: users/templates/users/user_detail.html:123
#: users/templates/users/user_group_detail.html:67 #: users/templates/users/user_group_detail.html:67
#: users/templates/users/user_group_list.html:14 #: users/templates/users/user_group_list.html:14
#: users/templates/users/user_profile.html:130 xpack/plugins/cloud/models.py:40 #: users/templates/users/user_profile.html:130 xpack/plugins/cloud/models.py:45
#: xpack/plugins/cloud/models.py:129 #: xpack/plugins/cloud/models.py:134
#: xpack/plugins/cloud/templates/cloud/account_detail.html:72 #: xpack/plugins/cloud/templates/cloud/account_detail.html:72
#: xpack/plugins/cloud/templates/cloud/account_list.html:15 #: xpack/plugins/cloud/templates/cloud/account_list.html:15
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:71 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:71
#: xpack/plugins/cloud/templates/cloud/sync_task_list.html:15 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:16
#: xpack/plugins/orgs/templates/orgs/org_detail.html:64 #: xpack/plugins/orgs/templates/orgs/org_detail.html:64
#: xpack/plugins/orgs/templates/orgs/org_list.html:22 #: xpack/plugins/orgs/templates/orgs/org_list.html:22
#: xpack/templates/orgs/org_list.html:14
msgid "Comment" msgid "Comment"
msgstr "备注" msgstr "备注"
...@@ -578,9 +576,8 @@ msgstr "每行一个命令" ...@@ -578,9 +576,8 @@ msgstr "每行一个命令"
#: users/templates/users/user_group_list.html:15 #: users/templates/users/user_group_list.html:15
#: users/templates/users/user_list.html:29 #: users/templates/users/user_list.html:29
#: xpack/plugins/cloud/templates/cloud/account_list.html:16 #: xpack/plugins/cloud/templates/cloud/account_list.html:16
#: xpack/plugins/cloud/templates/cloud/sync_task_list.html:16 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:18
#: xpack/plugins/orgs/templates/orgs/org_list.html:23 #: xpack/plugins/orgs/templates/orgs/org_list.html:23
#: xpack/templates/orgs/org_list.html:15
msgid "Action" msgid "Action"
msgstr "动作" msgstr "动作"
...@@ -621,7 +618,6 @@ msgstr "默认资产组" ...@@ -621,7 +618,6 @@ msgstr "默认资产组"
#: xpack/plugins/orgs/forms.py:26 #: xpack/plugins/orgs/forms.py:26
#: xpack/plugins/orgs/templates/orgs/org_detail.html:113 #: xpack/plugins/orgs/templates/orgs/org_detail.html:113
#: xpack/plugins/orgs/templates/orgs/org_list.html:14 #: xpack/plugins/orgs/templates/orgs/org_list.html:14
#: xpack/templates/orgs/org_list.html:13
msgid "User" msgid "User"
msgstr "用户" msgstr "用户"
...@@ -862,7 +858,7 @@ msgstr "其它" ...@@ -862,7 +858,7 @@ msgstr "其它"
#: users/templates/users/user_pubkey_update.html:70 #: users/templates/users/user_pubkey_update.html:70
#: users/templates/users/user_pubkey_update.html:76 #: users/templates/users/user_pubkey_update.html:76
#: xpack/plugins/cloud/templates/cloud/account_create_update.html:33 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:33
#: xpack/plugins/cloud/templates/cloud/sync_task_create.html:35 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:35
msgid "Reset" msgid "Reset"
msgstr "重置" msgstr "重置"
...@@ -990,7 +986,6 @@ msgstr "测试" ...@@ -990,7 +986,6 @@ msgstr "测试"
#: xpack/plugins/cloud/templates/cloud/account_list.html:38 #: xpack/plugins/cloud/templates/cloud/account_list.html:38
#: xpack/plugins/orgs/templates/orgs/org_detail.html:25 #: xpack/plugins/orgs/templates/orgs/org_detail.html:25
#: xpack/plugins/orgs/templates/orgs/org_list.html:85 #: xpack/plugins/orgs/templates/orgs/org_list.html:85
#: xpack/templates/orgs/org_list.html:43
msgid "Update" msgid "Update"
msgstr "更新" msgstr "更新"
...@@ -1019,11 +1014,10 @@ msgstr "更新" ...@@ -1019,11 +1014,10 @@ msgstr "更新"
#: users/templates/users/user_list.html:85 #: users/templates/users/user_list.html:85
#: xpack/plugins/cloud/templates/cloud/account_detail.html:29 #: xpack/plugins/cloud/templates/cloud/account_detail.html:29
#: xpack/plugins/cloud/templates/cloud/account_list.html:40 #: xpack/plugins/cloud/templates/cloud/account_list.html:40
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:32 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:32
#: xpack/plugins/cloud/templates/cloud/sync_task_list.html:44 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:54
#: xpack/plugins/orgs/templates/orgs/org_detail.html:29 #: xpack/plugins/orgs/templates/orgs/org_detail.html:29
#: xpack/plugins/orgs/templates/orgs/org_list.html:87 #: xpack/plugins/orgs/templates/orgs/org_list.html:87
#: xpack/templates/orgs/org_list.html:45
msgid "Delete" msgid "Delete"
msgstr "删除" msgstr "删除"
...@@ -1053,9 +1047,8 @@ msgstr "选择节点" ...@@ -1053,9 +1047,8 @@ msgstr "选择节点"
#: users/templates/users/user_list.html:201 #: users/templates/users/user_list.html:201
#: users/templates/users/user_profile.html:232 #: users/templates/users/user_profile.html:232
#: xpack/plugins/cloud/templates/cloud/account_create_update.html:34 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:34
#: xpack/plugins/cloud/templates/cloud/sync_task_create.html:36 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:36
#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:33
#: xpack/templates/orgs/org_list.html:86
msgid "Confirm" msgid "Confirm"
msgstr "确认" msgstr "确认"
...@@ -1269,7 +1262,6 @@ msgstr "重命名失败，不能更改root节点的名称" ...@@ -1269,7 +1262,6 @@ msgstr "重命名失败，不能更改root节点的名称"
#: users/templates/users/user_detail.html:470 #: users/templates/users/user_detail.html:470
#: users/templates/users/user_group_list.html:81 #: users/templates/users/user_group_list.html:81
#: users/templates/users/user_list.html:195 #: users/templates/users/user_list.html:195
#: xpack/templates/orgs/org_list.html:81
msgid "Are you sure?" msgid "Are you sure?"
msgstr "你确认吗?" msgstr "你确认吗?"
...@@ -1672,8 +1664,8 @@ msgstr "选择用户" ...@@ -1672,8 +1664,8 @@ msgstr "选择用户"
#: templates/_base_list.html:43 templates/_header_bar.html:8 #: templates/_base_list.html:43 templates/_header_bar.html:8
#: terminal/templates/terminal/command_list.html:60 #: terminal/templates/terminal/command_list.html:60
#: terminal/templates/terminal/session_list.html:61 #: terminal/templates/terminal/session_list.html:61
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:50 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:50
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:50 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:50
msgid "Search" msgid "Search"
msgstr "搜索" msgstr "搜索"
...@@ -1682,8 +1674,8 @@ msgstr "搜索" ...@@ -1682,8 +1674,8 @@ msgstr "搜索"
#: ops/templates/ops/adhoc_history_detail.html:49 #: ops/templates/ops/adhoc_history_detail.html:49
#: ops/templates/ops/task_detail.html:55 #: ops/templates/ops/task_detail.html:55
#: terminal/templates/terminal/session_list.html:70 #: terminal/templates/terminal/session_list.html:70
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:62 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:62
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:62 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62
msgid "ID" msgid "ID"
msgstr "ID" msgstr "ID"
...@@ -1702,16 +1694,16 @@ msgid "MFA" ...@@ -1702,16 +1694,16 @@ msgid "MFA"
msgstr "MFA" msgstr "MFA"
#: audits/templates/audits/login_log_list.html:55 #: audits/templates/audits/login_log_list.html:55
#: users/models/authentication.py:76 xpack/plugins/cloud/models.py:176 #: users/models/authentication.py:76 xpack/plugins/cloud/models.py:184
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:67 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:67
msgid "Reason" msgid "Reason"
msgstr "原因" msgstr "原因"
#: audits/templates/audits/login_log_list.html:56 #: audits/templates/audits/login_log_list.html:56
#: users/models/authentication.py:77 xpack/plugins/cloud/models.py:175 #: users/models/authentication.py:77 xpack/plugins/cloud/models.py:183
#: xpack/plugins/cloud/models.py:192 #: xpack/plugins/cloud/models.py:200
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:68 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:68
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:67 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:67
msgid "Status" msgid "Status"
msgstr "状态" msgstr "状态"
...@@ -2319,7 +2311,7 @@ msgid "Versions" ...@@ -2319,7 +2311,7 @@ msgid "Versions"
msgstr "版本" msgstr "版本"
#: ops/templates/ops/task_list.html:71 #: ops/templates/ops/task_list.html:71
#: xpack/plugins/cloud/templates/cloud/sync_task_list.html:42 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:52
msgid "Run" msgid "Run"
msgstr "执行" msgstr "执行"
...@@ -2332,8 +2324,7 @@ msgstr "任务开始: " ...@@ -2332,8 +2324,7 @@ msgstr "任务开始: "
msgid "Ops" msgid "Ops"
msgstr "作业中心" msgstr "作业中心"
#: ops/views.py:37 templates/_nav.html:67 templates/_nav.html:103 #: ops/views.py:37 templates/_nav.html:67
#: xpack/plugins/cloud/views.py:85
msgid "Task list" msgid "Task list"
msgstr "任务列表" msgstr "任务列表"
...@@ -2609,6 +2600,10 @@ msgstr "" ...@@ -2609,6 +2600,10 @@ msgstr ""
msgid "Account list" msgid "Account list"
msgstr "账户列表" msgstr "账户列表"
#: templates/_nav.html:103
msgid "Sync instance"
msgstr "同步实例"
#: templates/_pagination.html:59 #: templates/_pagination.html:59
msgid "" msgid ""
"Displays the results of items _START_ to _END_; A total of _TOTAL_ entries" "Displays the results of items _START_ to _END_; A total of _TOTAL_ entries"
...@@ -3194,8 +3189,8 @@ msgstr "用户名/密码 校验失败" ...@@ -3194,8 +3189,8 @@ msgstr "用户名/密码 校验失败"
msgid "MFA authentication failed" msgid "MFA authentication failed"
msgstr "MFA 认证失败" msgstr "MFA 认证失败"
#: users/models/authentication.py:67 xpack/plugins/cloud/models.py:168 #: users/models/authentication.py:67 xpack/plugins/cloud/models.py:176
#: xpack/plugins/cloud/models.py:182 #: xpack/plugins/cloud/models.py:190
msgid "Failed" msgid "Failed"
msgstr "失败" msgstr "失败"
...@@ -3275,9 +3270,9 @@ msgstr "安全令牌验证" ...@@ -3275,9 +3270,9 @@ msgstr "安全令牌验证"
#: users/templates/users/_base_otp.html:44 users/templates/users/_user.html:13 #: users/templates/users/_base_otp.html:44 users/templates/users/_user.html:13
#: users/templates/users/user_profile_update.html:51 #: users/templates/users/user_profile_update.html:51
#: xpack/plugins/cloud/models.py:124 #: xpack/plugins/cloud/models.py:129
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:59 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:59
#: xpack/plugins/cloud/templates/cloud/sync_task_list.html:13 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:13
msgid "Account" msgid "Account"
msgstr "账户" msgstr "账户"
...@@ -3645,28 +3640,23 @@ msgid "Add user" ...@@ -3645,28 +3640,23 @@ msgid "Add user"
msgstr "添加用户" msgstr "添加用户"
#: users/templates/users/user_group_list.html:5 users/views/group.py:45 #: users/templates/users/user_group_list.html:5 users/views/group.py:45
#: xpack/templates/orgs/org_list.html:5
msgid "Create user group" msgid "Create user group"
msgstr "创建用户组" msgstr "创建用户组"
#: users/templates/users/user_group_list.html:82 #: users/templates/users/user_group_list.html:82
#: xpack/templates/orgs/org_list.html:82
msgid "This will delete the selected groups !!!" msgid "This will delete the selected groups !!!"
msgstr "删除选择组" msgstr "删除选择组"
#: users/templates/users/user_group_list.html:91 #: users/templates/users/user_group_list.html:91
#: xpack/templates/orgs/org_list.html:90
msgid "UserGroups Deleted." msgid "UserGroups Deleted."
msgstr "用户组删除" msgstr "用户组删除"
#: users/templates/users/user_group_list.html:92 #: users/templates/users/user_group_list.html:92
#: users/templates/users/user_group_list.html:97 #: users/templates/users/user_group_list.html:97
#: xpack/templates/orgs/org_list.html:91 xpack/templates/orgs/org_list.html:96
msgid "UserGroups Delete" msgid "UserGroups Delete"
msgstr "用户组删除" msgstr "用户组删除"
#: users/templates/users/user_group_list.html:96 #: users/templates/users/user_group_list.html:96
#: xpack/templates/orgs/org_list.html:95
msgid "UserGroup Deleting failed." msgid "UserGroup Deleting failed."
msgstr "用户组删除失败" msgstr "用户组删除失败"
...@@ -4038,35 +4028,35 @@ msgstr "MFA 解绑成功" ...@@ -4038,35 +4028,35 @@ msgstr "MFA 解绑成功"
msgid "MFA disable success, return login page" msgid "MFA disable success, return login page"
msgstr "MFA 解绑成功，返回登录页面" msgstr "MFA 解绑成功，返回登录页面"
#: xpack/plugins/cloud/api.py:60 xpack/plugins/cloud/providers/provider.py:75 #: xpack/plugins/cloud/api.py:60 xpack/plugins/cloud/providers/base.py:83
msgid "Account unavailable" msgid "Account unavailable"
msgstr "账户无效" msgstr "账户无效"
#: xpack/plugins/cloud/forms.py:13 #: xpack/plugins/cloud/forms.py:12
msgid "Access Key ID" msgid "Access Key ID"
msgstr "" msgstr ""
#: xpack/plugins/cloud/forms.py:14 #: xpack/plugins/cloud/forms.py:13
msgid "Access Key Secret" msgid "Access Key Secret"
msgstr "" msgstr ""
#: xpack/plugins/cloud/forms.py:59 #: xpack/plugins/cloud/forms.py:58
msgid "Select account" msgid "Select account"
msgstr "选择账户" msgstr "选择账户"
#: xpack/plugins/cloud/forms.py:65 #: xpack/plugins/cloud/forms.py:64
msgid "Select regions" msgid "Select regions"
msgstr "选择地域" msgstr "选择地域"
#: xpack/plugins/cloud/forms.py:71 #: xpack/plugins/cloud/forms.py:70
msgid "Select instances" msgid "Select instances"
msgstr "选择实例" msgstr "选择实例"
#: xpack/plugins/cloud/forms.py:77 #: xpack/plugins/cloud/forms.py:76
msgid "Select node" msgid "Select node"
msgstr "选择节点" msgstr "选择节点"
#: xpack/plugins/cloud/forms.py:83 xpack/plugins/orgs/forms.py:18 #: xpack/plugins/cloud/forms.py:82 xpack/plugins/orgs/forms.py:18
msgid "Select admins" msgid "Select admins"
msgstr "选择管理员" msgstr "选择管理员"
...@@ -4078,106 +4068,152 @@ msgstr "选择管理员" ...@@ -4078,106 +4068,152 @@ msgstr "选择管理员"
msgid "Cloud center" msgid "Cloud center"
msgstr "云管中心" msgstr "云管中心"
#: xpack/plugins/cloud/models.py:25 #: xpack/plugins/cloud/models.py:30
msgid "Aliyun" msgid "Aliyun"
msgstr "阿里云" msgstr "阿里云"
#: xpack/plugins/cloud/models.py:26 #: xpack/plugins/cloud/models.py:31
msgid "AWS (China)" msgid "AWS (China)"
msgstr "AWS (中国)" msgstr "AWS (中国)"
#: xpack/plugins/cloud/models.py:27 #: xpack/plugins/cloud/models.py:32
msgid "AWS (International)" msgid "AWS (International)"
msgstr "AWS (国际)" msgstr "AWS (国际)"
#: xpack/plugins/cloud/models.py:30 #: xpack/plugins/cloud/models.py:35
msgid "Available" msgid "Available"
msgstr "有效" msgstr "有效"
#: xpack/plugins/cloud/models.py:31 #: xpack/plugins/cloud/models.py:36
msgid "Unavailable" msgid "Unavailable"
msgstr "无效" msgstr "无效"
#: xpack/plugins/cloud/models.py:36 #: xpack/plugins/cloud/models.py:41
#: xpack/plugins/cloud/templates/cloud/account_detail.html:56 #: xpack/plugins/cloud/templates/cloud/account_detail.html:56
#: xpack/plugins/cloud/templates/cloud/account_list.html:13 #: xpack/plugins/cloud/templates/cloud/account_list.html:13
msgid "Provider" msgid "Provider"
msgstr "云服务商" msgstr "云服务商"
#: xpack/plugins/cloud/models.py:37 #: xpack/plugins/cloud/models.py:42
msgid "Access key id" msgid "Access key id"
msgstr "" msgstr ""
#: xpack/plugins/cloud/models.py:38 #: xpack/plugins/cloud/models.py:43
msgid "Access key secret" msgid "Access key secret"
msgstr "" msgstr ""
#: xpack/plugins/cloud/models.py:39 #: xpack/plugins/cloud/models.py:44
#: xpack/plugins/cloud/templates/cloud/account_detail.html:60 #: xpack/plugins/cloud/templates/cloud/account_detail.html:60
#: xpack/plugins/cloud/templates/cloud/account_list.html:14 #: xpack/plugins/cloud/templates/cloud/account_list.html:14
msgid "Validity" msgid "Validity"
msgstr "账户状态" msgstr "账户状态"
#: xpack/plugins/cloud/models.py:125 #: xpack/plugins/cloud/models.py:130
msgid "Regions" msgid "Regions"
msgstr "地域" msgstr "地域"
#: xpack/plugins/cloud/models.py:126 #: xpack/plugins/cloud/models.py:131
msgid "Instances" msgid "Instances"
msgstr "实例" msgstr "实例"
#: xpack/plugins/cloud/models.py:130 #: xpack/plugins/cloud/models.py:135
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:75 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:75
#: xpack/plugins/cloud/templates/cloud/sync_task_list.html:14 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:17
msgid "Date last sync" msgid "Date last sync"
msgstr "最后同步日期" msgstr "最后同步日期"
#: xpack/plugins/cloud/models.py:169 xpack/plugins/cloud/models.py:183 #: xpack/plugins/cloud/models.py:177 xpack/plugins/cloud/models.py:191
msgid "Succeed" msgid "Succeed"
msgstr "成功" msgstr "成功"
#: xpack/plugins/cloud/models.py:170 #: xpack/plugins/cloud/models.py:178
msgid "Partial succeed" msgid "Partial succeed"
msgstr "" msgstr ""
#: xpack/plugins/cloud/models.py:173 xpack/plugins/cloud/models.py:187 #: xpack/plugins/cloud/models.py:181
msgid "Sync task" msgid "Sync instance task"
msgstr "同步任务" msgstr "同步实例任务"
#: xpack/plugins/cloud/models.py:174 #: xpack/plugins/cloud/models.py:182
msgid "Result" msgid "Result"
msgstr "" msgstr "结果"
#: xpack/plugins/cloud/models.py:177 xpack/plugins/cloud/models.py:193 #: xpack/plugins/cloud/models.py:185 xpack/plugins/cloud/models.py:201
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:69 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:68 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:68
msgid "Date sync" msgid "Date sync"
msgstr "同步日期" msgstr "同步日期"
#: xpack/plugins/cloud/models.py:184 #: xpack/plugins/cloud/models.py:192
msgid "Exist" msgid "Exist"
msgstr "存在" msgstr "存在"
#: xpack/plugins/cloud/models.py:188 #: xpack/plugins/cloud/models.py:195
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:25 msgid "Sync task"
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:26 msgstr "同步任务"
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:26
#: xpack/plugins/cloud/views.py:137
msgid "Sync task history"
msgstr "同步历史列表"
#: xpack/plugins/cloud/models.py:189 #: xpack/plugins/cloud/models.py:196
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:91 msgid "Sync instance task history"
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:63 msgstr "同步实例任务历史"
#: xpack/plugins/cloud/models.py:197
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:91
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:63
msgid "Instance" msgid "Instance"
msgstr "实例" msgstr "实例"
#: xpack/plugins/cloud/models.py:190 #: xpack/plugins/cloud/models.py:198
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:83 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:64 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:64
msgid "Region" msgid "Region"
msgstr "地域" msgstr "地域"
#: xpack/plugins/cloud/providers/base.py:73
msgid "任务执行开始: {}"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:77
msgid "检测账户有效性: {}"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:80
msgid "账户无效!"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:85
msgid "账户有效!"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:91
msgid "任务执行结束!"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:93
msgid ""
"查看任务详细信息路径: XPack -> 云管中心 -> 任务列表 -> 任务详情(点击任务名"
"称) -> 查看同步历史列表/实例列表"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:130
msgid "同步实例列表: {}"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:139
msgid "同步地域列表: {}"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:143
msgid "地域: {}"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:154
msgid "实例: {}, 地域: {}"
msgstr ""
#: xpack/plugins/cloud/providers/base.py:160
msgid "正在创建资产..."
msgstr ""
#: xpack/plugins/cloud/templates/cloud/account_detail.html:22 #: xpack/plugins/cloud/templates/cloud/account_detail.html:22
#: xpack/plugins/cloud/views.py:72 #: xpack/plugins/cloud/views.py:72
msgid "Account detail" msgid "Account detail"
...@@ -4188,50 +4224,64 @@ msgstr "账户详情" ...@@ -4188,50 +4224,64 @@ msgstr "账户详情"
msgid "Create account" msgid "Create account"
msgstr "创建账户" msgstr "创建账户"
#: xpack/plugins/cloud/templates/cloud/sync_task_create.html:91 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:91
msgid "Loading..." msgid "Loading..."
msgstr "" msgstr ""
#: xpack/plugins/cloud/templates/cloud/sync_task_create.html:106 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:106
msgid "Load failed" msgid "Load failed"
msgstr "加载失败" msgstr "加载失败"
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:22 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:22
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:23 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:23
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:23 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:23
#: xpack/plugins/cloud/views.py:122 #: xpack/plugins/cloud/views.py:122
msgid "Sync task detail" msgid "Sync task detail"
msgstr "同步任务详情" msgstr "同步任务详情"
#: xpack/plugins/cloud/templates/cloud/sync_task_detail.html:28 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:25
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:29 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:26
#: xpack/plugins/cloud/templates/cloud/sync_task_instance.html:29 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:26
#: xpack/plugins/cloud/views.py:137
msgid "Sync task history"
msgstr "同步历史列表"
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:28
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:29
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:29
#: xpack/plugins/cloud/views.py:180 #: xpack/plugins/cloud/views.py:180
msgid "Sync task instance" msgid "Sync instance list"
msgstr "同步实例列表" msgstr "同步实例列表"
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:63 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:63
msgid "Total count" msgid "Total count"
msgstr "总数" msgstr "总数"
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:64 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:64
msgid "Succeed count" msgid "Succeed count"
msgstr "成功" msgstr "成功"
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:65 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:65
msgid "Failed count" msgid "Failed count"
msgstr "失败" msgstr "失败"
#: xpack/plugins/cloud/templates/cloud/sync_task_history.html:66 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:66
msgid "Exist count" msgid "Exist count"
msgstr "存在" msgstr "存在"
#: xpack/plugins/cloud/templates/cloud/sync_task_list.html:5 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:5
#: xpack/plugins/cloud/views.py:101 msgid "Create sync instance task"
msgid "Create sync task" msgstr "创建同步实例任务"
msgstr "创建同步任务"
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:14
msgid "Run count"
msgstr "执行次数"
#: xpack/plugins/cloud/templates/cloud/sync_task_list.html:79 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:15
msgid "Instance count"
msgstr "实例个数"
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:92
msgid "Sync success" msgid "Sync success"
msgstr "同步成功" msgstr "同步成功"
...@@ -4239,6 +4289,14 @@ msgstr "同步成功" ...@@ -4239,6 +4289,14 @@ msgstr "同步成功"
msgid "Update account" msgid "Update account"
msgstr "更新账户" msgstr "更新账户"
#: xpack/plugins/cloud/views.py:85
msgid "Sync instance task list"
msgstr "同步实例任务列表"
#: xpack/plugins/cloud/views.py:101
msgid "Create sync Instance task"
msgstr "创建同步实例任务"
#: xpack/plugins/orgs/forms.py:14 #: xpack/plugins/orgs/forms.py:14
#: xpack/plugins/orgs/templates/orgs/org_detail.html:76 #: xpack/plugins/orgs/templates/orgs/org_detail.html:76
#: xpack/plugins/orgs/templates/orgs/org_list.html:13 #: xpack/plugins/orgs/templates/orgs/org_list.html:13
...@@ -4283,6 +4341,15 @@ msgstr "创建组织" ...@@ -4283,6 +4341,15 @@ msgstr "创建组织"
msgid "Update org" msgid "Update org"
msgstr "更新组织" msgstr "更新组织"
#~ msgid "Sync instance task detail"
#~ msgstr "同步实例任务详情"
#~ msgid "Sync task instance"
#~ msgstr "同步实例列表"
#~ msgid "Sync instance task instance"
#~ msgstr "同步实例任务实例"
#~ msgid "Get sync task error" #~ msgid "Get sync task error"
#~ msgstr "获取同步任务" #~ msgstr "获取同步任务"
......
apps/templates/_nav.html
View file @ a3bd7cee
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<a href="#"><span class="nav-label">{% trans plugin.verbose_name %}</span><span class="fa arrow"></span></a> <a href="#"><span class="nav-label">{% trans plugin.verbose_name %}</span><span class="fa arrow"></span></a>
<ul class="nav nav-third-level"> <ul class="nav nav-third-level">
<li id="account"><a href="{% url 'xpack:cloud:account-list' %}">{% trans 'Account list' %}</a></li> <li id="account"><a href="{% url 'xpack:cloud:account-list' %}">{% trans 'Account list' %}</a></li>
<li id="sync-task"><a href="{% url 'xpack:cloud:sync-task-list' %}">{% trans 'Task list' %}</a></li> <li id="sync-instance-task"><a href="{% url 'xpack:cloud:sync-instance-task-list' %}">{% trans 'Sync instance' %}</a></li>
</ul> </ul>
</li> </li>
{% else %} {% else %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment