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

app/javascript/mastodon/locales/defaultMessages.json

@@ -278,6 +278,19 @@
     ],
     "path": "app/javascript/mastodon/components/poll.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Loading…",
+        "id": "regeneration_indicator.label"
+      },
+      {
+        "defaultMessage": "Your home feed is being prepared!",
+        "id": "regeneration_indicator.sublabel"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/regeneration_indicator.json"
+  },
   {
     "descriptors": [
       {
@@ -445,19 +458,6 @@
     ],
     "path": "app/javascript/mastodon/components/status_content.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Loading…",
-        "id": "regeneration_indicator.label"
-      },
-      {
-        "defaultMessage": "Your home feed is being prepared!",
-        "id": "regeneration_indicator.sublabel"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/status_list.json"
-  },
   {
     "descriptors": [
       {
@@ -1135,15 +1135,6 @@
     ],
     "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": [
       {
@@ -1435,6 +1426,10 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Refresh",
+        "id": "refresh"
+      },
       {
         "defaultMessage": "No one has favourited this toot yet. When someone does, they will show up here.",
         "id": "empty_column.favourites"
@@ -1483,10 +1478,6 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Refresh",
-        "id": "refresh"
-      },
       {
         "defaultMessage": "Profile unavailable",
         "id": "empty_column.account_unavailable"
@@ -1640,6 +1631,10 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Basic",
+        "id": "home.column_settings.basic"
+      },
       {
         "defaultMessage": "Show boosts",
         "id": "home.column_settings.show_reblogs"
@@ -2021,14 +2016,6 @@
         "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"
@@ -2087,10 +2074,6 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "and {count, plural, one {# other} other {# others}}",
-        "id": "notification.and_n_others"
-      },
       {
         "defaultMessage": "{name} followed you",
         "id": "notification.follow"