Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
chenjinsong
2018-04-08 15:45:07 +08:00
3 changed files with 6 additions and 0 deletions

View File

@@ -224,6 +224,8 @@ save_success=save success
save_failed=save failed
delete_success=delete success
delete_failed=delete failed
audit_success=auditing success
audit_failed=auditing failed
turning_page=It is turning to the page
login_timeout=No login or login timeout,please login again,Thank you!
captcha_error=captcha error

View File

@@ -197,6 +197,8 @@ save_success=save success
save_failed=save failed
delete_success=delete success
delete_failed=delete failed
audit_success=auditing success
audit_failed=auditing failed
turning_page=It is turning to the page
login_timeout=No login or login timeout,please login again,Thank you!
captcha_error=captcha error

View File

@@ -222,6 +222,8 @@ save_success=\u4FDD\u5B58\u6210\u529F
save_failed=\u4FDD\u5B58\u5931\u8D25
delete_success=\u5220\u9664\u6210\u529F
delete_failed=\u5220\u9664\u5931\u8D25
audit_success=\u5BA1\u6838\u6210\u529F
audit_failed=\u5BA1\u6838\u5931\u8D25
turning_page=\u6B63\u5728\u4E3A\u60A8\u8DF3\u8F6C\u9875\u9762
login_timeout=\u672A\u767B\u5F55\u6216\u767B\u5F55\u8D85\u65F6,\u8BF7\u91CD\u65B0\u767B\u5F55,\u8C22\u8C22\!
captcha_error=\u9A8C\u8BC1\u7801\u4E0D\u6B63\u786E