From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-admin/src/main/resources/i18n/messages_en_US.properties |   59 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
index 8a3fba3..af57cf4 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@@ -1,33 +1,32 @@
 #閿欒娑堟伅
-not.null=
-user.jcaptcha.error=
-user.jcaptcha.expire=
-user.not.exists=
-user.password.not.match=
-user.password.retry.limit.count=
-user.password.retry.limit.exceed=
-user.password.delete=
-user.blocked=
-role.blocked=
-user.logout.success=
-length.not.valid=
-user.username.not.valid=
-user.password.not.valid=
-user.email.not.valid=
-user.mobile.phone.number.not.valid=
-user.login.success=
-user.register.success=register success
-user.notfound=
-user.unknown.error=
-
+not.null=* Required fill in
+user.jcaptcha.error=Captcha error
+user.jcaptcha.expire=Captcha invalid
+user.not.exists=User does not exist/Password error
+user.password.not.match=User does not exist/Password error
+user.password.retry.limit.count=Password input error {0} times
+user.password.retry.limit.exceed=Password input error {0} times, account locked for 10 minutes
+user.password.delete=Sorry, your account has been deleted
+user.blocked=User disabled锛宲lease contact administrators
+role.blocked=Role disabled锛宲lease contact administrators
+user.logout.success=Exit successful
+length.not.valid=The length must be between {min} and {max} characters
+user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number
+user.password.not.valid=* 5-50 characters
+user.email.not.valid=Mailbox format error
+user.mobile.phone.number.not.valid=Phone number format error
+user.login.success=Login successful
+user.register.success=Register successful
+user.notfound=Please login again
+user.forcelogout=The administrator is forced to exit锛宲lease login again
+user.unknown.error=Unknown error, please login again
 ##鏂囦欢涓婁紶娑堟伅
-upload.exceed.maxSize=
-upload.filename.exceed.length=
-
+upload.exceed.maxSize=The uploaded file size exceeds the limit file size锛�<br/>the maximum allowed file size is锛歿0}MB锛�
+upload.filename.exceed.length=The maximum length of uploaded file name is {0} characters
 ##鏉冮檺
-no.permission=
-no.create.permission=
-no.update.permission=
-no.delete.permission=
-no.export.permission=
-no.view.permission=
+no.permission=You do not have permission to the data锛宲lease contact your administrator to add permissions [{0}]
+no.create.permission=You do not have permission to create data锛宲lease contact your administrator to add permissions [{0}]
+no.update.permission=You do not have permission to modify data锛宲lease contact your administrator to add permissions [{0}]
+no.delete.permission=You do not have permission to delete data锛宲lease contact your administrator to add permissions [{0}]
+no.export.permission=You do not have permission to export data锛宲lease contact your administrator to add permissions [{0}]
+no.view.permission=You do not have permission to view data锛宲lease contact your administrator to add permissions [{0}]

--
Gitblit v1.9.3