diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 6d771b7f5..ff5e85b78 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 05685912a..d0ec9afb8 100644 --- 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-23 16:44+0800\n" +"POT-Creation-Date: 2018-11-26 18:31+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -1981,8 +1981,8 @@ msgid "" "will be automatic sent to the user by system within 5 days (daily) before " "the password expires" msgstr "" -"提示:(单位:天)如果用户在此期间没有更新密码,用户密码将过期失效; 密码过期提醒" -"邮件将在密码过期前5天内由系统(每天)自动发送给用户" +"提示:(单位:天)如果用户在此期间没有更新密码,用户密码将过期失效; 密码过期" +"提醒邮件将在密码过期前5天内由系统(每天)自动发送给用户" #: common/forms.py:202 msgid "Password minimum length" @@ -2189,17 +2189,11 @@ msgstr "不能包含特殊字符" msgid "Settings" msgstr "系统设置" -#: common/views.py:29 common/views.py:81 common/views.py:112 +#: common/views.py:29 common/views.py:55 common/views.py:81 common/views.py:112 #: common/views.py:162 msgid "Update setting successfully" msgstr "更新设置成功" -#: common/views.py:55 -#, fuzzy -#| msgid "Update setting successfully" -msgid "Update setting successfully, please restart program" -msgstr "更新设置成功" - #: common/views.py:127 msgid "Create replay storage" msgstr "创建录像存储" @@ -4568,6 +4562,11 @@ msgstr "创建组织" msgid "Update org" msgstr "更新组织" +#, fuzzy +#~| msgid "Update setting successfully" +#~ msgid "Update setting successfully, please restart program" +#~ msgstr "更新设置成功" + #~ msgid "User login settings" #~ msgstr "用户登录设置" diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 70864c1ff..93fa69a42 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -52,7 +52,6 @@ Pillow==4.3.0 pyasn1==0.4.2 pycparser==2.19 pycrypto==2.6.1 -pyldap==2.4.45 pyotp==2.2.6 PyNaCl==1.2.1 python-dateutil==2.6.1 @@ -76,5 +75,5 @@ aliyun-python-sdk-core-v3==2.9.1 aliyun-python-sdk-ecs==4.10.1 python-keycloak==0.13.3 python-keycloak-client==0.1.3 -python-ldap==3.1.0 rest_condition==1.0.3 +python-ldap==3.1.0