Finish new reset password, etc.

2 files changed, 28 insertions, 0 deletions

diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 9e2302195d..d5adde92b0 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -52,9 +52,23 @@ create_new_account = Create New Account
 register_hepler_msg = Already have an account? Sign in now!
 social_register_hepler_msg = Already have an account? Bind now!
 disable_register_prompt = Sorry, registration has been disabled. Please contact the site administrator.
+disable_register_mail = Sorry, Register Mail Confirmation has been disabled.
 remember_me = Remember Me
+forgot_password= Fotgot Password
 forget_password = Fotget password?
 sign_up_now = Need an account? Sign up now.
+confirmation_mail_sent_prompt = A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete your registration.
+sign_in_email = Sign in to your e-mail
+active_your_account = Activate Your Account
+resent_limit_prompt = Sorry, you are sending an activation e-mail too frequently. Please wait 3 minutes.
+has_unconfirmed_mail = Hi %s, you have an unconfirmed email address(<b>%s</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.
+resend_mail = Click here to resend your activation e-mail
+email_not_associate = This e-mail address does not associate to any account.
+send_reset_mail = Click here to (re)send your passowrd reset e-mail
+reset_password = Reset Your Password
+invalid_code = Sorry, your confirmation code has exipired or not valid.
+reset_password_helper = Click here to reset your password
+password_too_short = Password length cannot be less then 6.
 
 [form]
 UserName = Username
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 8aec50092c..c847f76345 100644
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -52,9 +52,23 @@ create_new_account = 创建帐户
 register_hepler_msg = 已经注册？立即登录！
 social_register_hepler_msg = 已经注册？立即绑定！
 disable_register_prompt = 对不起，注册功能已被关闭。请联系网站管理员。
+disable_register_mail = 对不起，注册邮箱确认功能已被关闭。
 remember_me = 记住登录
+forgot_password = 忘记密码
 forget_password = 忘记密码？
 sign_up_now = 还没帐户？马上注册。
+confirmation_mail_sent_prompt = 一封新的确认邮件已经被发送至 <b>%s</b>，请检查您的收件箱并在 %d 小时内完成确认注册操作。
+sign_in_email = 登录到您的邮箱
+active_your_account = 激活您的帐户
+resent_limit_prompt = 对不起，您请求发送激活邮件过于频繁，请等待 3 分钟后再试！
+has_unconfirmed_mail = %s 您好，系统检测到您有一封发送至 <b>%s</b> 但未被确认的邮件。如果您未收到激活邮件，或需要重新发送，请单击下方的按钮。
+resend_mail = 单击此处重新发送确认邮件
+email_not_associate = 您输入的邮箱地址未被关联到任何帐号！
+send_reset_mail = 单击此处（重新）发送您的密码重置邮件
+reset_password = 重置密码
+invalid_code = 对不起，您的确认代码已过期或已失效。
+reset_password_helper = 单击此处重置密码
+password_too_short = 密码长度不能少于 6 位！
 
 [form]
 UserName = 用户名