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

diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
index d63b20c8953dc13537d2c4fdc3fc4a9c7f8796ae,6502ab02e55008613163d0a2f3aa226323961241..bdc1f98fb159e574c2cd539fab027a786b001823
--- 1/app/javascript/mastodon/locales/ja.json
--- 2/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -250,9 -246,8 +250,9 @@@
    "navigation_bar.personal": "個人用",
    "navigation_bar.pins": "固定したトゥート",
    "navigation_bar.preferences": "ユーザー設定",
-   "navigation_bar.profile_directory": "Profile directory",
+   "navigation_bar.profile_directory": "ディレクトリ",
    "navigation_bar.public_timeline": "連合タイムライン",
 +  "navigation_bar.misc": "その他",
    "navigation_bar.security": "セキュリティ",
    "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
    "notification.follow": "{name}さんにフォローされました",

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

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

diff --cc config/locales/ja.yml
index e4116881226e07e0e227783426ff51ab4e43a4f1,10876f5d3c0e2a915967463d062d834d0e69f5ca..895610d160782ab25c65f92928d5744b62ca6ce1
--- 1/config/locales/ja.yml
--- 2/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@@ -641,9 -641,7 +641,8 @@@ ja
      copy: コピー
      order_by: 並び順
      save_changes: 変更を保存
 +    use_this: これを使う
      validation_errors:
-       one: エラーが発生しました！ 以下のエラーを確認してください
        other: エラーが発生しました！ 以下の%{count}個のエラーを確認してください
    html_validator:
      invalid_markup: '無効なHTMLマークアップが含まれています: %{error}'

diff --cc config/locales/pl.yml
index f5e40aa7274530858e34b666596ea9421993b666,cc3a671260505f765b2aad01b744c3af8c37c3be..538e6d554243babda544fd3e66db87a5c605617c
--- 1/config/locales/pl.yml
--- 2/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@@ -881,9 -898,9 +899,10 @@@ pl
      edit_profile: Edytuj profil
      export: Eksportowanie danych
      featured_tags: Wyróżnione hashtagi
 +    flavours: Odmiany
      identity_proofs: Dowody tożsamości
      import: Importowanie danych
+     import_and_export: Import i eksport
      migrate: Migracja konta
      notifications: Powiadomienia
      preferences: Preferencje

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

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

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