From 646a29108ca4fb25cf13dbdc23e0ace207d206eb Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Fri, 23 Nov 2018 17:00:35 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=A8=A1=E5=9D=97=E6=8E=92=E7=89=88=EF=BC=8C?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=20(#2083)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/forms.py | 2 +- .../templates/common/security_setting.html | 4 +- apps/common/views.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 57933 -> 58344 bytes apps/locale/zh/LC_MESSAGES/django.po | 174 +++++++++--------- 5 files changed, 92 insertions(+), 90 deletions(-) diff --git a/apps/common/forms.py b/apps/common/forms.py index d843eec0b..830c81cf4 100644 --- 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 " diff --git a/apps/common/templates/common/security_setting.html b/apps/common/templates/common/security_setting.html index 56705f372..adc00191f 100644 --- a/apps/common/templates/common/security_setting.html +++ b/apps/common/templates/common/security_setting.html @@ -39,9 +39,9 @@ {% endif %} {% csrf_token %} -

{% trans "User login settings" %}

+

{% trans "Security setting" %}

{% for field in form %} - {% if forloop.counter == 5 %} + {% if forloop.counter == 6 %}

{% trans "Password check rule" %}

{% endif %} diff --git a/apps/common/views.py b/apps/common/views.py index e8ccfe6ba..2500d96a3 100644 --- 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: diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 91637b2230eb48e2c8ea2071a1e05198d209cb13..6d771b7f5362b4891ac0bf194a0036babd1744a7 100644 GIT binary patch delta 8653 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 delta 8249 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 m|2s7LSWmY_sPXY9!z*8!yXivl%*!jkyi~k0^oP\n" "Language-Team: Jumpserver team\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 "" "
Luna is a separately deployed program, you need to deploy Luna, coco, " "configure nginx for url distribution,
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 " 位"