diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-15 21:57:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 21:57:26 +0100 |
| commit | ac300173f68d2497cccf4e5bf558d95fc6105c96 (patch) | |
| tree | 71debfede36bf8985cd5e3e37b6107560c358f57 /config/locales/en.yml | |
| parent | 80c4db160ecfd201cb82ed320cbe3eb32236ad20 (diff) | |
| parent | c79a03b319e17f5ab8c40d065842607de0d76108 (diff) | |
Merge pull request #1719 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, 1 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index cdc66bd68..d4a42e867 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1438,7 +1438,7 @@ en: disallowed_hashtags: one: 'contained a disallowed hashtag: %{tags}' other: 'contained the disallowed hashtags: %{tags}' - edited_at: Edited %{date} + edited_at_html: Edited %{date} errors: in_reply_not_found: The post you are trying to reply to does not appear to exist. open_in_web: Open in web |