github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修改翻译内容 (#5489) 

* fix: 修改翻译内容

* fix: 修改翻译内容(2)

Co-authored-by: Bai <bugatti_it@163.com>
pull/5490/head
fit2bot 2021-01-20 11:38:09 +08:00 committed by GitHub
parent 4de9e608b1
commit ea16088c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -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: 2021-01-19 20:03+0800\n" "POT-Creation-Date: 2021-01-20 11:35+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"
@ -268,7 +268,7 @@ msgstr "主机名"
#: assets/models/asset.py:194 assets/models/domain.py:54 #: assets/models/asset.py:194 assets/models/domain.py:54
#: assets/models/user.py:120 terminal/serializers/session.py:29 #: assets/models/user.py:120 terminal/serializers/session.py:29
#: terminal/serializers/storage.py:68 #: terminal/serializers/storage.py:69
msgid "Protocol" msgid "Protocol"
msgstr "协议" msgstr "协议"
@ -726,7 +726,7 @@ msgstr "硬件信息"
msgid "Org name" msgid "Org name"
msgstr "组织名称" msgstr "组织名称"
#: assets/serializers/asset.py:162 assets/serializers/asset.py:193 #: assets/serializers/asset.py:162 assets/serializers/asset.py:201
msgid "Connectivity" msgid "Connectivity"
msgstr "连接" msgstr "连接"
@ -1129,7 +1129,7 @@ msgstr "是否成功"
msgid "Result" msgid "Result"
msgstr "结果" msgstr "结果"
#: audits/serializers.py:79 terminal/serializers/storage.py:177 #: audits/serializers.py:79 terminal/serializers/storage.py:178
msgid "Hosts" msgid "Hosts"
msgstr "主机" msgstr "主机"
@ -2714,60 +2714,60 @@ msgstr "是否可重放"
msgid "Can join" msgid "Can join"
msgstr "是否可加入" msgstr "是否可加入"
#: terminal/serializers/storage.py:20 #: terminal/serializers/storage.py:21
msgid "Endpoint invalid: remove path `{}`" msgid "Endpoint invalid: remove path `{}`"
msgstr "端点无效: 移除路径 `{}`" msgstr "端点无效: 移除路径 `{}`"
#: terminal/serializers/storage.py:26 #: terminal/serializers/storage.py:27
msgid "Bucket" msgid "Bucket"
msgstr "桶名称" msgstr "桶名称"
#: terminal/serializers/storage.py:29 #: terminal/serializers/storage.py:30
msgid "Access key" msgid "Access key"
msgstr "" msgstr ""
#: terminal/serializers/storage.py:33 #: terminal/serializers/storage.py:34
msgid "Secret key" msgid "Secret key"
msgstr "" msgstr ""
#: terminal/serializers/storage.py:38 terminal/serializers/storage.py:50 #: terminal/serializers/storage.py:39 terminal/serializers/storage.py:51
#: terminal/serializers/storage.py:80 #: terminal/serializers/storage.py:81
msgid "Endpoint" msgid "Endpoint"
msgstr "端点" msgstr "端点"
#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:276 #: terminal/serializers/storage.py:66 xpack/plugins/cloud/models.py:276
msgid "Region" msgid "Region"
msgstr "地域" msgstr "地域"
#: terminal/serializers/storage.py:90 #: terminal/serializers/storage.py:91
msgid "Container name" msgid "Container name"
msgstr "容器名称" msgstr "容器名称"
#: terminal/serializers/storage.py:92 #: terminal/serializers/storage.py:93
msgid "Account name" msgid "Account name"
msgstr "账户名称" msgstr "账户名称"
#: terminal/serializers/storage.py:93 #: terminal/serializers/storage.py:94
msgid "Account key" msgid "Account key"
msgstr "账户密钥" msgstr "账户密钥"
#: terminal/serializers/storage.py:96 #: terminal/serializers/storage.py:97
msgid "Endpoint suffix" msgid "Endpoint suffix"
msgstr "端点后缀" msgstr "端点后缀"
#: terminal/serializers/storage.py:154 #: terminal/serializers/storage.py:155
msgid "The address format is incorrect" msgid "The address format is incorrect"
msgstr "地址格式不正确" msgstr "地址格式不正确"
#: terminal/serializers/storage.py:161 #: terminal/serializers/storage.py:162
msgid "Host invalid" msgid "Host invalid"
msgstr "主机无效" msgstr "主机无效"
#: terminal/serializers/storage.py:164 #: terminal/serializers/storage.py:165
msgid "Port invalid" msgid "Port invalid"
msgstr "端口无效" msgstr "端口无效"
#: terminal/serializers/storage.py:180 #: terminal/serializers/storage.py:181
msgid "Index" msgid "Index"
msgstr "索引" msgstr "索引"
@ -3236,7 +3236,7 @@ msgid "Join user groups"
msgstr "添加到用户组" msgstr "添加到用户组"
#: users/forms/user.py:103 users/views/profile/password.py:59 #: users/forms/user.py:103 users/views/profile/password.py:59
#: users/views/profile/reset.py:127 #: users/views/profile/reset.py:126
msgid "* Your password does not meet the requirements" msgid "* Your password does not meet the requirements"
msgstr "* 您的密码不符合要求" msgstr "* 您的密码不符合要求"
@ -3867,7 +3867,7 @@ msgstr "新的公钥已设置成功，请下载对应的私钥"
msgid "Update user" msgid "Update user"
msgstr "更新用户" msgstr "更新用户"
#: users/templates/users/user_update.html:22 users/views/profile/reset.py:120 #: users/templates/users/user_update.html:22 users/views/profile/reset.py:119
msgid "User auth from {}, go there change password" msgid "User auth from {}, go there change password"
msgstr "用户认证源来自 {}, 请去相应系统修改密码" msgstr "用户认证源来自 {}, 请去相应系统修改密码"
@ -3975,7 +3975,7 @@ msgstr ""
" <br>\n" " <br>\n"
" " " "
#: users/utils.py:116 users/views/profile/reset.py:80 #: users/utils.py:116 users/views/profile/reset.py:79
msgid "Reset password success" msgid "Reset password success"
msgstr "重置密码成功" msgstr "重置密码成功"
@ -4188,20 +4188,20 @@ msgid ""
"password" "password"
msgstr "用户来自 {} 请去相应系统修改密码" msgstr "用户来自 {} 请去相应系统修改密码"
#: users/views/profile/reset.py:66 #: users/views/profile/reset.py:65
msgid "Send reset password message" msgid "Send reset password message"
msgstr "发送重置密码邮件" msgstr "发送重置密码邮件"
#: users/views/profile/reset.py:67 #: users/views/profile/reset.py:66
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/profile/reset.py:81 #: users/views/profile/reset.py:80
msgid "Reset password success, return to login page" msgid "Reset password success, return to login page"
msgstr "重置密码成功，返回到登录页面" msgstr "重置密码成功，返回到登录页面"
#: users/views/profile/reset.py:105 users/views/profile/reset.py:115 #: users/views/profile/reset.py:104 users/views/profile/reset.py:114
msgid "Token invalid or expired" msgid "Token invalid or expired"
msgstr "Token错误或失效" msgstr "Token错误或失效"

3
apps/users/views/profile/reset.py
View File

@ -49,8 +49,7 @@ class UserForgotPasswordView(FormView):
if not user.is_local: if not user.is_local:
error = _( error = _(
'The user is from {}, please go to the corresponding system to change the password' 'The user is from {}, please go to the corresponding system to change the password'
''.format(user.get_source_display()) ).format(user.get_source_display())
)
form.add_error('email', error) form.add_error('email', error)
return self.form_invalid(form) return self.form_invalid(form)