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

Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code

app/javascript/mastodon/locales/defaultMessages.json

@@ -1129,6 +1129,15 @@
     ],
     "path": "app/javascript/mastodon/features/compose/components/upload_form.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Uploading...",
+        "id": "upload_progress.label"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/compose/components/upload_progress.json"
+  },
   {
     "descriptors": [
       {
@@ -1155,19 +1164,6 @@
     ],
     "path": "app/javascript/mastodon/features/compose/containers/navigation_container.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Are you sure you want to log out?",
-        "id": "confirmations.logout.message"
-      },
-      {
-        "defaultMessage": "Log out",
-        "id": "confirmations.logout.confirm"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/containers/navigation_container.json"
-  },
   {
     "descriptors": [
       {
@@ -1584,10 +1580,6 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Basic",
-        "id": "home.column_settings.basic"
-      },
       {
         "defaultMessage": "Show boosts",
         "id": "home.column_settings.show_reblogs"
@@ -1969,6 +1961,14 @@
         "defaultMessage": "Push notifications",
         "id": "notifications.column_settings.push"
       },
+      {
+        "defaultMessage": "Basic",
+        "id": "home.column_settings.basic"
+      },
+      {
+        "defaultMessage": "Update in real-time",
+        "id": "home.column_settings.update_live"
+      },
       {
         "defaultMessage": "Quick filter bar",
         "id": "notifications.column_settings.filter_bar.category"
@@ -2027,6 +2027,10 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "and {count, plural, one {# other} other {# others}}",
+        "id": "notification.and_n_others"
+      },
       {
         "defaultMessage": "{name} followed you",
         "id": "notification.follow"
@@ -2283,6 +2287,10 @@
         "defaultMessage": "Block & Report",
         "id": "confirmations.block.block_and_report"
       },
+      {
+        "defaultMessage": "Toot",
+        "id": "column.status"
+      },
       {
         "defaultMessage": "Are you sure you want to block {name}?",
         "id": "confirmations.block.message"