Skip to content

J
jumpserver
Commit c48531c5 authored by ibuler's avatar ibuler
Browse files
Options

[Update] 添加和修改部分翻译

parent 0916757e
Show whitespace changes
Inline Side-by-side
Showing with 655 additions and 545 deletions
apps/assets/templates/assets/_asset_group_bulk_update_modal.html
View file @ c48531c5
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% block modal_id %}asset_group_bulk_update_modal{% endblock %} {% block modal_id %}asset_group_bulk_update_modal{% endblock %}
{% block modal_class %}modal-lg{% endblock %} {% block modal_class %}modal-lg{% endblock %}
{% block modal_title%}{% trans "Update Asset Group" %}{% endblock %} {% block modal_title%}{% trans "Update asset sroup" %}{% endblock %}
{% block modal_body %} {% block modal_body %}
{% load bootstrap3 %} {% load bootstrap3 %}
<p class="text-success text-center">{% trans "Hint: only change the field you want to update." %}</p> <p class="text-success text-center">{% trans "Hint: only change the field you want to update." %}</p>
......
apps/assets/templates/assets/asset_detail.html
View file @ c48531c5
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Test is alive' %}:</td> <td>{% trans 'Test connective' %}:</td>
<td> <td>
<span class="pull-right"> <span class="pull-right">
<button type="button" class="btn btn-primary btn-xs" id="btn-test-is-alive" style="width: 54px">{% trans 'Test' %}</button> <button type="button" class="btn btn-primary btn-xs" id="btn-test-is-alive" style="width: 54px">{% trans 'Test' %}</button>
......
apps/assets/templates/assets/cluster_assets.html
View file @ c48531c5
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<table class="table"> <table class="table">
<tbody> <tbody>
<tr class="no-borders-tr"> <tr class="no-borders-tr">
<td width="50%">{% trans 'Test assets alive' %}:</td> <td width="50%">{% trans 'Test assets connective' %}:</td>
<td> <td>
<span style="float: right"> <span style="float: right">
<button type="button" class="btn btn-primary btn-xs" id="btn-test-assets" style="width: 54px">{% trans 'Run' %}</button> <button type="button" class="btn btn-primary btn-xs" id="btn-test-assets" style="width: 54px">{% trans 'Run' %}</button>
......
apps/assets/templates/assets/cluster_list.html
View file @ c48531c5
...@@ -91,12 +91,12 @@ $(document).ready(function(){ ...@@ -91,12 +91,12 @@ $(document).ready(function(){
}, function() { }, function() {
var success = function() { var success = function() {
var msg = "{% trans 'Cluster Deleted.' %}"; var msg = "{% trans 'Cluster Deleted.' %}";
swal("{% trans 'Cluster Delete' %}", msg, "success"); swal("{% trans 'Cluster delete' %}", msg, "success");
$('#cluster_list_table').DataTable().ajax.reload(); $('#cluster_list_table').DataTable().ajax.reload();
}; };
var fail = function() { var fail = function() {
var msg = "{% trans 'Cluster Deleting failed.' %}"; var msg = "{% trans 'Cluster deleting failed.' %}";
swal("{% trans 'Cluster Delete' %}", msg, "error"); swal("{% trans 'Cluster delete' %}", msg, "error");
}; };
var url_delete = the_url + '?id__in=' + JSON.stringify(plain_id_list); var url_delete = the_url + '?id__in=' + JSON.stringify(plain_id_list);
APIUpdateAttr({url: url_delete, method: 'DELETE', success: success, error: fail}); APIUpdateAttr({url: url_delete, method: 'DELETE', success: success, error: fail});
......
apps/locale/zh/LC_MESSAGES/django.po
View file @ c48531c5
...@@ -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: 2017-12-19 23:11+0800\n" "POT-Creation-Date: 2018-01-01 00:34+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"
...@@ -17,113 +17,82 @@ msgstr "" ...@@ -17,113 +17,82 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: assets/const.py:6 #: assets/forms.py:23 assets/forms.py:53 assets/forms.py:99 perms/forms.py:36
msgid "PUSH SYSTEM USER TO CLUSTER PERIOD TASK" #: perms/templates/perms/asset_permission_asset.html:127 users/forms.py:240
msgstr "定期推送系统用户到集群"
#: assets/const.py:7
msgid "PUSH SYSTEM USER TO CLUSTER: {}"
msgstr "推送系统用户到集群: {}"
#: assets/const.py:11
msgid "UPDATE ASSETS HARDWARE INFO"
msgstr "更新资产硬件信息"
#: assets/const.py:13
msgid "UPDATE ASSETS HARDWARE INFO PERIOD"
msgstr "定期更新资产硬件信息"
#: assets/const.py:24
msgid "TEST ADMIN USER CONN PERIOD TASK"
msgstr "定期测试资产是否在线"
#: assets/const.py:25
msgid "TEST ADMIN USER CONN: {}"
msgstr "测试管理用户连接性"
#: assets/const.py:38
msgid "ASSET CONN TEST MANUAL"
msgstr "手动测试资产连接性"
#: assets/const.py:41
msgid "TEST SYSTEM USER CONN PERIOD TASK"
msgstr "定期测试系统用户连接性"
#: assets/const.py:43
msgid "TEST SYSTEM USER CONN: {}"
msgstr "测试系统用户连接性: {}"
#: assets/forms.py:25 assets/forms.py:47 assets/forms.py:86 perms/forms.py:30
#: perms/templates/perms/asset_permission_asset.html:127 users/forms.py:231
msgid "Select asset groups" msgid "Select asset groups"
msgstr "选择资产组" msgstr "选择资产组"
#: assets/forms.py:26 assets/templates/assets/admin_user_detail.html:92 #: assets/forms.py:24 assets/templates/assets/admin_user_detail.html:92
msgid "Select cluster" msgid "Select cluster"
msgstr "选择集群" msgstr "选择集群"
#: assets/forms.py:27 #: assets/forms.py:25
msgid "Select admin user" msgid "Select admin user"
msgstr "选择管理用户" msgstr "选择管理用户"
#: assets/forms.py:34 assets/forms.py:55 #: assets/forms.py:33 assets/forms.py:61
msgid "Host level admin user, If not set using cluster admin user default" msgid "Host level admin user, If not set using cluster admin user default"
msgstr "主机级别管理用户，如果没有设置则默认使用集群级别管理用户" msgstr "主机级别管理用户，如果没有设置则默认使用集群级别管理用户"
#: assets/forms.py:48 #: assets/forms.py:40 assets/forms.py:68
msgid "You need set a admin user if cluster not have"
msgstr ""
#: assets/forms.py:54
msgid "Default using cluster admin user" msgid "Default using cluster admin user"
msgstr "默认使用管理用户" msgstr "默认使用管理用户"
#: assets/forms.py:63 assets/forms.py:68 assets/forms.py:115 #: assets/forms.py:76 assets/forms.py:81 assets/forms.py:127
#: assets/templates/assets/asset_group_detail.html:70 perms/forms.py:27 #: assets/templates/assets/asset_group_detail.html:70 perms/forms.py:33
#: perms/templates/perms/asset_permission_asset.html:99 users/forms.py:228 #: perms/templates/perms/asset_permission_asset.html:99 users/forms.py:237
msgid "Select assets" msgid "Select assets"
msgstr "选择资产" msgstr "选择资产"
#: assets/forms.py:73 assets/models/asset.py:49 #: assets/forms.py:86 assets/models/asset.py:45
#: assets/templates/assets/admin_user_assets.html:61 #: assets/templates/assets/admin_user_assets.html:61
#: assets/templates/assets/asset_detail.html:69 #: assets/templates/assets/asset_detail.html:69
#: assets/templates/assets/asset_group_detail.html:47 #: assets/templates/assets/asset_group_detail.html:47
#: assets/templates/assets/asset_list.html:32 #: assets/templates/assets/asset_list.html:32
#: assets/templates/assets/cluster_assets.html:53 #: assets/templates/assets/cluster_assets.html:53
#: assets/templates/assets/system_user_asset.html:54 #: assets/templates/assets/system_user_asset.html:54
#: assets/templates/assets/user_asset_list.html:35 #: assets/templates/assets/user_asset_list.html:31
#: perms/templates/perms/asset_permission_asset.html:56 #: perms/templates/perms/asset_permission_asset.html:56
#: users/templates/users/user_group_granted_asset.html:51 #: users/templates/users/user_group_granted_asset.html:51
msgid "Port" msgid "Port"
msgstr "端口" msgstr "端口"
#: assets/forms.py:112 assets/templates/assets/asset_group_list.html:16 #: assets/forms.py:124 assets/templates/assets/asset_group_list.html:16
#: assets/templates/assets/system_user_list.html:19 perms/models.py:17 #: assets/templates/assets/system_user_list.html:26 perms/models.py:17
#: perms/templates/perms/asset_permission_create_update.html:40 #: perms/templates/perms/asset_permission_create_update.html:40
#: perms/templates/perms/asset_permission_list.html:22 templates/_nav.html:22 #: perms/templates/perms/asset_permission_list.html:28 templates/_nav.html:22
#: terminal/backends/command/models.py:11 terminal/models.py:91 #: terminal/backends/command/models.py:11 terminal/models.py:93
#: terminal/templates/terminal/command_list.html:39 #: terminal/templates/terminal/command_list.html:40
#: terminal/templates/terminal/session_list.html:38 #: terminal/templates/terminal/command_list.html:73
#: terminal/templates/terminal/session_list.html:69 #: terminal/templates/terminal/session_list.html:41
#: terminal/templates/terminal/session_list.html:72
#: users/templates/users/user_granted_asset.html:82 #: users/templates/users/user_granted_asset.html:82
#: users/templates/users/user_group_granted_asset.html:86 #: users/templates/users/user_group_granted_asset.html:86
msgid "Asset" msgid "Asset"
msgstr "资产" msgstr "资产"
#: assets/forms.py:147 assets/forms.py:205 assets/forms.py:261 #: assets/forms.py:159 assets/forms.py:219 assets/forms.py:278
#: assets/models/cluster.py:18 assets/models/group.py:21 #: assets/models/cluster.py:18 assets/models/group.py:20
#: assets/models/user.py:27 assets/templates/assets/admin_user_detail.html:56 #: assets/models/user.py:28 assets/templates/assets/admin_user_detail.html:56
#: assets/templates/assets/admin_user_list.html:22 #: assets/templates/assets/admin_user_list.html:22
#: assets/templates/assets/asset_group_list.html:15 #: assets/templates/assets/asset_group_list.html:15
#: assets/templates/assets/cluster_detail.html:57 #: assets/templates/assets/cluster_detail.html:57
#: assets/templates/assets/cluster_list.html:18 #: assets/templates/assets/cluster_list.html:19
#: assets/templates/assets/system_user_detail.html:53 #: assets/templates/assets/system_user_detail.html:53
#: assets/templates/assets/system_user_list.html:17 ops/models.py:24 #: assets/templates/assets/system_user_list.html:24 ops/models.py:31
#: ops/templates/ops/task_detail.html:56 ops/templates/ops/task_list.html:39 #: ops/templates/ops/task_detail.html:56 ops/templates/ops/task_list.html:39
#: perms/models.py:14 #: perms/models.py:14
#: perms/templates/perms/asset_permission_create_update.html:33 #: perms/templates/perms/asset_permission_create_update.html:33
#: perms/templates/perms/asset_permission_detail.html:62 #: perms/templates/perms/asset_permission_detail.html:62
#: perms/templates/perms/asset_permission_list.html:19 #: perms/templates/perms/asset_permission_list.html:25
#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:14 #: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:14
#: terminal/models.py:115 terminal/templates/terminal/terminal_detail.html:43 #: terminal/models.py:117 terminal/templates/terminal/terminal_detail.html:43
#: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:21 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
#: users/models/user.py:32 users/templates/users/_select_user_modal.html:13 #: users/models/user.py:36 users/templates/users/_select_user_modal.html:13
#: users/templates/users/user_detail.html:62 #: users/templates/users/user_detail.html:62
#: users/templates/users/user_granted_asset.html:81 #: users/templates/users/user_granted_asset.html:81
#: users/templates/users/user_group_detail.html:55 #: users/templates/users/user_group_detail.html:55
...@@ -135,243 +104,258 @@ msgstr "资产" ...@@ -135,243 +104,258 @@ msgstr "资产"
msgid "Name" msgid "Name"
msgstr "名称" msgstr "名称"
#: assets/forms.py:162 #: assets/forms.py:174
msgid "If also set private key, use that first" msgid "If also set private key, use that first"
msgstr "如果设置私钥，则优先使用密钥" msgstr "如果设置私钥，则优先使用密钥"
#: assets/forms.py:188 assets/forms.py:243 assets/forms.py:305 #: assets/forms.py:202 assets/forms.py:260 assets/forms.py:321
msgid "Invalid private key" msgid "Invalid private key"
msgstr "ssh密钥不合法" msgstr "ssh密钥不合法"
#: assets/forms.py:198 #: assets/forms.py:212
msgid "Password and private key file must be input one" msgid "Password and private key file must be input one"
msgstr "密码和私钥, 必须输入一个" msgstr "密码和私钥, 必须输入一个"
#: assets/forms.py:206 assets/forms.py:262 assets/models/user.py:28 #: assets/forms.py:220 assets/forms.py:279 assets/models/user.py:29
#: assets/templates/assets/admin_user_detail.html:60 #: assets/templates/assets/admin_user_detail.html:60
#: assets/templates/assets/admin_user_list.html:23 #: assets/templates/assets/admin_user_list.html:23
#: assets/templates/assets/system_user_detail.html:57 #: assets/templates/assets/system_user_detail.html:57
#: assets/templates/assets/system_user_list.html:18 #: assets/templates/assets/system_user_list.html:25
#: perms/templates/perms/asset_permission_user.html:55 users/forms.py:14 #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:14
#: users/models/authentication.py:44 users/models/user.py:31 #: users/models/authentication.py:44 users/models/user.py:35
#: users/templates/users/_select_user_modal.html:14 #: users/templates/users/_select_user_modal.html:14
#: users/templates/users/login.html:53 #: users/templates/users/login.html:53
#: users/templates/users/login_log_list.html:48 #: users/templates/users/login_log_list.html:49
#: users/templates/users/user_detail.html:66 #: users/templates/users/user_detail.html:66
#: users/templates/users/user_list.html:24 #: users/templates/users/user_list.html:24
#: users/templates/users/user_profile.html:47 #: users/templates/users/user_profile.html:47
msgid "Username" msgid "Username"
msgstr "用户名" msgstr "用户名"
#: assets/forms.py:250 assets/forms.py:311 #: assets/forms.py:267 assets/forms.py:327
msgid "Auth info required, private_key or password" msgid "Auth info required, private_key or password"
msgstr "密钥和密码必须填写一个" msgstr "密钥和密码必须填写一个"
#: assets/forms.py:265 #: assets/forms.py:282
msgid " Select clusters" msgid " Select clusters"
msgstr "选择集群" msgstr "选择集群"
#: assets/models/asset.py:28 #: assets/models/asset.py:24
msgid "In use" msgid "In use"
msgstr "使用中" msgstr "使用中"
#: assets/models/asset.py:29 #: assets/models/asset.py:25
msgid "Out of use" msgid "Out of use"
msgstr "未使用" msgstr "未使用"
#: assets/models/asset.py:32 #: assets/models/asset.py:28
msgid "Server" msgid "Server"
msgstr "物理机" msgstr "物理机"
#: assets/models/asset.py:33 #: assets/models/asset.py:29
msgid "VM" msgid "VM"
msgstr "虚拟机" msgstr "虚拟机"
#: assets/models/asset.py:34 #: assets/models/asset.py:30
msgid "Switch" msgid "Switch"
msgstr "交换机" msgstr "交换机"
#: assets/models/asset.py:35 #: assets/models/asset.py:31
msgid "Router" msgid "Router"
msgstr "路由器" msgstr "路由器"
#: assets/models/asset.py:36 #: assets/models/asset.py:32
msgid "Firewall" msgid "Firewall"
msgstr "防火墙" msgstr "防火墙"
#: assets/models/asset.py:37 #: assets/models/asset.py:33
msgid "Storage" msgid "Storage"
msgstr "存储" msgstr "存储"
#: assets/models/asset.py:47 assets/templates/assets/admin_user_assets.html:60 #: assets/models/asset.py:36
msgid "Production"
msgstr "生产环境"
#: assets/models/asset.py:37
msgid "Development"
msgstr "开发环境"
#: assets/models/asset.py:38
msgid "Testing"
msgstr "测试环境"
#: assets/models/asset.py:43 assets/templates/assets/admin_user_assets.html:60
#: assets/templates/assets/asset_detail.html:61 #: assets/templates/assets/asset_detail.html:61
#: assets/templates/assets/asset_group_detail.html:46 #: assets/templates/assets/asset_group_detail.html:46
#: assets/templates/assets/asset_list.html:31 #: assets/templates/assets/asset_list.html:31
#: assets/templates/assets/cluster_assets.html:52 #: assets/templates/assets/cluster_assets.html:52
#: assets/templates/assets/system_user_asset.html:53 #: assets/templates/assets/system_user_asset.html:53
#: assets/templates/assets/user_asset_list.html:34 #: assets/templates/assets/user_asset_list.html:30
#: perms/templates/perms/asset_permission_asset.html:55 #: perms/templates/perms/asset_permission_asset.html:55
#: users/templates/users/login_log_list.html:51 #: users/templates/users/login_log_list.html:52
#: users/templates/users/user_granted_asset.html:49 #: users/templates/users/user_granted_asset.html:49
#: users/templates/users/user_group_granted_asset.html:50 #: users/templates/users/user_group_granted_asset.html:50
msgid "IP" msgid "IP"
msgstr "IP" msgstr "IP"
#: assets/models/asset.py:48 assets/templates/assets/admin_user_assets.html:59 #: assets/models/asset.py:44 assets/templates/assets/admin_user_assets.html:59
#: assets/templates/assets/asset_detail.html:57 #: assets/templates/assets/asset_detail.html:57
#: assets/templates/assets/asset_group_detail.html:45 #: assets/templates/assets/asset_group_detail.html:45
#: assets/templates/assets/asset_list.html:30 #: assets/templates/assets/asset_list.html:30
#: assets/templates/assets/cluster_assets.html:51 #: assets/templates/assets/cluster_assets.html:51
#: assets/templates/assets/system_user_asset.html:52 #: assets/templates/assets/system_user_asset.html:52
#: assets/templates/assets/user_asset_list.html:33 #: assets/templates/assets/user_asset_list.html:29
#: perms/templates/perms/asset_permission_asset.html:54 #: perms/templates/perms/asset_permission_asset.html:54
#: users/templates/users/user_granted_asset.html:48 #: users/templates/users/user_granted_asset.html:48
#: users/templates/users/user_group_granted_asset.html:49 #: users/templates/users/user_group_granted_asset.html:49
msgid "Hostname" msgid "Hostname"
msgstr "主机名" msgstr "主机名"
#: assets/models/asset.py:50 assets/templates/assets/asset_detail.html:213 #: assets/models/asset.py:46 assets/templates/assets/asset_detail.html:213
#: assets/views/asset.py:217 assets/views/asset.py:257 #: assets/views/asset.py:212 assets/views/asset.py:252
msgid "Asset groups" msgid "Asset groups"
msgstr "资产组" msgstr "资产组"
#: assets/models/asset.py:51 assets/models/user.py:201 #: assets/models/asset.py:47 assets/models/user.py:215
#: assets/templates/assets/asset_detail.html:85 templates/_nav.html:24 #: assets/templates/assets/asset_detail.html:85
#: assets/templates/assets/asset_list.html:33 templates/_nav.html:24
msgid "Cluster" msgid "Cluster"
msgstr "集群" msgstr "集群"
#: assets/models/asset.py:52 assets/templates/assets/asset_detail.html:129 #: assets/models/asset.py:48 assets/templates/assets/asset_detail.html:129
msgid "Is active" msgid "Is active"
msgstr "激活" msgstr "激活"
#: assets/models/asset.py:53 assets/templates/assets/asset_detail.html:133 #: assets/models/asset.py:49 assets/templates/assets/asset_detail.html:133
msgid "Asset type" msgid "Asset type"
msgstr "系统类型" msgstr "系统类型"
#: assets/models/asset.py:54 assets/templates/assets/asset_detail.html:137 #: assets/models/asset.py:50 assets/templates/assets/asset_detail.html:137
msgid "Asset environment" msgid "Asset environment"
msgstr "资产环境" msgstr "资产环境"
#: assets/models/asset.py:55 assets/templates/assets/asset_detail.html:125 #: assets/models/asset.py:51 assets/templates/assets/asset_detail.html:125
msgid "Asset status" msgid "Asset status"
msgstr "资产状态" msgstr "资产状态"
#: assets/models/asset.py:58 assets/models/cluster.py:19 #: assets/models/asset.py:54 assets/models/cluster.py:19
#: assets/templates/assets/asset_detail.html:73 #: assets/templates/assets/asset_detail.html:73
#: assets/templates/assets/cluster_list.html:19 templates/_nav.html:25 #: assets/templates/assets/cluster_list.html:20 templates/_nav.html:25
msgid "Admin user" msgid "Admin user"
msgstr "管理用户" msgstr "管理用户"
#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:65 #: assets/models/asset.py:57 assets/templates/assets/asset_detail.html:65
msgid "Public IP" msgid "Public IP"
msgstr "公网IP" msgstr "公网IP"
#: assets/models/asset.py:62 #: assets/models/asset.py:58
msgid "Remote control card IP" msgid "Remote control card IP"
msgstr "远控卡IP" msgstr "远控卡IP"
#: assets/models/asset.py:63 assets/templates/assets/asset_detail.html:89 #: assets/models/asset.py:59 assets/templates/assets/asset_detail.html:89
msgid "Cabinet number" msgid "Cabinet number"
msgstr "机柜编号" msgstr "机柜编号"
#: assets/models/asset.py:64 assets/templates/assets/asset_detail.html:93 #: assets/models/asset.py:60 assets/templates/assets/asset_detail.html:93
msgid "Cabinet position" msgid "Cabinet position"
msgstr "机柜层号" msgstr "机柜层号"
#: assets/models/asset.py:65 assets/templates/assets/asset_detail.html:145 #: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:145
msgid "Asset number" msgid "Asset number"
msgstr "资产编号" msgstr "资产编号"
#: assets/models/asset.py:68 assets/templates/assets/asset_detail.html:97 #: assets/models/asset.py:64 assets/templates/assets/asset_detail.html:97
msgid "Vendor" msgid "Vendor"
msgstr "制造商" msgstr "制造商"
#: assets/models/asset.py:69 assets/templates/assets/asset_detail.html:101 #: assets/models/asset.py:65 assets/templates/assets/asset_detail.html:101
msgid "Model" msgid "Model"
msgstr "型号" msgstr "型号"
#: assets/models/asset.py:70 assets/templates/assets/asset_detail.html:141 #: assets/models/asset.py:66 assets/templates/assets/asset_detail.html:141
msgid "Serial number" msgid "Serial number"
msgstr "序列号" msgstr "序列号"
#: assets/models/asset.py:72 #: assets/models/asset.py:68
msgid "CPU model" msgid "CPU model"
msgstr "CPU型号" msgstr "CPU型号"
#: assets/models/asset.py:73 #: assets/models/asset.py:69
msgid "CPU count" msgid "CPU count"
msgstr "CPU数量" msgstr "CPU数量"
#: assets/models/asset.py:74 #: assets/models/asset.py:70
msgid "CPU cores" msgid "CPU cores"
msgstr "CPU核数" msgstr "CPU核数"
#: assets/models/asset.py:75 assets/templates/assets/asset_detail.html:109 #: assets/models/asset.py:71 assets/templates/assets/asset_detail.html:109
msgid "Memory" msgid "Memory"
msgstr "内存" msgstr "内存"
#: assets/models/asset.py:76 #: assets/models/asset.py:72
msgid "Disk total" msgid "Disk total"
msgstr "硬盘大小" msgstr "硬盘大小"
#: assets/models/asset.py:77 #: assets/models/asset.py:73
msgid "Disk info" msgid "Disk info"
msgstr "硬盘信息" msgstr "硬盘信息"
#: assets/models/asset.py:79 assets/templates/assets/asset_detail.html:117 #: assets/models/asset.py:75 assets/templates/assets/asset_detail.html:117
msgid "Platform" msgid "Platform"
msgstr "系统平台" msgstr "系统平台"
#: assets/models/asset.py:80 assets/templates/assets/asset_detail.html:121 #: assets/models/asset.py:76 assets/templates/assets/asset_detail.html:121
msgid "OS" msgid "OS"
msgstr "操作系统" msgstr "操作系统"
#: assets/models/asset.py:81 #: assets/models/asset.py:77
msgid "OS version" msgid "OS version"
msgstr "系统版本" msgstr "系统版本"
#: assets/models/asset.py:82 #: assets/models/asset.py:78
msgid "OS arch" msgid "OS arch"
msgstr "系统架构" msgstr "系统架构"
#: assets/models/asset.py:83 #: assets/models/asset.py:79
msgid "Hostname raw" msgid "Hostname raw"
msgstr "主机名原始" msgstr "主机名原始"
#: assets/models/asset.py:85 assets/models/cluster.py:28 #: assets/models/asset.py:81 assets/models/cluster.py:28
#: assets/models/group.py:22 assets/models/user.py:35 #: assets/models/group.py:21 assets/models/user.py:36
#: assets/templates/assets/admin_user_detail.html:68 #: assets/templates/assets/admin_user_detail.html:68
#: assets/templates/assets/asset_detail.html:149 #: assets/templates/assets/asset_detail.html:149
#: assets/templates/assets/cluster_detail.html:93 #: assets/templates/assets/cluster_detail.html:93
#: assets/templates/assets/system_user_detail.html:91 perms/models.py:22 #: assets/templates/assets/system_user_detail.html:91
#: ops/templates/ops/adhoc_detail.html:86 perms/models.py:22
#: perms/templates/perms/asset_permission_detail.html:94 #: perms/templates/perms/asset_permission_detail.html:94
#: users/models/user.py:47 users/templates/users/user_detail.html:98 #: users/models/user.py:51 users/templates/users/user_detail.html:98
msgid "Created by" msgid "Created by"
msgstr "创建者" msgstr "创建者"
#: assets/models/asset.py:86 assets/models/cluster.py:26 #: assets/models/asset.py:82 assets/models/cluster.py:26
#: assets/models/group.py:23 assets/templates/assets/admin_user_detail.html:64 #: assets/models/group.py:22 assets/templates/assets/admin_user_detail.html:64
#: assets/templates/assets/cluster_detail.html:89 #: assets/templates/assets/cluster_detail.html:89
#: assets/templates/assets/system_user_detail.html:87 #: assets/templates/assets/system_user_detail.html:87
#: ops/templates/ops/task_detail.html:60 perms/models.py:23 #: ops/templates/ops/adhoc_detail.html:90 ops/templates/ops/task_detail.html:60
#: perms/templates/perms/asset_permission_detail.html:90 #: perms/models.py:23 perms/templates/perms/asset_permission_detail.html:90
#: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:24 #: 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
msgid "Date created" msgid "Date created"
msgstr "创建日期" msgstr "创建日期"
#: assets/models/asset.py:87 assets/models/cluster.py:29 #: assets/models/asset.py:83 assets/models/cluster.py:29
#: assets/models/group.py:24 assets/models/user.py:32 #: assets/models/group.py:23 assets/models/user.py:33
#: assets/templates/assets/admin_user_detail.html:72 #: assets/templates/assets/admin_user_detail.html:72
#: assets/templates/assets/admin_user_list.html:26 #: assets/templates/assets/admin_user_list.html:26
#: assets/templates/assets/asset_detail.html:157 #: assets/templates/assets/asset_detail.html:157
#: assets/templates/assets/asset_group_list.html:17 #: assets/templates/assets/asset_group_list.html:17
#: assets/templates/assets/cluster_detail.html:97 #: assets/templates/assets/cluster_detail.html:97
#: assets/templates/assets/system_user_detail.html:95 #: assets/templates/assets/system_user_detail.html:95
#: assets/templates/assets/system_user_list.html:23 perms/models.py:24 #: assets/templates/assets/system_user_list.html:30 ops/models.py:37
#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:22 #: perms/models.py:24 perms/templates/perms/asset_permission_detail.html:98
#: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:22 #: terminal/models.py:22 terminal/templates/terminal/terminal_detail.html:63
#: users/models/user.py:44 users/templates/users/user_detail.html:110 #: users/models/group.py:15 users/models/user.py:48
#: users/templates/users/user_detail.html:110
#: 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:118 #: users/templates/users/user_profile.html:118
...@@ -383,13 +367,11 @@ msgid "Bandwidth" ...@@ -383,13 +367,11 @@ msgid "Bandwidth"
msgstr "带宽" msgstr "带宽"
#: assets/models/cluster.py:21 assets/templates/assets/cluster_detail.html:65 #: assets/models/cluster.py:21 assets/templates/assets/cluster_detail.html:65
#: assets/templates/assets/cluster_list.html:21
msgid "Contact" msgid "Contact"
msgstr "联系人" msgstr "联系人"
#: assets/models/cluster.py:22 assets/templates/assets/cluster_detail.html:69 #: assets/models/cluster.py:22 assets/templates/assets/cluster_detail.html:69
#: assets/templates/assets/cluster_list.html:22 users/models/user.py:38 #: users/models/user.py:42 users/templates/users/user_detail.html:75
#: users/templates/users/user_detail.html:75
msgid "Phone" msgid "Phone"
msgstr "手机" msgstr "手机"
...@@ -406,15 +388,14 @@ msgid "Extranet" ...@@ -406,15 +388,14 @@ msgid "Extranet"
msgstr "外网" msgstr "外网"
#: assets/models/cluster.py:27 assets/templates/assets/cluster_detail.html:85 #: assets/models/cluster.py:27 assets/templates/assets/cluster_detail.html:85
#: assets/templates/assets/cluster_list.html:23
msgid "Operator" msgid "Operator"
msgstr "运营商" msgstr "运营商"
#: assets/models/cluster.py:36 assets/models/group.py:34 #: assets/models/cluster.py:36 assets/models/group.py:33
msgid "Default" msgid "Default"
msgstr "默认" msgstr "默认"
#: assets/models/cluster.py:36 users/models/user.py:253 #: assets/models/cluster.py:36 users/models/user.py:259
msgid "System" msgid "System"
msgstr "系统" msgstr "系统"
...@@ -422,11 +403,11 @@ msgstr "系统" ...@@ -422,11 +403,11 @@ msgstr "系统"
msgid "Default Cluster" msgid "Default Cluster"
msgstr "默认Cluster" msgstr "默认Cluster"
#: assets/models/group.py:34 #: assets/models/group.py:33
msgid "Default asset group" msgid "Default asset group"
msgstr "默认资产组" msgstr "默认资产组"
#: assets/models/user.py:29 users/forms.py:16 users/forms.py:24 #: assets/models/user.py:30 users/forms.py:16 users/forms.py:24
#: users/templates/users/login.html:56 #: users/templates/users/login.html:56
#: users/templates/users/reset_password.html:52 #: users/templates/users/reset_password.html:52
#: users/templates/users/user_create.html:11 #: users/templates/users/user_create.html:11
...@@ -436,33 +417,33 @@ msgstr "默认资产组" ...@@ -436,33 +417,33 @@ msgstr "默认资产组"
msgid "Password" msgid "Password"
msgstr "密码" msgstr "密码"
#: assets/models/user.py:30 #: assets/models/user.py:31
msgid "SSH private key" msgid "SSH private key"
msgstr "ssh密钥" msgstr "ssh密钥"
#: assets/models/user.py:31 #: assets/models/user.py:32
msgid "SSH public key" msgid "SSH public key"
msgstr "ssh公钥" msgstr "ssh公钥"
#: assets/models/user.py:202 #: assets/models/user.py:216
msgid "Priority" msgid "Priority"
msgstr "" msgstr ""
#: assets/models/user.py:203 assets/templates/assets/system_user_detail.html:61 #: assets/models/user.py:217 assets/templates/assets/system_user_detail.html:61
msgid "Protocol" msgid "Protocol"
msgstr "协议" msgstr "协议"
#: assets/models/user.py:204 assets/templates/assets/_system_user.html:59 #: assets/models/user.py:218 assets/templates/assets/_system_user.html:59
#: assets/templates/assets/system_user_detail.html:113 #: assets/templates/assets/system_user_detail.html:113
#: assets/templates/assets/system_user_update.html:11 #: assets/templates/assets/system_user_update.html:11
msgid "Auto push" msgid "Auto push"
msgstr "自动推送" msgstr "自动推送"
#: assets/models/user.py:205 assets/templates/assets/system_user_detail.html:65 #: assets/models/user.py:219 assets/templates/assets/system_user_detail.html:65
msgid "Sudo" msgid "Sudo"
msgstr "Sudo" msgstr "Sudo"
#: assets/models/user.py:206 assets/templates/assets/system_user_detail.html:70 #: assets/models/user.py:220 assets/templates/assets/system_user_detail.html:70
msgid "Shell" msgid "Shell"
msgstr "Shell" msgstr "Shell"
...@@ -471,8 +452,54 @@ msgstr "Shell" ...@@ -471,8 +452,54 @@ msgstr "Shell"
msgid "%(value)s is not an even number" msgid "%(value)s is not an even number"
msgstr "%(value)s is not an even number" msgstr "%(value)s is not an even number"
#: assets/signals_handler.py:31
msgid "Push cluster system users to asset"
msgstr "推送集群系统用户到资产"
#: assets/signals_handler.py:63 assets/signals_handler.py:125
msgid "Push system user to cluster assets: {}->{}"
msgstr "推送系统用户到: {}->{}"
#: assets/signals_handler.py:102
msgid "Push system user to assets"
msgstr "推送系统用户到资产"
#: assets/tasks.py:91
msgid "Update some assets hardware info"
msgstr "更新一些资产硬件信息"
#: assets/tasks.py:107
msgid "Update asset hardware info"
msgstr "更新资产硬件信息"
#: assets/tasks.py:121
msgid "Update assets hardware info period"
msgstr "定期更新资产硬件信息"
#: assets/tasks.py:189
msgid "Test admin user connectability period: {}"
msgstr "定期测试管理用户可以连接性"
#: assets/tasks.py:203
msgid "Test admin user connectability: {}"
msgstr "测试管理用户可连接性: {}"
#: assets/tasks.py:289
msgid "Test system user connectability period: {}"
msgstr "测试系统用户可连接性: {}"
#: assets/tasks.py:363
msgid "Push system user to cluster assets: {}"
msgstr "推送系统用户到资产: {}"
#: assets/tasks.py:384
msgid "Push system user to cluster assets period: {}->{}"
msgstr "定期推送系统用户到资产: {}->{}"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:5 #: assets/templates/assets/_asset_group_bulk_update_modal.html:5
msgid "Update Asset Group" #, fuzzy
#| msgid "Update asset group"
msgid "Update asset sroup"
msgstr "编辑资产组" msgstr "编辑资产组"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:8 #: assets/templates/assets/_asset_group_bulk_update_modal.html:8
...@@ -481,7 +508,8 @@ msgstr "仅修改你需要更新的字段" ...@@ -481,7 +508,8 @@ msgstr "仅修改你需要更新的字段"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:12 #: assets/templates/assets/_asset_group_bulk_update_modal.html:12
#: assets/templates/assets/system_user_asset.html:21 #: assets/templates/assets/system_user_asset.html:21
#: assets/views/admin_user.py:27 assets/views/cluster.py:22 #: assets/views/admin_user.py:27 assets/views/asset.py:47
#: assets/views/asset.py:61 assets/views/cluster.py:22
#: assets/views/cluster.py:80 assets/views/cluster.py:97 #: assets/views/cluster.py:80 assets/views/cluster.py:97
#: assets/views/group.py:30 assets/views/group.py:53 assets/views/group.py:71 #: assets/views/group.py:30 assets/views/group.py:53 assets/views/group.py:71
#: assets/views/group.py:93 assets/views/system_user.py:29 #: assets/views/group.py:93 assets/views/system_user.py:29
...@@ -495,6 +523,7 @@ msgid "Select Asset" ...@@ -495,6 +523,7 @@ msgid "Select Asset"
msgstr "选择资产" msgstr "选择资产"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:22 #: assets/templates/assets/_asset_group_bulk_update_modal.html:22
#: assets/templates/assets/cluster_list.html:22
msgid "System users" msgid "System users"
msgstr "系统用户" msgstr "系统用户"
...@@ -529,7 +558,7 @@ msgid "If set id, will use this id update asset existed" ...@@ -529,7 +558,7 @@ msgid "If set id, will use this id update asset existed"
msgstr "如果设置了id，则会使用该行信息更新该id的资产" msgstr "如果设置了id，则会使用该行信息更新该id的资产"
#: assets/templates/assets/_system_user.html:16 #: assets/templates/assets/_system_user.html:16
#: assets/templates/assets/system_user_list.html:9 #: assets/templates/assets/system_user_list.html:16
#: assets/views/system_user.py:49 #: assets/views/system_user.py:49
msgid "Create system user" msgid "Create system user"
msgstr "创建系统用户" msgstr "创建系统用户"
...@@ -585,7 +614,7 @@ msgstr "重置" ...@@ -585,7 +614,7 @@ msgstr "重置"
#: assets/templates/assets/admin_user_create_update.html:46 #: assets/templates/assets/admin_user_create_update.html:46
#: assets/templates/assets/asset_bulk_update.html:24 #: assets/templates/assets/asset_bulk_update.html:24
#: assets/templates/assets/asset_create.html:41 #: assets/templates/assets/asset_create.html:41
#: assets/templates/assets/asset_list.html:54 #: assets/templates/assets/asset_list.html:55
#: assets/templates/assets/asset_update.html:57 #: assets/templates/assets/asset_update.html:57
#: assets/templates/assets/cluster_create_update.html:54 #: assets/templates/assets/cluster_create_update.html:54
#: perms/templates/perms/asset_permission_create_update.html:68 #: perms/templates/perms/asset_permission_create_update.html:68
...@@ -607,8 +636,9 @@ msgstr "提交" ...@@ -607,8 +636,9 @@ msgstr "提交"
#: assets/templates/assets/cluster_detail.html:17 #: assets/templates/assets/cluster_detail.html:17
#: assets/templates/assets/system_user_asset.html:17 #: assets/templates/assets/system_user_asset.html:17
#: assets/templates/assets/system_user_detail.html:18 #: assets/templates/assets/system_user_detail.html:18
#: ops/templates/ops/adhoc_history.html:129
#: ops/templates/ops/task_adhoc.html:109 #: ops/templates/ops/task_adhoc.html:109
#: ops/templates/ops/task_history.html:118 #: ops/templates/ops/task_history.html:132
#: perms/templates/perms/asset_permission_asset.html:18 #: perms/templates/perms/asset_permission_asset.html:18
#: perms/templates/perms/asset_permission_detail.html:18 #: perms/templates/perms/asset_permission_detail.html:18
#: perms/templates/perms/asset_permission_user.html:18 #: perms/templates/perms/asset_permission_user.html:18
...@@ -630,17 +660,16 @@ msgstr "资产列表" ...@@ -630,17 +660,16 @@ msgstr "资产列表"
#: assets/templates/assets/admin_user_assets.html:62 #: assets/templates/assets/admin_user_assets.html:62
#: assets/templates/assets/asset_group_detail.html:48 #: assets/templates/assets/asset_group_detail.html:48
#: assets/templates/assets/asset_list.html:33 #: assets/templates/assets/asset_list.html:34
#: assets/templates/assets/cluster_assets.html:54 #: assets/templates/assets/cluster_assets.html:54
#: assets/templates/assets/user_asset_list.html:36 #: assets/templates/assets/user_asset_list.html:32
#: users/templates/users/login_log_list.html:49 #: users/templates/users/login_log_list.html:50
msgid "Type" msgid "Type"
msgstr "类型" msgstr "类型"
#: assets/templates/assets/admin_user_assets.html:63 #: assets/templates/assets/admin_user_assets.html:63
#: assets/templates/assets/asset_group_detail.html:49 #: assets/templates/assets/asset_group_detail.html:49
#: assets/templates/assets/cluster_assets.html:55 #: assets/templates/assets/cluster_assets.html:55
#: assets/templates/assets/user_asset_list.html:40
#: terminal/templates/terminal/terminal_list.html:35 #: terminal/templates/terminal/terminal_list.html:35
msgid "Alive" msgid "Alive"
msgstr "在线" msgstr "在线"
...@@ -654,20 +683,19 @@ msgid "Quick update" ...@@ -654,20 +683,19 @@ msgid "Quick update"
msgstr "快速更新" msgstr "快速更新"
#: assets/templates/assets/admin_user_assets.html:81 #: assets/templates/assets/admin_user_assets.html:81
#, fuzzy #: assets/templates/assets/asset_detail.html:199
#| msgid "Retest asset connectivity"
msgid "Test connective" msgid "Test connective"
msgstr "重置资产连接性" msgstr "测试可连接性"
#: assets/templates/assets/admin_user_assets.html:84 #: assets/templates/assets/admin_user_assets.html:84
#: assets/templates/assets/asset_detail.html:202 #: assets/templates/assets/asset_detail.html:202
#: assets/templates/assets/system_user_asset.html:84 #: assets/templates/assets/system_user_asset.html:84
msgid "Test" msgid "Test"
msgstr "" msgstr "测试"
#: assets/templates/assets/admin_user_assets.html:147 #: assets/templates/assets/admin_user_assets.html:147
msgid "Task has been send, seen left asset status" msgid "Task has been send, seen left asset status"
msgstr "" msgstr "任务已下发，查看左侧资产状态"
#: assets/templates/assets/admin_user_create_update.html:16 #: assets/templates/assets/admin_user_create_update.html:16
#: assets/templates/assets/admin_user_list.html:14 #: assets/templates/assets/admin_user_list.html:14
...@@ -675,53 +703,51 @@ msgid "Create admin user" ...@@ -675,53 +703,51 @@ msgid "Create admin user"
msgstr "创建管理用户" msgstr "创建管理用户"
#: assets/templates/assets/admin_user_detail.html:84 #: assets/templates/assets/admin_user_detail.html:84
#, fuzzy
#| msgid "Select asset admin user"
msgid "Using this as cluster admin user" msgid "Using this as cluster admin user"
msgstr "选择资产管理用户" msgstr "使用集群管理用户"
#: assets/templates/assets/admin_user_detail.html:101 #: assets/templates/assets/admin_user_detail.html:101
#: assets/templates/assets/asset_detail.html:230 #: assets/templates/assets/asset_detail.html:230
#: assets/templates/assets/asset_group_list.html:87 #: assets/templates/assets/asset_group_list.html:87
#: assets/templates/assets/asset_list.html:199 #: assets/templates/assets/asset_list.html:202
#: assets/templates/assets/cluster_assets.html:104 #: assets/templates/assets/cluster_assets.html:104
#: assets/templates/assets/cluster_list.html:88 #: assets/templates/assets/cluster_list.html:89
#: assets/templates/assets/system_user_detail.html:159 #: assets/templates/assets/system_user_detail.html:159
#: assets/templates/assets/system_user_list.html:127 #: assets/templates/assets/system_user_list.html:134 templates/_modal.html:16
#: assets/templates/assets/user_asset_list.html:165 templates/_modal.html:16
#: terminal/templates/terminal/session_detail.html:108 #: terminal/templates/terminal/session_detail.html:108
#: users/templates/users/user_detail.html:338 #: users/templates/users/user_detail.html:338
#: users/templates/users/user_detail.html:363 #: users/templates/users/user_detail.html:363
#: users/templates/users/user_detail.html:386 #: users/templates/users/user_detail.html:386
#: users/templates/users/user_group_create_update.html:46 #: users/templates/users/user_group_create_update.html:46
#: users/templates/users/user_group_list.html:82 #: users/templates/users/user_group_list.html:82
#: users/templates/users/user_list.html:182 #: users/templates/users/user_list.html:184
#: users/templates/users/user_profile.html:181 #: users/templates/users/user_profile.html:181
msgid "Confirm" msgid "Confirm"
msgstr "确认" msgstr "确认"
#: assets/templates/assets/admin_user_list.html:24 #: assets/templates/assets/admin_user_list.html:24
#: assets/templates/assets/cluster_list.html:20 #: assets/templates/assets/cluster_list.html:21
#: users/templates/users/_select_user_modal.html:17 #: users/templates/users/_select_user_modal.html:17
msgid "Asset num" msgid "Asset num"
msgstr "资产数量" msgstr "资产数量"
#: assets/templates/assets/admin_user_list.html:25 #: assets/templates/assets/admin_user_list.html:25
#: assets/templates/assets/system_user_list.html:21 #: assets/templates/assets/system_user_list.html:28
msgid "Unreachable" msgid "Unreachable"
msgstr "不可达" msgstr "不可达"
#: assets/templates/assets/admin_user_list.html:27 #: assets/templates/assets/admin_user_list.html:27
#: assets/templates/assets/asset_group_detail.html:50 #: assets/templates/assets/asset_group_detail.html:50
#: assets/templates/assets/asset_group_list.html:18 #: assets/templates/assets/asset_group_list.html:18
#: assets/templates/assets/asset_list.html:38 #: assets/templates/assets/asset_list.html:39
#: assets/templates/assets/cluster_assets.html:56 #: assets/templates/assets/cluster_assets.html:56
#: assets/templates/assets/cluster_list.html:24 #: assets/templates/assets/cluster_list.html:23
#: assets/templates/assets/system_user_list.html:24 #: assets/templates/assets/system_user_list.html:31
#: ops/templates/ops/task_adhoc.html:61 ops/templates/ops/task_history.html:61 #: assets/templates/assets/user_asset_list.html:37
#: ops/templates/ops/task_list.html:46 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:61
#: perms/templates/perms/asset_permission_list.html:26 #: ops/templates/ops/task_history.html:62 ops/templates/ops/task_list.html:46
#: terminal/templates/terminal/session_list.html:75 #: perms/templates/perms/asset_permission_list.html:32
#: terminal/templates/terminal/session_list.html:78
#: terminal/templates/terminal/terminal_list.html:36 #: terminal/templates/terminal/terminal_list.html:36
#: users/templates/users/user_group_list.html:15 #: users/templates/users/user_group_list.html:15
#: users/templates/users/user_list.html:28 #: users/templates/users/user_list.html:28
...@@ -733,9 +759,9 @@ msgstr "动作" ...@@ -733,9 +759,9 @@ msgstr "动作"
#: assets/templates/assets/asset_group_list.html:42 #: assets/templates/assets/asset_group_list.html:42
#: assets/templates/assets/asset_list.html:95 #: assets/templates/assets/asset_list.html:95
#: assets/templates/assets/cluster_assets.html:170 #: assets/templates/assets/cluster_assets.html:170
#: assets/templates/assets/cluster_list.html:44 #: assets/templates/assets/cluster_list.html:43
#: assets/templates/assets/system_user_list.html:77 #: assets/templates/assets/system_user_list.html:84
#: perms/templates/perms/asset_permission_list.html:67 #: perms/templates/perms/asset_permission_list.html:73
#: terminal/templates/terminal/terminal_list.html:71 #: terminal/templates/terminal/terminal_list.html:71
#: users/templates/users/user_group_list.html:39 #: users/templates/users/user_group_list.html:39
#: users/templates/users/user_list.html:76 #: users/templates/users/user_list.html:76
...@@ -745,10 +771,10 @@ msgstr "更新" ...@@ -745,10 +771,10 @@ msgstr "更新"
#: assets/templates/assets/admin_user_list.html:48 #: assets/templates/assets/admin_user_list.html:48
#: assets/templates/assets/asset_group_list.html:43 #: assets/templates/assets/asset_group_list.html:43
#: assets/templates/assets/asset_list.html:96 #: assets/templates/assets/asset_list.html:96
#: assets/templates/assets/cluster_list.html:45 #: assets/templates/assets/cluster_list.html:44
#: assets/templates/assets/system_user_list.html:78 #: assets/templates/assets/system_user_list.html:85
#: ops/templates/ops/task_list.html:70 #: ops/templates/ops/task_list.html:76
#: perms/templates/perms/asset_permission_list.html:68 #: perms/templates/perms/asset_permission_list.html:74
#: terminal/templates/terminal/terminal_list.html:73 #: terminal/templates/terminal/terminal_list.html:73
#: users/templates/users/user_group_list.html:41 #: users/templates/users/user_group_list.html:41
#: users/templates/users/user_list.html:80 #: users/templates/users/user_list.html:80
...@@ -791,7 +817,8 @@ msgid "Quick modify" ...@@ -791,7 +817,8 @@ msgid "Quick modify"
msgstr "快速修改" msgstr "快速修改"
#: assets/templates/assets/asset_detail.html:175 #: assets/templates/assets/asset_detail.html:175
#: assets/templates/assets/asset_list.html:36 perms/models.py:20 #: assets/templates/assets/asset_list.html:37
#: assets/templates/assets/user_asset_list.html:35 perms/models.py:20
#: perms/templates/perms/asset_permission_create_update.html:47 #: perms/templates/perms/asset_permission_create_update.html:47
#: terminal/templates/terminal/terminal_list.html:34 #: terminal/templates/terminal/terminal_list.html:34
#: users/templates/users/_select_user_modal.html:18 #: users/templates/users/_select_user_modal.html:18
...@@ -809,10 +836,6 @@ msgstr "更新硬件信息" ...@@ -809,10 +836,6 @@ msgstr "更新硬件信息"
msgid "Refresh" msgid "Refresh"
msgstr "刷新" msgstr "刷新"
#: assets/templates/assets/asset_detail.html:199
msgid "Test is alive"
msgstr ""
#: assets/templates/assets/asset_detail.html:221 #: assets/templates/assets/asset_detail.html:221
msgid "Join asset groups" msgid "Join asset groups"
msgstr "添加到资产组" msgstr "添加到资产组"
...@@ -823,8 +846,11 @@ msgid "Update successfully!" ...@@ -823,8 +846,11 @@ msgid "Update successfully!"
msgstr "更新成功" msgstr "更新成功"
#: assets/templates/assets/asset_detail.html:376 #: assets/templates/assets/asset_detail.html:376
msgid "Pong" #: assets/templates/assets/asset_list.html:38
msgstr "" #: assets/templates/assets/system_user_asset.html:55
#: assets/templates/assets/system_user_list.html:27
msgid "Reachable"
msgstr "可连接"
#: assets/templates/assets/asset_group_detail.html:16 #: assets/templates/assets/asset_group_detail.html:16
msgid "Group assets" msgid "Group assets"
...@@ -853,14 +879,13 @@ msgid "Create asset group" ...@@ -853,14 +879,13 @@ msgid "Create asset group"
msgstr "创建资产组" msgstr "创建资产组"
#: assets/templates/assets/asset_group_list.html:82 #: assets/templates/assets/asset_group_list.html:82
#: assets/templates/assets/asset_list.html:194 #: assets/templates/assets/asset_list.html:197
#: assets/templates/assets/cluster_list.html:83 #: assets/templates/assets/cluster_list.html:84
#: assets/templates/assets/system_user_list.html:122 #: assets/templates/assets/system_user_list.html:129
#: assets/templates/assets/user_asset_list.html:160
#: users/templates/users/user_detail.html:333 #: users/templates/users/user_detail.html:333
#: users/templates/users/user_detail.html:358 #: users/templates/users/user_detail.html:358
#: users/templates/users/user_group_list.html:77 #: users/templates/users/user_group_list.html:77
#: users/templates/users/user_list.html:177 #: users/templates/users/user_list.html:179
msgid "Are you sure?" msgid "Are you sure?"
msgstr "你确认吗?" msgstr "你确认吗?"
...@@ -891,11 +916,13 @@ msgid "AssetGroup Updated" ...@@ -891,11 +916,13 @@ msgid "AssetGroup Updated"
msgstr "资产组更新" msgstr "资产组更新"
#: assets/templates/assets/asset_list.html:15 #: assets/templates/assets/asset_list.html:15
#: assets/templates/assets/user_asset_list.html:15
#: users/templates/users/user_list.html:7 #: users/templates/users/user_list.html:7
msgid "Import" msgid "Import"
msgstr "导入" msgstr "导入"
#: assets/templates/assets/asset_list.html:18 #: assets/templates/assets/asset_list.html:18
#: assets/templates/assets/user_asset_list.html:18
#: users/templates/users/user_list.html:10 #: users/templates/users/user_list.html:10
msgid "Export" msgid "Export"
msgstr "导出" msgstr "导出"
...@@ -904,63 +931,52 @@ msgstr "导出" ...@@ -904,63 +931,52 @@ msgstr "导出"
msgid "Create asset" msgid "Create asset"
msgstr "创建资产" msgstr "创建资产"
#: assets/templates/assets/asset_list.html:34 #: assets/templates/assets/asset_list.html:35
#: assets/templates/assets/user_asset_list.html:37 #: assets/templates/assets/user_asset_list.html:33
msgid "Env" msgid "Env"
msgstr "环境" msgstr "环境"
#: assets/templates/assets/asset_list.html:35 #: assets/templates/assets/asset_list.html:36
#: assets/templates/assets/user_asset_list.html:38 #: assets/templates/assets/user_asset_list.html:34
msgid "Hardware" msgid "Hardware"
msgstr "硬件" msgstr "硬件"
#: assets/templates/assets/asset_list.html:37 #: assets/templates/assets/asset_list.html:48
#, fuzzy
#| msgid "Connect"
msgid "Connective"
msgstr "连接"
#: assets/templates/assets/asset_list.html:47
#: users/templates/users/user_list.html:37 #: users/templates/users/user_list.html:37
msgid "Delete selected" msgid "Delete selected"
msgstr "批量删除" msgstr "批量删除"
#: assets/templates/assets/asset_list.html:48 #: assets/templates/assets/asset_list.html:49
#: users/templates/users/user_list.html:38 #: users/templates/users/user_list.html:38
msgid "Update selected" msgid "Update selected"
msgstr "批量更新" msgstr "批量更新"
#: assets/templates/assets/asset_list.html:49 #: assets/templates/assets/asset_list.html:50
#: users/templates/users/user_list.html:39 #: users/templates/users/user_list.html:39
msgid "Deactive selected" msgid "Deactive selected"
msgstr "禁用所选" msgstr "禁用所选"
#: assets/templates/assets/asset_list.html:50 #: assets/templates/assets/asset_list.html:51
#: users/templates/users/user_list.html:40 #: users/templates/users/user_list.html:40
msgid "Active selected" msgid "Active selected"
msgstr "激活所选" msgstr "激活所选"
#: assets/templates/assets/asset_list.html:195 #: assets/templates/assets/asset_list.html:198
#: assets/templates/assets/user_asset_list.html:161
msgid "This will delete the selected assets !!!" msgid "This will delete the selected assets !!!"
msgstr "删除选择资产" msgstr "删除选择资产"
# msgid "Deleted!" # msgid "Deleted!"
# msgstr "删除" # msgstr "删除"
#: assets/templates/assets/asset_list.html:203 #: assets/templates/assets/asset_list.html:206
#: assets/templates/assets/user_asset_list.html:169
msgid "Asset Deleted." msgid "Asset Deleted."
msgstr "已被删除" msgstr "已被删除"
#: assets/templates/assets/asset_list.html:204 #: assets/templates/assets/asset_list.html:207
#: assets/templates/assets/asset_list.html:209 #: assets/templates/assets/asset_list.html:212
#: assets/templates/assets/user_asset_list.html:170
#: assets/templates/assets/user_asset_list.html:175
msgid "Asset Delete" msgid "Asset Delete"
msgstr "删除" msgstr "删除"
#: assets/templates/assets/asset_list.html:208 #: assets/templates/assets/asset_list.html:211
#: assets/templates/assets/user_asset_list.html:174
msgid "Asset Deleting failed." msgid "Asset Deleting failed."
msgstr "删除失败" msgstr "删除失败"
...@@ -979,15 +995,14 @@ msgid "Cluster assets" ...@@ -979,15 +995,14 @@ msgid "Cluster assets"
msgstr "集群中资产" msgstr "集群中资产"
#: assets/templates/assets/cluster_assets.html:74 #: assets/templates/assets/cluster_assets.html:74
#, fuzzy #: assets/templates/assets/system_user_asset.html:81
#| msgid "Select assets" msgid "Test assets connective"
msgid "Test assets alive" msgstr "测试资产可连接性"
msgstr "选择资产"
#: assets/templates/assets/cluster_assets.html:77 #: assets/templates/assets/cluster_assets.html:77
#: ops/templates/ops/task_list.html:69 #: ops/templates/ops/task_list.html:75
msgid "Run" msgid "Run"
msgstr "" msgstr "执行"
#: assets/templates/assets/cluster_assets.html:87 #: assets/templates/assets/cluster_assets.html:87
msgid "Add assets to" msgid "Add assets to"
...@@ -997,30 +1012,30 @@ msgstr "添加资产到" ...@@ -997,30 +1012,30 @@ msgstr "添加资产到"
msgid "Select asset" msgid "Select asset"
msgstr "选择资产" msgstr "选择资产"
#: assets/templates/assets/cluster_create_update.html:41 templates/_nav.html:70 #: assets/templates/assets/cluster_create_update.html:41
#: users/templates/users/user_profile.html:20 #: users/templates/users/user_profile.html:20
msgid "Settings" msgid "Settings"
msgstr "设置" msgstr "设置"
#: assets/templates/assets/cluster_list.html:10 assets/views/cluster.py:39 #: assets/templates/assets/cluster_list.html:11 assets/views/cluster.py:39
msgid "Create Cluster" msgid "Create Cluster"
msgstr "创建Cluster" msgstr "创建Cluster"
#: assets/templates/assets/cluster_list.html:84 #: assets/templates/assets/cluster_list.html:85
msgid "This will delete the selected cluster" msgid "This will delete the selected cluster"
msgstr "删除选择Cluster" msgstr "删除选择Cluster"
#: assets/templates/assets/cluster_list.html:92 #: assets/templates/assets/cluster_list.html:93
msgid "Cluster Deleted." msgid "Cluster Deleted."
msgstr "已被删除" msgstr "集群已被删除"
#: assets/templates/assets/cluster_list.html:93 #: assets/templates/assets/cluster_list.html:94
#: assets/templates/assets/cluster_list.html:98 #: assets/templates/assets/cluster_list.html:99
msgid "Cluster Delete" msgid "Cluster delete"
msgstr "删除" msgstr "删除集群"
#: assets/templates/assets/cluster_list.html:97 #: assets/templates/assets/cluster_list.html:98
msgid "Cluster Deleting failed." msgid "Cluster deleting failed."
msgstr "Cluster删除失败" msgstr "Cluster删除失败"
#: assets/templates/assets/delete_confirm.html:6 #: assets/templates/assets/delete_confirm.html:6
...@@ -1038,11 +1053,6 @@ msgstr "您确定删除吗?" ...@@ -1038,11 +1053,6 @@ msgstr "您确定删除吗?"
msgid "Assets of " msgid "Assets of "
msgstr "资产" msgstr "资产"
#: assets/templates/assets/system_user_asset.html:55
#: assets/templates/assets/system_user_list.html:20
msgid "Reachable"
msgstr "可连接"
#: assets/templates/assets/system_user_asset.html:73 #: assets/templates/assets/system_user_asset.html:73
msgid "Push system user manually" msgid "Push system user manually"
msgstr "手动推送系统" msgstr "手动推送系统"
...@@ -1051,19 +1061,13 @@ msgstr "手动推送系统" ...@@ -1051,19 +1061,13 @@ msgstr "手动推送系统"
msgid "Push" msgid "Push"
msgstr "推送" msgstr "推送"
#: assets/templates/assets/system_user_asset.html:81
#, fuzzy
#| msgid "Retest asset connectivity"
msgid "Test assets connective"
msgstr "重置资产连接性"
#: assets/templates/assets/system_user_asset.html:150 #: assets/templates/assets/system_user_asset.html:150
msgid "Task has been send, Go to ops task list seen result" msgid "Task has been send, Go to ops task list seen result"
msgstr "" msgstr "任务已下发，查看ops任务列表"
#: assets/templates/assets/system_user_asset.html:162 #: assets/templates/assets/system_user_asset.html:162
msgid "Task has been send, seen left assets status" msgid "Task has been send, seen left assets status"
msgstr "" msgstr "任务已下发，查看左侧资产状态"
#: assets/templates/assets/system_user_detail.html:22 #: assets/templates/assets/system_user_detail.html:22
msgid "Attached assets" msgid "Attached assets"
...@@ -1085,41 +1089,36 @@ msgstr "集群" ...@@ -1085,41 +1089,36 @@ msgstr "集群"
msgid "Add to cluster" msgid "Add to cluster"
msgstr "添加到集群" msgstr "添加到集群"
#: assets/templates/assets/system_user_list.html:22 #: assets/templates/assets/system_user_list.html:29
#, fuzzy #: ops/templates/ops/adhoc_history.html:54
#| msgid "Location" #: ops/templates/ops/task_history.html:57
msgid "Ratio" msgid "Ratio"
msgstr "位置" msgstr "比例"
#: assets/templates/assets/system_user_list.html:123 #: assets/templates/assets/system_user_list.html:130
msgid "This will delete the selected System Users !!!" msgid "This will delete the selected System Users !!!"
msgstr "删除选择系统用户" msgstr "删除选择系统用户"
#: assets/templates/assets/system_user_list.html:131 #: assets/templates/assets/system_user_list.html:138
msgid "System Users Deleted." msgid "System Users Deleted."
msgstr "已被删除" msgstr "已被删除"
#: assets/templates/assets/system_user_list.html:132 #: assets/templates/assets/system_user_list.html:139
#: assets/templates/assets/system_user_list.html:137 #: assets/templates/assets/system_user_list.html:144
msgid "System Users Delete" msgid "System Users Delete"
msgstr "删除系统用户" msgstr "删除系统用户"
#: assets/templates/assets/system_user_list.html:136 #: assets/templates/assets/system_user_list.html:143
msgid "System Users Deleting failed." msgid "System Users Deleting failed."
msgstr "系统用户删除失败" msgstr "系统用户删除失败"
#: assets/templates/assets/user_asset_list.html:39 #: assets/templates/assets/user_asset_list.html:36
#: users/templates/users/user_group_granted_asset.html:53 msgid "Connective"
msgid "Valid" msgstr "连接性"
msgstr "可用"
#: assets/templates/assets/user_asset_list.html:252
msgid "The selected assets has been updated successfully."
msgstr "选择资产更新成功"
#: assets/templates/assets/user_asset_list.html:253 #: assets/templates/assets/user_asset_list.html:76
msgid "Asset Updated" msgid "Connect"
msgstr "更新" msgstr "连接"
#: assets/views/admin_user.py:28 #: assets/views/admin_user.py:28
msgid "Admin user list" msgid "Admin user list"
...@@ -1130,7 +1129,11 @@ msgstr "管理用户列表" ...@@ -1130,7 +1129,11 @@ msgstr "管理用户列表"
msgid "Create admin user <a href=\"{url}\">{name}</a> successfully." msgid "Create admin user <a href=\"{url}\">{name}</a> successfully."
msgstr "创建管理用户 <a href=\"{url}\">{name}</a> 成功" msgstr "创建管理用户 <a href=\"{url}\">{name}</a> 成功"
#: assets/views/asset.py:297 #: assets/views/asset.py:48 assets/views/asset.py:62
msgid "Asset list"
msgstr "资产列表"
#: assets/views/asset.py:292
msgid "already exists" msgid "already exists"
msgstr "已经存在" msgstr "已经存在"
...@@ -1147,10 +1150,8 @@ msgid "Update Cluster" ...@@ -1147,10 +1150,8 @@ msgid "Update Cluster"
msgstr "更新Cluster" msgstr "更新Cluster"
#: assets/views/cluster.py:81 #: assets/views/cluster.py:81
#, fuzzy
#| msgid "User detail"
msgid "Cluster detail" msgid "Cluster detail"
msgstr "用户详情" msgstr "集群详情"
#: assets/views/group.py:54 #: assets/views/group.py:54
msgid "Asset group list" msgid "Asset group list"
...@@ -1177,77 +1178,206 @@ msgstr "更新系统用户" ...@@ -1177,77 +1178,206 @@ msgstr "更新系统用户"
msgid "System user detail" msgid "System user detail"
msgstr "系统用户详情" msgstr "系统用户详情"
#: common/mixins.py:30 #: common/mixins.py:29
msgid "is discard" msgid "is discard"
msgstr "" msgstr ""
#: common/mixins.py:31 #: common/mixins.py:30
msgid "discard time" msgid "discard time"
msgstr "" msgstr ""
#: ops/models.py:95 templates/_nav.html:43 #: ops/models.py:32
msgid "Interval"
msgstr "间隔"
#: ops/models.py:32
msgid "Units: seconds"
msgstr "单位: 秒"
#: ops/models.py:33
msgid "Crontab"
msgstr "Crontab"
#: ops/models.py:33
msgid "5 * * * *"
msgstr ""
#: ops/models.py:35
msgid "Callback"
msgstr "回调"
#: ops/models.py:149 ops/templates/ops/adhoc_detail.html:114
msgid "Tasks" msgid "Tasks"
msgstr "任务" msgstr "任务"
#: ops/models.py:96 ops/templates/ops/task_adhoc.html:57 #: ops/models.py:150 ops/templates/ops/adhoc_detail.html:57
#: ops/templates/ops/task_adhoc.html:57
msgid "Pattern" msgid "Pattern"
msgstr "" msgstr ""
#: ops/models.py:97 #: ops/models.py:151 ops/templates/ops/adhoc_detail.html:61
msgid "Options" msgid "Options"
msgstr "选项" msgstr "选项"
#: ops/models.py:98 ops/templates/ops/task_adhoc.html:56 #: ops/models.py:152 ops/templates/ops/adhoc_detail.html:53
#: ops/templates/ops/task_list.html:42 #: ops/templates/ops/task_adhoc.html:56 ops/templates/ops/task_list.html:42
msgid "Hosts" msgid "Hosts"
msgstr "主机" msgstr "主机"
#: ops/models.py:99 #: ops/models.py:153
msgid "Run as admin" msgid "Run as admin"
msgstr "再次执行" msgstr "再次执行"
#: ops/models.py:100 ops/templates/ops/task_adhoc.html:58 #: ops/models.py:154 ops/templates/ops/adhoc_detail.html:72
#: ops/templates/ops/adhoc_detail.html:77 ops/templates/ops/task_adhoc.html:58
msgid "Run as" msgid "Run as"
msgstr "用户" msgstr "用户"
#: ops/models.py:101 ops/templates/ops/task_adhoc.html:59 #: ops/models.py:155 ops/templates/ops/adhoc_detail.html:82
#: ops/templates/ops/task_adhoc.html:59
msgid "Become" msgid "Become"
msgstr "Become" msgstr "Become"
#: ops/models.py:102 users/templates/users/user_group_detail.html:59 #: ops/models.py:156 users/templates/users/user_group_detail.html:59
msgid "Create by" msgid "Create by"
msgstr "创建者" msgstr "创建者"
#: ops/models.py:197 #: ops/models.py:306
msgid "Start time" msgid "Start time"
msgstr "开始时间" msgstr "开始时间"
#: ops/models.py:198 #: ops/models.py:307
msgid "End time" msgid "End time"
msgstr "完成时间" msgstr "完成时间"
#: ops/models.py:199 ops/templates/ops/task_history.html:59 #: ops/models.py:308 ops/templates/ops/adhoc_history.html:57
#: ops/templates/ops/task_list.html:45 #: ops/templates/ops/task_history.html:60 ops/templates/ops/task_list.html:45
msgid "Time" msgid "Time"
msgstr "时间" msgstr "时间"
#: ops/models.py:200 ops/templates/ops/task_detail.html:80 #: ops/models.py:309 ops/templates/ops/adhoc_detail.html:106
#: ops/templates/ops/task_history.html:57 #: ops/templates/ops/adhoc_history.html:55
#: ops/templates/ops/adhoc_history_detail.html:66
#: ops/templates/ops/task_detail.html:80 ops/templates/ops/task_history.html:58
msgid "Is finished" msgid "Is finished"
msgstr "是否完成" msgstr "是否完成"
#: ops/models.py:201 ops/templates/ops/task_history.html:58 #: ops/models.py:310 ops/templates/ops/adhoc_history.html:56
#: ops/templates/ops/task_history.html:59
msgid "Is success" msgid "Is success"
msgstr "是否成功" msgstr "是否成功"
#: ops/models.py:202 #: ops/models.py:311
msgid "Adhoc raw result" msgid "Adhoc raw result"
msgstr "结果" msgstr "结果"
#: ops/models.py:203 #: ops/models.py:312
msgid "Adhoc result summary" msgid "Adhoc result summary"
msgstr "汇总" msgstr "汇总"
#: ops/templates/ops/adhoc_detail.html:19
#: ops/templates/ops/adhoc_history.html:19
msgid "Version detail"
msgstr "版本详情"
#: ops/templates/ops/adhoc_detail.html:22
#: ops/templates/ops/adhoc_history.html:22
msgid "Version run history"
msgstr "执行历史"
#: ops/templates/ops/adhoc_detail.html:49
#: ops/templates/ops/adhoc_history_detail.html:46
#: ops/templates/ops/task_detail.html:52
#: terminal/templates/terminal/session_list.html:70
#: users/templates/users/login_log_list.html:48
msgid "ID"
msgstr "ID"
#: ops/templates/ops/adhoc_detail.html:94 ops/templates/ops/task_list.html:40
msgid "Run times"
msgstr "执行时间"
#: ops/templates/ops/adhoc_detail.html:98 ops/templates/ops/task_detail.html:72
msgid "Last run"
msgstr "最后运行"
#: ops/templates/ops/adhoc_detail.html:102
#: ops/templates/ops/adhoc_history_detail.html:62
#: ops/templates/ops/task_detail.html:76
msgid "Time delta"
msgstr "运行时间"
#: ops/templates/ops/adhoc_detail.html:110
#: ops/templates/ops/adhoc_history_detail.html:70
#: ops/templates/ops/task_detail.html:84
msgid "Is success "
msgstr "成功"
#: ops/templates/ops/adhoc_detail.html:131
#: ops/templates/ops/task_detail.html:105
msgid "Last run failed hosts"
msgstr "最后运行失败主机"
#: ops/templates/ops/adhoc_detail.html:151
#: ops/templates/ops/adhoc_detail.html:176
#: ops/templates/ops/task_detail.html:125
#: ops/templates/ops/task_detail.html:150
msgid "No hosts"
msgstr "没有主机"
#: ops/templates/ops/adhoc_detail.html:161
#: ops/templates/ops/task_detail.html:135
msgid "Last run success hosts"
msgstr "最后运行成功主机"
#: ops/templates/ops/adhoc_history.html:30
#: ops/templates/ops/task_history.html:33
msgid "History of "
msgstr "执行历史"
#: ops/templates/ops/adhoc_history.html:52
#: ops/templates/ops/adhoc_history_detail.html:58
#: ops/templates/ops/task_history.html:55 terminal/models.py:100
#: terminal/templates/terminal/session_list.html:76
msgid "Date start"
msgstr "开始日期"
#: ops/templates/ops/adhoc_history.html:53
#: ops/templates/ops/task_history.html:56
msgid "F/S/T"
msgstr "失败/成功/总"
#: ops/templates/ops/adhoc_history.html:58
#: ops/templates/ops/adhoc_history_detail.html:54
#: ops/templates/ops/task_adhoc.html:55 ops/templates/ops/task_history.html:61
msgid "Version"
msgstr "版本"
#: ops/templates/ops/adhoc_history_detail.html:19
msgid "Run history detail"
msgstr "执行历史详情"
#: ops/templates/ops/adhoc_history_detail.html:27
msgid "History detail of"
msgstr "执行历史详情"
#: ops/templates/ops/adhoc_history_detail.html:50
msgid "Task name"
msgstr "任务名称"
#: ops/templates/ops/adhoc_history_detail.html:81
msgid "Failed assets"
msgstr "失败资产"
#: ops/templates/ops/adhoc_history_detail.html:101
#: ops/templates/ops/adhoc_history_detail.html:126
msgid "No assets"
msgstr "没有资产"
#: ops/templates/ops/adhoc_history_detail.html:111
msgid "Success assets"
msgstr "成功资产"
#: ops/templates/ops/task_adhoc.html:19 ops/templates/ops/task_detail.html:19 #: ops/templates/ops/task_adhoc.html:19 ops/templates/ops/task_detail.html:19
#: ops/templates/ops/task_history.html:19 #: ops/templates/ops/task_history.html:19
msgid "Task detail" msgid "Task detail"
...@@ -1267,71 +1397,30 @@ msgstr "执行历史" ...@@ -1267,71 +1397,30 @@ msgstr "执行历史"
msgid "Versions of " msgid "Versions of "
msgstr "版本" msgstr "版本"
#: ops/templates/ops/task_adhoc.html:55 ops/templates/ops/task_history.html:60
msgid "Version"
msgstr "版本"
#: ops/templates/ops/task_adhoc.html:60 #: ops/templates/ops/task_adhoc.html:60
#: terminal/templates/terminal/command_list.html:76
msgid "Datetime" msgid "Datetime"
msgstr "日期" msgstr "日期"
#: ops/templates/ops/task_detail.html:52
#: terminal/templates/terminal/session_list.html:67
#: users/templates/users/login_log_list.html:47
msgid "ID"
msgstr "ID"
#: ops/templates/ops/task_detail.html:64 #: ops/templates/ops/task_detail.html:64
msgid "Total versions" msgid "Total versions"
msgstr "版本数量" msgstr "版本数量"
#: ops/templates/ops/task_detail.html:68 #: ops/templates/ops/task_detail.html:68
#, fuzzy
#| msgid "Last version"
msgid "Latest version" msgid "Latest version"
msgstr "最新版本" msgstr "最新版本"
#: ops/templates/ops/task_detail.html:72
msgid "Latest run"
msgstr "最后一次运行"
#: ops/templates/ops/task_detail.html:76
msgid "Time delta"
msgstr "运行时间"
#: ops/templates/ops/task_detail.html:84
msgid "Is success "
msgstr "成功"
#: ops/templates/ops/task_detail.html:88 #: ops/templates/ops/task_detail.html:88
msgid "Contents" msgid "Contents"
msgstr "内容" msgstr "内容"
#: ops/templates/ops/task_detail.html:105 #: ops/templates/ops/task_list.html:25 ops/templates/ops/task_list.html:30
msgid "Failed assets" #: templates/_base_list.html:43 templates/_header_bar.html:8
msgstr "失败资产" #: terminal/templates/terminal/command_list.html:60
#: users/templates/users/login_log_list.html:35
#: ops/templates/ops/task_detail.html:121 #: users/templates/users/login_log_list.html:40
#: ops/templates/ops/task_detail.html:146 msgid "Search"
msgid "No assets" msgstr "搜索"
msgstr "没有资产"
#: ops/templates/ops/task_detail.html:131
msgid "Success assets"
msgstr "成功资产"
#: ops/templates/ops/task_history.html:33
msgid "History of "
msgstr "执行历史"
#: ops/templates/ops/task_history.html:55 terminal/models.py:98
#: terminal/templates/terminal/session_list.html:73
msgid "Date start"
msgstr "开始日期"
#: ops/templates/ops/task_history.html:56 ops/templates/ops/task_list.html:40
msgid "F/S/T"
msgstr "失败/成功/总"
#: ops/templates/ops/task_list.html:41 #: ops/templates/ops/task_list.html:41
msgid "Versions" msgid "Versions"
...@@ -1342,69 +1431,83 @@ msgid "Success" ...@@ -1342,69 +1431,83 @@ msgid "Success"
msgstr "成功" msgstr "成功"
#: ops/templates/ops/task_list.html:44 #: ops/templates/ops/task_list.html:44
#: users/templates/users/login_log_list.html:53 #: users/templates/users/login_log_list.html:54
msgid "Date" msgid "Date"
msgstr "日期" msgstr "日期"
#: perms/forms.py:21 users/forms.py:135 users/forms.py:140 users/forms.py:152 #: ops/views.py:43
#: users/forms.py:181 msgid "Task list"
msgstr "任务列表"
#: perms/forms.py:16 users/forms.py:144 users/forms.py:149 users/forms.py:161
#: users/forms.py:190
msgid "Select users" msgid "Select users"
msgstr "选择用户" msgstr "选择用户"
#: perms/forms.py:24 perms/templates/perms/asset_permission_user.html:127 #: perms/forms.py:18 perms/models.py:15
#: perms/templates/perms/asset_permission_create_update.html:36
#: perms/templates/perms/asset_permission_list.html:26 templates/_nav.html:12
#: templates/_user_profile.html:14 terminal/backends/command/models.py:10
#: terminal/models.py:92 terminal/templates/terminal/command_list.html:32
#: terminal/templates/terminal/command_list.html:72
#: terminal/templates/terminal/session_list.html:33
#: terminal/templates/terminal/session_list.html:71
#: users/templates/users/user_group_detail.html:78 users/views/user.py:348
msgid "User"
msgstr "用户"
#: perms/forms.py:30 perms/templates/perms/asset_permission_user.html:127
msgid "Select user groups" msgid "Select user groups"
msgstr "选择用户组" msgstr "选择用户组"
#: perms/forms.py:33 perms/templates/perms/asset_permission_detail.html:144 #: perms/forms.py:39 perms/templates/perms/asset_permission_detail.html:144
#: users/forms.py:234 #: users/forms.py:243
msgid "Select system users" msgid "Select system users"
msgstr "选择系统用户" msgstr "选择系统用户"
#: perms/forms.py:38 #: perms/forms.py:44
msgid "User or user group at least one required" msgid "User or user group at least one required"
msgstr "" msgstr ""
#: perms/forms.py:39 #: perms/forms.py:45
msgid "Asset or Asset group at least one required" msgid "Asset or Asset group at least one required"
msgstr "" msgstr ""
#: perms/models.py:15 #: perms/forms.py:59
#: perms/templates/perms/asset_permission_create_update.html:36 msgid "Asset {} not have [{}] system users, please check \n"
#: perms/templates/perms/asset_permission_list.html:20 templates/_nav.html:12 msgstr ""
#: templates/_user_profile.html:14 terminal/backends/command/models.py:10
#: terminal/models.py:90 terminal/templates/terminal/command_list.html:31
#: terminal/templates/terminal/session_list.html:30
#: terminal/templates/terminal/session_list.html:68
#: users/templates/users/user_group_detail.html:78
msgid "User"
msgstr "用户"
#: perms/models.py:16 perms/templates/perms/asset_permission_list.html:21 #: perms/forms.py:67
#: templates/_nav.html:13 users/models/user.py:34 msgid "Asset {}: {} not have [{}] system users, please check"
msgstr ""
#: perms/models.py:16 perms/templates/perms/asset_permission_list.html:27
#: templates/_nav.html:13 users/models/user.py:38
#: users/templates/users/_select_user_modal.html:16 #: users/templates/users/_select_user_modal.html:16
#: users/templates/users/user_detail.html:178 #: users/templates/users/user_detail.html:178
#: users/templates/users/user_list.html:26 #: users/templates/users/user_list.html:26
msgid "User group" msgid "User group"
msgstr "用户组" msgstr "用户组"
#: perms/models.py:18 perms/templates/perms/asset_permission_list.html:23 #: perms/models.py:18 perms/templates/perms/asset_permission_list.html:29
#: templates/_nav.html:23 #: templates/_nav.html:23
msgid "Asset group" msgid "Asset group"
msgstr "资产组" msgstr "资产组"
#: perms/models.py:19 perms/templates/perms/asset_permission_detail.html:136 #: perms/models.py:19 perms/templates/perms/asset_permission_detail.html:136
#: perms/templates/perms/asset_permission_list.html:24 templates/_nav.html:26 #: perms/templates/perms/asset_permission_list.html:30 templates/_nav.html:26
#: terminal/backends/command/models.py:12 terminal/models.py:92 #: terminal/backends/command/models.py:12 terminal/models.py:94
#: terminal/templates/terminal/command_list.html:47 #: terminal/templates/terminal/command_list.html:48
#: terminal/templates/terminal/session_list.html:46 #: terminal/templates/terminal/command_list.html:74
#: terminal/templates/terminal/session_list.html:70 #: terminal/templates/terminal/session_list.html:49
#: terminal/templates/terminal/session_list.html:73
#: users/templates/users/user_granted_asset.html:50 #: users/templates/users/user_granted_asset.html:50
#: users/templates/users/user_group_granted_asset.html:52 #: users/templates/users/user_group_granted_asset.html:52
msgid "System user" msgid "System user"
msgstr "系统用户" msgstr "系统用户"
#: perms/models.py:21 perms/templates/perms/asset_permission_detail.html:86 #: perms/models.py:21 perms/templates/perms/asset_permission_detail.html:86
#: users/models/user.py:46 users/templates/users/user_detail.html:94 #: users/models/user.py:50 users/templates/users/user_detail.html:94
#: users/templates/users/user_profile.html:96 #: users/templates/users/user_profile.html:96
msgid "Date expired" msgid "Date expired"
msgstr "失效日期" msgstr "失效日期"
...@@ -1422,7 +1525,7 @@ msgid "Assets and asset groups" ...@@ -1422,7 +1525,7 @@ msgid "Assets and asset groups"
msgstr "资产或资产组" msgstr "资产或资产组"
#: perms/templates/perms/asset_permission_asset.html:57 #: perms/templates/perms/asset_permission_asset.html:57
#: perms/templates/perms/asset_permission_list.html:25 #: perms/templates/perms/asset_permission_list.html:31
#: perms/templates/perms/asset_permission_user.html:57 #: perms/templates/perms/asset_permission_user.html:57
msgid "Is valid" msgid "Is valid"
msgstr "有效" msgstr "有效"
...@@ -1465,7 +1568,7 @@ msgstr "资产组数量" ...@@ -1465,7 +1568,7 @@ msgstr "资产组数量"
msgid "System user count" msgid "System user count"
msgstr "系统用户数量" msgstr "系统用户数量"
#: perms/templates/perms/asset_permission_list.html:10 #: perms/templates/perms/asset_permission_list.html:16
msgid "Create permission" msgid "Create permission"
msgstr "创建授权规则" msgstr "创建授权规则"
...@@ -1473,7 +1576,7 @@ msgstr "创建授权规则" ...@@ -1473,7 +1576,7 @@ msgstr "创建授权规则"
msgid "User list of " msgid "User list of "
msgstr "用户列表" msgstr "用户列表"
#: perms/templates/perms/asset_permission_user.html:56 users/models/user.py:33 #: perms/templates/perms/asset_permission_user.html:56 users/models/user.py:37
#: users/templates/users/user_detail.html:70 #: users/templates/users/user_detail.html:70
#: users/templates/users/user_profile.html:59 #: users/templates/users/user_profile.html:59
msgid "Email" msgid "Email"
...@@ -1484,7 +1587,7 @@ msgid "Add user to asset permission" ...@@ -1484,7 +1587,7 @@ msgid "Add user to asset permission"
msgstr "添加用户" msgstr "添加用户"
#: perms/templates/perms/asset_permission_user.html:99 #: perms/templates/perms/asset_permission_user.html:99
#: users/templates/users/login_log_list.html:27 #: users/templates/users/login_log_list.html:28
msgid "Select user" msgid "Select user"
msgstr "选择用户" msgstr "选择用户"
...@@ -1492,44 +1595,50 @@ msgstr "选择用户" ...@@ -1492,44 +1595,50 @@ msgstr "选择用户"
msgid "Add user group to asset permission" msgid "Add user group to asset permission"
msgstr "添加用户组" msgstr "添加用户组"
#: perms/views.py:28 perms/views.py:80 perms/views.py:95 perms/views.py:109 #: perms/views.py:27 perms/views.py:77 perms/views.py:103 perms/views.py:128
#: perms/views.py:146 perms/views.py:176 templates/_nav.html:30 #: perms/views.py:165 perms/views.py:195 templates/_nav.html:30
msgid "Perms" msgid "Perms"
msgstr "权限管理" msgstr "权限管理"
#: perms/views.py:29 #: perms/views.py:28
msgid "Asset permission list" msgid "Asset permission list"
msgstr "资产授权列表" msgstr "资产授权列表"
#: perms/views.py:64 #: perms/views.py:63
#, python-brace-format #, python-brace-format
msgid "Create asset permission <a href=\"{url}\"> {name} </a> successfully." msgid "Create asset permission <a href=\"{url}\"> {name} </a> successfully."
msgstr "创建授权 <a href=\"{url}\"> {name} </a> 成功" msgstr "创建授权 <a href=\"{url}\"> {name} </a> 成功"
#: perms/views.py:81 #: perms/views.py:78
msgid "Create asset permission" msgid "Create asset permission"
msgstr "创建权限规则" msgstr "创建权限规则"
#: perms/views.py:96 #: perms/views.py:89
#, python-brace-format
msgid "Create asset permission <a href=\"{url}\"> {name} </a> success."
msgstr "创建授权 <a href=\"{url}\"> {name} </a> 成功"
#: perms/views.py:104
msgid "Update asset permission" msgid "Update asset permission"
msgstr "更新资产授权" msgstr "更新资产授权"
#: perms/views.py:110 #: perms/views.py:115
#, fuzzy, python-brace-format
msgid "Update asset permission <a href=\"{url}\"> {name} </a> success."
msgstr "更新授权 <a href=\"{url}\"> {name} </a> 成功"
#: perms/views.py:129
msgid "Asset permission detail" msgid "Asset permission detail"
msgstr "资产授权详情" msgstr "资产授权详情"
#: perms/views.py:147 #: perms/views.py:166
msgid "Asset permission user list" msgid "Asset permission user list"
msgstr "资产授权包含用户" msgstr "资产授权包含用户"
#: perms/views.py:177 #: perms/views.py:196
msgid "Asset permission asset list" msgid "Asset permission asset list"
msgstr "资产组授权包含资产" msgstr "资产组授权包含资产"
#: templates/_base_list.html:43 templates/_header_bar.html:8
msgid "Search"
msgstr "搜索"
#: templates/_header_bar.html:14 #: templates/_header_bar.html:14
msgid "Welcome to use Jumpserver system" msgid "Welcome to use Jumpserver system"
msgstr "欢迎使用Jumpserver开源跳板机系统" msgstr "欢迎使用Jumpserver开源跳板机系统"
...@@ -1538,7 +1647,7 @@ msgstr "欢迎使用Jumpserver开源跳板机系统" ...@@ -1538,7 +1647,7 @@ msgstr "欢迎使用Jumpserver开源跳板机系统"
msgid "Help" msgid "Help"
msgstr "帮助" msgstr "帮助"
#: templates/_header_bar.html:24 templates/_user_profile.html:22 #: templates/_header_bar.html:24 templates/_user_profile.html:29
msgid "Logout" msgid "Logout"
msgstr "注销登录" msgstr "注销登录"
...@@ -1552,12 +1661,7 @@ msgid "Dashboard" ...@@ -1552,12 +1661,7 @@ msgid "Dashboard"
msgstr "仪表盘" msgstr "仪表盘"
#: templates/_message.html:6 #: templates/_message.html:6
#, fuzzy, python-format #, python-format
#| msgid ""
#| "\n"
#| " Your information was incomplete. Please click <a href="
#| "\"%(first_login_url)s\"> this link </a>to complete your information.\n"
#| " "
msgid "" msgid ""
"\n" "\n"
" Your information was incomplete. Please click <a href=" " Your information was incomplete. Please click <a href="
...@@ -1570,31 +1674,20 @@ msgstr "" ...@@ -1570,31 +1674,20 @@ msgstr ""
" " " "
#: templates/_message.html:16 #: templates/_message.html:16
#, fuzzy, python-format
#| msgid ""
#| "\n"
#| " Your ssh public key not set or expired. Please click <a "
#| "href=\"%(user_pubkey_update)s\"> this link </a>to update your\n"
#| " "
msgid "" msgid ""
"\n" "Your ssh public key not set or expired. Please click <a href="
" Your ssh public key not set or expired. Please click <a href=" "\"{{ user_pubkey_update }}\"> this link </a>to update your"
"\"%(user_pubkey_update)s\"> this link </a>to update your\n" msgstr "您的ssh秘钥没有设置或已失效，请点击 <a href={{ user_pubkey_update}} > 链接 </a> 更新"
" "
msgstr ""
"\n"
" 你的SSH Key没有设置或已经过期,点击 <a href="
"\"%(user_pubkey_update)s\"> 链接 </a>更新 \n"
" "
#: templates/_modal.html:15 #: templates/_modal.html:15
msgid "Close" msgid "Close"
msgstr "关闭" msgstr "关闭"
#: templates/_nav.html:9 users/views/group.py:30 users/views/group.py:46 #: templates/_nav.html:9 users/views/group.py:30 users/views/group.py:46
#: users/views/group.py:72 users/views/group.py:89 users/views/login.py:189 #: users/views/group.py:72 users/views/group.py:89 users/views/login.py:192
#: users/views/login.py:256 users/views/user.py:55 users/views/user.py:70 #: users/views/login.py:242 users/views/user.py:55 users/views/user.py:70
#: users/views/user.py:95 users/views/user.py:151 #: users/views/user.py:95 users/views/user.py:151 users/views/user.py:308
#: users/views/user.py:322 users/views/user.py:366 users/views/user.py:388
msgid "Users" msgid "Users"
msgstr "用户管理" msgstr "用户管理"
...@@ -1606,33 +1699,41 @@ msgstr "登录日志" ...@@ -1606,33 +1699,41 @@ msgstr "登录日志"
msgid "Asset permission" msgid "Asset permission"
msgstr "资产授权" msgstr "资产授权"
#: templates/_nav.html:40 #: templates/_nav.html:39
msgid "Job Center" msgid "Job Center"
msgstr "作业中心" msgstr "作业中心"
#: templates/_nav.html:49 templates/_nav.html:52 templates/_nav_user.html:14 #: templates/_nav.html:42
#: terminal/templates/terminal/session_list.html:71 #, fuzzy
#: terminal/views/command.py:65 terminal/views/session.py:97 #| msgid "Tasks"
#: terminal/views/session.py:114 terminal/views/session.py:136 msgid "Task"
#: terminal/views/terminal.py:30 terminal/views/terminal.py:45 msgstr "任务"
#: terminal/views/terminal.py:57
#: templates/_nav.html:47 templates/_nav.html:50 templates/_nav_user.html:14
#: terminal/templates/terminal/session_list.html:74
#: terminal/views/command.py:48 terminal/views/session.py:78
#: terminal/views/session.py:95 terminal/views/session.py:117
#: terminal/views/terminal.py:31 terminal/views/terminal.py:46
#: terminal/views/terminal.py:58
msgid "Terminal" msgid "Terminal"
msgstr "终端" msgstr "终端"
#: templates/_nav.html:53 #: templates/_nav.html:51
msgid "Session online" msgid "Session online"
msgstr "在线会话" msgstr "在线会话"
#: templates/_nav.html:54 #: templates/_nav.html:52
msgid "Session offline" msgid "Session offline"
msgstr "离线会话" msgstr "离线会话"
#: templates/_nav.html:55 terminal/models.py:96 #: templates/_nav.html:53 terminal/models.py:98
#: terminal/templates/terminal/session_list.html:72 #: terminal/templates/terminal/command_list.html:55
#: terminal/templates/terminal/command_list.html:71
#: terminal/templates/terminal/session_list.html:75
msgid "Command" msgid "Command"
msgstr "命令" msgstr "命令"
#: templates/_nav.html:75 #: templates/_nav.html:73
msgid "Visit us" msgid "Visit us"
msgstr "访问官网" msgstr "访问官网"
...@@ -1646,7 +1747,7 @@ msgstr "我的资产" ...@@ -1646,7 +1747,7 @@ msgstr "我的资产"
#: users/templates/users/user_profile.html:17 #: users/templates/users/user_profile.html:17
#: users/templates/users/user_profile_update.html:37 #: users/templates/users/user_profile_update.html:37
#: users/templates/users/user_profile_update.html:57 #: users/templates/users/user_profile_update.html:57
#: users/templates/users/user_pubkey_update.html:37 #: users/templates/users/user_pubkey_update.html:37 users/views/user.py:323
msgid "Profile" msgid "Profile"
msgstr "个人信息" msgstr "个人信息"
...@@ -1654,6 +1755,18 @@ msgstr "个人信息" ...@@ -1654,6 +1755,18 @@ msgstr "个人信息"
msgid "Profile settings" msgid "Profile settings"
msgstr "个人信息设置" msgstr "个人信息设置"
#: templates/_user_profile.html:24
#, fuzzy
#| msgid "Admin user"
msgid "Admin page"
msgstr "管理用户"
#: templates/_user_profile.html:26
#, fuzzy
#| msgid "User agent"
msgid "User page"
msgstr "Agent"
#: templates/captcha/image.html:3 #: templates/captcha/image.html:3
msgid "Play CAPTCHA as audio file" msgid "Play CAPTCHA as audio file"
msgstr "语言播放验证码" msgstr "语言播放验证码"
...@@ -1675,6 +1788,7 @@ msgid "Output" ...@@ -1675,6 +1788,7 @@ msgid "Output"
msgstr "输出" msgstr "输出"
#: terminal/backends/command/models.py:15 #: terminal/backends/command/models.py:15
#: terminal/templates/terminal/command_list.html:75
msgid "Session" msgid "Session"
msgstr "会话" msgstr "会话"
...@@ -1702,55 +1816,55 @@ msgstr "SSH端口" ...@@ -1702,55 +1816,55 @@ msgstr "SSH端口"
msgid "HTTP Port" msgid "HTTP Port"
msgstr "HTTP端口" msgstr "HTTP端口"
#: terminal/models.py:66 #: terminal/models.py:68
msgid "Session Online" msgid "Session Online"
msgstr "在线会话" msgstr "在线会话"
#: terminal/models.py:67 #: terminal/models.py:69
msgid "CPU Usage" msgid "CPU Usage"
msgstr "" msgstr ""
#: terminal/models.py:68 #: terminal/models.py:70
msgid "Memory Used" msgid "Memory Used"
msgstr "内存使用" msgstr "内存使用"
#: terminal/models.py:69 #: terminal/models.py:71
msgid "Connections" msgid "Connections"
msgstr "连接" msgstr "连接"
#: terminal/models.py:70 #: terminal/models.py:72
msgid "Threads" msgid "Threads"
msgstr "线程" msgstr "线程"
#: terminal/models.py:71 #: terminal/models.py:73
msgid "Boot Time" msgid "Boot Time"
msgstr "运行时间" msgstr "运行时间"
#: terminal/models.py:95 terminal/templates/terminal/session_list.html:95 #: terminal/models.py:97 terminal/templates/terminal/session_list.html:98
msgid "Replay" msgid "Replay"
msgstr "回放" msgstr "回放"
#: terminal/models.py:99 #: terminal/models.py:101
#, fuzzy #, fuzzy
#| msgid "Date joined" #| msgid "Date joined"
msgid "Date end" msgid "Date end"
msgstr "创建日期" msgstr "创建日期"
#: terminal/models.py:116 #: terminal/models.py:118
msgid "Args" msgid "Args"
msgstr "参数" msgstr "参数"
#: terminal/templates/terminal/command_list.html:87 #: terminal/templates/terminal/command_list.html:88
msgid "Goto" msgid "Goto"
msgstr "" msgstr ""
#: terminal/templates/terminal/session_detail.html:17 #: terminal/templates/terminal/session_detail.html:17
#: terminal/views/session.py:137 #: terminal/views/session.py:118
msgid "Session detail" msgid "Session detail"
msgstr "会话详情" msgstr "会话详情"
#: terminal/templates/terminal/session_detail.html:28 #: terminal/templates/terminal/session_detail.html:28
#: terminal/views/command.py:66 #: terminal/views/command.py:49
msgid "Command list" msgid "Command list"
msgstr "命令记录列表" msgstr "命令记录列表"
...@@ -1775,24 +1889,24 @@ msgstr "监控" ...@@ -1775,24 +1889,24 @@ msgstr "监控"
msgid "Terminate session" msgid "Terminate session"
msgstr "终止会话" msgstr "终止会话"
#: terminal/templates/terminal/session_list.html:74 #: terminal/templates/terminal/session_list.html:77
msgid "Duration" msgid "Duration"
msgstr "时长" msgstr "时长"
#: terminal/templates/terminal/session_list.html:97 #: terminal/templates/terminal/session_list.html:100
msgid "Monitor" msgid "Monitor"
msgstr "监控" msgstr "监控"
#: terminal/templates/terminal/session_list.html:98 #: terminal/templates/terminal/session_list.html:101
msgid "Terminate" msgid "Terminate"
msgstr "终断" msgstr "终断"
#: terminal/templates/terminal/session_list.html:114 #: terminal/templates/terminal/session_list.html:117
msgid "Terminate task send, waiting ..." msgid "Terminate task send, waiting ..."
msgstr "终断任务已发送，请等待" msgstr "终断任务已发送，请等待"
#: terminal/templates/terminal/terminal_detail.html:13 #: terminal/templates/terminal/terminal_detail.html:13
#: terminal/views/terminal.py:58 #: terminal/views/terminal.py:59
msgid "Terminal detail" msgid "Terminal detail"
msgstr "终端详情" msgstr "终端详情"
...@@ -1826,10 +1940,6 @@ msgstr "接受" ...@@ -1826,10 +1940,6 @@ msgstr "接受"
msgid "Reject" msgid "Reject"
msgstr "拒绝" msgstr "拒绝"
#: terminal/templates/terminal/terminal_list.html:81
msgid "Connect"
msgstr "连接"
#: terminal/templates/terminal/terminal_modal_accept.html:5 #: terminal/templates/terminal/terminal_modal_accept.html:5
msgid "Accept terminal registration" msgid "Accept terminal registration"
msgstr "接受终端注册" msgstr "接受终端注册"
...@@ -1838,39 +1948,39 @@ msgstr "接受终端注册" ...@@ -1838,39 +1948,39 @@ msgstr "接受终端注册"
msgid "Info" msgid "Info"
msgstr "信息" msgstr "信息"
#: terminal/views/session.py:74 #: terminal/views/session.py:55
msgid "Audits" msgid "Audits"
msgstr "审计中心" msgstr "审计中心"
#: terminal/views/session.py:75 #: terminal/views/session.py:56
msgid "Proxy log list" msgid "Proxy log list"
msgstr "Session列表" msgstr "Session列表"
#: terminal/views/session.py:98 #: terminal/views/session.py:79
msgid "Session online list" msgid "Session online list"
msgstr "在线会话" msgstr "在线会话"
#: terminal/views/session.py:115 #: terminal/views/session.py:96
msgid "Session offline list" msgid "Session offline list"
msgstr "离线会话" msgstr "离线会话"
#: terminal/views/terminal.py:31 #: terminal/views/terminal.py:32
msgid "Terminal list" msgid "Terminal list"
msgstr "终端列表" msgstr "终端列表"
#: terminal/views/terminal.py:45 #: terminal/views/terminal.py:46
msgid "Update terminal" msgid "Update terminal"
msgstr "更新终端" msgstr "更新终端"
#: terminal/views/terminal.py:100 terminal/views/terminal.py:101 #: terminal/views/terminal.py:102 terminal/views/terminal.py:103
msgid "Redirect to web terminal" msgid "Redirect to web terminal"
msgstr "重定向到web terminal" msgstr "重定向到web terminal"
#: terminal/views/terminal.py:108 #: terminal/views/terminal.py:110
msgid "Connect ssh terminal" msgid "Connect ssh terminal"
msgstr "连接ssh终端" msgstr "连接ssh终端"
#: terminal/views/terminal.py:109 #: terminal/views/terminal.py:111
msgid "" msgid ""
"You should use your ssh client tools connect terminal: {} <br /> <br />{}" "You should use your ssh client tools connect terminal: {} <br /> <br />{}"
msgstr "你可以使用ssh客户端工具连接终端" msgstr "你可以使用ssh客户端工具连接终端"
...@@ -1930,31 +2040,43 @@ msgstr "" ...@@ -1930,31 +2040,43 @@ msgstr ""
msgid "Join user groups" msgid "Join user groups"
msgstr "添加到用户组" msgstr "添加到用户组"
#: users/forms.py:83 #: users/forms.py:71
msgid "Old password"
msgstr "原来密码"
#: users/forms.py:76
msgid "New password"
msgstr "新密码"
#: users/forms.py:81
msgid "Confirm password"
msgstr "确认密码"
#: users/forms.py:91
msgid "Old password error" msgid "Old password error"
msgstr "原来密码错误" msgstr "原来密码错误"
#: users/forms.py:91 #: users/forms.py:99
msgid "Password does not match" msgid "Password does not match"
msgstr "密码不一致" msgstr "密码不一致"
#: users/forms.py:103 #: users/forms.py:111
msgid "ssh public key" msgid "ssh public key"
msgstr "ssh公钥" msgstr "ssh公钥"
#: users/forms.py:104 #: users/forms.py:112
msgid "ssh-rsa AAAA..." msgid "ssh-rsa AAAA..."
msgstr "" msgstr ""
#: users/forms.py:105 #: users/forms.py:113
msgid "Paste your id_rsa.pub here." msgid "Paste your id_rsa.pub here."
msgstr "复制你的公钥到这里" msgstr "复制你的公钥到这里"
#: users/forms.py:117 #: users/forms.py:126
msgid "Public key should not be the same as your old one." msgid "Public key should not be the same as your old one."
msgstr "不能和原来的密钥相同" msgstr "不能和原来的密钥相同"
#: users/forms.py:121 users/serializers.py:40 #: users/forms.py:130 users/serializers.py:42
msgid "Not a valid ssh public key" msgid "Not a valid ssh public key"
msgstr "ssh密钥不合法" msgstr "ssh密钥不合法"
...@@ -1982,43 +2104,41 @@ msgstr "Agent" ...@@ -1982,43 +2104,41 @@ msgstr "Agent"
msgid "Date login" msgid "Date login"
msgstr "登录日期" msgstr "登录日期"
#: users/models/user.py:35 users/templates/users/_select_user_modal.html:15 #: users/models/user.py:39 users/templates/users/_select_user_modal.html:15
#: users/templates/users/user_detail.html:86 #: users/templates/users/user_detail.html:86
#: users/templates/users/user_list.html:25 #: users/templates/users/user_list.html:25
#: users/templates/users/user_profile.html:55 #: users/templates/users/user_profile.html:55
msgid "Role" msgid "Role"
msgstr "角色" msgstr "角色"
#: users/models/user.py:36 #: users/models/user.py:40
msgid "Avatar" msgid "Avatar"
msgstr "头像" msgstr "头像"
#: users/models/user.py:37 users/templates/users/user_detail.html:81 #: users/models/user.py:41 users/templates/users/user_detail.html:81
msgid "Wechat" msgid "Wechat"
msgstr "微信" msgstr "微信"
#: users/models/user.py:39 users/templates/users/user_detail.html:90 #: users/models/user.py:43
msgid "Enable OTP" msgid "Enable OTP"
msgstr "二次验证" msgstr "二次验证"
#: users/models/user.py:42 #: users/models/user.py:46
#, fuzzy
#| msgid "Private Token"
msgid "Private key" msgid "Private key"
msgstr "ssh密钥" msgstr "ssh私钥"
#: users/models/user.py:43 users/templates/users/user_password_update.html:43 #: users/models/user.py:47 users/templates/users/user_password_update.html:43
#: users/templates/users/user_profile.html:71 #: users/templates/users/user_profile.html:71
#: users/templates/users/user_profile_update.html:43 #: users/templates/users/user_profile_update.html:43
#: users/templates/users/user_pubkey_update.html:43 #: users/templates/users/user_pubkey_update.html:43
msgid "Public key" msgid "Public key"
msgstr "ssh公钥" msgstr "ssh公钥"
#: users/models/user.py:249 #: users/models/user.py:255
msgid "Administrator" msgid "Administrator"
msgstr "管理员" msgstr "管理员"
#: users/models/user.py:252 #: users/models/user.py:258
msgid "Administrator is the super user of system" msgid "Administrator is the super user of system"
msgstr "Administrator是初始的超级管理员" msgstr "Administrator是初始的超级管理员"
...@@ -2097,11 +2217,11 @@ msgstr "输入您的邮箱, 将会发一封重置短信邮件到您的邮箱中" ...@@ -2097,11 +2217,11 @@ msgstr "输入您的邮箱, 将会发一封重置短信邮件到您的邮箱中"
msgid "Captcha invalid" msgid "Captcha invalid"
msgstr "验证码错误" msgstr "验证码错误"
#: users/templates/users/login_log_list.html:50 #: users/templates/users/login_log_list.html:51
msgid "UA" msgid "UA"
msgstr "Agent" msgstr "Agent"
#: users/templates/users/login_log_list.html:52 #: users/templates/users/login_log_list.html:53
msgid "City" msgid "City"
msgstr "城市" msgstr "城市"
...@@ -2137,7 +2257,6 @@ msgstr "用户详情" ...@@ -2137,7 +2257,6 @@ msgstr "用户详情"
#: users/templates/users/user_detail.html:22 #: users/templates/users/user_detail.html:22
#: users/templates/users/user_granted_asset.html:21 #: users/templates/users/user_granted_asset.html:21
#: users/templates/users/user_group_detail.html:25
#: users/templates/users/user_group_granted_asset.html:21 #: users/templates/users/user_group_granted_asset.html:21
msgid "Asset granted" msgid "Asset granted"
msgstr "授权的资产" msgstr "授权的资产"
...@@ -2148,21 +2267,17 @@ msgid "Last login" ...@@ -2148,21 +2267,17 @@ msgid "Last login"
msgstr "最后登录" msgstr "最后登录"
#: users/templates/users/user_detail.html:156 #: users/templates/users/user_detail.html:156
#, fuzzy
#| msgid "Send reset password message"
msgid "Send reset password mail" msgid "Send reset password mail"
msgstr "发送重置密码邮件" msgstr "发送重置密码邮件"
#: users/templates/users/user_detail.html:159 #: users/templates/users/user_detail.html:159
#: users/templates/users/user_detail.html:167 #: users/templates/users/user_detail.html:167
msgid "Send" msgid "Send"
msgstr "" msgstr "发送"
#: users/templates/users/user_detail.html:164 #: users/templates/users/user_detail.html:164
#, fuzzy
#| msgid "Reset ssh key"
msgid "Send reset ssh key mail" msgid "Send reset ssh key mail"
msgstr "重置密钥" msgstr "发送重置密钥邮件"
#: users/templates/users/user_detail.html:323 #: users/templates/users/user_detail.html:323
msgid "An e-mail has been sent to the user\\'s mailbox." msgid "An e-mail has been sent to the user\\'s mailbox."
...@@ -2192,13 +2307,13 @@ msgstr "重置" ...@@ -2192,13 +2307,13 @@ msgstr "重置"
#: users/templates/users/user_detail.html:376 #: users/templates/users/user_detail.html:376
#: users/templates/users/user_profile.html:170 #: users/templates/users/user_profile.html:170
msgid "Successfully updated the SSH public key." msgid "Successfully updated the SSH public key."
msgstr "" msgstr "更新ssh密钥成功"
#: users/templates/users/user_detail.html:377 #: users/templates/users/user_detail.html:377
#: users/templates/users/user_detail.html:381 #: users/templates/users/user_detail.html:381
#: users/templates/users/user_profile.html:171 #: users/templates/users/user_profile.html:171
#: users/templates/users/user_profile.html:176 #: users/templates/users/user_profile.html:176
msgid "User SSH Public Key Update" msgid "User SSH public key update"
msgstr "ssh密钥" msgstr "ssh密钥"
#: users/templates/users/user_granted_asset.html:29 #: users/templates/users/user_granted_asset.html:29
...@@ -2223,6 +2338,10 @@ msgstr "资产组详情" ...@@ -2223,6 +2338,10 @@ msgstr "资产组详情"
msgid "Add user" msgid "Add user"
msgstr "添加用户" msgstr "添加用户"
#: users/templates/users/user_group_granted_asset.html:53
msgid "Valid"
msgstr "可用"
#: users/templates/users/user_group_list.html:5 users/views/group.py:47 #: users/templates/users/user_group_list.html:5 users/views/group.py:47
msgid "Create user group" msgid "Create user group"
msgstr "创建用户组" msgstr "创建用户组"
...@@ -2240,20 +2359,20 @@ msgstr "用户组删除" ...@@ -2240,20 +2359,20 @@ msgstr "用户组删除"
msgid "UserGroup Deleting failed." msgid "UserGroup Deleting failed."
msgstr "用户组删除失败" msgstr "用户组删除失败"
#: users/templates/users/user_list.html:178 #: users/templates/users/user_list.html:180
msgid "This will delete the selected users !!!" msgid "This will delete the selected users !!!"
msgstr "" msgstr "删除选中用户 !!!"
#: users/templates/users/user_list.html:186 #: users/templates/users/user_list.html:188
msgid "User Deleted." msgid "User Deleted."
msgstr "已被删除" msgstr "已被删除"
#: users/templates/users/user_list.html:187 #: users/templates/users/user_list.html:189
#: users/templates/users/user_list.html:192 #: users/templates/users/user_list.html:194
msgid "User Delete" msgid "User Delete"
msgstr "删除" msgstr "删除"
#: users/templates/users/user_list.html:191 #: users/templates/users/user_list.html:193
msgid "User Deleting failed." msgid "User Deleting failed."
msgstr "用户删除失败" msgstr "用户删除失败"
...@@ -2428,48 +2547,52 @@ msgstr "用户组列表" ...@@ -2428,48 +2547,52 @@ msgstr "用户组列表"
msgid "Update user group" msgid "Update user group"
msgstr "编辑用户组" msgstr "编辑用户组"
#: users/views/login.py:79 #: users/views/login.py:54
msgid "Please enable cookies and try again."
msgstr ""
#: users/views/login.py:83
msgid "Logout success" msgid "Logout success"
msgstr "退出登录成功" msgstr "退出登录成功"
#: users/views/login.py:80 #: users/views/login.py:84
msgid "Logout success, return login page" msgid "Logout success, return login page"
msgstr "退出登录成功，返回到登录页面" msgstr "退出登录成功，返回到登录页面"
#: users/views/login.py:95 #: users/views/login.py:99
msgid "Email address invalid, please input again" msgid "Email address invalid, please input again"
msgstr "邮箱地址错误，重新输入" msgstr "邮箱地址错误，重新输入"
#: users/views/login.py:108 #: users/views/login.py:112
msgid "Send reset password message" msgid "Send reset password message"
msgstr "发送重置密码邮件" msgstr "发送重置密码邮件"
#: users/views/login.py:109 #: users/views/login.py:113
msgid "Send reset password mail success, login your mail box and follow it " msgid "Send reset password mail success, login your mail box and follow it "
msgstr "" msgstr ""
"发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)" "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)"
#: users/views/login.py:123 #: users/views/login.py:127
msgid "Reset password success" msgid "Reset password success"
msgstr "重置密码成功" msgstr "重置密码成功"
#: users/views/login.py:124 #: users/views/login.py:128
msgid "Reset password success, return to login page" msgid "Reset password success, return to login page"
msgstr "重置密码成功，返回到登录页面" msgstr "重置密码成功，返回到登录页面"
#: users/views/login.py:141 users/views/login.py:154 #: users/views/login.py:145 users/views/login.py:158
msgid "Token invalid or expired" msgid "Token invalid or expired"
msgstr "Token错误或失效" msgstr "Token错误或失效"
#: users/views/login.py:150 #: users/views/login.py:154
msgid "Password not same" msgid "Password not same"
msgstr "密码不一致" msgstr "密码不一致"
#: users/views/login.py:189 #: users/views/login.py:192
msgid "First login" msgid "First login"
msgstr "首次登陆" msgstr "首次登陆"
#: users/views/login.py:257 #: users/views/login.py:243
msgid "Login log list" msgid "Login log list"
msgstr "登录日志" msgstr "登录日志"
...@@ -2483,41 +2606,25 @@ msgid "Create user <a href=\"{url}\">{name}</a> successfully." ...@@ -2483,41 +2606,25 @@ msgid "Create user <a href=\"{url}\">{name}</a> successfully."
msgstr "创建用户 <a href=\"{url}\">{name}</a> 成功" msgstr "创建用户 <a href=\"{url}\">{name}</a> 成功"
#: users/views/user.py:105 #: users/views/user.py:105
#, fuzzy
#| msgid "Update auth info success"
msgid "Bulk update user success" msgid "Bulk update user success"
msgstr "更新认证信息成功" msgstr "批量更新用户成功"
#: users/views/user.py:210 #: users/views/user.py:210
msgid "Invalid file." msgid "Invalid file."
msgstr "文件错误" msgstr "文件不合法"
#~ msgid "Start"
#~ msgstr "开始"
#~ msgid "Refresh assets connectivity"
#~ msgstr "重置资产连接性"
#~ msgid "Repush system user" #: users/views/user.py:309
#~ msgstr "重新推送系统" msgid "User granted assets"
msgstr "用户授权资产"
#~ msgid "Update asset permission <a href=\"{url}\"> {name} </a> successfully." #: users/views/user.py:349
#~ msgstr "更新授权 <a href=\"{url}\"> {name} </a> 成功" msgid "Profile setting"
msgstr "个人信息设置"
#~ msgid "System User"
#~ msgstr "系统用户"
#~ msgid "Asset permission of "
#~ msgstr "授权规则"
#~ msgid "Quick create permission for user"
#~ msgstr "创建权限"
#~ msgid "Revoke Successfully!"
#~ msgstr "回收成功"
#~ msgid "Quick create permission for user group" #: users/views/user.py:367
#~ msgstr "快速授权" msgid "Password update"
msgstr "密码更新"
#~ msgid "Select User" #: users/views/user.py:389
#~ msgstr "选择用户" msgid "Public key update"
msgstr "秘钥更新"
apps/ops/templates/ops/task_detail.html
View file @ c48531c5
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<td><b><a href="{% url 'ops:adhoc-detail' pk=object.latest_adhoc.id %}">{{ object.latest_adhoc.short_id }}</a></b></td> <td><b><a href="{% url 'ops:adhoc-detail' pk=object.latest_adhoc.id %}">{{ object.latest_adhoc.short_id }}</a></b></td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Latest run' %}:</td> <td>{% trans 'Last run' %}:</td>
<td><b>{{ object.latest_history.date_start }}</b></td> <td><b>{{ object.latest_history.date_start }}</b></td>
</tr> </tr>
<tr> <tr>
......
apps/static/js/jumpserver.js
View file @ c48531c5
...@@ -280,6 +280,11 @@ jumpserver.initDataTable = function (options) { ...@@ -280,6 +280,11 @@ jumpserver.initDataTable = function (options) {
language: { language: {
search: "搜索", search: "搜索",
lengthMenu: "每页 _MENU_", lengthMenu: "每页 _MENU_",
info: "显示第 _START_ 到 _END_; 总共 _TOTAL_ ",
infoFiltered: "",
infoEmpty: "",
zeroRecords: "没有匹配记录",
emptyTable: "没有记录",
paginate: { paginate: {
first: "第一页", first: "第一页",
previous: "上一页", previous: "上一页",
......
apps/templates/_message.html
View file @ c48531c5
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
{% if user.is_authenticated and not user.is_public_key_valid %} {% if user.is_authenticated and not user.is_public_key_valid %}
<div class="alert alert-danger help-message"> <div class="alert alert-danger help-message">
{% url 'users:user-pubkey-update' as user_pubkey_update %} {% url 'users:user-pubkey-update' as user_pubkey_update %}
{% blocktrans %} {% trans 'Your ssh public key not set or expired. Please click <a href="{{ user_pubkey_update }}"> this link </a>to update' %}
Your ssh public key not set or expired. Please click <a href="{{ user_pubkey_update }}"> this link </a>to update your
{% endblocktrans %}
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
......
apps/users/models/user.py
View file @ c48531c5
...@@ -46,7 +46,7 @@ class User(AbstractUser): ...@@ -46,7 +46,7 @@ class User(AbstractUser):
_private_key = models.CharField(max_length=5000, blank=True, verbose_name=_('Private key')) _private_key = models.CharField(max_length=5000, blank=True, verbose_name=_('Private key'))
_public_key = models.CharField(max_length=5000, blank=True, verbose_name=_('Public key')) _public_key = models.CharField(max_length=5000, blank=True, verbose_name=_('Public key'))
comment = models.TextField(max_length=200, blank=True, verbose_name=_('Comment')) comment = models.TextField(max_length=200, blank=True, verbose_name=_('Comment'))
is_first_login = models.BooleanField(default=False) is_first_login = models.BooleanField(default=True)
date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True, verbose_name=_('Date expired')) date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True, verbose_name=_('Date expired'))
created_by = models.CharField(max_length=30, default='', verbose_name=_('Created by')) created_by = models.CharField(max_length=30, default='', verbose_name=_('Created by'))
......
apps/users/templates/users/user_detail.html
View file @ c48531c5
...@@ -374,11 +374,11 @@ $(document).ready(function() { ...@@ -374,11 +374,11 @@ $(document).ready(function() {
$('#txt_pk').val(''); $('#txt_pk').val('');
$this.closest('.modal').modal('hide'); $this.closest('.modal').modal('hide');
var msg = "{% trans 'Successfully updated the SSH public key.' %}"; var msg = "{% trans 'Successfully updated the SSH public key.' %}";
swal("{% trans 'User SSH Public Key Update' %}", msg, "success"); swal("{% trans 'User SSH public key update' %}", msg, "success");
}; };
var fail = function(msg) { var fail = function(msg) {
swal({ swal({
title: "{% trans 'User SSH Public Key Update' %}", title: "{% trans 'User SSH public key update' %}",
text: msg, text: msg,
type: "error", type: "error",
showCancelButton: false, showCancelButton: false,
......
apps/users/templates/users/user_profile.html
View file @ c48531c5
...@@ -168,12 +168,12 @@ $(document).on('click', '#btn_update_pk', function() { ...@@ -168,12 +168,12 @@ $(document).on('click', '#btn_update_pk', function() {
var success = function() { var success = function() {
$('#txt_pk').val(''); $('#txt_pk').val('');
var msg = "{% trans 'Successfully updated the SSH public key.' %}"; var msg = "{% trans 'Successfully updated the SSH public key.' %}";
swal("{% trans 'User SSH Public Key Update' %}", msg, "success"); swal("{% trans 'User SSH public key update' %}", msg, "success");
}; };
var fail = function() { var fail = function() {
var msg = "{% trans 'Failed to update SSH public key.' %}"; var msg = "{% trans 'Failed to update SSH public key.' %}";
swal({ swal({
title: "{% trans 'User SSH Public Key Update' %}", title: "{% trans 'User SSH public key update' %}",
text: msg, text: msg,
type: "error", type: "error",
showCancelButton: false, showCancelButton: false,
......
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