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

Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes

app/javascript/mastodon/locales/defaultMessages.json

@@ -592,10 +592,6 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Local timeline",
-        "id": "column.community"
-      },
       {
         "defaultMessage": "Toots",
         "id": "timeline.posts"
@@ -603,6 +599,15 @@
       {
         "defaultMessage": "Media",
         "id": "timeline.media"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/community_timeline/components/section_headline.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Local timeline",
+        "id": "column.community"
       },
       {
         "defaultMessage": "The local timeline is empty. Write something publicly to get the ball rolling!",
@@ -1401,14 +1406,6 @@
         "defaultMessage": "Federated timeline",
         "id": "column.public"
       },
-      {
-        "defaultMessage": "Toots",
-        "id": "timeline.posts"
-      },
-      {
-        "defaultMessage": "Media",
-        "id": "timeline.media"
-      },
       {
         "defaultMessage": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
         "id": "empty_column.public"