diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-02 20:03:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 20:03:32 +0100 |
| commit | 0acd51acdc1e670bf57f58671cb8e30743782c63 (patch) | |
| tree | f5ff0b5c3b1e8fd94691264f2bc147e5fa233ecb /config/locales/devise.en.yml | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | e77ceb1b29547ed89b4110b3cc3edc9ac325b620 (diff) | |
Merge pull request #878 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/devise.en.yml')
| -rw-r--r-- | config/locales/devise.en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 20938e47b..bd0642b25 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -18,6 +18,7 @@ en: mailer: confirmation_instructions: action: Verify email address + action_with_app: Confirm and return to %{app} 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}' |