diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-23 19:17:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 19:17:31 +0100 |
| commit | e58e0eb9aa375b1107b207e8229a2142c4edc0b8 (patch) | |
| tree | 9418aede73dbd682e937f900cd0eb1b637f2ea24 /config/locales/en.yml | |
| parent | b209e919bddb4bb72bb4f8589f4b15654f22ef53 (diff) | |
| parent | 9483d0c6b2b3eaffca8e02e8be4b9a21c5f9e767 (diff) | |
Merge pull request #1663 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
| -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 36ac89664..85aa87c7a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -844,6 +844,7 @@ en: invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one. link_to_otp: Enter a two-factor code from your phone or a recovery code link_to_webauth: Use your security key device + log_in_with: Log in with login: Log in logout: Logout migrate_account: Move to a different account @@ -1309,6 +1310,7 @@ en: disallowed_hashtags: one: 'contained a disallowed hashtag: %{tags}' other: 'contained the disallowed hashtags: %{tags}' + edited_at: Edited %{date} errors: in_reply_not_found: The post you are trying to reply to does not appear to exist. language_detection: Automatically detect language |