summaryrefslogtreecommitdiffstats
path: root/conf/locale/locale_en-US.ini
diff options
context:
space:
mode:
author无闻 <joe2010xtmf@163.com>2014-08-14 15:56:25 -0700
committer无闻 <joe2010xtmf@163.com>2014-08-14 15:56:25 -0700
commit3e32b14ad4da2db1b05eeec73936dbbe79cecc45 (patch)
treecc52940a3dcfa4148dc6ba5709761485eb97e1f5 /conf/locale/locale_en-US.ini
parent5fbf27bb0753b8ea31975304323bf9727100d2d6 (diff)
parent202a29a475b77514d8a325f9d16a8f152c268418 (diff)
downloadgitea-3e32b14ad4da2db1b05eeec73936dbbe79cecc45.tar.gz
gitea-3e32b14ad4da2db1b05eeec73936dbbe79cecc45.zip
Merge pull request #359 from fanningert/dev
Correct some type issues in the English translation and update the German translation
Diffstat (limited to 'conf/locale/locale_en-US.ini')
-rw-r--r--conf/locale/locale_en-US.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 951b74c89e..d7b5c45a02 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -64,9 +64,9 @@ resent_limit_prompt = Sorry, you are sending an activation e-mail too frequently
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
+send_reset_mail = Click here to (re)send your password reset e-mail
reset_password = Reset Your Password
-invalid_code = Sorry, your confirmation code has exipired or not valid.
+invalid_code = Sorry, your confirmation code has expired or not valid.
reset_password_helper = Click here to reset your password
password_too_short = Password length cannot be less then 6.