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

Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.

app/javascript/mastodon/locales/defaultMessages.json

@@ -2766,6 +2766,10 @@
         "defaultMessage": "A quick brown fox jumps over the lazy dog",
         "id": "upload_modal.description_placeholder"
       },
+      {
+        "defaultMessage": "Choose image",
+        "id": "upload_modal.choose_image"
+      },
       {
         "defaultMessage": "Describe for people with hearing loss",
         "id": "upload_form.audio_description"
@@ -2786,6 +2790,10 @@
         "defaultMessage": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
         "id": "upload_modal.hint"
       },
+      {
+        "defaultMessage": "Change thumbnail",
+        "id": "upload_form.thumbnail"
+      },
       {
         "defaultMessage": "Analyzing picture…",
         "id": "upload_modal.analyzing_picture"