Skip to content

Commit 8827fd2

Browse files
ibuleribuler
committed
Modify translation
1 parent 6fc3bbb commit 8827fd2

6 files changed

Lines changed: 39 additions & 92 deletions

File tree

‎apps/assets/models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ class Asset(models.Model):
106106
groups = models.ManyToManyField(AssetGroup, null=True, blank=True, verbose_name=_('Asset groups'))
107107
username = models.CharField(max_length=16, null=True, blank=True, verbose_name=_('Admin user'))
108108
password = models.CharField(max_length=256, null=True, blank=True, verbose_name=_("Admin password"))
109-
admin_user = models.ForeignKey(AdminUser, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=_("Admin User"))
110-
sys_user = models.ManyToManyField(SysUser, null=True, blank=True, verbose_name=_("Sys User"))
109+
admin_user = models.ForeignKey(AdminUser, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=_("Admin user"))
110+
sys_user = models.ManyToManyField(SysUser, null=True, blank=True, verbose_name=_("System User"))
111111
idc = models.ForeignKey(IDC, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=_('IDC'))
112112
mac_addr = models.CharField(max_length=20, null=True, blank=True, verbose_name=_("Mac address"))
113113
brand = models.CharField(max_length=64, null=True, blank=True, verbose_name=_('Brand'))

‎apps/locale/zh/LC_MESSAGES/django.mo‎

1.24 KB
Binary file not shown.

‎apps/locale/zh/LC_MESSAGES/django.po‎

Lines changed: 28 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,18 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: PACKAGE VERSION\n"
10-
"Report-Msgid-Bugs-To: \n"
9+
"Project-Id-Version: Jumpserver 0.3.3\n"
10+
"Report-Msgid-Bugs-To: ibuler@qq.com\n"
1111
"POT-Creation-Date: 2016-09-05 12:13+0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13-
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14-
"Language-Team: LANGUAGE <LL@li.org>\n"
15-
"Language: \n"
13+
"Last-Translator: ibuler <ibuler@qq.com>\n"
14+
"Language-Team: Jumpserver team<ibuler@qq.com>\n"
15+
"Language: zh_CN\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919

2020
#: assets/forms.py:20
21-
#, fuzzy
22-
#| msgid "Join usergroups"
2321
msgid "Join assetgroups"
2422
msgstr "添加到用户组"
2523

@@ -77,21 +75,19 @@ msgstr "运营商"
7775

7876
#: assets/models.py:40 assets/models.py:142
7977
msgid "KEY"
80-
msgstr ""
78+
msgstr "KEY"
8179

8280
#: assets/models.py:41 assets/models.py:143
8381
msgid "VALUE"
84-
msgstr ""
82+
msgstr "VALUE"
8583

8684
#: assets/models.py:55 assets/models.py:77 users/forms.py:12
8785
#: users/models.py:106 users/templates/users/login.html:58
8886
#: users/templates/users/user_detail.html:73
8987
#: users/templates/users/user_edit.html:5
9088
#: users/templates/users/user_list.html:13
91-
#, fuzzy
92-
#| msgid "User"
9389
msgid "Username"
94-
msgstr "用户"
90+
msgstr "用户名"
9591

9692
#: assets/models.py:56 assets/models.py:78 users/forms.py:13
9793
#: users/templates/users/login.html:61
@@ -103,60 +99,56 @@ msgid "Password"
10399
msgstr "密码"
104100

105101
#: assets/models.py:57 assets/models.py:80
106-
#, fuzzy
107-
#| msgid "ssh private key"
108102
msgid "SSH private key"
109103
msgstr "ssh密钥"
110104

111105
#: assets/models.py:58 assets/models.py:82
112106
msgid "As default"
113-
msgstr ""
107+
msgstr "默认使用"
114108

115109
#: assets/models.py:59 assets/models.py:84
116110
msgid "Auto update pass/key"
117-
msgstr ""
111+
msgstr "自动更新密码/密钥"
118112

119113
#: assets/models.py:79
120114
msgid "Protocol"
121-
msgstr ""
115+
msgstr "协议"
122116

123117
#: assets/models.py:81
124-
#, fuzzy
125-
#| msgid "ssh public key"
126118
msgid "SSH public key"
127119
msgstr "ssh公钥"
128120

129121
#: assets/models.py:83
130122
msgid "Auto push"
131-
msgstr ""
123+
msgstr "自动推送"
132124

133125
#: assets/models.py:85
134126
msgid "Sudo"
135-
msgstr ""
127+
msgstr "Sudo"
136128

137129
#: assets/models.py:86
138130
msgid "Shell"
139-
msgstr ""
131+
msgstr "Shell"
140132

141133
#: assets/models.py:87 templates/_header_bar.html:35 templates/_nav.html:4
142134
msgid "Home"
143135
msgstr "仪表盘"
144136

145137
#: assets/models.py:88
146138
msgid "Uid"
147-
msgstr ""
139+
msgstr "Uid"
148140

149141
#: assets/models.py:101
150142
msgid "IP"
151-
msgstr ""
143+
msgstr "IP"
152144

153145
#: assets/models.py:102
154146
msgid "Other IP"
155-
msgstr ""
147+
msgstr "其它IP"
156148

157149
#: assets/models.py:103
158150
msgid "Remote card IP"
159-
msgstr ""
151+
msgstr "远控卡IP"
160152

161153
#: assets/models.py:104
162154
msgid "Hostname"
@@ -171,26 +163,16 @@ msgid "Asset groups"
171163
msgstr "用户组"
172164

173165
#: assets/models.py:107
174-
#, fuzzy
175-
#| msgid "Edit user"
176166
msgid "Admin user"
177-
msgstr "编辑用户"
167+
msgstr "管理用户"
178168

179169
#: assets/models.py:108
180170
msgid "Admin password"
181171
msgstr "管理员密码"
182172

183-
#: assets/models.py:109
184-
#, fuzzy
185-
#| msgid "Edit user"
186-
msgid "Admin User"
187-
msgstr "编辑用户"
188-
189173
#: assets/models.py:110
190-
#, fuzzy
191-
#| msgid "User"
192174
msgid "Sys User"
193-
msgstr "用户"
175+
msgstr "系统用户"
194176

195177
#: assets/models.py:111 templates/_nav.html:23
196178
msgid "IDC"
@@ -259,16 +241,12 @@ msgstr "资产"
259241

260242
#: assets/templates/assets/assetgroup_add.html:16
261243
#: assets/templates/assets/assetgroup_list.html:5 assets/views.py:60
262-
#, fuzzy
263-
#| msgid "Create usergroup"
264244
msgid "Create asset group"
265-
msgstr "创建用户组"
245+
msgstr "创建资产组"
266246

267247
#: assets/templates/assets/assetgroup_add.html:37
268-
#, fuzzy
269-
#| msgid "Select usergroups"
270248
msgid "Select asset"
271-
msgstr "选择用户组"
249+
msgstr "选择资产"
272250

273251
#: assets/templates/assets/assetgroup_add.html:49
274252
#: users/templates/users/_user.html:70
@@ -283,14 +261,12 @@ msgstr "重置"
283261
#: users/templates/users/forget_password.html:44
284262
#: users/templates/users/user_list.html:63
285263
msgid "Submit"
286-
msgstr ""
264+
msgstr "提交"
287265

288266
#: assets/templates/assets/assetgroup_list.html:13
289267
#: users/templates/users/user_list.html:16
290-
#, fuzzy
291-
#| msgid "Asset number"
292268
msgid "Asset num"
293-
msgstr "资产编号"
269+
msgstr "资产数量"
294270

295271
#: assets/templates/assets/assetgroup_list.html:32
296272
#: users/templates/users/user_list.html:44
@@ -327,18 +303,14 @@ msgid "Assets"
327303
msgstr "资产管理"
328304

329305
#: assets/views.py:75
330-
#, fuzzy
331-
#| msgid "Asset groups"
332306
msgid "Asset group list"
333-
msgstr "用户组"
307+
msgstr "资产组列表"
334308

335309
#: templates/_header_bar.html:8 users/templates/users/user_detail.html:29
336310
msgid "Search"
337311
msgstr "搜索"
338312

339313
#: templates/_header_bar.html:14
340-
#, fuzzy
341-
#| msgid "Welcome use Jumpserver system"
342314
msgid "Welcome to use Jumpserver system"
343315
msgstr "欢迎使用Jumpserver开源跳板机系统"
344316

@@ -361,22 +333,6 @@ msgstr "用户"
361333
msgid "Usergroup"
362334
msgstr "用户组"
363335

364-
#: templates/_nav.html:22
365-
msgid "Assetgroup"
366-
msgstr "用户组"
367-
368-
#: templates/_nav.html:24
369-
#, fuzzy
370-
#| msgid "Asset admin"
371-
msgid "Assetadmin"
372-
msgstr "管理用户"
373-
374-
#: templates/_nav.html:25
375-
#, fuzzy
376-
#| msgid "Asset user"
377-
msgid "Assetuser"
378-
msgstr "系统用户"
379-
380336
#: templates/_nav.html:26
381337
msgid "Label"
382338
msgstr "标签"
@@ -509,10 +465,8 @@ msgstr "验证码错误"
509465

510466
#: users/templates/users/reset_password.html:45
511467
#: users/templates/users/user_detail.html:159 users/utils.py:98
512-
#, fuzzy
513-
#| msgid "Reset password success"
514468
msgid "Reset password"
515-
msgstr "重置密码成功"
469+
msgstr "重置密码"
516470

517471
#: users/templates/users/reset_password.html:55
518472
msgid "Password again"
@@ -543,10 +497,8 @@ msgid "User log"
543497
msgstr "登录日志"
544498

545499
#: users/templates/users/user_detail.html:105
546-
#, fuzzy
547-
#| msgid "Date expired"
548500
msgid "Date joined"
549-
msgstr "失效日期"
501+
msgstr "创建日期"
550502

551503
#: users/templates/users/user_detail.html:109
552504
msgid "Last login"
@@ -569,10 +521,8 @@ msgid "Add"
569521
msgstr "添加"
570522

571523
#: users/templates/users/user_list.html:17
572-
#, fuzzy
573-
#| msgid "Is active"
574524
msgid "Active"
575-
msgstr "是否激活"
525+
msgstr "激活"
576526

577527
#: users/utils.py:47
578528
msgid "Begin to generate ssh private key ..."
@@ -697,8 +647,6 @@ msgid "Create user<a href=\"%s\">%s</a> success."
697647
msgstr "创建用户<a href=\"%s\">%s</a> 成功"
698648

699649
#: users/views.py:159
700-
#, fuzzy
701-
#| msgid "Edit user"
702650
msgid "Edit user"
703651
msgstr "编辑用户"
704652

@@ -738,9 +686,3 @@ msgstr "Token错误或失效"
738686
#: users/views.py:296
739687
msgid "Password not same"
740688
msgstr "密码不一致"
741-
742-
#~ msgid "Asset user"
743-
#~ msgstr "系统用户"
744-
745-
#~ msgid "Commit"
746-
#~ msgstr "提交"

‎apps/templates/_nav.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<li class="{% url 'assets:asset-list' %}"><a href="">{% trans 'Asset' %}</a></li>
2222
<li class=""><a href="{% url 'assets:assetgroup-list' %}">{% trans 'Assetgroup' %}</a></li>
2323
<li class=""><a href="">{% trans 'IDC' %}</a></li>
24-
<li class=""><a href="">{% trans 'Assetadmin' %}</a></li>
25-
<li class=""><a href="">{% trans 'Assetuser' %}</a></li>
24+
<li class=""><a href="">{% trans 'Admin user' %}</a></li>
25+
<li class=""><a href="">{% trans 'System user' %}</a></li>
2626
<li class=""><a href="">{% trans 'Label' %}</a></li>
2727
</ul>
2828
</li>

‎apps/templates/captcha/text_field.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
{% load i18n %}
12
<div class="row">
23
<div class="col-sm-6">
3-
<input autocomplete="off" id="{{id}}_1" class="form-control" name="{{name}}_1" type="text" />
4-
<span class="red-fonts" id="captcha-error" style="display: none">验证码错误</span>
4+
<input autocomplete="off" id="{{id}}_1" class="form-control" name="{{name}}_1" placeholder="{% trans 'Captcha' %}" type="text" />
55
</div>
66
</div>
77
</br>

‎apps/users/templates/users/login.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
{% include '_head_css_js.html' %}
1212
<link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
1313
<script src="{% static "js/jumpserver.js" %}"></script>
14+
<style>
15+
.captcha {
16+
float: right;
17+
}
18+
</style>
1419
</head>
1520

1621
<body class="gray-bg">

0 commit comments

Comments
 (0)