diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-23 18:13:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-23 18:24:01 +0100 |
| commit | 61ef81c548a0140a80281d4004ac55873d8f74d6 (patch) | |
| tree | 770c251059d139243b9cb557c762648e0af55037 /config/locales/en.yml | |
| parent | 4d0383d75ac606f8c9c2b8ecb0ea2dddf28213cb (diff) | |
| parent | 0a120d86d28e3f2e20455f56c1656f5d5f2f4af6 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.
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 |