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

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

app/javascript/mastodon/locales/defaultMessages.json

@@ -1407,6 +1407,10 @@
         "defaultMessage": "Unmute @{name}",
         "id": "account.unmute"
       },
+      {
+        "defaultMessage": "Unfollow",
+        "id": "confirmations.unfollow.confirm"
+      },
       {
         "defaultMessage": "Are you sure you want to unfollow {name}?",
         "id": "confirmations.unfollow.message"
@@ -1563,6 +1567,10 @@
       {
         "defaultMessage": "Next",
         "id": "lightbox.next"
+      },
+      {
+        "defaultMessage": "Announcement",
+        "id": "announcement.announcement"
       }
     ],
     "path": "app/javascript/mastodon/features/getting_started/components/announcements.json"