diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-13 23:10:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 23:10:19 +0200 |
| commit | 6fece522f9dca9d13ae2d4437b395a92ddb106c9 (patch) | |
| tree | 882f9cf298e9dffa985f214b28a877b08cf19752 /config | |
| parent | 660188c9008761ae38d0e82dea841f7d90e199f9 (diff) | |
| parent | 0f71372d6337f695a87c7158c52b93e49acc215d (diff) | |
Merge pull request #1404 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -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} |