diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-06-23 12:49:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-23 12:49:09 +0200 |
commit | 776e00f19399875a135a64d8ad486f3578101cf9 (patch) | |
tree | ea846e21767b1cb2f9f277d3829fbade1f0e46a0 /config/locales/en.yml | |
parent | a434f370f38ac66e05000545e36d7c696f4962d0 (diff) | |
parent | 979059fbc93664b38b720b369b31beaa89457879 (diff) |
Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 6274031dc..cdb2e3df7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1004,6 +1004,17 @@ en: lists: errors: limit: You have reached the maximum amount of lists + login_activities: + authentication_methods: + otp: two-factor authentication app + password: password + sign_in_token: e-mail security code + webauthn: security keys + description_html: If you see activity that you don't recognize, consider changing your password and enabling two-factor authentication. + empty: No authentication history available + failed_sign_in_html: Failed sign-in attempt with %{method} from %{ip} (%{browser}) + successful_sign_in_html: Successful sign-in with %{method} from %{ip} (%{browser}) + title: Authentication history media_attachments: validations: images_and_video: Cannot attach a video to a post that already contains images @@ -1211,6 +1222,7 @@ en: revoke: Revoke revoke_success: Session successfully revoked title: Sessions + view_authentication_history: View authentication history of your account settings: account: Account account_settings: Account settings |