Merge branch 'main' into glitch-soc/merge-upstream

2022-08-15 14:33:05 +02:00
parent 3f15326a05 113dd90aa3
commit e2a7a458d6
159 changed files with 1537 additions and 1316 deletions
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -59,6 +59,7 @@
  "alert.unexpected.title": "Oops!",
  "announcement.announcement": "Announcement",
  "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
  "autosuggest_hashtag.per_week": "{count} per week",
  "boost_modal.combo": "You can press {combo} to skip this next time",
  "bundle_column_error.body": "Something went wrong while loading this component.",