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

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.

app/javascript/mastodon/locales/defaultMessages.json

@@ -79,6 +79,49 @@
     ],
     "path": "app/javascript/mastodon/components/account.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Loading...",
+        "id": "loading_indicator.label"
+      },
+      {
+        "defaultMessage": "Sign-up month",
+        "id": "admin.dashboard.retention.cohort"
+      },
+      {
+        "defaultMessage": "New users",
+        "id": "admin.dashboard.retention.cohort_size"
+      },
+      {
+        "defaultMessage": "Average",
+        "id": "admin.dashboard.retention.average"
+      },
+      {
+        "defaultMessage": "Retention",
+        "id": "admin.dashboard.retention"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/admin/Retention.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Trending now",
+        "id": "trends.trending_now"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/admin/Trends.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "(unprocessed)",
+        "id": "attachments_list.unprocessed"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/attachment_list.json"
+  },
   {
     "descriptors": [
       {
@@ -290,9 +333,12 @@
       },
       {
         "defaultMessage": "You voted for this answer",
-        "description": "Tooltip of the \"voted\" checkmark in polls",
         "id": "poll.voted"
       },
+      {
+        "defaultMessage": "{votes, plural, one {# vote} other {# votes}}",
+        "id": "poll.votes"
+      },
       {
         "defaultMessage": "{count, plural, one {# person} other {# people}}",
         "id": "poll.total_people"
@@ -2908,6 +2954,10 @@
         "defaultMessage": "Apply",
         "id": "upload_modal.apply"
       },
+      {
+        "defaultMessage": "Applying…",
+        "id": "upload_modal.applying"
+      },
       {
         "defaultMessage": "A quick brown fox jumps over the lazy dog",
         "id": "upload_modal.description_placeholder"
@@ -2916,6 +2966,14 @@
         "defaultMessage": "Choose image",
         "id": "upload_modal.choose_image"
       },
+      {
+        "defaultMessage": "You have unsaved changes to the media description or preview, discard them anyway?",
+        "id": "confirmations.discard_edit_media.message"
+      },
+      {
+        "defaultMessage": "Discard",
+        "id": "confirmations.discard_edit_media.confirm"
+      },
       {
         "defaultMessage": "Describe for people with hearing loss",
         "id": "upload_form.audio_description"