diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-08-13 22:17:29 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-08-13 22:17:29 +0200 |
| commit | da62e350e0b4bcf1f683c48169294d761fd901f1 (patch) | |
| tree | 14709b118d680ffc93ee12620565087397190b27 /config/locales | |
| parent | 660188c9008761ae38d0e82dea841f7d90e199f9 (diff) | |
| parent | 0f38f9726a0a9d8e13633424d03e79f54df047a4 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 2cae0a3e3..40adfc21e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1325,9 +1325,11 @@ en: tips: Tips title: Welcome aboard, %{name}! users: + blocked_email_provider: This e-mail provider isn't allowed follow_limit_reached: You cannot follow more than %{limit} people generic_access_help_html: Trouble accessing your account? You may get in touch with %{email} for assistance invalid_email: The e-mail address is invalid + invalid_email_mx: The e-mail address does not seem to exist invalid_otp_token: Invalid two-factor code invalid_sign_in_token: Invalid security code otp_lost_help_html: If you lost access to both, you may get in touch with %{email} |