diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-17 19:23:39 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-17 19:23:39 +0100 |
| commit | 4e3c68e0256e6aab4bb30f350dac4fc4386cb0b9 (patch) | |
| tree | 00a495e6f4abf68dbb9ecceae729c9e5345c318a /config/locales/is.yml | |
| parent | ac300173f68d2497cccf4e5bf558d95fc6105c96 (diff) | |
| parent | 443d114574ef152f14815afc5c4ed5c977dd9205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code.
Diffstat (limited to 'config/locales/is.yml')
| -rw-r--r-- | config/locales/is.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/is.yml b/config/locales/is.yml index 935252a6f..04d193975 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1437,7 +1437,7 @@ is: disallowed_hashtags: one: 'innihélt óleyfilegt myllumerki: %{tags}' other: 'innihélt óleyfilegu myllumerkin: %{tags}' - edited_at: Breytt %{date} + edited_at_html: Breytt %{date} errors: in_reply_not_found: Færslan sem þú ert að reyna að svara að er líklega ekki til. open_in_web: Opna í vafra |