From 92aeae4a2a11166fca8df4967132622d0b74a840 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Thu, 9 Dec 2021 19:57:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: 修改i18n
---
 apps/locale/zh/LC_MESSAGES/django.mo |   4 +-
 apps/locale/zh/LC_MESSAGES/django.po | 132 ++++++++++++++++-----------
 2 files changed, 82 insertions(+), 54 deletions(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 8b291eba8..e9a002a25 100644
--- a/apps/locale/zh/LC_MESSAGES/django.mo
+++ b/apps/locale/zh/LC_MESSAGES/django.mo
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a4e8bcfb535a77c85668323bb86f0348d2622f4840ecb42bc0ca9e47fcbef51
-size 94514
+oid sha256:9a8f5840c041b5f3188621ec731fa1b4a5da20730ea6394cf5e2b5c9c241a00e
+size 94712
diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 0f02531d3..440019d15 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 17:52+0800\n"
+"POT-Creation-Date: 2021-12-09 19:55+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
 #: orgs/models.py:24 perms/models/base.py:44 settings/models.py:29
 #: settings/serializers/sms.py:6 terminal/models/storage.py:23
 #: terminal/models/task.py:16 terminal/models/terminal.py:100
-#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:547
+#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:549
 #: users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_asset_permission.html:37
 #: users/templates/users/user_asset_permission.html:154
@@ -60,7 +60,7 @@ msgstr "激活中"
 #: orgs/models.py:27 perms/models/base.py:53 settings/models.py:34
 #: terminal/models/storage.py:26 terminal/models/terminal.py:114
 #: tickets/models/ticket.py:71 users/models/group.py:16
-#: users/models/user.py:583 xpack/plugins/change_auth_plan/models/base.py:41
+#: users/models/user.py:585 xpack/plugins/change_auth_plan/models/base.py:41
 #: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:113
 #: xpack/plugins/gathered_user/models.py:26
 msgid "Comment"
@@ -88,7 +88,7 @@ msgstr "登录复核"
 #: terminal/backends/command/serializers.py:12 terminal/models/session.py:39
 #: terminal/notifications.py:90 terminal/notifications.py:138
 #: tickets/models/comment.py:17 users/const.py:14 users/models/user.py:169
-#: users/models/user.py:754 users/models/user.py:780
+#: users/models/user.py:756 users/models/user.py:782
 #: users/serializers/group.py:19
 #: users/templates/users/user_asset_permission.html:38
 #: users/templates/users/user_asset_permission.html:64
@@ -164,7 +164,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. "
 #: assets/models/base.py:176 assets/models/gathered_user.py:15
 #: audits/models.py:105 authentication/forms.py:15 authentication/forms.py:17
 #: authentication/templates/authentication/_msg_different_city.html:9
-#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:545
+#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:547
 #: users/templates/users/_msg_user_created.html:12
 #: users/templates/users/_select_user_modal.html:14
 #: xpack/plugins/change_auth_plan/models/asset.py:35
@@ -287,7 +287,7 @@ msgid "Version"
 msgstr "版本"
 
 #: applications/models/account.py:18 xpack/plugins/cloud/models.py:82
-#: xpack/plugins/cloud/serializers/task.py:65
+#: xpack/plugins/cloud/serializers/task.py:66
 msgid "Account"
 msgstr "账户"
 
@@ -556,7 +556,7 @@ msgstr "标签管理"
 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:48
 #: assets/models/cmd_filter.py:90 assets/models/group.py:21
 #: common/db/models.py:70 common/mixins/models.py:49 orgs/models.py:25
-#: orgs/models.py:437 perms/models/base.py:51 users/models/user.py:591
+#: orgs/models.py:437 perms/models/base.py:51 users/models/user.py:593
 #: users/serializers/group.py:33
 #: xpack/plugins/change_auth_plan/models/base.py:45
 #: xpack/plugins/cloud/models.py:119 xpack/plugins/gathered_user/models.py:30
@@ -569,7 +569,7 @@ msgstr "创建者"
 #: assets/models/label.py:25 common/db/models.py:72 common/mixins/models.py:50
 #: ops/models/adhoc.py:38 ops/models/command.py:29 orgs/models.py:26
 #: orgs/models.py:435 perms/models/base.py:52 users/models/group.py:18
-#: users/models/user.py:781 xpack/plugins/cloud/models.py:122
+#: users/models/user.py:783 xpack/plugins/cloud/models.py:122
 msgid "Date created"
 msgstr "创建日期"
 
@@ -624,7 +624,7 @@ msgstr "带宽"
 msgid "Contact"
 msgstr "联系人"
 
-#: assets/models/cluster.py:22 users/models/user.py:566
+#: assets/models/cluster.py:22 users/models/user.py:568
 msgid "Phone"
 msgstr "手机"
 
@@ -650,7 +650,7 @@ msgid "Default"
 msgstr "默认"
 
 #: assets/models/cluster.py:36 assets/models/label.py:14
-#: users/models/user.py:766
+#: users/models/user.py:768
 msgid "System"
 msgstr "系统"
 
@@ -659,7 +659,7 @@ msgid "Default Cluster"
 msgstr "默认Cluster"
 
 #: assets/models/cmd_filter.py:30 perms/models/base.py:47
-#: templates/_nav.html:21 users/models/group.py:31 users/models/user.py:553
+#: templates/_nav.html:21 users/models/group.py:31 users/models/user.py:555
 #: users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_asset_permission.html:39
 #: users/templates/users/user_asset_permission.html:67
@@ -785,7 +785,7 @@ msgstr "ssh私钥"
 #: users/templates/users/user_asset_permission.html:41
 #: users/templates/users/user_asset_permission.html:73
 #: users/templates/users/user_asset_permission.html:158
-#: xpack/plugins/cloud/models.py:93 xpack/plugins/cloud/serializers/task.py:68
+#: xpack/plugins/cloud/models.py:93 xpack/plugins/cloud/serializers/task.py:69
 msgid "Node"
 msgstr "节点"
 
@@ -1243,7 +1243,7 @@ msgstr "用户代理"
 
 #: audits/models.py:110
 #: authentication/templates/authentication/_mfa_confirm_modal.html:14
-#: users/forms/profile.py:64 users/models/user.py:569
+#: users/forms/profile.py:64 users/models/user.py:571
 #: users/serializers/profile.py:123
 msgid "MFA"
 msgstr "MFA"
@@ -1326,13 +1326,13 @@ msgstr ""
 msgid "Auth Token"
 msgstr "认证令牌"
 
-#: audits/signals_handler.py:68 authentication/views/login.py:170
-#: notifications/backends/__init__.py:11 users/models/user.py:605
+#: audits/signals_handler.py:68 authentication/views/login.py:183
+#: notifications/backends/__init__.py:11 users/models/user.py:607
 msgid "WeCom"
 msgstr "企业微信"
 
-#: audits/signals_handler.py:69 authentication/views/login.py:176
-#: notifications/backends/__init__.py:12 users/models/user.py:606
+#: audits/signals_handler.py:69 authentication/views/login.py:189
+#: notifications/backends/__init__.py:12 users/models/user.py:608
 msgid "DingTalk"
 msgstr "钉钉"
 
@@ -1899,7 +1899,7 @@ msgstr "代码错误"
 #: authentication/templates/authentication/_msg_reset_password.html:3
 #: authentication/templates/authentication/_msg_rest_password_success.html:2
 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2
-#: jumpserver/conf.py:269
+#: jumpserver/conf.py:282
 #: perms/templates/perms/_msg_item_permissions_expire.html:3
 #: perms/templates/perms/_msg_permed_items_expire.html:3
 #: users/templates/users/_msg_account_expire_reminder.html:4
@@ -2107,24 +2107,24 @@ msgstr "没有绑定飞书"
 msgid "Please login with a password and then bind the FeiShu"
 msgstr "请使用密码登录，然后绑定飞书"
 
-#: authentication/views/login.py:82
+#: authentication/views/login.py:89
 msgid "Redirecting"
 msgstr "跳转中"
 
-#: authentication/views/login.py:83
+#: authentication/views/login.py:90
 msgid "Redirecting to {} authentication"
 msgstr "正在跳转到 {} 认证"
 
-#: authentication/views/login.py:109
+#: authentication/views/login.py:116
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"
 
-#: authentication/views/login.py:182 notifications/backends/__init__.py:14
-#: users/models/user.py:607
+#: authentication/views/login.py:195 notifications/backends/__init__.py:14
+#: users/models/user.py:609
 msgid "FeiShu"
 msgstr "飞书"
 
-#: authentication/views/login.py:271
+#: authentication/views/login.py:284
 msgid ""
 "Wait for <b>{}</b> confirm, You also can copy link to her/him <br/>\n"
 "                  Don't close this page"
@@ -2132,15 +2132,15 @@ msgstr ""
 "等待 <b>{}</b> 确认, 你也可以复制链接发给他/她 <br/>\n"
 "                  不要关闭本页面"
 
-#: authentication/views/login.py:276
+#: authentication/views/login.py:289
 msgid "No ticket found"
 msgstr "没有发现工单"
 
-#: authentication/views/login.py:308
+#: authentication/views/login.py:323
 msgid "Logout success"
 msgstr "退出登录成功"
 
-#: authentication/views/login.py:309
+#: authentication/views/login.py:324
 msgid "Logout success, return login page"
 msgstr "退出登录成功，返回到登录页面"
 
@@ -2339,11 +2339,11 @@ msgstr "不能包含特殊字符"
 msgid "The mobile phone number format is incorrect"
 msgstr "手机号格式不正确"
 
-#: jumpserver/conf.py:268
+#: jumpserver/conf.py:281
 msgid "Create account successfully"
 msgstr "创建账户成功"
 
-#: jumpserver/conf.py:270
+#: jumpserver/conf.py:283
 msgid "Your account has been created successfully"
 msgstr "你的账户已创建成功"
 
@@ -2379,7 +2379,7 @@ msgstr ""
 "div>"
 
 #: notifications/backends/__init__.py:10 users/forms/profile.py:101
-#: users/models/user.py:549
+#: users/models/user.py:551
 msgid "Email"
 msgstr "邮件"
 
@@ -2594,7 +2594,7 @@ msgstr "组织审计员"
 msgid "GLOBAL"
 msgstr "全局组织"
 
-#: orgs/models.py:434 users/models/user.py:557 users/serializers/user.py:37
+#: orgs/models.py:434 users/models/user.py:559 users/serializers/user.py:37
 #: users/templates/users/_select_user_modal.html:15
 msgid "Role"
 msgstr "角色"
@@ -2657,7 +2657,7 @@ msgstr "收藏夹"
 #: perms/models/base.py:50
 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:58
 #: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:60
-#: users/models/user.py:588
+#: users/models/user.py:590
 msgid "Date expired"
 msgstr "失效日期"
 
@@ -2803,7 +2803,7 @@ msgstr "获取 LDAP 用户为 None"
 msgid "Imported {} users successfully (Organization: {})"
 msgstr "成功导入 {} 个用户 ( 组织: {} )"
 
-#: settings/models.py:191 users/templates/users/reset_password.html:29
+#: settings/models.py:196 users/templates/users/reset_password.html:29
 msgid "Setting"
 msgstr "设置"
 
@@ -2835,11 +2835,15 @@ msgstr "企业微信 认证"
 msgid "SSO Auth"
 msgstr "SSO Token 认证"
 
-#: settings/serializers/auth/base.py:19 settings/serializers/basic.py:36
+#: settings/serializers/auth/base.py:17
+msgid "SAML2 Auth"
+msgstr "SAML2 认证"
+
+#: settings/serializers/auth/base.py:20 settings/serializers/basic.py:36
 msgid "Forgot password url"
 msgstr "忘记密码 URL"
 
-#: settings/serializers/auth/base.py:25
+#: settings/serializers/auth/base.py:26
 msgid "Enable login redirect msg"
 msgstr "启用登录跳转提示"
 
@@ -2855,7 +2859,7 @@ msgstr "服务端地址"
 msgid "Proxy server url"
 msgstr "代理服务地址"
 
-#: settings/serializers/auth/cas.py:14
+#: settings/serializers/auth/cas.py:14 settings/serializers/auth/saml2.py:29
 msgid "Logout completely"
 msgstr "同步注销"
 
@@ -2867,7 +2871,7 @@ msgstr "用户名属性"
 msgid "Enable attributes map"
 msgstr "启用属性映射"
 
-#: settings/serializers/auth/cas.py:18
+#: settings/serializers/auth/cas.py:18 settings/serializers/auth/saml2.py:28
 msgid "Rename attr"
 msgstr "映射属性"
 
@@ -2925,7 +2929,7 @@ msgstr ""
 "email 是jumpserver的用户需要属性"
 
 #: settings/serializers/auth/ldap.py:58
-#: xpack/plugins/cloud/serializers/task.py:69
+#: xpack/plugins/cloud/serializers/task.py:70
 #: xpack/plugins/gathered_user/serializers.py:20
 msgid "Periodic display"
 msgstr "定时执行"
@@ -3027,7 +3031,7 @@ msgstr "使用状态"
 msgid "Use nonce"
 msgstr "临时使用"
 
-#: settings/serializers/auth/oidc.py:76
+#: settings/serializers/auth/oidc.py:76 settings/serializers/auth/saml2.py:30
 msgid "Always update user"
 msgstr "总是更新用户信息"
 
@@ -3039,6 +3043,26 @@ msgstr "启用 Radius 认证"
 msgid "OTP in Radius"
 msgstr "使用 Radius OTP"
 
+#: settings/serializers/auth/saml2.py:12
+msgid "Enable SAML2 Auth"
+msgstr "启用 SAML2 认证"
+
+#: settings/serializers/auth/saml2.py:15
+msgid "IDP Metadata URL"
+msgstr ""
+
+#: settings/serializers/auth/saml2.py:18
+msgid "IDP Metadata XML"
+msgstr ""
+
+#: settings/serializers/auth/saml2.py:22
+msgid "SP Private Key"
+msgstr ""
+
+#: settings/serializers/auth/saml2.py:26
+msgid "SP Public Cert"
+msgstr ""
+
 #: settings/serializers/auth/sms.py:10
 msgid "Enable SMS"
 msgstr "启用 SMS"
@@ -4484,7 +4508,7 @@ msgstr "桶名称"
 msgid "Access key"
 msgstr "Access key"
 
-#: terminal/serializers/storage.py:34 users/models/user.py:580
+#: terminal/serializers/storage.py:34 users/models/user.py:582
 msgid "Secret key"
 msgstr "密钥"
 
@@ -5054,7 +5078,7 @@ msgstr "不能和原来的密钥相同"
 msgid "Not a valid ssh public key"
 msgstr "SSH密钥不合法"
 
-#: users/forms/profile.py:160 users/models/user.py:577
+#: users/forms/profile.py:160 users/models/user.py:579
 #: users/templates/users/user_password_update.html:48
 msgid "Public key"
 msgstr "SSH公钥"
@@ -5067,35 +5091,35 @@ msgstr "强制启用"
 msgid "Local"
 msgstr "数据库"
 
-#: users/models/user.py:560
+#: users/models/user.py:562
 msgid "Avatar"
 msgstr "头像"
 
-#: users/models/user.py:563
+#: users/models/user.py:565
 msgid "Wechat"
 msgstr "微信"
 
-#: users/models/user.py:574
+#: users/models/user.py:576
 msgid "Private key"
 msgstr "ssh私钥"
 
-#: users/models/user.py:596
+#: users/models/user.py:598
 msgid "Source"
 msgstr "来源"
 
-#: users/models/user.py:600
+#: users/models/user.py:602
 msgid "Date password last updated"
 msgstr "最后更新密码日期"
 
-#: users/models/user.py:603
+#: users/models/user.py:605
 msgid "Need update password"
 msgstr "需要更新密码"
 
-#: users/models/user.py:762
+#: users/models/user.py:764
 msgid "Administrator"
 msgstr "管理员"
 
-#: users/models/user.py:765
+#: users/models/user.py:767
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
@@ -5842,11 +5866,11 @@ msgstr "地域"
 msgid "Hostname strategy"
 msgstr "主机名策略"
 
-#: xpack/plugins/cloud/models.py:97 xpack/plugins/cloud/serializers/task.py:66
+#: xpack/plugins/cloud/models.py:97 xpack/plugins/cloud/serializers/task.py:67
 msgid "Unix admin user"
 msgstr "Unix 管理员"
 
-#: xpack/plugins/cloud/models.py:101 xpack/plugins/cloud/serializers/task.py:67
+#: xpack/plugins/cloud/models.py:101 xpack/plugins/cloud/serializers/task.py:68
 msgid "Windows admin user"
 msgstr "Windows 管理员"
 
@@ -5854,7 +5878,7 @@ msgstr "Windows 管理员"
 msgid "IP network segment group"
 msgstr "IP网段组"
 
-#: xpack/plugins/cloud/models.py:110 xpack/plugins/cloud/serializers/task.py:70
+#: xpack/plugins/cloud/models.py:110 xpack/plugins/cloud/serializers/task.py:71
 msgid "Always update"
 msgstr "总是更新"
 
@@ -6100,6 +6124,10 @@ msgstr "执行次数"
 msgid "Instance count"
 msgstr "实例个数"
 
+#: xpack/plugins/cloud/serializers/task.py:65
+msgid "Linux admin user"
+msgstr "Linux 管理员"
+
 #: xpack/plugins/cloud/utils.py:68
 msgid "Account unavailable"
 msgstr "账户无效"