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

app/helpers/settings_helper.rb

app/javascript/mastodon/features/keyboard_shortcuts/index.js

...javascript/mastodon/features/ui/components/media_modal.js

app/javascript/mastodon/locales/ar.json

app/javascript/mastodon/locales/ast.json

app/javascript/mastodon/locales/bg.json

app/javascript/mastodon/locales/ca.json

app/javascript/mastodon/locales/co.json

app/javascript/mastodon/locales/cs.json

app/javascript/mastodon/locales/da.json

app/javascript/mastodon/locales/de.json

app/javascript/mastodon/locales/defaultMessages.json

app/javascript/mastodon/locales/el.json

app/javascript/mastodon/locales/en.json

app/javascript/mastodon/locales/eo.json

app/javascript/mastodon/locales/es.json

app/javascript/mastodon/locales/eu.json

app/javascript/mastodon/locales/fa.json

app/javascript/mastodon/locales/fi.json

app/javascript/mastodon/locales/fr.json