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

Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.
2023-02-09 12:46:12 +01:00 · 2023-02-09 12:46:12 +01:00 · 5f26e6e7ca
parent 35f16b2009 6716afb8f8
commit 5f26e6e7ca
216 changed files with 767 additions and 324 deletions
--- a/2
+++ b/2
@ -26,7 +26,7 @@ gem 'blurhash', '~> 0.1'

 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
-gem 'bootsnap', '~> 1.15.0', require: false
+gem 'bootsnap', '~> 1.16.0', require: false
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'chewy', '~> 7.2'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -122,7 +122,7 @@ GEM
      debug_inspector (>= 0.0.1)
    blurhash (0.1.6)
      ffi (~> 1.14)
-    bootsnap (1.15.0)
+    bootsnap (1.16.0)
      msgpack (~> 1.2)
    brakeman (5.4.0)
    browser (4.2.0)
@ -207,7 +207,7 @@ GEM
    docile (1.4.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.6.3)
+    doorkeeper (5.6.4)
      railties (>= 5)
    dotenv (2.8.1)
    dotenv-rails (2.8.1)
@ -229,7 +229,7 @@ GEM
      tzinfo
    excon (0.95.0)
    fabrication (2.30.0)
-    faker (3.1.0)
+    faker (3.1.1)
      i18n (>= 1.8.11, < 2)
    faraday (1.9.3)
      faraday-em_http (~> 1.0)
@ -511,7 +511,7 @@ GEM
      httpclient
      json-jwt (>= 1.11.0)
      rack (>= 2.1.0)
-    rack-proxy (0.7.0)
+    rack-proxy (0.7.6)
      rack
    rack-test (2.0.2)
      rack (>= 1.3)
@ -611,7 +611,7 @@ GEM
      parser (>= 3.1.1.0)
    rubocop-capybara (2.17.0)
      rubocop (~> 1.41)
-    rubocop-performance (1.15.2)
+    rubocop-performance (1.16.0)
      rubocop (>= 1.7.0, < 2.0)
      rubocop-ast (>= 0.4.0)
    rubocop-rails (2.17.4)
@ -744,7 +744,7 @@ GEM
      addressable (>= 2.8.0)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (5.4.3)
+    webpacker (5.4.4)
      activesupport (>= 5.2)
      rack-proxy (>= 0.6.1)
      railties (>= 5.2)
@ -770,7 +770,7 @@ DEPENDENCIES
  better_errors (~> 2.9)
  binding_of_caller (~> 1.0)
  blurhash (~> 0.1)
-  bootsnap (~> 1.15.0)
+  bootsnap (~> 1.16.0)
  brakeman (~> 5.4)
  browser
  bullet (~> 7.0)
--- a/app/controllers/api/v1/streaming_controller.rb
+++ b/app/controllers/api/v1/streaming_controller.rb
@ -2,10 +2,10 @@

 class Api::V1::StreamingController < Api::BaseController
  def index
-    if Rails.configuration.x.streaming_api_base_url != request.host
-      redirect_to streaming_api_url, status: 301
-    else
+    if Rails.configuration.x.streaming_api_base_url == request.host
      not_found
+    else
+      redirect_to streaming_api_url, status: 301
    end
  end

--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@ -227,7 +227,7 @@ module SignatureVerification
  end

  def to_header_name(name)
-    name.split(/-/).map(&:capitalize).join('-')
+    name.split('-').map(&:capitalize).join('-')
  end

  def missing_required_signature_parameters?
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@ -11,7 +11,7 @@ class TagsController < ApplicationController
  before_action :authenticate_user!, if: :whitelist_mode?
  before_action :set_local
  before_action :set_tag
-  before_action :set_statuses
+  before_action :set_statuses, if: -> { request.format == :rss }
  before_action :set_instance_presenter

  skip_before_action :require_functional!, unless: :whitelist_mode?
@ -44,12 +44,7 @@ class TagsController < ApplicationController
  end

  def set_statuses
-    case request.format&.to_sym
-    when :json
-      @statuses = cache_collection(TagFeed.new(@tag, current_account, local: @local).get(PAGE_SIZE, params[:max_id], params[:since_id], params[:min_id]), Status)
-    when :rss
-      @statuses = cache_collection(TagFeed.new(@tag, nil, local: @local).get(limit_param), Status)
-    end
+    @statuses = cache_collection(TagFeed.new(@tag, nil, local: @local).get(limit_param), Status)
  end

  def set_instance_presenter
@ -64,8 +59,6 @@ class TagsController < ApplicationController
    ActivityPub::CollectionPresenter.new(
      id: tag_url(@tag),
      type: :ordered,
-      size: @tag.statuses.count,
-      items: @statuses.map { |status| ActivityPub::TagManager.instance.uri_for(status) }
    )
  end
 end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -67,7 +67,7 @@ module ApplicationHelper
  def link_to_login(name = nil, html_options = nil, &block)
    target = new_user_session_path

-    html_options = name if block_given?
+    html_options = name if block

    if omniauth_only? && Devise.mappings[:user].omniauthable? && User.omniauth_providers.size == 1
      target = omniauth_authorize_path(:user, User.omniauth_providers[0])
@ -75,7 +75,7 @@ module ApplicationHelper
      html_options[:method] = :post
    end

-    if block_given?
+    if block
      link_to(target, html_options, &block)
    else
      link_to(name, target, html_options)
--- a/app/helpers/email_helper.rb
+++ b/app/helpers/email_helper.rb
@ -7,7 +7,7 @@ module EmailHelper

  def email_to_canonical_email(str)
    username, domain = str.downcase.split('@', 2)
-    username, = username.gsub('.', '').split('+', 2)
+    username, = username.delete('.').split('+', 2)

    "#{username}@#{domain}"
  end
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@ -213,7 +213,7 @@ module JsonLdHelper
    end
  end

-  def load_jsonld_context(url, _options = {}, &_block)
+  def load_jsonld_context(url, _options = {}, &block)
    json = Rails.cache.fetch("jsonld:context:#{url}", expires_in: 30.days, raw: true) do
      request = Request.new(:get, url)
      request.add_headers('Accept' => 'application/ld+json')
@ -226,6 +226,6 @@ module JsonLdHelper

    doc = JSON::LD::API::RemoteDocument.new(json, documentUrl: url)

-    block_given? ? yield(doc) : doc
+    block ? yield(doc) : doc
  end
 end
--- a/app/javascript/mastodon/components/autosuggest_input.js
+++ b/app/javascript/mastodon/components/autosuggest_input.js
@ -51,6 +51,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {
    searchTokens: PropTypes.arrayOf(PropTypes.string),
    maxLength: PropTypes.number,
    lang: PropTypes.string,
+    spellCheck: PropTypes.string,
  };

  static defaultProps = {
@ -186,7 +187,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {
  };

  render () {
-    const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, className, id, maxLength, lang } = this.props;
+    const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, className, id, maxLength, lang, spellCheck } = this.props;
    const { suggestionsHidden } = this.state;

    return (
@ -212,6 +213,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {
            className={className}
            maxLength={maxLength}
            lang={lang}
+            spellCheck={spellCheck}
          />
        </label>

--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@ -243,6 +243,7 @@ class ComposeForm extends ImmutablePureComponent {
            id='cw-spoiler-input'
            className='spoiler-input__input'
            lang={this.props.lang}
+            spellCheck
          />
        </div>

--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@ -93,6 +93,7 @@ class Option extends React.PureComponent {
            maxLength={100}
            value={title}
            lang={lang}
+            spellCheck
            onChange={this.handleOptionTitleChange}
            suggestions={this.props.suggestions}
            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
--- a/app/javascript/mastodon/features/follow_requests/index.js
+++ b/app/javascript/mastodon/features/follow_requests/index.js
@ -5,7 +5,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { debounce } from 'lodash';
-import LoadingIndicator from '../../components/loading_indicator';
 import Column from '../ui/components/column';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import AccountAuthorizeContainer from './containers/account_authorize_container';
@ -53,16 +52,8 @@ class FollowRequests extends ImmutablePureComponent {
  render () {
    const { intl, accountIds, hasMore, multiColumn, locked, domain, isLoading } = this.props;

-    if (!accountIds) {
-      return (
-        <Column>
-          <LoadingIndicator />
-        </Column>
-      );
-    }
-
    const emptyMessage = <FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />;
-    const unlockedPrependMessage = locked ? null : (
+    const unlockedPrependMessage = !locked && accountIds.size > 0 && (
      <div className='follow_requests-unlocked_explanation'>
        <FormattedMessage
          id='follow_requests.unlocked_explanation'
@ -80,6 +71,7 @@ class FollowRequests extends ImmutablePureComponent {
          onLoadMore={this.handleLoadMore}
          hasMore={hasMore}
          isLoading={isLoading}
+          showLoading={isLoading && accountIds.size === 0}
          emptyMessage={emptyMessage}
          bindToDocument={!multiColumn}
          prepend={unlockedPrependMessage}
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@ -3,7 +3,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
-import { domain, version, source_url, profile_directory as profileDirectory } from 'mastodon/initial_state';
+import { domain, version, source_url, statusPageUrl, profile_directory as profileDirectory } from 'mastodon/initial_state';
 import { logOut } from 'mastodon/utils/log_out';
 import { openModal } from 'mastodon/actions/modal';
 import { PERMISSION_INVITE_USERS } from 'mastodon/permissions';
@ -59,21 +59,27 @@ class LinkFooter extends React.PureComponent {
        <p>
          <strong>{domain}</strong>:
          {' '}
-          <Link key='about' to='/about'><FormattedMessage id='footer.about' defaultMessage='About' /></Link>
+          <Link to='/about'><FormattedMessage id='footer.about' defaultMessage='About' /></Link>
+          {statusPageUrl && (
+            <>
+              {DividingCircle}
+              <a href={statusPageUrl} target='_blank' rel='noopener'><FormattedMessage id='footer.status' defaultMessage='Status' /></a>
+            </>
+          )}
          {canInvite && (
            <>
              {DividingCircle}
-              <a key='invites' href='/invites' target='_blank'><FormattedMessage id='footer.invite' defaultMessage='Invite people' /></a>
+              <a href='/invites' target='_blank'><FormattedMessage id='footer.invite' defaultMessage='Invite people' /></a>
            </>
          )}
          {canProfileDirectory && (
            <>
              {DividingCircle}
-              <Link key='directory' to='/directory'><FormattedMessage id='footer.directory' defaultMessage='Profiles directory' /></Link>
+              <Link to='/directory'><FormattedMessage id='footer.directory' defaultMessage='Profiles directory' /></Link>
            </>
          )}
          {DividingCircle}
-          <Link key='privacy-policy' to='/privacy-policy'><FormattedMessage id='footer.privacy_policy' defaultMessage='Privacy policy' /></Link>
+          <Link to='/privacy-policy'><FormattedMessage id='footer.privacy_policy' defaultMessage='Privacy policy' /></Link>
        </p>

        <p>
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@ -134,6 +134,7 @@ export const usePendingItems = getMeta('use_pending_items');
 export const version = getMeta('version');
 export const translationEnabled = getMeta('translation_enabled');
 export const languages = initialState?.languages;
+export const statusPageUrl = getMeta('status_page_url');

 // Glitch-soc-specific settings
 export const maxChars = (initialState && initialState.max_toot_chars) || 500;
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Kortpadsleutels",
  "footer.privacy_policy": "Privaatheidsbeleid",
  "footer.source_code": "Wys bronkode",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Kom aan die gang",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Alcorces de teclau",
  "footer.privacy_policy": "Politica de privacidat",
  "footer.source_code": "Veyer codigo fuent",
+  "footer.status": "Status",
  "generic.saved": "Alzau",
  "getting_started.heading": "Primers pasos",
  "hashtag.column_header.tag_mode.all": "y {additional}",
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "اختصارات لوحة المفاتيح",
  "footer.privacy_policy": "سياسة الخصوصية",
  "footer.source_code": "الاطلاع على الشفرة المصدرية",
+  "footer.status": "Status",
  "generic.saved": "تم الحفظ",
  "getting_started.heading": "استعدّ للبدء",
  "hashtag.column_header.tag_mode.all": "و {additional}",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Atayos del tecláu",
  "footer.privacy_policy": "Política de privacidá",
  "footer.source_code": "Ver el códigu fonte",
+  "footer.status": "Status",
  "generic.saved": "Guardóse",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "y {additional}",
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Спалучэнні клавіш",
  "footer.privacy_policy": "Палітыка прыватнасці",
  "footer.source_code": "Прагледзець зыходны код",
+  "footer.status": "Статус",
  "generic.saved": "Захавана",
  "getting_started.heading": "Пачатак працы",
  "hashtag.column_header.tag_mode.all": "і {additional}",
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Клавишни комбинации",
  "footer.privacy_policy": "Политика за поверителност",
  "footer.source_code": "Преглед на изходния код",
+  "footer.status": "Status",
  "generic.saved": "Запазено",
  "getting_started.heading": "Първи стъпки",
  "hashtag.column_header.tag_mode.all": "и {additional}",
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "সংরক্ষণ হয়েছে",
  "getting_started.heading": "শুরু করা",
  "hashtag.column_header.tag_mode.all": "এবং {additional}",
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Berradennoù klavier",
  "footer.privacy_policy": "Reolennoù prevezded",
  "footer.source_code": "Gwelet kod mammenn",
+  "footer.status": "Status",
  "generic.saved": "Enrollet",
  "getting_started.heading": "Loc'hañ",
  "hashtag.column_header.tag_mode.all": "ha {additional}",
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Dreceres de teclat",
  "footer.privacy_policy": "Política de privadesa",
  "footer.source_code": "Mostra el codi font",
+  "footer.status": "Estat",
  "generic.saved": "Desat",
  "getting_started.heading": "Primeres passes",
  "hashtag.column_header.tag_mode.all": "i {additional}",
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "پاشکەوتکرا",
  "getting_started.heading": "دەست پێکردن",
  "hashtag.column_header.tag_mode.all": "و {additional}",
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Salvatu",
  "getting_started.heading": "Per principià",
  "hashtag.column_header.tag_mode.all": "è {additional}",
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Klávesové zkratky",
  "footer.privacy_policy": "Zásady ochrany osobních údajů",
  "footer.source_code": "Zobrazit zdrojový kód",
+  "footer.status": "Stav",
  "generic.saved": "Uloženo",
  "getting_started.heading": "Začínáme",
  "hashtag.column_header.tag_mode.all": "a {additional}",
--- a/app/javascript/mastodon/locales/csb.json
+++ b/app/javascript/mastodon/locales/csb.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Bysellau brys",
  "footer.privacy_policy": "Polisi preifatrwydd",
  "footer.source_code": "Gweld y cod ffynhonnell",
+  "footer.status": "Status",
  "generic.saved": "Wedi'i Gadw",
  "getting_started.heading": "Dechrau",
  "hashtag.column_header.tag_mode.all": "a {additional}",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Tastaturgenveje",
  "footer.privacy_policy": "Fortrolighedspolitik",
  "footer.source_code": "Vis kildekode",
+  "footer.status": "Status",
  "generic.saved": "Gemt",
  "getting_started.heading": "Startmenu",
  "hashtag.column_header.tag_mode.all": "og {additional}",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -247,7 +247,7 @@
  "filter_modal.added.expired_explanation": "Diese Filterkategorie ist abgelaufen. Du musst das Ablaufdatum für diese Kategorie ändern.",
  "filter_modal.added.expired_title": "Abgelaufener Filter!",
  "filter_modal.added.review_and_configure": "Um diesen Filter zu überprüfen oder noch weiter zu konfigurieren, rufe die {settings_link} auf.",
-  "filter_modal.added.review_and_configure_title": "Filtereinstellungen",
+  "filter_modal.added.review_and_configure_title": "Filter-Einstellungen",
  "filter_modal.added.settings_link": "Einstellungen",
  "filter_modal.added.short_explanation": "Dieser Post wurde folgender Filterkategorie hinzugefügt: {title}.",
  "filter_modal.added.title": "Filter hinzugefügt!",
@ -260,7 +260,7 @@
  "filter_modal.title.status": "Beitrag per Filter ausblenden",
  "follow_recommendations.done": "Fertig",
  "follow_recommendations.heading": "Folge Leuten, deren Beiträge du sehen möchtest! Hier sind einige Vorschläge.",
-  "follow_recommendations.lead": "Beiträge von Personen, denen du folgst, werden in chronologischer Reihenfolge auf deiner Startseite angezeigt. Hab keine Angst, Fehler zu machen, du kannst den Leuten jederzeit wieder entfolgen!",
+  "follow_recommendations.lead": "Beiträge von Profilen, denen du folgst, werden in chronologischer Reihenfolge auf deiner Startseite angezeigt. Sei unbesorgt, mal Fehler zu begehen. Du kannst diesen Konten ganz einfach und jederzeit wieder entfolgen.",
  "follow_request.authorize": "Genehmigen",
  "follow_request.reject": "Ablehnen",
  "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Tastenkombinationen",
  "footer.privacy_policy": "Datenschutzerklärung",
  "footer.source_code": "Quellcode anzeigen",
+  "footer.status": "Status",
  "generic.saved": "Gespeichert",
  "getting_started.heading": "Auf geht's!",
  "hashtag.column_header.tag_mode.all": "und {additional}",
@ -279,10 +280,10 @@
  "hashtag.column_header.tag_mode.none": "ohne {additional}",
  "hashtag.column_settings.select.no_options_message": "Keine Vorschläge gefunden",
  "hashtag.column_settings.select.placeholder": "Hashtags eingeben …",
-  "hashtag.column_settings.tag_mode.all": "All diese",
+  "hashtag.column_settings.tag_mode.all": "Alle",
  "hashtag.column_settings.tag_mode.any": "Eines von diesen",
  "hashtag.column_settings.tag_mode.none": "Keines von diesen",
-  "hashtag.column_settings.tag_toggle": "Zusätzliche Hashtags für diese Spalte einfügen",
+  "hashtag.column_settings.tag_toggle": "Zusätzliche Hashtags dieser Spalte hinzufügen",
  "hashtag.follow": "Hashtag folgen",
  "hashtag.unfollow": "Hashtag entfolgen",
  "home.column_settings.basic": "Einfach",
@ -308,7 +309,7 @@
  "keyboard_shortcuts.back": "zurücknavigieren",
  "keyboard_shortcuts.blocked": "Liste gesperrter Profile öffnen",
  "keyboard_shortcuts.boost": "Beitrag teilen",
-  "keyboard_shortcuts.column": "Spalte fokussieren",
+  "keyboard_shortcuts.column": "Auf die aktuelle Spalte fokussieren",
  "keyboard_shortcuts.compose": "Eingabefeld fokussieren",
  "keyboard_shortcuts.description": "Beschreibung",
  "keyboard_shortcuts.direct": "Direktnachrichten öffnen",
@ -340,8 +341,8 @@
  "keyboard_shortcuts.unfocus": "Eingabefeld/Suche nicht mehr fokussieren",
  "keyboard_shortcuts.up": "sich in der Liste hinaufbewegen",
  "lightbox.close": "Schließen",
-  "lightbox.compress": "Bildansicht komprimieren",
-  "lightbox.expand": "Bildansicht erweitern",
+  "lightbox.compress": "Bildansicht verkleinern",
+  "lightbox.expand": "Bildansicht vergrößern",
  "lightbox.next": "Vor",
  "lightbox.previous": "Zurück",
  "limited_account_hint.action": "Profil trotzdem anzeigen",
@ -377,7 +378,7 @@
  "navigation_bar.discover": "Entdecken",
  "navigation_bar.domain_blocks": "Gesperrte Domains",
  "navigation_bar.edit_profile": "Profil bearbeiten",
-  "navigation_bar.explore": "Entdecken",
+  "navigation_bar.explore": "Erforschen",
  "navigation_bar.favourites": "Favoriten",
  "navigation_bar.filters": "Stummgeschaltete Wörter",
  "navigation_bar.follow_requests": "Follower-Anfragen",
@ -393,7 +394,7 @@
  "navigation_bar.search": "Suche",
  "navigation_bar.security": "Sicherheit",
  "not_signed_in_indicator.not_signed_in": "Du musst dich anmelden, um auf diesen Inhalt zugreifen zu können.",
-  "notification.admin.report": "{target} wurde von {name} gemeldet",
+  "notification.admin.report": "{name} meldete {target}",
  "notification.admin.sign_up": "{name} registrierte sich",
  "notification.favourite": "{name} hat deinen Beitrag favorisiert",
  "notification.follow": "{name} folgt dir jetzt",
@ -451,7 +452,7 @@
  "poll.votes": "{votes, plural, one {# Stimme} other {# Stimmen}}",
  "poll_button.add_poll": "Umfrage erstellen",
  "poll_button.remove_poll": "Umfrage entfernen",
-  "privacy.change": "Sichtbarkeit des Beitrags anpassen",
+  "privacy.change": "Sichtbarkeit anpassen",
  "privacy.direct.long": "Nur für die genannten Profile sichtbar",
  "privacy.direct.short": "Nur erwähnte Profile",
  "privacy.private.long": "Nur für deine Follower sichtbar",
@ -465,16 +466,16 @@
  "refresh": "Aktualisieren",
  "regeneration_indicator.label": "Wird geladen …",
  "regeneration_indicator.sublabel": "Deine Startseite wird gerade vorbereitet!",
-  "relative_time.days": "{number}T",
+  "relative_time.days": "{number} T.",
  "relative_time.full.days": "vor {number, plural, one {# Tag} other {# Tagen}}",
  "relative_time.full.hours": "vor {number, plural, one {# Stunde} other {# Stunden}}",
  "relative_time.full.just_now": "soeben",
  "relative_time.full.minutes": "vor {number, plural, one {# Minute} other {# Minuten}}",
  "relative_time.full.seconds": "vor {number, plural, one {1 Sekunde} other {# Sekunden}}",
-  "relative_time.hours": "{number} Std",
+  "relative_time.hours": "{number} Std.",
  "relative_time.just_now": "jetzt",
-  "relative_time.minutes": "{number} min",
-  "relative_time.seconds": "{number} sek",
+  "relative_time.minutes": "{number} Min.",
+  "relative_time.seconds": "{number} Sek.",
  "relative_time.today": "heute",
  "reply_indicator.cancel": "Abbrechen",
  "report.block": "Sperren",
@ -530,7 +531,7 @@
  "search_results.accounts": "Profile",
  "search_results.all": "Alles",
  "search_results.hashtags": "Hashtags",
-  "search_results.nothing_found": "Nichts für diese Suchbegriffe gefunden",
+  "search_results.nothing_found": "Nichts zu diesen Suchbegriffen gefunden",
  "search_results.statuses": "Beiträge",
  "search_results.statuses_fts_disabled": "Die Suche nach Beitragsinhalten ist auf diesem Mastodon-Server deaktiviert.",
  "search_results.title": "Suchergebnisse für {q}",
@ -544,9 +545,9 @@
  "sign_in_banner.create_account": "Konto erstellen",
  "sign_in_banner.sign_in": "Anmelden",
  "sign_in_banner.text": "Melde dich an, um Profilen oder Hashtags zu folgen, Beiträge zu favorisieren, zu teilen und auf sie zu antworten. Du kannst auch von deinem Konto aus auf einem anderen Server interagieren.",
-  "status.admin_account": "Moderationsoberfläche für @{name} öffnen",
-  "status.admin_domain": "Moderationsoberfläche für {domain} öffnen",
-  "status.admin_status": "Diesen Beitrag in der Moderationsoberfläche öffnen",
+  "status.admin_account": "@{name} moderieren",
+  "status.admin_domain": "{domain} moderieren",
+  "status.admin_status": "Beitrag moderieren",
  "status.block": "@{name} blockieren",
  "status.bookmark": "Beitrag als Lesezeichen setzen",
  "status.cancel_reblog_private": "Teilen des Beitrags rückgängig machen",
@ -595,7 +596,7 @@
  "status.show_original": "Ursprünglichen Beitrag anzeigen",
  "status.translate": "Übersetzen",
  "status.translated_from_with": "Aus {lang} mittels {provider} übersetzt",
-  "status.uncached_media_warning": "Nicht verfügbar",
+  "status.uncached_media_warning": "Medien-Datei auf diesem Server noch nicht verfügbar",
  "status.unmute_conversation": "Stummschaltung der Unterhaltung aufheben",
  "status.unpin": "Vom Profil lösen",
  "subscribed_languages.lead": "Nach der Änderung werden nur noch Beiträge in den ausgewählten Sprachen in den Timelines deiner Startseite und deiner Listen angezeigt. Wähle keine Sprache aus, um alle Beiträge zu sehen.",
@ -646,7 +647,7 @@
  "upload_progress.label": "Wird hochgeladen …",
  "upload_progress.processing": "Wird verarbeitet…",
  "video.close": "Video schließen",
-  "video.download": "Datei herunterladen",
+  "video.download": "Video-Datei herunterladen",
  "video.exit_fullscreen": "Vollbild verlassen",
  "video.expand": "Video vergrößern",
  "video.fullscreen": "Vollbild",
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -4075,6 +4075,10 @@
        "defaultMessage": "About",
        "id": "footer.about"
      },
+      {
+        "defaultMessage": "Status",
+        "id": "footer.status"
+      },
      {
        "defaultMessage": "Invite people",
        "id": "footer.invite"
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Συντομεύσεις πληκτρολογίου",
  "footer.privacy_policy": "Πολιτική απορρήτου",
  "footer.source_code": "Προβολή πηγαίου κώδικα",
+  "footer.status": "Κατάσταση",
  "generic.saved": "Αποθηκεύτηκε",
  "getting_started.heading": "Αφετηρία",
  "hashtag.column_header.tag_mode.all": "και {additional}",
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -276,6 +276,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -3,7 +3,7 @@
  "about.contact": "Kontakto:",
  "about.disclaimer": "Mastodon estas libera, malfermitkoda programo kaj varmarko de la firmao Mastodon gGmbH.",
  "about.domain_blocks.no_reason_available": "Kialo ne disponebla",
-  "about.domain_blocks.preamble": "Mastodono ebligas vidi la enhavojn de uzantoj el aliaj serviloj en la Fediverso, kaj komuniki kun ili. Jen la limigoj deciditaj de tiu ĉi servilo mem.",
+  "about.domain_blocks.preamble": "Mastodon ĝenerale rajtigas vidi la enhavojn de uzantoj el aliaj serviloj en la fediverso, kaj komuniki kun ili. Jen la limigoj deciditaj de tiu ĉi servilo mem.",
  "about.domain_blocks.silenced.explanation": "Vi ne ĝenerale vidos profilojn kaj enhavojn de ĉi tiu servilo, krom se vi eksplice trovas aŭ estas permesita de via sekvato.",
  "about.domain_blocks.silenced.title": "Limigita",
  "about.domain_blocks.suspended.explanation": "Neniuj datumoj el tiu servilo estos prilaboritaj, konservitaj, aŭ interŝanĝitaj, do neeblas interagi aŭ komuniki kun uzantoj de tiu servilo.",
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Fulmoklavoj",
  "footer.privacy_policy": "Politiko de privateco",
  "footer.source_code": "Montri fontkodon",
+  "footer.status": "Stato",
  "generic.saved": "Konservita",
  "getting_started.heading": "Por komenci",
  "hashtag.column_header.tag_mode.all": "kaj {additional}",
@ -460,7 +461,7 @@
  "privacy.public.short": "Publika",
  "privacy.unlisted.long": "Videbla por ĉiuj, sed ekskluzive el la funkcio de esploro",
  "privacy.unlisted.short": "Nelistigita",
-  "privacy_policy.last_updated": "Laste ĝisdatigita sur {date}",
+  "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
  "privacy_policy.title": "Politiko de privateco",
  "refresh": "Refreŝigu",
  "regeneration_indicator.label": "Ŝargado…",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Atajos de teclado",
  "footer.privacy_policy": "Política de privacidad",
  "footer.source_code": "Ver código fuente",
+  "footer.status": "Estado",
  "generic.saved": "Guardado",
  "getting_started.heading": "Inicio de Mastodon",
  "hashtag.column_header.tag_mode.all": "y {additional}",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Atajos de teclado",
  "footer.privacy_policy": "Política de privacidad",
  "footer.source_code": "Ver código fuente",
+  "footer.status": "Status",
  "generic.saved": "Guardado",
  "getting_started.heading": "Primeros pasos",
  "hashtag.column_header.tag_mode.all": "y {additional}",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Atajos de teclado",
  "footer.privacy_policy": "Política de privacidad",
  "footer.source_code": "Ver código fuente",
+  "footer.status": "Estado",
  "generic.saved": "Guardado",
  "getting_started.heading": "Primeros pasos",
  "hashtag.column_header.tag_mode.all": "y {additional}",
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Kiirklahvid",
  "footer.privacy_policy": "Isikuandmete kaitse",
  "footer.source_code": "Lähtekood",
+  "footer.status": "Olek",
  "generic.saved": "Salvestatud",
  "getting_started.heading": "Alustamine",
  "hashtag.column_header.tag_mode.all": "ja {additional}",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Lasterbideak",
  "footer.privacy_policy": "Pribatutasun politika",
  "footer.source_code": "Ikusi iturburu kodea",
+  "footer.status": "Egoera",
  "generic.saved": "Gordea",
  "getting_started.heading": "Menua",
  "hashtag.column_header.tag_mode.all": "eta {osagarria}",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "میان‌برهای صفحه‌کلید",
  "footer.privacy_policy": "سیاست محرمانگی",
  "footer.source_code": "نمایش کد مبدأ",
+  "footer.status": "Status",
  "generic.saved": "ذخیره شده",
  "getting_started.heading": "آغاز کنید",
  "hashtag.column_header.tag_mode.all": "و {additional}",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Pikanäppäimet",
  "footer.privacy_policy": "Tietosuojakäytäntö",
  "footer.source_code": "Näytä lähdekoodi",
+  "footer.status": "Tila",
  "generic.saved": "Tallennettu",
  "getting_started.heading": "Näin pääset alkuun",
  "hashtag.column_header.tag_mode.all": "ja {additional}",
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Knappasnarvegir",
  "footer.privacy_policy": "Privatlívspolitikkur",
  "footer.source_code": "Vís keldukotuna",
+  "footer.status": "Støða",
  "generic.saved": "Goymt",
  "getting_started.heading": "At byrja",
  "hashtag.column_header.tag_mode.all": "og {additional}",
--- a/app/javascript/mastodon/locales/fr-QC.json
+++ b/app/javascript/mastodon/locales/fr-QC.json
@ -128,7 +128,7 @@
  "compose.language.search": "Rechercher des langues…",
  "compose_form.direct_message_warning_learn_more": "En savoir plus",
  "compose_form.encryption_warning": "Les publications sur Mastodon ne sont pas chiffrées de bout en bout. Veuillez ne partager aucune information sensible sur Mastodon.",
-  "compose_form.hashtag_warning": "Ce message n'apparaîtra pas dans les listes de hashtags, car il n'est pas public. Seuls les messages publics peuvent appaître dans les recherches par hashtags.",
+  "compose_form.hashtag_warning": "Ce message n'apparaîtra pas dans les listes de hashtags, car il n'est pas public. Seuls les messages publics peuvent apparaître dans les recherches par hashtags.",
  "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos publications privés.",
  "compose_form.lock_disclaimer.lock": "verrouillé",
  "compose_form.placeholder": "À quoi pensez-vous?",
@ -221,7 +221,7 @@
  "empty_column.favourites": "Personne n’a encore ajouté cette publication à ses favoris. Lorsque quelqu’un le fera, elle apparaîtra ici.",
  "empty_column.follow_recommendations": "Il semble qu’aucune suggestion n’ait pu être générée pour vous. Vous pouvez essayer d’utiliser la recherche pour découvrir des personnes que vous pourriez connaître ou explorer les hashtags populaires.",
  "empty_column.follow_requests": "Vous n’avez pas encore de demande d'abonnement. Lorsque vous en recevrez une, elle apparaîtra ici.",
-  "empty_column.followed_tags": "You have not followed any hashtags yet. When you do, they will show up here.",
+  "empty_column.followed_tags": "Vous n'avez pas encore suivi d'hashtags. Lorsque vous le ferez, ils apparaîtront ici.",
  "empty_column.hashtag": "Il n’y a pas encore de contenu associé à ce hashtag.",
  "empty_column.home": "Votre fil d'accueil est vide! Suivez plus de personnes pour la remplir. {suggestions}",
  "empty_column.home.suggestions": "Voir quelques suggestions",
@ -264,7 +264,7 @@
  "follow_request.authorize": "Autoriser",
  "follow_request.reject": "Rejeter",
  "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir peut-être consulter manuellement les demandes d'abonnement de ces comptes.",
-  "followed_tags": "Followed hashtags",
+  "followed_tags": "Hashtags suivis",
  "footer.about": "À propos",
  "footer.directory": "Annuaire des profils",
  "footer.get_app": "Télécharger l’application",
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Raccourcis clavier",
  "footer.privacy_policy": "Politique de confidentialité",
  "footer.source_code": "Voir le code source",
+  "footer.status": "Status",
  "generic.saved": "Sauvegardé",
  "getting_started.heading": "Pour commencer",
  "hashtag.column_header.tag_mode.all": "et {additional}",
@ -381,7 +382,7 @@
  "navigation_bar.favourites": "Favoris",
  "navigation_bar.filters": "Mots masqués",
  "navigation_bar.follow_requests": "Demandes d'abonnements",
-  "navigation_bar.followed_tags": "Followed hashtags",
+  "navigation_bar.followed_tags": "Hashtags suivis",
  "navigation_bar.follows_and_followers": "Abonnements et abonnés",
  "navigation_bar.lists": "Listes",
  "navigation_bar.logout": "Se déconnecter",
@ -543,7 +544,7 @@
  "server_banner.server_stats": "Statistiques du serveur:",
  "sign_in_banner.create_account": "Créer un compte",
  "sign_in_banner.sign_in": "Se connecter",
-  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.",
+  "sign_in_banner.text": "Identifiez-vous pour suivre des profils ou des hashtags, ajouter des favoris, partager et répondre à des messages. Vous pouvez également interagir depuis votre compte sur un autre serveur.",
  "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
  "status.admin_domain": "Ouvrir l’interface de modération pour {domain}",
  "status.admin_status": "Ouvrir ce message dans l’interface de modération",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -6,7 +6,7 @@
  "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateur⋅rice⋅s de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.",
  "about.domain_blocks.silenced.explanation": "Vous ne verrez généralement pas les profils et le contenu de ce serveur, à moins que vous ne les recherchiez explicitement ou que vous ne choisissiez de les suivre.",
  "about.domain_blocks.silenced.title": "Limité",
-  "about.domain_blocks.suspended.explanation": "Aucune donnée de ce serveur ne sera traitée, enregistrée ou échangée, rendant impossible toute interaction ou communication avec les utilisateurs de ce serveur.",
+  "about.domain_blocks.suspended.explanation": "Aucune donnée de ce serveur ne sera traitée, enregistrée ou échangée, rendant impossible toute interaction ou communication avec les comptes de ce serveur.",
  "about.domain_blocks.suspended.title": "Suspendu",
  "about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
  "about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
@ -45,7 +45,7 @@
  "account.locked_info": "Ce compte est privé. Son ou sa propriétaire approuve manuellement qui peut le suivre.",
  "account.media": "Médias",
  "account.mention": "Mentionner @{name}",
-  "account.moved_to": "{name} a indiqué que son nouveau compte est maintenant  :",
+  "account.moved_to": "{name} a indiqué que son nouveau compte est maintenant :",
  "account.mute": "Masquer @{name}",
  "account.mute_notifications": "Masquer les notifications de @{name}",
  "account.muted": "Masqué·e",
@ -71,7 +71,7 @@
  "admin.dashboard.monthly_retention": "Taux de rétention des utilisateur·rice·s par mois après inscription",
  "admin.dashboard.retention.average": "Moyenne",
  "admin.dashboard.retention.cohort": "Mois d'inscription",
-  "admin.dashboard.retention.cohort_size": "Nouveaux utilisateurs",
+  "admin.dashboard.retention.cohort_size": "Nouveaux comptes",
  "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.",
  "alert.rate_limited.title": "Nombre de requêtes limité",
  "alert.unexpected.message": "Une erreur inattendue s’est produite.",
@ -96,7 +96,7 @@
  "closed_registrations.other_server_instructions": "Puisque Mastodon est décentralisé, vous pouvez créer un compte sur un autre serveur et interagir quand même avec celui-ci.",
  "closed_registrations_modal.description": "Créer un compte sur {domain} est actuellement impossible, néanmoins souvenez-vous que vous n'avez pas besoin d'un compte spécifiquement sur {domain} pour utiliser Mastodon.",
  "closed_registrations_modal.find_another_server": "Trouver un autre serveur",
-  "closed_registrations_modal.preamble": "Mastodon est décentralisé : peu importe où vous créez votre votre, vous serez en mesure de suivre et d'interagir avec quiconque sur ce serveur. Vous pouvez même l'héberger !",
+  "closed_registrations_modal.preamble": "Mastodon est décentralisé : peu importe où vous créez votre compte, vous serez en mesure de suivre et d'interagir avec quiconque sur ce serveur. Vous pouvez même l'héberger !",
  "closed_registrations_modal.title": "Inscription sur Mastodon",
  "column.about": "À propos",
  "column.blocks": "Comptes bloqués",
@ -128,8 +128,8 @@
  "compose.language.search": "Rechercher des langues …",
  "compose_form.direct_message_warning_learn_more": "En savoir plus",
  "compose_form.encryption_warning": "Les messages sur Mastodon ne sont pas chiffrés de bout en bout. Ne partagez aucune information sensible sur Mastodon.",
-  "compose_form.hashtag_warning": "Ce message n'apparaîtra pas dans les listes de hashtags, car il n'est pas public. Seuls les messages publics peuvent appaître dans les recherches par hashtags.",
-  "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos messages privés.",
+  "compose_form.hashtag_warning": "Ce message n'apparaîtra pas dans les listes de hashtags, car il n'est pas public. Seuls les messages publics peuvent apparaître dans les recherches par hashtags.",
+  "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre pour voir vos messages réservés à vos abonné⋅e⋅s.",
  "compose_form.lock_disclaimer.lock": "verrouillé",
  "compose_form.placeholder": "Qu’avez-vous en tête ?",
  "compose_form.poll.add_option": "Ajouter un choix",
@ -185,12 +185,12 @@
  "directory.recently_active": "Actif·ve·s récemment",
  "disabled_account_banner.account_settings": "Paramètres du compte",
  "disabled_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé.",
-  "dismissable_banner.community_timeline": "Voici les messages publics les plus récents des personnes dont les comptes sont hébergés par {domain}.",
+  "dismissable_banner.community_timeline": "Voici les messages publics les plus récents des comptes hébergés par {domain}.",
  "dismissable_banner.dismiss": "Rejeter",
  "dismissable_banner.explore_links": "On parle actuellement de ces nouvelles sur ce serveur, ainsi que sur d'autres serveurs du réseau décentralisé.",
  "dismissable_banner.explore_statuses": "Ces publications depuis les serveurs du réseau décentralisé, dont celui-ci, sont actuellement en train de gagner de l'ampleur sur ce serveur.",
  "dismissable_banner.explore_tags": "Ces hashtags sont actuellement en train de gagner de l'ampleur parmi les personnes sur les serveurs du réseau décentralisé dont celui-ci.",
-  "dismissable_banner.public_timeline": "Voici les publications publiques les plus récentes des personnes de ce serveur et des autres du réseau décentralisé que ce serveur connait.",
+  "dismissable_banner.public_timeline": "Voici les messages publics les plus récents des personnes de cette instance et des autres instances du réseau décentralisé connues par ce serveur.",
  "embed.instructions": "Intégrez ce message à votre site en copiant le code ci-dessous.",
  "embed.preview": "Il apparaîtra comme cela :",
  "emoji_button.activity": "Activités",
@ -246,7 +246,7 @@
  "filter_modal.added.context_mismatch_title": "Incompatibilité du contexte !",
  "filter_modal.added.expired_explanation": "Cette catégorie de filtre a expiré, vous devrez modifier la date d'expiration pour qu'elle soit appliquée.",
  "filter_modal.added.expired_title": "Filtre expiré !",
-  "filter_modal.added.review_and_configure": "Pour passer en revue et approfondir la configuration de cette catégorie de filtre, aller sur le {settings_link}.",
+  "filter_modal.added.review_and_configure": "Pour examiner et affiner la configuration de cette catégorie de filtre, allez à {settings_link}.",
  "filter_modal.added.review_and_configure_title": "Paramètres du filtre",
  "filter_modal.added.settings_link": "page des paramètres",
  "filter_modal.added.short_explanation": "Ce message a été ajouté à la catégorie de filtre suivante : {title}.",
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Raccourcis clavier",
  "footer.privacy_policy": "Politique de confidentialité",
  "footer.source_code": "Voir le code source",
+  "footer.status": "État",
  "generic.saved": "Sauvegardé",
  "getting_started.heading": "Pour commencer",
  "hashtag.column_header.tag_mode.all": "et {additional}",
@ -290,17 +291,17 @@
  "home.column_settings.show_replies": "Afficher les réponses",
  "home.hide_announcements": "Masquer les annonces",
  "home.show_announcements": "Afficher les annonces",
-  "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter ce post aux favoris pour informer l'auteur que vous l'appréciez et le sauvegarder pour plus tard.",
+  "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter ce message à vos favoris pour informer l'auteur⋅rice que vous l'appréciez et pour le sauvegarder pour plus tard.",
  "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs posts dans votre fil d'actualité.",
-  "interaction_modal.description.reblog": "Avec un compte sur Mastodon, vous pouvez booster ce message pour le partager avec vos propres abonnés.",
+  "interaction_modal.description.reblog": "Avec un compte sur Mastodon, vous pouvez partager ce message pour le faire découvrir à vos propres abonné⋅e⋅s.",
  "interaction_modal.description.reply": "Avec un compte sur Mastodon, vous pouvez répondre à ce message.",
  "interaction_modal.on_another_server": "Sur un autre serveur",
  "interaction_modal.on_this_server": "Sur ce serveur",
-  "interaction_modal.other_server_instructions": "Copiez et collez cette URL dans le champ de recherche de votre application Mastodon préférée ou l'interface web de votre serveur Mastodon.",
+  "interaction_modal.other_server_instructions": "Copiez et collez cette URL dans le champ de recherche de votre application Mastodon préférée ou de l'interface web de votre serveur Mastodon.",
  "interaction_modal.preamble": "Puisque Mastodon est décentralisé, vous pouvez utiliser votre compte existant hébergé par un autre serveur Mastodon ou une plateforme compatible si vous n'avez pas de compte sur celui-ci.",
-  "interaction_modal.title.favourite": "Ajouter de post de {name} aux favoris",
+  "interaction_modal.title.favourite": "Ajouter le message de {name} aux favoris",
  "interaction_modal.title.follow": "Suivre {name}",
-  "interaction_modal.title.reblog": "Partager la publication de {name}",
+  "interaction_modal.title.reblog": "Partager le message de {name}",
  "interaction_modal.title.reply": "Répondre au message de {name}",
  "intervals.full.days": "{number, plural, one {# jour} other {# jours}}",
  "intervals.full.hours": "{number, plural, one {# heure} other {# heures}}",
@ -364,7 +365,7 @@
  "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
  "missing_indicator.label": "Non trouvé",
  "missing_indicator.sublabel": "Ressource introuvable",
-  "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déplacé vers {movedToAccount}.",
+  "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.",
  "mute_modal.duration": "Durée",
  "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
  "mute_modal.indefinite": "Indéfinie",
@ -395,7 +396,7 @@
  "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",
  "notification.admin.report": "{name} a signalé {target}",
  "notification.admin.sign_up": "{name} s'est inscrit",
-  "notification.favourite": "{name} a aimé votre publication",
+  "notification.favourite": "{name} a ajouté votre message à ses favoris",
  "notification.follow": "{name} vous suit",
  "notification.follow_request": "{name} a demandé à vous suivre",
  "notification.mention": "{name} vous a mentionné·e :",
@ -522,10 +523,10 @@
  "search.placeholder": "Rechercher",
  "search.search_or_paste": "Rechercher ou saisir une URL",
  "search_popout.search_format": "Recherche avancée",
-  "search_popout.tips.full_text": "Un texte normal retourne les messages que vous avez écrits, ajoutés à vos favoris, partagés, ou vous mentionnant, ainsi que les identifiants, les noms affichés, et les hashtags des personnes et messages correspondants.",
+  "search_popout.tips.full_text": "Faire une recherche textuelle retrouve les messages que vous avez écrits, ajoutés à vos favoris, partagés, ou vous mentionnant, ainsi que les identifiants, les noms affichés, et les hashtags des personnes et messages correspondants.",
  "search_popout.tips.hashtag": "hashtag",
  "search_popout.tips.status": "message",
-  "search_popout.tips.text": "Un texte simple renvoie les noms affichés, les identifiants et les hashtags correspondants",
+  "search_popout.tips.text": "Faire une recherche textuelle retrouve les noms affichés, les identifiants et les hashtags correspondants",
  "search_popout.tips.user": "utilisateur",
  "search_results.accounts": "Comptes",
  "search_results.all": "Tous les résultats",
@ -562,7 +563,7 @@
  "status.favourite": "Ajouter aux favoris",
  "status.filter": "Filtrer ce message",
  "status.filtered": "Filtré",
-  "status.hide": "Masquer la publication",
+  "status.hide": "Masquer le message",
  "status.history.created": "créé par {name} {date}",
  "status.history.edited": "édité par {name} {date}",
  "status.load_more": "Charger plus",
@ -615,7 +616,7 @@
  "timeline_hint.remote_resource_not_displayed": "{resource} des autres serveurs ne sont pas affichés.",
  "timeline_hint.resources.followers": "Les abonnés",
  "timeline_hint.resources.follows": "Les abonnements",
-  "timeline_hint.resources.statuses": "Les messages plus anciens",
+  "timeline_hint.resources.statuses": "Messages plus anciens",
  "trends.counter_by_accounts": "{count, plural, one {{counter} personne} other {{counter} personnes}} au cours {days, plural, one {des dernières 24h} other {des {days} derniers jours}}",
  "trends.trending_now": "Tendance en ce moment",
  "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
@ -627,7 +628,7 @@
  "upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
  "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
  "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
-  "upload_form.description": "Décrire pour les malvoyants",
+  "upload_form.description": "Décrire pour les malvoyant·e·s",
  "upload_form.description_missing": "Description manquante",
  "upload_form.edit": "Modifier",
  "upload_form.thumbnail": "Changer la vignette",
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Fluchtoetsen",
  "footer.privacy_policy": "Privacybelied",
  "footer.source_code": "Boarnekoade besjen",
+  "footer.status": "Steat",
  "generic.saved": "Bewarre",
  "getting_started.heading": "Uteinsette",
  "hashtag.column_header.tag_mode.all": "en {additional}",
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Aicearraí méarchláir",
  "footer.privacy_policy": "Polasaí príobháideachais",
  "footer.source_code": "Féach ar an gcód foinseach",
+  "footer.status": "Status",
  "generic.saved": "Sábháilte",
  "getting_started.heading": "Ag tosú amach",
  "hashtag.column_header.tag_mode.all": "agus {additional}",
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Ath-ghoiridean a’ mheur-chlàir",
  "footer.privacy_policy": "Poileasaidh prìobhaideachd",
  "footer.source_code": "Seall am bun-tùs",
+  "footer.status": "Status",
  "generic.saved": "Chaidh a shàbhaladh",
  "getting_started.heading": "Toiseach",
  "hashtag.column_header.tag_mode.all": "agus {additional}",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Atallos do teclado",
  "footer.privacy_policy": "Política de privacidade",
  "footer.source_code": "Ver código fonte",
+  "footer.status": "Estado",
  "generic.saved": "Gardado",
  "getting_started.heading": "Primeiros pasos",
  "hashtag.column_header.tag_mode.all": "e {additional}",
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "קיצורי מקלדת",
  "footer.privacy_policy": "מדיניות פרטיות",
  "footer.source_code": "צפיה בקוד המקור",
+  "footer.status": "מצב",
  "generic.saved": "נשמר",
  "getting_started.heading": "בואו נתחיל",
  "hashtag.column_header.tag_mode.all": "ו- {additional}",
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "कीबोर्ड शॉर्टकट",
  "footer.privacy_policy": "प्राइवेसी पालिसी",
  "footer.source_code": "सोर्स कोड देखें",
+  "footer.status": "Status",
  "generic.saved": "सेव्ड",
  "getting_started.heading": "पहले कदम रखें",
  "hashtag.column_header.tag_mode.all": "और {additional}",
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Tipkovni prečaci",
  "footer.privacy_policy": "Pravila o zaštiti privatnosti",
  "footer.source_code": "Prikaz izvornog koda",
+  "footer.status": "Status",
  "generic.saved": "Spremljeno",
  "getting_started.heading": "Počnimo",
  "hashtag.column_header.tag_mode.all": "i {additional}",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Billentyűparancsok",
  "footer.privacy_policy": "Adatvédelmi szabályzat",
  "footer.source_code": "Forráskód megtekintése",
+  "footer.status": "Állapot",
  "generic.saved": "Elmentve",
  "getting_started.heading": "Első lépések",
  "hashtag.column_header.tag_mode.all": "és {additional}",
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Ստեղնաշարի կարճատներ",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Պահպանուած է",
  "getting_started.heading": "Ինչպէս սկսել",
  "hashtag.column_header.tag_mode.all": "եւ {additional}",
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Pintasan papan ketik",
  "footer.privacy_policy": "Kebijakan privasi",
  "footer.source_code": "Lihat kode sumber",
+  "footer.status": "Status",
  "generic.saved": "Disimpan",
  "getting_started.heading": "Mulai",
  "hashtag.column_header.tag_mode.all": "dan {additional}",
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Iwu nzuzu",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Mbido",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Sparesis",
  "getting_started.heading": "Debuto",
  "hashtag.column_header.tag_mode.all": "e {additional}",
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Flýtileiðir á lyklaborði",
  "footer.privacy_policy": "Persónuverndarstefna",
  "footer.source_code": "Skoða frumkóða",
+  "footer.status": "Staða",
  "generic.saved": "Vistað",
  "getting_started.heading": "Komast í gang",
  "hashtag.column_header.tag_mode.all": "og {additional}",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Scorciatoie da tastiera",
  "footer.privacy_policy": "Politica sulla privacy",
  "footer.source_code": "Visualizza il codice sorgente",
+  "footer.status": "Stato",
  "generic.saved": "Salvato",
  "getting_started.heading": "Per iniziare",
  "hashtag.column_header.tag_mode.all": "e {additional}",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -45,7 +45,7 @@
  "account.locked_info": "このアカウントは承認制アカウントです。相手が承認するまでフォローは完了しません。",
  "account.media": "メディア",
  "account.mention": "@{name}さんにメンション",
-  "account.moved_to": "{name} さんがアカウントを引っ越しました:",
+  "account.moved_to": "{name}さんがアカウントを引っ越しました:",
  "account.mute": "@{name}さんをミュート",
  "account.mute_notifications": "@{name}さんからの通知を受け取らない",
  "account.muted": "ミュート済み",
@ -54,7 +54,7 @@
  "account.posts_with_replies": "投稿と返信",
  "account.report": "@{name}さんを通報",
  "account.requested": "フォロー承認待ちです。クリックしてキャンセル",
-  "account.requested_follow": "{name} さんがあなたにフォローリクエストしました",
+  "account.requested_follow": "{name}さんがあなたにフォローリクエストしました",
  "account.share": "@{name}さんのプロフィールを共有する",
  "account.show_reblogs": "@{name}さんからのブーストを表示",
  "account.statuses_counter": "{counter} 投稿",
@ -276,6 +276,7 @@
  "footer.keyboard_shortcuts": "キーボードショートカット",
  "footer.privacy_policy": "プライバシーポリシー",
  "footer.source_code": "ソースコードを表示",
+  "footer.status": "ステータス",
  "generic.saved": "保存しました",
  "getting_started.heading": "スタート",
  "hashtag.column_header.tag_mode.all": "と{additional}",
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "დაწყება",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Inegzumen n unasiw",
  "footer.privacy_policy": "Tasertit tabaḍnit",
  "footer.source_code": "Wali tangalt taɣbalut",
+  "footer.status": "Status",
  "generic.saved": "Yettwasekles",
  "getting_started.heading": "Bdu",
  "hashtag.column_header.tag_mode.all": "d {additional}",
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Сақталды",
  "getting_started.heading": "Желіде",
  "hashtag.column_header.tag_mode.all": "және {additional}",
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -1,8 +1,8 @@
 {
  "about.blocks": "제한된 서버들",
  "about.contact": "연락처:",
-  "about.disclaimer": "마스토돈은 자유 오픈소스 소프트웨어이며, Mastodon gGmbH의 상표입니다",
-  "about.domain_blocks.no_reason_available": "이유 비공개",
+  "about.disclaimer": "Mastodon은 자유 오픈소스 소프트웨어이며, Mastodon gGmbH의 상표입니다",
+  "about.domain_blocks.no_reason_available": "사유를 밝히지 않음",
  "about.domain_blocks.preamble": "마스토돈은 일반적으로 연합우주에 있는 어떤 서버의 사용자와도 게시물을 보고 응답을 할 수 있도록 허용합니다. 다음 항목들은 특정한 서버에 대해 만들어 진 예외사항입니다.",
  "about.domain_blocks.silenced.explanation": "명시적으로 찾아보거나 팔로우를 하기 전까지는, 이 서버에 있는 프로필이나 게시물 등을 일반적으로 볼 수 없습니다.",
  "about.domain_blocks.silenced.title": "제한됨",
@ -138,8 +138,8 @@
  "compose_form.poll.remove_option": "이 항목 삭제",
  "compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
  "compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
-  "compose_form.publish": "뿌우",
-  "compose_form.publish_form": "뿌우",
+  "compose_form.publish": "게시",
+  "compose_form.publish_form": "게시",
  "compose_form.publish_loud": "{publish}!",
  "compose_form.save_changes": "변경사항 저장",
  "compose_form.sensitive.hide": "미디어를 민감함으로 설정하기",
@ -209,7 +209,7 @@
  "emoji_button.symbols": "기호",
  "emoji_button.travel": "여행과 장소",
  "empty_column.account_suspended": "계정 정지됨",
-  "empty_column.account_timeline": "여긴 게시물이 없어요!",
+  "empty_column.account_timeline": "이곳에는 게시물이 없습니다!",
  "empty_column.account_unavailable": "프로필 사용 불가",
  "empty_column.blocks": "아직 아무도 차단하지 않았습니다.",
  "empty_column.bookmarked_statuses": "아직 북마크에 저장한 게시물이 없습니다. 게시물을 북마크 지정하면 여기에 나타납니다.",
@ -232,7 +232,7 @@
  "empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 서버의 사용자를 팔로우 해서 채워보세요",
  "error.unexpected_crash.explanation": "버그 혹은 브라우저 호환성 문제로 이 페이지를 올바르게 표시할 수 없습니다.",
  "error.unexpected_crash.explanation_addons": "이 페이지는 올바르게 보여질 수 없습니다. 브라우저 애드온이나 자동 번역 도구 등으로 인해 발생된 에러일 수 있습니다.",
-  "error.unexpected_crash.next_steps": "페이지를 새로고침 해보세요. 그래도 해결되지 않는 경우, 다른 브라우저나 네이티브 앱으로도 마스토돈을 이용하실 수 있습니다.",
+  "error.unexpected_crash.next_steps": "페이지를 새로고침 해보세요. 도움이 되지 않는다면, 다른 브라우저나 네이티브 앱을 통해서도 Mastodon을 이용할 수 있습니다.",
  "error.unexpected_crash.next_steps_addons": "그걸 끄고 페이지를 새로고침 해보세요. 그래도 해결되지 않으면, 다른 브라우저나 네이티브 앱으로 마스토돈을 이용해 보실 수 있습니다.",
  "errors.unexpected_crash.copy_stacktrace": "에러 내용을 클립보드에 복사",
  "errors.unexpected_crash.report_issue": "문제 신고",
@ -272,15 +272,16 @@
  "footer.keyboard_shortcuts": "키보드 단축키",
  "footer.privacy_policy": "개인정보 정책",
  "footer.source_code": "소스코드 보기",
+  "footer.status": "상태",
  "generic.saved": "저장됨",
  "getting_started.heading": "시작하기",
  "hashtag.column_header.tag_mode.all": "및 {additional}",
  "hashtag.column_header.tag_mode.any": "또는 {additional}",
  "hashtag.column_header.tag_mode.none": "{additional}를 제외하고",
-  "hashtag.column_settings.select.no_options_message": "추천할 내용이 없습니다",
-  "hashtag.column_settings.select.placeholder": "해시태그를 입력하세요…",
+  "hashtag.column_settings.select.no_options_message": "제안을 찾을 수 없습니다.",
+  "hashtag.column_settings.select.placeholder": "해시태그를 기입하면...",
  "hashtag.column_settings.tag_mode.all": "모두",
-  "hashtag.column_settings.tag_mode.any": "아무것이든",
+  "hashtag.column_settings.tag_mode.any": "어느것이든",
  "hashtag.column_settings.tag_mode.none": "이것들을 제외하고",
  "hashtag.column_settings.tag_toggle": "추가 해시태그를 이 컬럼에 추가합니다",
  "hashtag.follow": "해시태그 팔로우",
@ -400,11 +401,11 @@
  "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
  "notification.mention": "{name} 님이 언급하였습니다",
  "notification.own_poll": "내 투표가 끝났습니다",
-  "notification.poll": "당신이 참여 한 투표가 종료되었습니다",
+  "notification.poll": "참여했던 투표가 끝났습니다.",
  "notification.reblog": "{name} 님이 부스트했습니다",
  "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
  "notification.update": "{name} 님이 게시물을 수정했습니다",
-  "notifications.clear": "알림 지우기",
+  "notifications.clear": "알림 비우기",
  "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
  "notifications.column_settings.admin.report": "새 신고:",
  "notifications.column_settings.admin.sign_up": "새로운 가입:",
@ -494,13 +495,13 @@
  "report.mute_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 여전히 당신을 팔로우 하거나 당신의 게시물을 볼 수 있으며 해당 계정은 자신이 뮤트 되었는지 알지 못합니다.",
  "report.next": "다음",
  "report.placeholder": "코멘트",
-  "report.reasons.dislike": "마음에 안듭니다",
+  "report.reasons.dislike": "마음에 안 들어요",
  "report.reasons.dislike_description": "내가 보기 싫은 종류에 속합니다",
-  "report.reasons.other": "기타",
+  "report.reasons.other": "그 밖의 것들",
  "report.reasons.other_description": "이슈가 다른 분류에 속하지 않습니다",
-  "report.reasons.spam": "스팸입니다",
+  "report.reasons.spam": "스팸이에요",
  "report.reasons.spam_description": "악성 링크, 반응 스팸, 또는 반복적인 답글",
-  "report.reasons.violation": "서버 규칙을 위반합니다",
+  "report.reasons.violation": "서버 규칙을 위반해요",
  "report.reasons.violation_description": "특정 규칙을 위반합니다",
  "report.rules.subtitle": "해당하는 사항을 모두 선택하세요",
  "report.rules.title": "어떤 규칙을 위반했나요?",
@ -617,7 +618,7 @@
  "timeline_hint.resources.follows": "팔로우",
  "timeline_hint.resources.statuses": "이전 게시물",
  "trends.counter_by_accounts": "이전 {days}일 동안 {counter} 명의 사용자",
-  "trends.trending_now": "지금 유행중",
+  "trends.trending_now": "지금 유행 중",
  "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.",
  "units.short.billion": "{count}B",
  "units.short.million": "{count}B",
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Kurteriyên klavyeyê",
  "footer.privacy_policy": "Peymana nepeniyê",
  "footer.source_code": "Koda çavkanî nîşan bide",
+  "footer.status": "Status",
  "generic.saved": "Tomarkirî",
  "getting_started.heading": "Destpêkirin",
  "hashtag.column_header.tag_mode.all": "û {additional}",
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Gwithys",
  "getting_started.heading": "Dhe dhalleth",
  "hashtag.column_header.tag_mode.all": "ha(g) {additional}",
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "servavit",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Īsinājumtaustiņi",
  "footer.privacy_policy": "Privātuma politika",
  "footer.source_code": "Skatīt pirmkodu",
+  "footer.status": "Statuss",
  "generic.saved": "Saglabāts",
  "getting_started.heading": "Darba sākšana",
  "hashtag.column_header.tag_mode.all": "un {additional}",
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Започни",
  "hashtag.column_header.tag_mode.all": "и {additional}",
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "സംരക്ഷിച്ചു",
  "getting_started.heading": "തുടക്കം കുറിക്കുക",
  "hashtag.column_header.tag_mode.all": "{additional} ഉം കൂടെ",
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Pintasan papan kekunci",
  "footer.privacy_policy": "Dasar privasi",
  "footer.source_code": "Lihat kod sumber",
+  "footer.status": "Status",
  "generic.saved": "Disimpan",
  "getting_started.heading": "Mari bermula",
  "hashtag.column_header.tag_mode.all": "dan {additional}",
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Sneltoetsen",
  "footer.privacy_policy": "Privacybeleid",
  "footer.source_code": "Broncode bekijken",
+  "footer.status": "Status",
  "generic.saved": "Opgeslagen",
  "getting_started.heading": "Aan de slag",
  "hashtag.column_header.tag_mode.all": "en {additional}",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Snøggtastar",
  "footer.privacy_policy": "Personvernsreglar",
  "footer.source_code": "Vis kjeldekode",
+  "footer.status": "Status",
  "generic.saved": "Gøymt",
  "getting_started.heading": "Kom i gang",
  "hashtag.column_header.tag_mode.all": "og {additional}",
@ -381,7 +382,7 @@
  "navigation_bar.favourites": "Favorittar",
  "navigation_bar.filters": "Målbundne ord",
  "navigation_bar.follow_requests": "Fylgjeførespurnader",
-  "navigation_bar.followed_tags": "Followed hashtags",
+  "navigation_bar.followed_tags": "Fulgte emneknagger",
  "navigation_bar.follows_and_followers": "Fylgje og fylgjarar",
  "navigation_bar.lists": "Lister",
  "navigation_bar.logout": "Logg ut",
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Hurtigtaster",
  "footer.privacy_policy": "Personvernregler",
  "footer.source_code": "Vis kildekode",
+  "footer.status": "Status",
  "generic.saved": "Lagret",
  "getting_started.heading": "Kom i gang",
  "hashtag.column_header.tag_mode.all": "og {additional}",
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Acorchis clavièr",
  "footer.privacy_policy": "Politica de confidencialitat",
  "footer.source_code": "Veire lo còdi font",
+  "footer.status": "Status",
  "generic.saved": "Enregistrat",
  "getting_started.heading": "Per començar",
  "hashtag.column_header.tag_mode.all": "e {additional}",
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@ -276,6 +276,7 @@
  "footer.keyboard_shortcuts": "Skróty klawiszowe",
  "footer.privacy_policy": "Polityka prywatności",
  "footer.source_code": "Zobacz kod źródłowy",
+  "footer.status": "Status",
  "generic.saved": "Zapisano",
  "getting_started.heading": "Rozpocznij",
  "hashtag.column_header.tag_mode.all": "i {additional}",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Atalhos de teclado",
  "footer.privacy_policy": "Política de privacidade",
  "footer.source_code": "Exibir código-fonte",
+  "footer.status": "Status",
  "generic.saved": "Salvo",
  "getting_started.heading": "Primeiros passos",
  "hashtag.column_header.tag_mode.all": "e {additional}",
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Atalhos do teclado",
  "footer.privacy_policy": "Política de privacidade",
  "footer.source_code": "Ver código-fonte",
+  "footer.status": "Estado",
  "generic.saved": "Guardado",
  "getting_started.heading": "Primeiros passos",
  "hashtag.column_header.tag_mode.all": "e {additional}",
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Comenzi rapide de la tastatură",
  "footer.privacy_policy": "Politica de confidenţialitate",
  "footer.source_code": "Vizualizează codul sursă",
+  "footer.status": "Status",
  "generic.saved": "Salvat",
  "getting_started.heading": "Primii pași",
  "hashtag.column_header.tag_mode.all": "și {additional}",
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Сочетания клавиш",
  "footer.privacy_policy": "Политика конфиденциальности",
  "footer.source_code": "Исходный код",
+  "footer.status": "Статус",
  "generic.saved": "Сохранено",
  "getting_started.heading": "Начать",
  "hashtag.column_header.tag_mode.all": "и {additional}",
@ -381,7 +382,7 @@
  "navigation_bar.favourites": "Избранное",
  "navigation_bar.filters": "Игнорируемые слова",
  "navigation_bar.follow_requests": "Запросы на подписку",
-  "navigation_bar.followed_tags": "Followed hashtags",
+  "navigation_bar.followed_tags": "Отслеживаемые хэштеги",
  "navigation_bar.follows_and_followers": "Подписки и подписчики",
  "navigation_bar.lists": "Списки",
  "navigation_bar.logout": "Выйти",
@ -543,7 +544,7 @@
  "server_banner.server_stats": "Статистика сервера:",
  "sign_in_banner.create_account": "Создать учётную запись",
  "sign_in_banner.sign_in": "Войти",
-  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.",
+  "sign_in_banner.text": "Войдите, чтобы отслеживать профили, хэштеги или избранное, делиться сообщениями и отвечать на них. Вы также можете взаимодействовать с вашей учётной записью на другом сервере.",
  "status.admin_account": "Открыть интерфейс модератора для @{name}",
  "status.admin_domain": "Открыть интерфейс модерации {domain}",
  "status.admin_status": "Открыть этот пост в интерфейсе модератора",
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Polìtica de riservadesa",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Sarvadu",
  "getting_started.heading": "Comente cumintzare",
  "hashtag.column_header.tag_mode.all": "e {additional}",
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboord shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View the soorce code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Gettin stertit",
  "hashtag.column_header.tag_mode.all": "an {additional}",
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "සුරැකිණි",
  "getting_started.heading": "පටන් ගන්න",
  "hashtag.column_header.tag_mode.all": "සහ {additional}",
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Klávesové skratky",
  "footer.privacy_policy": "Zásady súkromia",
  "footer.source_code": "Zobraziť zdrojový kód",
+  "footer.status": "Stav",
  "generic.saved": "Uložené",
  "getting_started.heading": "Začni tu",
  "hashtag.column_header.tag_mode.all": "a {additional}",
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Tipkovne bližnjice",
  "footer.privacy_policy": "Pravilnik o zasebnosti",
  "footer.source_code": "Pokaži izvorno kodo",
+  "footer.status": "Stanje",
  "generic.saved": "Shranjeno",
  "getting_started.heading": "Kako začeti",
  "hashtag.column_header.tag_mode.all": "in {additional}",
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Shkurtore tastiere",
  "footer.privacy_policy": "Rregulla privatësie",
  "footer.source_code": "Shihni kodin burim",
+  "footer.status": "Gjendje",
  "generic.saved": "U ruajt",
  "getting_started.heading": "Si t’ia fillohet",
  "hashtag.column_header.tag_mode.all": "dhe {additional}",
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Tasterske prečice",
  "footer.privacy_policy": "Politika privatnosti",
  "footer.source_code": "Prikaži izvorni kod",
+  "footer.status": "Status",
  "generic.saved": "Sačuvano",
  "getting_started.heading": "Prvi koraci",
  "hashtag.column_header.tag_mode.all": "i {additional}",
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Тастерске пречице",
  "footer.privacy_policy": "Политика приватности",
  "footer.source_code": "Прикажи изворни код",
+  "footer.status": "Статус",
  "generic.saved": "Сачувано",
  "getting_started.heading": "Први кораци",
  "hashtag.column_header.tag_mode.all": "и {additional}",
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Tangentbordsgenvägar",
  "footer.privacy_policy": "Integritetspolicy",
  "footer.source_code": "Visa källkod",
+  "footer.status": "Status",
  "generic.saved": "Sparad",
  "getting_started.heading": "Kom igång",
  "hashtag.column_header.tag_mode.all": "och {additional}",
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "சேமிக்கப்பட்டது",
  "getting_started.heading": "முதன்மைப் பக்கம்",
  "hashtag.column_header.tag_mode.all": "மற்றும் {additional}",
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "Getting started",
  "hashtag.column_header.tag_mode.all": "and {additional}",
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@ -272,6 +272,7 @@
  "footer.keyboard_shortcuts": "Keyboard shortcuts",
  "footer.privacy_policy": "Privacy policy",
  "footer.source_code": "View source code",
+  "footer.status": "Status",
  "generic.saved": "Saved",
  "getting_started.heading": "మొదలుపెడదాం",
  "hashtag.column_header.tag_mode.all": "మరియు {additional}",
--- a/Show More
+++ b/Show More