diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-25 18:42:46 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-25 18:42:46 -0700 |
| commit | 046b28312704f3131e72dcd2dbdacc5264d4aa62 (patch) | |
| tree | a8c2b14a6e1db3b662fee2c79af70d9fcb643c2e /config/locales/devise.en.yml | |
| parent | e449426a4e7d15cdd582d4f136add52cbfb5e04e (diff) | |
| download | gitlab-ce-046b28312704f3131e72dcd2dbdacc5264d4aa62.tar.gz | |
Groundwork for merging CI into CE
Diffstat (limited to 'config/locales/devise.en.yml')
| -rw-r--r-- | config/locales/devise.en.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index f3db5b7476e..d8bf0878a3d 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -32,10 +32,11 @@ en: send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.' updated: 'Your password was changed successfully. You are now signed in.' updated_not_active: 'Your password was changed successfully.' - send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail" + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." confirmations: send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.' - send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.' + send_paranoid_instructions: 'If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes.' confirmed: 'Your account was successfully confirmed. You are now signed in.' registrations: signed_up: 'Welcome! You have signed up successfully.' @@ -57,4 +58,4 @@ en: reset_password_instructions: subject: 'Reset password instructions' unlock_instructions: - subject: 'Unlock Instructions'
\ No newline at end of file + subject: 'Unlock Instructions' |