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

Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.

app/javascript/mastodon/locales/defaultMessages.json

@@ -146,7 +146,7 @@
         "id": "account.statuses_counter"
       },
       {
-        "defaultMessage": "{count, plural, other {{counter} Following}}",
+        "defaultMessage": "{count, plural, one {{counter} Following} other {{counter} Following}}",
         "id": "account.following_counter"
       },
       {
@@ -2659,6 +2659,22 @@
         "defaultMessage": "Boost",
         "id": "status.reblog"
       },
+      {
+        "defaultMessage": "Public",
+        "id": "privacy.public.short"
+      },
+      {
+        "defaultMessage": "Unlisted",
+        "id": "privacy.unlisted.short"
+      },
+      {
+        "defaultMessage": "Followers-only",
+        "id": "privacy.private.short"
+      },
+      {
+        "defaultMessage": "Direct",
+        "id": "privacy.direct.short"
+      },
       {
         "defaultMessage": "You can press {combo} to skip this next time",
         "id": "boost_modal.combo"