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
Simple merge

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

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

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

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

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