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

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
index a519b819bf02d549fa8ccfbc35bfbce94cda0cb3,8e21c2d24c00488c4f6557e5fac56631b3c36793..dc0b5f8ade9b626e43bcc4da6214611cff48d21e
--- 1/app/javascript/mastodon/locales/ja.json
--- 2/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -74,14 -80,10 +80,14 @@@
    "column_header.pin": "ピン留めする",
    "column_header.show_settings": "設定を表示",
    "column_header.unpin": "ピン留めを外す",
 +  "column.heading": "その他",
 +  "column.subheading": "その他のオプション",
 +  "column_subheading.lists": "リスト",
 +  "column_subheading.navigation": "ナビゲーション",
    "column_subheading.settings": "設定",
-   "community.column_settings.local_only": "Local only",
+   "community.column_settings.local_only": "ローカルのみ表示",
    "community.column_settings.media_only": "メディアのみ表示",
-   "community.column_settings.remote_only": "Remote only",
+   "community.column_settings.remote_only": "リモートのみ表示",
    "compose_form.direct_message_warning": "このトゥートはメンションされた人にのみ送信されます。",
    "compose_form.direct_message_warning_learn_more": "もっと詳しく",
    "compose_form.hashtag_warning": "このトゥートは公開設定ではないのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",

diff --cc app/javascript/mastodon/locales/pl.json
index bbfe4cce32f7c5ea59fe7fdddf7765f975c39a36,1d6810d8c73438faf22dbff9310e1ce5697f1dbb..3ac38a0ead820382ad1f2e303928fe36a383a550
--- 1/app/javascript/mastodon/locales/pl.json
--- 2/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@@ -74,14 -80,10 +80,14 @@@
    "column_header.pin": "Przypnij",
    "column_header.show_settings": "Pokaż ustawienia",
    "column_header.unpin": "Cofnij przypięcie",
 +  "column.heading": "Różne",
 +  "column.subheading": "Różne opcje",
 +  "column_subheading.lists": "Listy",
 +  "column_subheading.navigation": "Nawigacja",
    "column_subheading.settings": "Ustawienia",
-   "community.column_settings.local_only": "Local only",
+   "community.column_settings.local_only": "Tylko Lokalne",
    "community.column_settings.media_only": "Tylko zawartość multimedialna",
-   "community.column_settings.remote_only": "Remote only",
+   "community.column_settings.remote_only": "Tylko Zdalne",
    "compose_form.direct_message_warning": "Ten wpis będzie widoczny tylko dla wszystkich wspomnianych użytkowników.",
    "compose_form.direct_message_warning_learn_more": "Dowiedz się więcej",
    "compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hashtagami, ponieważ jest oznaczony jako niewidoczny. Tylko publiczne wpisy mogą zostać znalezione z użyciem hashtagów.",