diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-17 16:17:10 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-17 16:17:10 +0000 |
| commit | aa2bf07281ba1e41c9e32a760684c15081524a7c (patch) | |
| tree | a5ae679254948e9825676c87aca2ca4d164806c3 /config/locales/devise.en.yml | |
| parent | 60ff0869603c80fbaae407e492e0e7f60e2e40e6 (diff) | |
| parent | fbe7756da6e817c3de633f624f5a28bc133e78c8 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/locales/devise.en.yml')
| -rw-r--r-- | config/locales/devise.en.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 4b3f81edb..20938e47b 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -18,10 +18,10 @@ en: mailer: confirmation_instructions: action: Verify email address - explanation: You have created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this e-mail. - extra_html: Please also check out our <a href="%{terms_path}">terms of service</a> and <a href="%{policy_path}">privacy policy</a>. + explanation: You have created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email. + extra_html: Please also check out <a href="%{terms_path}">the rules of the instance</a> and <a href="%{policy_path}">our terms of service</a>. subject: 'Mastodon: Confirmation instructions for %{instance}' - title: Verify e-mail address + title: Verify email address email_changed: explanation: 'The email address for your account is being changed to:' extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account. |