Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

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

diff --cc app/javascript/mastodon/locales/en.json
index 098bebf8f7d30e188bd9d294e6c90485519a4bc1,d214fe85fe5d9dbbff3e0cb319959db69c0ab069..b1dbaa69802ff2ee8029c7b042979a7ffd77e749
--- 1/app/javascript/mastodon/locales/en.json
--- 2/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@@ -49,11 -48,9 +49,12 @@@
    "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",
+   "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.",
    "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
    "compose_form.lock_disclaimer.lock": "locked",
    "compose_form.placeholder": "What is on your mind?",

diff --cc app/javascript/mastodon/locales/ja.json
index 614ef881559753b3a78fb84d2df2ae5b68bb2e0d,e7f15691c555c4f71fc38ce6e4e4c92d4ed2d013..19885056c04afbac1ff9ec3a6aa825f3cbe74c37
--- 1/app/javascript/mastodon/locales/ja.json
--- 2/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -49,11 -48,9 +49,12 @@@
    "column_header.pin": "ピン留めする",
    "column_header.show_settings": "設定を表示",
    "column_header.unpin": "ピン留めを外す",
 +  "column.heading": "その他",
 +  "column.subheading": "その他のオプション",
 +  "column_subheading.lists": "リスト",
    "column_subheading.navigation": "ナビゲーション",
    "column_subheading.settings": "設定",
+   "compose_form.hashtag_warning": "このトゥートは未収載なのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
    "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
    "compose_form.lock_disclaimer.lock": "非公開",
    "compose_form.placeholder": "今なにしてる？",

diff --cc app/views/accounts/_header.html.haml
Simple merge

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

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

diff --cc config/routes.rb
Simple merge

diff --cc spec/models/follow_request_spec.rb
Simple merge