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

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

diff --cc app/javascript/mastodon/locales/en.json
index c7153b7b13465f29150353199887bd8df2cd86e4,3b51b1b5f14c95a07f268bc4ed90d1782f9ec738..fbc488a0749090085dc5bef705c36d7d1c7e7412
--- 1/app/javascript/mastodon/locales/en.json
--- 2/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@@ -73,12 -73,10 +73,14 @@@
    "column_header.pin": "Pin",
    "column_header.show_settings": "Show settings",
    "column_header.unpin": "Unpin",
 +  "column.heading": "Misc",
 +  "column.subheading": "Miscellaneous options",
 +  "column_subheading.lists": "Lists",
 +  "column_subheading.navigation": "Navigation",
    "column_subheading.settings": "Settings",
+   "community.column_settings.local_only": "Local only",
    "community.column_settings.media_only": "Media Only",
+   "community.column_settings.remote_only": "Remote only",
    "compose_form.direct_message_warning": "This toot will only be sent to the mentioned users.",
    "compose_form.direct_message_warning_learn_more": "Learn more",
    "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",

diff --cc app/javascript/mastodon/locales/ja.json
index 83c7db6c154181fa085ea000cbebb80683cee845,026d32834fa53521dfbda88fb32607646ac92fac..75a215145ba50941b2474de02f1b31aec5572fe0
--- 1/app/javascript/mastodon/locales/ja.json
--- 2/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -73,12 -73,10 +73,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.media_only": "メディアのみ表示",
+   "community.column_settings.remote_only": "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 9d9eaa76902b64922e7bc2fc96c33690485bece6,30756a5a509351d6e4978ad845226b0e9cb8257b..afb4e29e608ceefa71652746c54853a582c98713
--- 1/app/javascript/mastodon/locales/pl.json
--- 2/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@@ -73,12 -73,10 +73,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.media_only": "Tylko zawartość multimedialna",
+   "community.column_settings.remote_only": "Remote only",
    "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.",

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc config/locales/pl.yml
Simple merge

diff --cc config/locales/simple_form.ja.yml
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge