diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-08-01 17:47:02 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-08-01 17:47:02 +0200 |
| commit | 3a9e3c124843a87611fea82a0258f4923dc966c1 (patch) | |
| tree | b3396382a06bfc8a94076560d013f6c0bcd09966 /app/javascript/mastodon/locales/defaultMessages.json | |
| parent | ed039075c478d85cc8877431f6938ec467d6ad2c (diff) | |
| parent | 4b36e47474d11849ac28c6c8121a568feb8308a7 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/locales/defaultMessages.json')
| -rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 8c287f892..89df1f0c8 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -2125,6 +2125,14 @@ { "descriptors": [ { + "defaultMessage": "Follow hashtag", + "id": "hashtag.follow" + }, + { + "defaultMessage": "Unfollow hashtag", + "id": "hashtag.unfollow" + }, + { "defaultMessage": "or {additional}", "id": "hashtag.column_header.tag_mode.any" }, @@ -3769,4 +3777,4 @@ ], "path": "app/javascript/mastodon/features/video/index.json" } -] +] \ No newline at end of file |