[Update] 修改安全设置模块排版，翻译 (#2083)

646a2910 · BaiJiangJie · 老广 · 79208a95 · 646a2910 · 646a2910
Commit 646a2910 authored Nov 23, 2018 by BaiJiangJie Committed by 老广 Nov 23, 2018
5 changed files
--- a/apps/common/forms.py
+++ b/apps/common/forms.py
@@ -189,7 +189,7 @@ class SecuritySettingForm(BaseForm):
        initial=9999, label=_("Password expiration time"),
        min_value=1,
        help_text=_(
-            "Tip: (unit/day) "
+            "Tip: (unit: day) "
            "If the user does not update the password during the time, "
            "the user password will expire failure;"
            "The password expiration reminder mail will be automatic sent to the user "

--- a/apps/common/templates/common/security_setting.html
+++ b/apps/common/templates/common/security_setting.html
@@ -39,9 +39,9 @@
                                    {% endif %}
                                    {% csrf_token %}

-                                    <h3>{% trans "User login settings" %}</h3>
+                                    <h3>{% trans "Security setting" %}</h3>
                                    {% for field in form %}
-                                        {% if forloop.counter == 5 %}
+                                        {% if forloop.counter == 6 %}
                                            <div class="hr-line-dashed"></div>
                                            <h3>{% trans "Password check rule" %}</h3>
                                        {% endif %}

--- a/apps/common/views.py
+++ b/apps/common/views.py
@@ -52,7 +52,7 @@ class EmailSettingView(SuperUserRequiredMixin, TemplateView):
        form = self.form_class(request.POST)
        if form.is_valid():
            form.save()
-            msg = _("Update setting successfully, please restart program")
+            msg = _("Update setting successfully")
            messages.success(request, msg)
            return redirect('settings:email-setting')
        else:

--- a/apps/locale/zh/LC_MESSAGES/django.mo
+++ b/apps/locale/zh/LC_MESSAGES/django.mo
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/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-11-22 15:16+0800\n"
+"POT-Creation-Date: 2018-11-23 16:44+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -126,7 +126,7 @@ msgstr "端口"
 #: perms/templates/perms/asset_permission_create_update.html:40
 #: perms/templates/perms/asset_permission_list.html:56
 #: perms/templates/perms/asset_permission_list.html:148
-#: terminal/backends/command/models.py:13 terminal/models.py:134
+#: terminal/backends/command/models.py:13 terminal/models.py:138
 #: terminal/templates/terminal/command_list.html:40
 #: terminal/templates/terminal/command_list.html:73
 #: terminal/templates/terminal/session_list.html:41
@@ -154,7 +154,7 @@ msgstr "不能包含特殊字符"
 #: assets/templates/assets/domain_list.html:25
 #: assets/templates/assets/label_list.html:14
 #: assets/templates/assets/system_user_detail.html:58
-#: assets/templates/assets/system_user_list.html:29 common/models.py:31
+#: assets/templates/assets/system_user_list.html:29 common/models.py:29
 #: common/templates/common/command_storage_create.html:41
 #: common/templates/common/replay_storage_create.html:44
 #: common/templates/common/terminal_setting.html:80
@@ -164,9 +164,9 @@ msgstr "不能包含特殊字符"
 #: perms/templates/perms/asset_permission_detail.html:62
 #: perms/templates/perms/asset_permission_list.html:53
 #: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:18
-#: terminal/models.py:161 terminal/templates/terminal/terminal_detail.html:43
+#: terminal/models.py:165 terminal/templates/terminal/terminal_detail.html:43
 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
-#: users/models/user.py:52 users/templates/users/_select_user_modal.html:13
+#: users/models/user.py:53 users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_detail.html:63
 #: users/templates/users/user_group_detail.html:55
 #: users/templates/users/user_group_list.html:12
@@ -191,7 +191,7 @@ msgstr "名称"
 #: assets/templates/assets/system_user_list.html:30
 #: audits/templates/audits/login_log_list.html:49
 #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:15
-#: users/forms.py:33 users/models/authentication.py:74 users/models/user.py:50
+#: users/forms.py:33 users/models/authentication.py:77 users/models/user.py:51
 #: users/templates/users/_select_user_modal.html:14
 #: users/templates/users/login.html:64
 #: users/templates/users/user_detail.html:67
@@ -216,7 +216,7 @@ msgstr "密码或密钥密码"
 msgid "Password"
 msgstr "密码"

-#: assets/forms/user.py:29 users/models/user.py:79
+#: assets/forms/user.py:29 users/models/user.py:80
 msgid "Private key"
 msgstr "ssh私钥"

@@ -388,7 +388,7 @@ msgstr "标签管理"
 #: assets/templates/assets/system_user_detail.html:100
 #: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:15 perms/models.py:37
 #: perms/models.py:84 perms/templates/perms/asset_permission_detail.html:98
-#: users/models/user.py:93 users/templates/users/user_detail.html:111
+#: users/models/user.py:94 users/templates/users/user_detail.html:111
 #: xpack/plugins/cloud/models.py:46 xpack/plugins/cloud/models.py:140
 msgid "Created by"
 msgstr "创建者"
@@ -426,11 +426,11 @@ msgstr "创建日期"
 #: assets/templates/assets/domain_list.html:28
 #: assets/templates/assets/system_user_detail.html:104
 #: assets/templates/assets/system_user_list.html:37
-#: assets/templates/assets/user_asset_list.html:170 common/models.py:36
+#: assets/templates/assets/user_asset_list.html:170 common/models.py:34
 #: ops/models/adhoc.py:43 orgs/models.py:17 perms/models.py:39
 #: perms/models.py:86 perms/templates/perms/asset_permission_detail.html:102
 #: terminal/models.py:28 terminal/templates/terminal/terminal_detail.html:63
-#: users/models/group.py:15 users/models/user.py:85
+#: users/models/group.py:15 users/models/user.py:86
 #: users/templates/users/user_detail.html:127
 #: users/templates/users/user_group_detail.html:67
 #: users/templates/users/user_group_list.html:14
@@ -461,7 +461,7 @@ msgstr "带宽"
 msgid "Contact"
 msgstr "联系人"

-#: assets/models/cluster.py:22 users/models/user.py:71
+#: assets/models/cluster.py:22 users/models/user.py:72
 #: users/templates/users/user_detail.html:76
 msgid "Phone"
 msgstr "手机"
@@ -487,7 +487,7 @@ msgid "Default"
 msgstr "默认"

 #: assets/models/cluster.py:36 assets/models/label.py:14
-#: users/models/user.py:397
+#: users/models/user.py:422
 msgid "System"
 msgstr "系统"

@@ -515,7 +515,7 @@ msgstr "BGP全网通"
 msgid "Regex"
 msgstr "正则表达式"

-#: assets/models/cmd_filter.py:35 terminal/models.py:140
+#: assets/models/cmd_filter.py:35 terminal/models.py:144
 #: terminal/templates/terminal/command_list.html:55
 #: terminal/templates/terminal/command_list.html:71
 #: terminal/templates/terminal/session_detail.html:48
@@ -616,12 +616,12 @@ msgstr "默认资产组"
 #: perms/templates/perms/asset_permission_create_update.html:36
 #: perms/templates/perms/asset_permission_list.html:54
 #: perms/templates/perms/asset_permission_list.html:142 templates/index.html:87
-#: terminal/backends/command/models.py:12 terminal/models.py:133
+#: terminal/backends/command/models.py:12 terminal/models.py:137
 #: 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:310
-#: users/models/user.py:32 users/models/user.py:385
+#: users/models/user.py:33 users/models/user.py:410
 #: users/templates/users/user_group_detail.html:78
 #: users/templates/users/user_group_list.html:13 users/views/user.py:384
 #: xpack/plugins/orgs/forms.py:26
@@ -631,7 +631,7 @@ msgid "User"
 msgstr "用户"

 #: assets/models/label.py:19 assets/models/node.py:20
-#: assets/templates/assets/label_list.html:15 common/models.py:32
+#: assets/templates/assets/label_list.html:15 common/models.py:30
 msgid "Value"
 msgstr "值"

@@ -699,7 +699,7 @@ msgstr "登录模式"
 #: perms/templates/perms/asset_permission_detail.html:140
 #: perms/templates/perms/asset_permission_list.html:58
 #: perms/templates/perms/asset_permission_list.html:154 templates/_nav.html:25
-#: terminal/backends/command/models.py:14 terminal/models.py:135
+#: terminal/backends/command/models.py:14 terminal/models.py:139
 #: terminal/templates/terminal/command_list.html:48
 #: terminal/templates/terminal/command_list.html:74
 #: terminal/templates/terminal/session_list.html:49
@@ -1624,7 +1624,7 @@ msgstr "系统用户集群资产"
 #: audits/templates/audits/ftp_log_list.html:73
 #: audits/templates/audits/operate_log_list.html:70
 #: audits/templates/audits/password_change_log_list.html:52
-#: terminal/models.py:137 terminal/templates/terminal/session_list.html:74
+#: terminal/models.py:141 terminal/templates/terminal/session_list.html:74
 #: terminal/templates/terminal/terminal_detail.html:47
 msgid "Remote addr"
 msgstr "远端地址"
@@ -1639,7 +1639,7 @@ msgid "Filename"
 msgstr "文件名"

 #: audits/models.py:22 audits/templates/audits/ftp_log_list.html:76
-#: ops/templates/ops/task_list.html:39 users/models/authentication.py:70
+#: ops/templates/ops/task_list.html:39 users/models/authentication.py:73
 #: users/templates/users/user_detail.html:456 xpack/plugins/cloud/api.py:61
 msgid "Success"
 msgstr "成功"
@@ -1665,7 +1665,7 @@ msgstr "修改者"
 #: ops/templates/ops/adhoc_history.html:52
 #: ops/templates/ops/adhoc_history_detail.html:61
 #: ops/templates/ops/task_history.html:58 perms/models.py:35
-#: perms/templates/perms/asset_permission_detail.html:86 terminal/models.py:144
+#: perms/templates/perms/asset_permission_detail.html:86 terminal/models.py:148
 #: terminal/templates/terminal/session_list.html:78
 msgid "Date start"
 msgstr "开始日期"
@@ -1707,19 +1707,19 @@ msgid "City"
 msgstr "城市"

 #: audits/templates/audits/login_log_list.html:54 users/forms.py:168
-#: users/models/authentication.py:79 users/models/user.py:74
+#: users/models/authentication.py:82 users/models/user.py:75
 #: users/templates/users/first_login.html:45
 msgid "MFA"
 msgstr "MFA"

 #: audits/templates/audits/login_log_list.html:55
-#: users/models/authentication.py:80 xpack/plugins/cloud/models.py:192
+#: users/models/authentication.py:83 xpack/plugins/cloud/models.py:192
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69
 msgid "Reason"
 msgstr "原因"

 #: audits/templates/audits/login_log_list.html:56
-#: users/models/authentication.py:81 xpack/plugins/cloud/models.py:191
+#: users/models/authentication.py:84 xpack/plugins/cloud/models.py:191
 #: xpack/plugins/cloud/models.py:208
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:67
@@ -1955,7 +1955,7 @@ msgid ""
 "Tip: (unit/minute) if the user has failed to log in for a limited number of "
 "times, no login is allowed during this time interval."
 msgstr ""
-"提示: (单位: 分钟) 当用户登录失败次数达到限制后，那么在此时间间隔内禁止登录."
+"提示：（单位：分）当用户登录失败次数达到限制后，那么在此时间间隔内禁止登录"

 #: common/forms.py:181
 msgid "Connection max idle time"
@@ -1964,7 +1964,7 @@ msgstr "SSH最大空闲时间"
 #: common/forms.py:183
 msgid ""
 "If idle time more than it, disconnect connection(only ssh now) Unit: minute"
-msgstr "提示: (单位: 分钟) 如果超过该配置没有操作，连接会被断开(仅ssh) "
+msgstr "提示：（单位：分）如果超过该配置没有操作，连接会被断开（仅ssh）"

 #: common/forms.py:189
 msgid "Password expiration time"
@@ -1972,11 +1972,13 @@ msgstr "密码过期时间"

 #: common/forms.py:192
 msgid ""
-"Tip: (unit/day) If the user does not update the password during the time, "
+"Tip: (unit: day) If the user does not update the password during the time, "
 "the user password will expire failure;The password expiration reminder mail "
 "will be automatic sent to the user by system within 5 days (daily) before "
 "the password expires"
 msgstr ""
+"提示：（单位：天）如果用户在此期间没有更新密码，用户密码将过期失效； 密码过期提醒"
+"邮件将在密码过期前5天内由系统（每天）自动发送给用户"

 #: common/forms.py:201
 msgid "Password minimum length"
@@ -2030,7 +2032,7 @@ msgstr ""
 msgid "discard time"
 msgstr ""

-#: common/models.py:35 users/models/authentication.py:51
+#: common/models.py:33 users/models/authentication.py:54
 #: users/templates/users/user_detail.html:96
 msgid "Enabled"
 msgstr "启用"
@@ -2072,6 +2074,7 @@ msgstr "终端设置"
 #: common/templates/common/email_setting.html:27
 #: common/templates/common/ldap_setting.html:27
 #: common/templates/common/security_setting.html:27
+#: common/templates/common/security_setting.html:42
 #: common/templates/common/terminal_setting.html:31 common/views.py:152
 msgid "Security setting"
 msgstr "安全设置"
@@ -2138,10 +2141,6 @@ msgstr "端点后缀"
 msgid "Region"
 msgstr "地域"

-#: common/templates/common/security_setting.html:42
-msgid "User login settings"
-msgstr "用户登录设置"
-
 #: common/templates/common/security_setting.html:46
 msgid "Password check rule"
 msgstr "密码校验规则"
@@ -2199,7 +2198,7 @@ msgstr "创建录像存储"
 msgid "Create command storage"
 msgstr "创建命令存储"

-#: jumpserver/views.py:180
+#: jumpserver/views.py:185
 msgid ""
 "<div>Luna is a separately deployed program, you need to deploy Luna, coco, "
 "configure nginx for url distribution,</div> </div>If you see this page, "
@@ -2457,7 +2456,7 @@ msgstr "组织管理"
 #: perms/forms.py:31 perms/models.py:30 perms/models.py:80
 #: perms/templates/perms/asset_permission_list.html:55
 #: perms/templates/perms/asset_permission_list.html:145 templates/_nav.html:14
-#: users/forms.py:280 users/models/group.py:26 users/models/user.py:58
+#: users/forms.py:280 users/models/group.py:26 users/models/user.py:59
 #: users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_detail.html:211
 #: users/templates/users/user_list.html:26
@@ -2475,7 +2474,7 @@ msgstr "资产和节点至少选一个"

 #: perms/models.py:36 perms/models.py:83
 #: perms/templates/perms/asset_permission_detail.html:90
-#: users/models/user.py:90 users/templates/users/user_detail.html:107
+#: users/models/user.py:91 users/templates/users/user_detail.html:107
 #: users/templates/users/user_profile.html:116
 msgid "Date expired"
 msgstr "失效日期"
@@ -2952,43 +2951,43 @@ msgstr "SSH端口"
 msgid "HTTP Port"
 msgstr "HTTP端口"

-#: terminal/models.py:105
+#: terminal/models.py:109
 msgid "Session Online"
 msgstr "在线会话"

-#: terminal/models.py:106
+#: terminal/models.py:110
 msgid "CPU Usage"
 msgstr "CPU使用"

-#: terminal/models.py:107
+#: terminal/models.py:111
 msgid "Memory Used"
 msgstr "内存使用"

-#: terminal/models.py:108
+#: terminal/models.py:112
 msgid "Connections"
 msgstr "连接数"

-#: terminal/models.py:109
+#: terminal/models.py:113
 msgid "Threads"
 msgstr "线程数"

-#: terminal/models.py:110
+#: terminal/models.py:114
 msgid "Boot Time"
 msgstr "运行时间"

-#: terminal/models.py:139 terminal/templates/terminal/session_list.html:104
+#: terminal/models.py:143 terminal/templates/terminal/session_list.html:104
 msgid "Replay"
 msgstr "回放"

-#: terminal/models.py:143
+#: terminal/models.py:147
 msgid "Date last active"
 msgstr "最后活跃日期"

-#: terminal/models.py:145
+#: terminal/models.py:149
 msgid "Date end"
 msgstr "结束日期"

-#: terminal/models.py:162
+#: terminal/models.py:166
 msgid "Args"
 msgstr "参数"

@@ -3142,66 +3141,66 @@ msgstr "用户 {} 密码已经过期，请更新。"
 msgid "Please carry seed value and conduct MFA secondary certification"
 msgstr "请携带seed值, 进行MFA二次认证"

-#: users/api/auth.py:205
+#: users/api/auth.py:204
 msgid "Please verify the user name and password first"
 msgstr "请先进行用户名和密码验证"

-#: users/api/auth.py:217
+#: users/api/auth.py:216
 msgid "MFA certification failed"
 msgstr "MFA认证失败"

-#: users/api/user.py:138
+#: users/api/user.py:140
 msgid "Could not reset self otp, use profile reset instead"
 msgstr "不能再该页面重置MFA, 请去个人信息页面重置"

-#: users/authentication.py:56
+#: users/authentication.py:53
 msgid "Invalid signature header. No credentials provided."
 msgstr ""

-#: users/authentication.py:59
+#: users/authentication.py:56
 msgid "Invalid signature header. Signature string should not contain spaces."
 msgstr ""

-#: users/authentication.py:66
+#: users/authentication.py:63
 msgid "Invalid signature header. Format like AccessKeyId:Signature"
 msgstr ""

-#: users/authentication.py:70
+#: users/authentication.py:67
 msgid ""
 "Invalid signature header. Signature string should not contain invalid "
 "characters."
 msgstr ""

-#: users/authentication.py:90 users/authentication.py:106
+#: users/authentication.py:87 users/authentication.py:103
 msgid "Invalid signature."
 msgstr ""

-#: users/authentication.py:97
+#: users/authentication.py:94
 msgid "HTTP header: Date not provide or not %a, %d %b %Y %H:%M:%S GMT"
 msgstr ""

-#: users/authentication.py:102
+#: users/authentication.py:99
 msgid "Expired, more than 15 minutes"
 msgstr ""

-#: users/authentication.py:109
+#: users/authentication.py:106
 msgid "User disabled."
 msgstr "用户已禁用"

-#: users/authentication.py:124
+#: users/authentication.py:121
 msgid "Invalid token header. No credentials provided."
 msgstr ""

-#: users/authentication.py:127
+#: users/authentication.py:124
 msgid "Invalid token header. Sign string should not contain spaces."
 msgstr ""

-#: users/authentication.py:134
+#: users/authentication.py:131
 msgid ""
 "Invalid token header. Sign string should not contain invalid characters."
 msgstr ""

-#: users/authentication.py:145
+#: users/authentication.py:142
 msgid "Invalid token or cache refreshed."
 msgstr ""

@@ -3209,7 +3208,7 @@ msgstr ""
 msgid "MFA code"
 msgstr "MFA 验证码"

-#: users/forms.py:52 users/models/user.py:62
+#: users/forms.py:52 users/models/user.py:63
 #: users/templates/users/_select_user_modal.html:15
 #: users/templates/users/user_detail.html:87
 #: users/templates/users/user_list.html:25
@@ -3237,7 +3236,7 @@ msgstr "添加到用户组"
 msgid "Public key should not be the same as your old one."
 msgstr "不能和原来的密钥相同"

-#: users/forms.py:114 users/forms.py:245 users/serializers.py:49
+#: users/forms.py:114 users/forms.py:245 users/serializers/v1.py:51
 msgid "Not a valid ssh public key"
 msgstr "ssh密钥不合法"

@@ -3297,7 +3296,7 @@ msgstr "自动配置并下载SSH密钥"
 msgid "Paste your id_rsa.pub here."
 msgstr "复制你的公钥到这里"

-#: users/forms.py:256 users/models/user.py:82
+#: users/forms.py:256 users/models/user.py:83
 #: users/templates/users/first_login.html:42
 #: users/templates/users/user_password_update.html:46
 #: users/templates/users/user_profile.html:68
@@ -3311,106 +3310,106 @@ msgstr "ssh公钥"
 msgid "Select users"
 msgstr "选择用户"

-#: users/models/authentication.py:36
+#: users/models/authentication.py:39
 msgid "Private Token"
 msgstr "ssh密钥"

-#: users/models/authentication.py:50 users/templates/users/user_detail.html:98
+#: users/models/authentication.py:53 users/templates/users/user_detail.html:98
 msgid "Disabled"
 msgstr "禁用"

-#: users/models/authentication.py:52 users/models/authentication.py:62
+#: users/models/authentication.py:55 users/models/authentication.py:65
 msgid "-"
 msgstr ""

-#: users/models/authentication.py:63
+#: users/models/authentication.py:66
 msgid "Username/password check failed"
 msgstr "用户名/密码 校验失败"

-#: users/models/authentication.py:64
+#: users/models/authentication.py:67
 msgid "MFA authentication failed"
 msgstr "MFA 认证失败"

-#: users/models/authentication.py:65
+#: users/models/authentication.py:68
 msgid "Username does not exist"
 msgstr "用户名不存在"

-#: users/models/authentication.py:66
+#: users/models/authentication.py:69
 msgid "Password expired"
 msgstr "密码过期"

-#: users/models/authentication.py:71 xpack/plugins/cloud/models.py:184
+#: users/models/authentication.py:74 xpack/plugins/cloud/models.py:184
 #: xpack/plugins/cloud/models.py:198
 msgid "Failed"
 msgstr "失败"

-#: users/models/authentication.py:75
+#: users/models/authentication.py:78
 msgid "Login type"
 msgstr "登录方式"

-#: users/models/authentication.py:76
+#: users/models/authentication.py:79
 msgid "Login ip"
 msgstr "登录IP"

-#: users/models/authentication.py:77
+#: users/models/authentication.py:80
 msgid "Login city"
 msgstr "登录城市"

-#: users/models/authentication.py:78
+#: users/models/authentication.py:81
 msgid "User agent"
 msgstr "Agent"

-#: users/models/authentication.py:82
+#: users/models/authentication.py:85
 msgid "Date login"
 msgstr "登录日期"

-#: users/models/user.py:31 users/models/user.py:393
+#: users/models/user.py:32 users/models/user.py:418
 msgid "Administrator"
 msgstr "管理员"

-#: users/models/user.py:33
+#: users/models/user.py:34
 msgid "Application"
 msgstr "应用程序"

-#: users/models/user.py:36 users/templates/users/user_profile.html:92
+#: users/models/user.py:37 users/templates/users/user_profile.html:92
 #: users/templates/users/user_profile.html:167
 #: users/templates/users/user_profile.html:170
 msgid "Disable"
 msgstr "禁用"

-#: users/models/user.py:37 users/templates/users/user_profile.html:90
+#: users/models/user.py:38 users/templates/users/user_profile.html:90
 #: users/templates/users/user_profile.html:174
 msgid "Enable"
 msgstr "启用"

-#: users/models/user.py:38 users/templates/users/user_profile.html:88
+#: users/models/user.py:39 users/templates/users/user_profile.html:88
 msgid "Force enable"
 msgstr "强制启用"

-#: users/models/user.py:54 users/templates/users/user_detail.html:71
+#: users/models/user.py:55 users/templates/users/user_detail.html:71
 #: users/templates/users/user_profile.html:59
 msgid "Email"
 msgstr "邮件"

-#: users/models/user.py:65
+#: users/models/user.py:66
 msgid "Avatar"
 msgstr "头像"

-#: users/models/user.py:68 users/templates/users/user_detail.html:82
+#: users/models/user.py:69 users/templates/users/user_detail.html:82
 msgid "Wechat"
 msgstr "微信"

-#: users/models/user.py:97 users/templates/users/user_detail.html:103
+#: users/models/user.py:98 users/templates/users/user_detail.html:103
 #: users/templates/users/user_list.html:27
 #: users/templates/users/user_profile.html:100
 msgid "Source"
 msgstr "用户来源"

-#: users/models/user.py:101
+#: users/models/user.py:102
 msgid "Date password last updated"
 msgstr "最后更新密码日期"

-#: users/models/user.py:396
+#: users/models/user.py:421
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"

@@ -4555,6 +4554,9 @@ msgstr "创建组织"
 msgid "Update org"
 msgstr "更新组织"

+#~ msgid "User login settings"
+#~ msgstr "用户登录设置"
+
 #~ msgid "Bit"
 #~ msgstr " 位"