Unverified Commit 060248d1 authored by 老广's avatar 老广 Committed by GitHub

Req (#2098)

* [Update] 修改requirements

* [Update] 修改requirements

* [Update] 编译语言
parent da8fec77
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Jumpserver 0.3.3\n" "Project-Id-Version: Jumpserver 0.3.3\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: Jumpserver team<ibuler@qq.com>\n" "Language-Team: Jumpserver team<ibuler@qq.com>\n"
...@@ -1981,8 +1981,8 @@ msgid "" ...@@ -1981,8 +1981,8 @@ msgid ""
"will be automatic sent to the user by system within 5 days (daily) before " "will be automatic sent to the user by system within 5 days (daily) before "
"the password expires" "the password expires"
msgstr "" msgstr ""
"提示:(单位:天)如果用户在此期间没有更新密码,用户密码将过期失效; 密码过期提醒" "提示:(单位:天)如果用户在此期间没有更新密码,用户密码将过期失效; 密码过期"
"邮件将在密码过期前5天内由系统(每天)自动发送给用户" "提醒邮件将在密码过期前5天内由系统(每天)自动发送给用户"
#: common/forms.py:202 #: common/forms.py:202
msgid "Password minimum length" msgid "Password minimum length"
...@@ -2189,17 +2189,11 @@ msgstr "不能包含特殊字符" ...@@ -2189,17 +2189,11 @@ msgstr "不能包含特殊字符"
msgid "Settings" msgid "Settings"
msgstr "系统设置" 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 #: common/views.py:162
msgid "Update setting successfully" msgid "Update setting successfully"
msgstr "更新设置成功" msgstr "更新设置成功"
#: common/views.py:55
#, fuzzy
#| msgid "Update setting successfully"
msgid "Update setting successfully, please restart program"
msgstr "更新设置成功"
#: common/views.py:127 #: common/views.py:127
msgid "Create replay storage" msgid "Create replay storage"
msgstr "创建录像存储" msgstr "创建录像存储"
...@@ -4568,6 +4562,11 @@ msgstr "创建组织" ...@@ -4568,6 +4562,11 @@ msgstr "创建组织"
msgid "Update org" msgid "Update org"
msgstr "更新组织" msgstr "更新组织"
#, fuzzy
#~| msgid "Update setting successfully"
#~ msgid "Update setting successfully, please restart program"
#~ msgstr "更新设置成功"
#~ msgid "User login settings" #~ msgid "User login settings"
#~ msgstr "用户登录设置" #~ msgstr "用户登录设置"
......
...@@ -52,7 +52,6 @@ Pillow==4.3.0 ...@@ -52,7 +52,6 @@ Pillow==4.3.0
pyasn1==0.4.2 pyasn1==0.4.2
pycparser==2.19 pycparser==2.19
pycrypto==2.6.1 pycrypto==2.6.1
pyldap==2.4.45
pyotp==2.2.6 pyotp==2.2.6
PyNaCl==1.2.1 PyNaCl==1.2.1
python-dateutil==2.6.1 python-dateutil==2.6.1
...@@ -76,5 +75,5 @@ aliyun-python-sdk-core-v3==2.9.1 ...@@ -76,5 +75,5 @@ aliyun-python-sdk-core-v3==2.9.1
aliyun-python-sdk-ecs==4.10.1 aliyun-python-sdk-ecs==4.10.1
python-keycloak==0.13.3 python-keycloak==0.13.3
python-keycloak-client==0.1.3 python-keycloak-client==0.1.3
python-ldap==3.1.0
rest_condition==1.0.3 rest_condition==1.0.3
python-ldap==3.1.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment