From 5f0b4a4b631d780f562d8d13ceabc92fecc6054c Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 28 Mar 2018 11:28:40 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 30239 -> 30439 bytes apps/i18n/zh/LC_MESSAGES/django.po | 95 ++++++++++---------- apps/users/templates/users/user_detail.html | 2 +- 3 files changed, 48 insertions(+), 49 deletions(-) diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index da9fcf171523f8a8a892810b7222767dd1e8c87c..033a23bea7623cacf4710e00aebdd2095e378a40 100644 GIT binary patch delta 10871 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 xMeCKEL-~s~(3w=9GqbP0pM5oFbN-k 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 diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index 78691d4e7..78000366c 100644 --- a/apps/i18n/zh/LC_MESSAGES/django.po +++ b/apps/i18n/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-23 19:50+0800\n" +"POT-Creation-Date: 2018-03-28 11:13+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -51,7 +51,7 @@ msgid "Labels" msgstr "标签管理" #: assets/forms/asset.py:34 assets/forms/asset.py:70 assets/models/asset.py:52 -#: assets/models/domain.py:34 +#: assets/models/domain.py:46 msgid "Domain" msgstr "网域" @@ -70,16 +70,16 @@ msgstr "* required 必须准确设置操作系统平台,如Windows, Linux ..." #: assets/forms/asset.py:46 assets/forms/asset.py:83 msgid "" "If your have some network not connect with each other, you can set domain" -msgstr "" +msgstr "如果有多个的互相隔离的网络,设置资产属于的网域,使用网域网关跳转登录" #: assets/forms/asset.py:90 assets/forms/asset.py:94 assets/forms/domain.py:16 #: assets/forms/label.py:15 -#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:270 +#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:272 msgid "Select assets" msgstr "选择资产" #: assets/forms/asset.py:99 assets/models/asset.py:51 -#: assets/models/domain.py:32 assets/templates/assets/admin_user_assets.html:53 +#: assets/models/domain.py:44 assets/templates/assets/admin_user_assets.html:53 #: assets/templates/assets/asset_detail.html:69 #: assets/templates/assets/domain_gateway_list.html:58 #: assets/templates/assets/system_user_asset.html:51 @@ -111,7 +111,7 @@ msgstr "资产" #: assets/forms/domain.py:54 assets/forms/user.py:79 assets/forms/user.py:120 #: assets/models/base.py:20 assets/models/cluster.py:18 -#: assets/models/domain.py:15 assets/models/group.py:20 +#: assets/models/domain.py:17 assets/models/group.py:20 #: assets/models/label.py:17 assets/templates/assets/admin_user_detail.html:56 #: assets/templates/assets/admin_user_list.html:23 #: assets/templates/assets/domain_detail.html:56 @@ -190,7 +190,7 @@ msgid "" "than 2 system user" msgstr "高优先级的系统用户将会作为默认登录用户" -#: assets/models/asset.py:49 assets/models/domain.py:31 +#: assets/models/asset.py:49 assets/models/domain.py:43 #: assets/templates/assets/_asset_list_modal.html:21 #: assets/templates/assets/admin_user_assets.html:52 #: assets/templates/assets/asset_detail.html:61 @@ -217,7 +217,7 @@ msgstr "IP" msgid "Hostname" msgstr "主机名" -#: assets/models/asset.py:54 assets/models/domain.py:36 +#: assets/models/asset.py:54 assets/models/domain.py:48 #: assets/models/label.py:20 assets/templates/assets/asset_detail.html:105 #: perms/templates/perms/asset_permission_list.html:70 msgid "Is active" @@ -300,7 +300,7 @@ msgid "Created by" msgstr "创建者" #: assets/models/asset.py:83 assets/models/cluster.py:26 -#: assets/models/domain.py:18 assets/models/group.py:22 +#: assets/models/domain.py:20 assets/models/group.py:22 #: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:64 #: assets/templates/assets/domain_detail.html:68 #: assets/templates/assets/system_user_detail.html:92 @@ -313,8 +313,8 @@ msgid "Date created" msgstr "创建日期" #: assets/models/asset.py:84 assets/models/base.py:25 -#: assets/models/cluster.py:29 assets/models/domain.py:16 -#: assets/models/domain.py:35 assets/models/group.py:23 +#: assets/models/cluster.py:29 assets/models/domain.py:18 +#: assets/models/domain.py:47 assets/models/group.py:23 #: assets/models/label.py:21 assets/templates/assets/admin_user_detail.html:72 #: assets/templates/assets/admin_user_list.html:29 #: assets/templates/assets/asset_detail.html:125 @@ -387,7 +387,7 @@ msgstr "默认Cluster" msgid "Cluster" msgstr "集群" -#: assets/models/domain.py:33 assets/models/user.py:104 +#: assets/models/domain.py:45 assets/models/user.py:104 #: assets/templates/assets/domain_gateway_list.html:59 #: assets/templates/assets/system_user_detail.html:66 #: assets/templates/assets/system_user_list.html:28 @@ -407,7 +407,7 @@ msgstr "默认资产组" #: 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/forms.py:218 +#: terminal/templates/terminal/session_list.html:71 users/forms.py:220 #: users/models/user.py:30 users/models/user.py:254 #: users/templates/users/user_group_detail.html:78 #: users/templates/users/user_group_list.html:13 users/views/user.py:334 @@ -493,7 +493,7 @@ msgstr "" msgid "推送系统用户到节点资产: {} => {}" msgstr "" -#: assets/tasks.py:431 +#: assets/tasks.py:432 msgid "推送节点系统用户到新加入资产中: {}" msgstr "" @@ -509,9 +509,9 @@ msgstr "仅修改你需要更新的字段" #: assets/templates/assets/system_user_asset.html:21 #: assets/views/admin_user.py:29 assets/views/admin_user.py:47 #: assets/views/admin_user.py:63 assets/views/admin_user.py:78 -#: assets/views/admin_user.py:102 assets/views/asset.py:48 -#: assets/views/asset.py:94 assets/views/asset.py:154 assets/views/asset.py:171 -#: assets/views/asset.py:195 assets/views/domain.py:29 +#: assets/views/admin_user.py:102 assets/views/asset.py:49 +#: assets/views/asset.py:95 assets/views/asset.py:155 assets/views/asset.py:172 +#: assets/views/asset.py:196 assets/views/domain.py:29 #: assets/views/domain.py:45 assets/views/domain.py:61 #: assets/views/domain.py:74 assets/views/domain.py:98 #: assets/views/domain.py:126 assets/views/domain.py:150 @@ -822,7 +822,7 @@ msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:100 #: assets/templates/assets/asset_detail.html:200 -#: assets/templates/assets/asset_list.html:586 +#: assets/templates/assets/asset_list.html:594 #: assets/templates/assets/system_user_detail.html:183 #: assets/templates/assets/system_user_list.html:138 templates/_modal.html:16 #: terminal/templates/terminal/session_detail.html:108 @@ -866,7 +866,7 @@ msgstr "节点" msgid "Label" msgstr "标签" -#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:196 +#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:197 msgid "Asset detail" msgstr "资产详情" @@ -905,7 +905,7 @@ msgid "Update successfully!" msgstr "更新成功" #: assets/templates/assets/asset_list.html:63 -#: assets/templates/assets/asset_list.html:120 assets/views/asset.py:95 +#: assets/templates/assets/asset_list.html:120 assets/views/asset.py:96 msgid "Create asset" msgstr "创建资产" @@ -955,7 +955,7 @@ msgstr "创建节点失败" msgid "Have child node, cancel" msgstr "存在子节点,不能删除" -#: assets/templates/assets/asset_list.html:581 +#: assets/templates/assets/asset_list.html:589 #: assets/templates/assets/system_user_list.html:133 #: users/templates/users/user_detail.html:334 #: users/templates/users/user_detail.html:359 @@ -964,20 +964,20 @@ msgstr "存在子节点,不能删除" msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:582 +#: assets/templates/assets/asset_list.html:590 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:590 +#: assets/templates/assets/asset_list.html:598 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:591 -#: assets/templates/assets/asset_list.html:596 +#: assets/templates/assets/asset_list.html:599 +#: assets/templates/assets/asset_list.html:604 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:595 +#: assets/templates/assets/asset_list.html:603 msgid "Asset Deleting failed." msgstr "删除失败" @@ -1104,23 +1104,23 @@ msgstr "更新管理用户" msgid "Admin user detail" msgstr "管理用户详情" -#: assets/views/asset.py:49 templates/_nav.html:23 +#: assets/views/asset.py:50 templates/_nav.html:23 msgid "Asset list" msgstr "资产列表" -#: assets/views/asset.py:61 templates/_nav_user.html:4 +#: assets/views/asset.py:62 templates/_nav_user.html:4 msgid "My assets" msgstr "我的资产" -#: assets/views/asset.py:155 +#: assets/views/asset.py:156 msgid "Bulk update asset" msgstr "批量更新资产" -#: assets/views/asset.py:172 +#: assets/views/asset.py:173 msgid "Update asset" msgstr "更新资产" -#: assets/views/asset.py:296 +#: assets/views/asset.py:299 msgid "already exists" msgstr "已经存在" @@ -1705,7 +1705,7 @@ msgstr "添加" msgid "Add asset group to this permission" msgstr "添加资产组" -#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:273 +#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:275 msgid "Select asset groups" msgstr "选择资产组" @@ -1734,7 +1734,7 @@ msgstr "资产组数量" msgid "System user count" msgstr "系统用户数量" -#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:276 +#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:278 msgid "Select system users" msgstr "选择系统用户" @@ -1787,7 +1787,7 @@ msgstr "商业支持" msgid "Docs" msgstr "文档" -#: templates/_header_bar.html:37 templates/_nav_user.html:9 users/forms.py:92 +#: templates/_header_bar.html:37 templates/_nav_user.html:9 users/forms.py:94 #: users/templates/users/_user.html:36 #: users/templates/users/user_password_update.html:37 #: users/templates/users/user_profile.html:17 @@ -2179,11 +2179,11 @@ msgstr "" msgid "Role" msgstr "角色" -#: users/forms.py:30 users/forms.py:138 +#: users/forms.py:30 users/forms.py:140 msgid "ssh public key" msgstr "ssh公钥" -#: users/forms.py:31 users/forms.py:139 +#: users/forms.py:31 users/forms.py:141 msgid "ssh-rsa AAAA..." msgstr "" @@ -2195,39 +2195,39 @@ msgstr "复制用户公钥到这里" msgid "Join user groups" msgstr "添加到用户组" -#: users/forms.py:58 users/forms.py:153 +#: users/forms.py:60 users/forms.py:155 msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms.py:62 users/forms.py:157 users/serializers.py:42 +#: users/forms.py:64 users/forms.py:159 users/serializers.py:42 msgid "Not a valid ssh public key" msgstr "ssh密钥不合法" -#: users/forms.py:98 +#: users/forms.py:100 msgid "Old password" msgstr "原来密码" -#: users/forms.py:103 +#: users/forms.py:105 msgid "New password" msgstr "新密码" -#: users/forms.py:108 +#: users/forms.py:110 msgid "Confirm password" msgstr "确认密码" -#: users/forms.py:118 +#: users/forms.py:120 msgid "Old password error" msgstr "原来密码错误" -#: users/forms.py:126 +#: users/forms.py:128 msgid "Password does not match" msgstr "密码不一致" -#: users/forms.py:140 +#: users/forms.py:142 msgid "Paste your id_rsa.pub here." msgstr "复制你的公钥到这里" -#: users/forms.py:168 users/models/user.py:46 +#: users/forms.py:170 users/models/user.py:46 #: users/templates/users/user_password_update.html:43 #: users/templates/users/user_profile.html:71 #: users/templates/users/user_profile_update.html:43 @@ -2235,7 +2235,7 @@ msgstr "复制你的公钥到这里" msgid "Public key" msgstr "ssh公钥" -#: users/forms.py:175 users/forms.py:180 users/forms.py:192 users/forms.py:222 +#: users/forms.py:177 users/forms.py:182 users/forms.py:194 users/forms.py:224 msgid "Select users" msgstr "选择用户" @@ -2433,7 +2433,7 @@ msgid "Send reset ssh key mail" msgstr "发送重置密钥邮件" #: users/templates/users/user_detail.html:324 -msgid "An e-mail has been sent to the user\\'s mailbox." +msgid "An e-mail has been sent to the user`s mailbox." msgstr "已发送邮件到用户邮箱" #: users/templates/users/user_detail.html:335 @@ -2777,4 +2777,3 @@ msgstr "密码更新" #: users/views/user.py:375 msgid "Public key update" msgstr "密钥更新" - diff --git a/apps/users/templates/users/user_detail.html b/apps/users/templates/users/user_detail.html index 573276bcb..12a9af86e 100644 --- a/apps/users/templates/users/user_detail.html +++ b/apps/users/templates/users/user_detail.html @@ -321,7 +321,7 @@ $(document).ready(function() { var the_url = '{% url "api-users:user-reset-password" pk=user_object.id %}'; var body = {}; var success = function() { - var msg = "{% trans "An e-mail has been sent to the user\'s mailbox." %}"; + var msg = "{% trans "An e-mail has been sent to the user`s mailbox." %}"; swal("{% trans 'Reset password' %}", msg, "success"); }; APIUpdateAttr({