diff options
author | Starfall <us@starfall.systems> | 2020-12-10 18:39:04 -0600 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2020-12-10 18:39:04 -0600 |
commit | ab127fd7941b7c84e6d6fe3071d41f52affb143c (patch) | |
tree | 7daabe20eb581a2b9215ed9c4f161bcab89019bd /config | |
parent | e68391fbaaf409cc01f74c8cf7076520a43ae06e (diff) | |
parent | 4acb5c90a271779a050c4d3b54562bd29359e5c0 (diff) |
Merge branch 'glitch' into main
Diffstat (limited to 'config')
-rw-r--r-- | config/locales/en.yml | 1 | ||||
-rw-r--r-- | config/locales/simple_form.en.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 263ffcdc7..59f561aa3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -751,6 +751,7 @@ en: functional: Your account is fully operational. pending: Your application is pending review by our staff. This may take some time. You will receive an e-mail if your application is approved. redirecting_to: Your account is inactive because it is currently redirecting to %{acct}. + too_fast: Form submitted too fast, try again. trouble_logging_in: Trouble logging in? use_security_key: Use security key authorize_follow: diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index f982d50f9..cea777550 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -126,6 +126,7 @@ en: expires_in: Expire after fields: Profile metadata header: Header + honeypot: "%{label} (do not fill in)" inbox_url: URL of the relay inbox irreversible: Drop instead of hide locale: Interface language |