Merge pull request #2577 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 127503eb2c
2024-01-18 20:27:31 +01:00 · 2024-01-18 20:27:31 +01:00 · d80d8f6bb9
parent 411efdc2d3 036e25f19d
commit d80d8f6bb9
205 changed files with 1334 additions and 972 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -109,6 +109,16 @@ Rails/LexicallyScopedActionFilter:
  Exclude:
    - 'app/controllers/auth/*'

+# Reason: These tasks are doing local work which do not need full env loaded
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsrakeenvironment
+Rails/RakeEnvironment:
+  Exclude:
+    - 'lib/tasks/auto_annotate_models.rake'
+    - 'lib/tasks/emojis.rake'
+    - 'lib/tasks/mastodon.rake'
+    - 'lib/tasks/repo.rake'
+    - 'lib/tasks/statistics.rake'
+
 # Reason: There are appropriate times to use these features
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsskipsmodelvalidations
 Rails/SkipsModelValidations:
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@ -13,13 +13,6 @@ Bundler/OrderedGems:
  Exclude:
    - 'Gemfile'

-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'app/models/account.rb'
-
 Lint/NonLocalExitFromIterator:
  Exclude:
    - 'app/helpers/jsonld_helper.rb'
@ -68,18 +61,6 @@ Rails/OutputSafety:
  Exclude:
    - 'config/initializers/simple_form.rb'

-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/Rakefile, **/*.rake
-Rails/RakeEnvironment:
-  Exclude:
-    - 'lib/tasks/auto_annotate_models.rake'
-    - 'lib/tasks/db.rake'
-    - 'lib/tasks/emojis.rake'
-    - 'lib/tasks/mastodon.rake'
-    - 'lib/tasks/repo.rake'
-    - 'lib/tasks/statistics.rake'
-
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -21,35 +21,35 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    actioncable (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailbox (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.1.2)
-      actionpack (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailer (7.1.3)
+      actionpack (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activesupport (= 7.1.3)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.2)
-    actionpack (7.1.2)
-      actionview (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionpack (7.1.3)
+      actionview (= 7.1.3)
+      activesupport (= 7.1.3)
      nokogiri (>= 1.8.5)
      racc
      rack (>= 2.2.4)
@ -57,15 +57,15 @@ GEM
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.2)
-      actionpack (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actiontext (7.1.3)
+      actionpack (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.1.2)
-      activesupport (= 7.1.2)
+    actionview (7.1.3)
+      activesupport (= 7.1.3)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
@ -75,22 +75,22 @@ GEM
      activemodel (>= 4.1)
      case_transform (>= 0.2)
      jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.2)
-      activesupport (= 7.1.2)
+    activejob (7.1.3)
+      activesupport (= 7.1.3)
      globalid (>= 0.3.6)
-    activemodel (7.1.2)
-      activesupport (= 7.1.2)
-    activerecord (7.1.2)
-      activemodel (= 7.1.2)
-      activesupport (= 7.1.2)
+    activemodel (7.1.3)
+      activesupport (= 7.1.3)
+    activerecord (7.1.3)
+      activemodel (= 7.1.3)
+      activesupport (= 7.1.3)
      timeout (>= 0.4.0)
-    activestorage (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activesupport (= 7.1.2)
+    activestorage (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activesupport (= 7.1.3)
      marcel (~> 1.0)
-    activesupport (7.1.2)
+    activesupport (7.1.3)
      base64
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.0.2)
@ -188,7 +188,7 @@ GEM
    climate_control (0.2.0)
    cocoon (1.2.15)
    color_diff (0.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
    connection_pool (2.4.1)
    cose (1.3.0)
      cbor (~> 0.5.9)
@ -454,7 +454,7 @@ GEM
      uri
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.4.4)
+    net-imap (0.4.9.1)
      date
      net-protocol
    net-ldap (0.19.0)
@ -462,7 +462,7 @@ GEM
      net-protocol
    net-protocol (0.2.2)
      timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
      net-protocol
    nio4r (2.5.9)
    nokogiri (1.16.0)
@ -552,27 +552,27 @@ GEM
      rack
    rack-proxy (0.7.6)
      rack
-    rack-session (1.0.1)
+    rack-session (1.0.2)
      rack (< 3)
    rack-test (2.1.0)
      rack (>= 1.3)
    rackup (1.0.0)
      rack (< 3)
      webrick
-    rails (7.1.2)
-      actioncable (= 7.1.2)
-      actionmailbox (= 7.1.2)
-      actionmailer (= 7.1.2)
-      actionpack (= 7.1.2)
-      actiontext (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activemodel (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    rails (7.1.3)
+      actioncable (= 7.1.3)
+      actionmailbox (= 7.1.3)
+      actionmailer (= 7.1.3)
+      actionpack (= 7.1.3)
+      actiontext (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activemodel (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
      bundler (>= 1.15.0)
-      railties (= 7.1.2)
+      railties (= 7.1.3)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@ -587,9 +587,9 @@ GEM
    rails-i18n (7.0.8)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 8)
-    railties (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    railties (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
      irb
      rackup (>= 1.0.0)
      rake (>= 12.2)
@ -955,4 +955,4 @@ RUBY VERSION
   ruby 3.2.2p53

 BUNDLED WITH
-   2.4.20
+   2.5.4
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@ -31,22 +31,26 @@ module AccountsHelper
    Setting.hide_followers_count || account.user&.settings&.[]('hide_followers_count')
  end

+  def account_formatted_stat(value)
+    number_to_human(value, precision: 3, strip_insignificant_zeros: true)
+  end
+
  def account_description(account)
    prepend_stats = [
      [
-        number_to_human(account.statuses_count, precision: 3, strip_insignificant_zeros: true),
+        account_formatted_stat(account.statuses_count),
        I18n.t('accounts.posts', count: account.statuses_count),
      ].join(' '),

      [
-        number_to_human(account.following_count, precision: 3, strip_insignificant_zeros: true),
+        account_formatted_stat(account.following_count),
        I18n.t('accounts.following', count: account.following_count),
      ].join(' '),
    ]

    unless hide_followers_count?(account)
      prepend_stats << [
-        number_to_human(account.followers_count, precision: 3, strip_insignificant_zeros: true),
+        account_formatted_stat(account.followers_count),
        I18n.t('accounts.followers', count: account.followers_count),
      ].join(' ')
    end
--- a/app/helpers/mascot_helper.rb
+++ b/app/helpers/mascot_helper.rb
@ -2,7 +2,7 @@

 module MascotHelper
  def mascot_url
-    full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'))
+    full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
  end

  def instance_presenter
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@ -24,8 +24,12 @@ module RoutingHelper
    Rails.configuration.action_controller.asset_host || root_url
  end

-  def full_pack_url(source, **options)
-    full_asset_url(asset_pack_path(source, **options))
+  def frontend_asset_path(source, **options)
+    asset_pack_path("media/#{source}", **options)
+  end
+
+  def frontend_asset_url(source, **options)
+    full_asset_url(frontend_asset_path(source, **options))
  end

  def use_storage?
--- a/app/javascript/flavours/glitch/components/media_gallery.jsx
+++ b/app/javascript/flavours/glitch/components/media_gallery.jsx
@ -123,7 +123,7 @@ class Item extends PureComponent {
    }

    if (attachment.get('description')?.length > 0) {
-      badges.push(<span key='alt' className='media-gallery__gifv__label'>ALT</span>);
+      badges.push(<span key='alt' className='media-gallery__alt__label'>ALT</span>);
    }

    const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
--- a/app/javascript/flavours/glitch/reducers/accounts.ts
+++ b/app/javascript/flavours/glitch/reducers/accounts.ts
@ -59,24 +59,18 @@ export const accountsReducer: Reducer<typeof initialState> = (
    return normalizeAccounts(state, action.payload.accounts);
  else if (followAccountSuccess.match(action)) {
    return state
-      .update(
-        action.payload.relationship.id,
-        (account) => account?.update('followers_count', (n) => n + 1),
+      .update(action.payload.relationship.id, (account) =>
+        account?.update('followers_count', (n) => n + 1),
      )
-      .update(
-        getCurrentUser(),
-        (account) => account?.update('following_count', (n) => n + 1),
+      .update(getCurrentUser(), (account) =>
+        account?.update('following_count', (n) => n + 1),
      );
  } else if (unfollowAccountSuccess.match(action))
    return state
-      .update(
-        action.payload.relationship.id,
-        (account) =>
+      .update(action.payload.relationship.id, (account) =>
        account?.update('followers_count', (n) => Math.max(0, n - 1)),
      )
-      .update(
-        getCurrentUser(),
-        (account) =>
+      .update(getCurrentUser(), (account) =>
        account?.update('following_count', (n) => Math.max(0, n - 1)),
      );
  else return state;
--- a/app/javascript/flavours/glitch/styles/components/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/components/accounts.scss
@ -621,6 +621,13 @@
          span {
            user-select: all;
          }
+
+          .icon-lock {
+            height: 16px;
+            width: 16px;
+            position: relative;
+            top: 3px;
+          }
        }
      }
    }
--- a/app/javascript/flavours/glitch/styles/components/media.scss
+++ b/app/javascript/flavours/glitch/styles/components/media.scss
@ -51,6 +51,7 @@
  gap: 2px;
 }

+.media-gallery__alt__label,
 .media-gallery__gifv__label {
  display: flex;
  align-items: center;
--- a/app/javascript/flavours/glitch/styles/components/modal.scss
+++ b/app/javascript/flavours/glitch/styles/components/modal.scss
@ -492,6 +492,10 @@
    padding-inline-end: 10px;
  }

+  .icon {
+    vertical-align: middle;
+  }
+
  .button {
    flex: 0 0 auto;
  }
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@ -591,8 +591,7 @@
  .icon {
    width: 15px;
    height: 15px;
-    position: relative;
-    top: 0.145em;
+    vertical-align: middle;
  }
 }

@ -1001,6 +1000,7 @@ a.status-card.compact:hover {

    .icon {
      color: $dark-text-color;
+      vertical-align: middle;
    }
  }
 }
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@ -103,7 +103,7 @@ class Item extends PureComponent {
    }

    if (attachment.get('description')?.length > 0) {
-      badges.push(<span key='alt' className='media-gallery__gifv__label'>ALT</span>);
+      badges.push(<span key='alt' className='media-gallery__alt__label'>ALT</span>);
    }

    const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -393,6 +393,7 @@
  "lists.search": "Leita millum fólk, sum tú fylgir",
  "lists.subheading": "Tínir listar",
  "load_pending": "{count, plural, one {# nýtt evni} other {# nýggj evni}}",
+  "loading_indicator.label": "Innlesur…",
  "media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
  "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
  "mute_modal.duration": "Tíðarbil",
@ -483,6 +484,15 @@
  "onboarding.follows.title": "Vælumtókt á Mastodon",
  "onboarding.profile.discoverable": "Ger tað møguligt hjá øðrum at finna vangan hjá mær",
  "onboarding.profile.discoverable_hint": "Tá tú játtar at onnur skulu kunna finna teg á Mastodon, so kann henda, at postar tínir síggjast í leitiúrslitum og rákum, og vangin hjá tær kann vera skotin upp fyri fólki við áhugamálum sum minna um tíni.",
+  "onboarding.profile.display_name": "Navn, sum skal vísast",
+  "onboarding.profile.display_name_hint": "Títt fulla navn ella títt stuttliga navn…",
+  "onboarding.profile.lead": "Tú kanst altíð gera hetta liðugt seinni í stillingunum, har enn fleiri tillagingarmøguleikar eru tøkir.",
+  "onboarding.profile.note": "Ævilýsing",
+  "onboarding.profile.note_hint": "Tú kanst @umrøða onnur fólk ella #frámerki…",
+  "onboarding.profile.save_and_continue": "Goym og halt fram",
+  "onboarding.profile.title": "Vangauppsetan",
+  "onboarding.profile.upload_avatar": "Legg vangamynd upp",
+  "onboarding.profile.upload_header": "Legg vangahøvd upp",
  "onboarding.share.lead": "Lat fólk vita, hvussu tey kunnu finna teg á Mastodon!",
  "onboarding.share.message": "Eg eri {username} á #Mastodon! Kom og fylg mær á {url}",
  "onboarding.share.next_steps": "Møgulig næstu stig:",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -20,7 +20,7 @@
  "account.block_short": "Bloquear",
  "account.blocked": "Bloqueada",
  "account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
-  "account.cancel_follow_request": "Cancelar a solicitude de seguimento",
+  "account.cancel_follow_request": "Desbotar a solicitude de seguimento",
  "account.copy": "Copiar ligazón ao perfil",
  "account.direct": "Mencionar de xeito privado a @{name}",
  "account.disable_notifications": "Deixar de notificarme cando @{name} publica",
@ -184,7 +184,7 @@
  "confirmations.mute.explanation": "Isto agochará as súas publicacións ou as que a mencionen, mais poderá ler as túas publicacións e ser seguidora túa.",
  "confirmations.mute.message": "Tes a certeza de querer acalar a {name}?",
  "confirmations.redraft.confirm": "Eliminar e reescribir",
-  "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as comparticións e favoritas, e as respostas á publicación orixinal ficarán orfas.",
+  "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as promocións e favorecementos, e as respostas á publicación orixinal ficarán orfas.",
  "confirmations.reply.confirm": "Responder",
  "confirmations.reply.message": "Ao responder sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
  "confirmations.unfollow.confirm": "Deixar de seguir",
@ -204,7 +204,7 @@
  "disabled_account_banner.text": "Actualmente a túa conta {disabledAccount} está desactivada.",
  "dismissable_banner.community_timeline": "Estas son as publicacións máis recentes das persoas que teñen a súa conta en {domain}.",
  "dismissable_banner.dismiss": "Desbotar",
-  "dismissable_banner.explore_links": "As persoas deste servidor e da rede descentralizada están a falar destas historias agora mesmo.",
+  "dismissable_banner.explore_links": "Estas son as novas historias más compartidas hoxe na web social. Aparecen primeiro as novas compartidas por máis persoas diferentes.",
  "dismissable_banner.explore_statuses": "Estas son as publicacións da web social que hoxe están gañando popularidade. As publicacións con máis promocións e favorecemento teñen puntuación máis alta.",
  "dismissable_banner.explore_tags": "Estes cancelos están gañando popularidade entre as persoas deste servidor e noutros servidores da rede descentralizada.",
  "dismissable_banner.public_timeline": "Estas son as publicacións públicas máis recentes das persoas que as usuarias de {domain} están a seguir.",
@ -240,7 +240,7 @@
  "empty_column.follow_requests": "Non tes peticións de seguimento. Cando recibas unha, amosarase aquí.",
  "empty_column.followed_tags": "Aínda non seguiches ningún cancelo. Cando o fagas aparecerán aquí.",
  "empty_column.hashtag": "Aínda non hai nada con este cancelo.",
-  "empty_column.home": "A túa cronoloxía inicial está baleira! Segue a outras usuarias para enchela. {suggestions}",
+  "empty_column.home": "A túa cronoloxía inicial está baleira! Sigue a outras usuarias para enchela.",
  "empty_column.list": "Aínda non hai nada nesta listaxe. Cando as usuarias incluídas na listaxe publiquen mensaxes, amosaranse aquí.",
  "empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
  "empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
@ -346,7 +346,7 @@
  "keyboard_shortcuts.down": "Para mover cara abaixo na listaxe",
  "keyboard_shortcuts.enter": "Para abrir publicación",
  "keyboard_shortcuts.favourite": "Marcar como favorita",
-  "keyboard_shortcuts.favourites": "Para abrir a listaxe das favoritas",
+  "keyboard_shortcuts.favourites": "Para abrir a lista das favoritas",
  "keyboard_shortcuts.federated": "Para abrir a cronoloxía federada",
  "keyboard_shortcuts.heading": "Atallos do teclado",
  "keyboard_shortcuts.home": "Para abrir a cronoloxía inicial",
@ -383,7 +383,7 @@
  "lists.delete": "Eliminar listaxe",
  "lists.edit": "Editar listaxe",
  "lists.edit.submit": "Mudar o título",
-  "lists.exclusive": "Agocha estas publicacións no inicio",
+  "lists.exclusive": "Agocha estas publicacións no Inicio",
  "lists.new.create": "Engadir listaxe",
  "lists.new.title_placeholder": "Título da nova listaxe",
  "lists.replies_policy.followed": "Toda usuaria seguida",
@ -480,8 +480,8 @@
  "onboarding.actions.go_to_home": "Vai á cronoloxía de inicio",
  "onboarding.compose.template": "Ola #Mastodon!",
  "onboarding.follows.empty": "Desgraciadamente agora mesmo non hai nada que mostrar. Podes intentalo coa busca ou na páxina descubrir para atopar persoas ás que seguir, ou intentalo máis tarde.",
-  "onboarding.follows.lead": "Podes facer que a túa cronoloxía de inicio sexa como ti a queres. Canta máis xente sigas máis interesante será. Estes perfís poderían axudarche a comezar —sempre poderás deixar de seguilos despois!",
-  "onboarding.follows.title": "Popular en Mastodon",
+  "onboarding.follows.lead": "A cronoloxía de Inicio é o principal xeito de desfrutar Mastodon. Cantas máis persoas sigas mais interesante e activa será. Para comezar, aquí tes algunhas suxestións:",
+  "onboarding.follows.title": "Personaliza a cronoloxía de inicio",
  "onboarding.profile.discoverable": "Que o meu perfil se poida atopar",
  "onboarding.profile.discoverable_hint": "Cando elixes que poidan atoparte en Mastodon as túas publicacións aparecerán nos resultados das buscas e nos temas en voga, e o teu perfil podería ser suxerido para seguimento a persoas con intereses semellantes aos teus.",
  "onboarding.profile.display_name": "Nome público",
@ -494,20 +494,20 @@
  "onboarding.profile.upload_avatar": "Subir imaxe do perfil",
  "onboarding.profile.upload_header": "Subir cabeceira para o perfil",
  "onboarding.share.lead": "Fai que as persoas saiban como atoparte en Mastodon!",
-  "onboarding.share.message": "Son {username} en #Mastodon! Ségueme en {url}",
+  "onboarding.share.message": "Son {username} en #Mastodon! Sígueme en {url}",
  "onboarding.share.next_steps": "Seguintes pasos:",
  "onboarding.share.title": "Comparte o teu perfil",
-  "onboarding.start.lead": "A túa nova conta en Mastodon está preparada. Mira de que xeito lle podes sacar proveito:",
+  "onboarding.start.lead": "Xa formas parte de Mastodon, unha plataforma de relacións sociais descentralizada, única, onde ti —e non un algoritmo— elixes o que les. Axudámosche cos primeiros pasos:",
  "onboarding.start.skip": "Queres omitir todo isto?",
  "onboarding.start.title": "Pois xa está!",
-  "onboarding.steps.follow_people.body": "Constrúes a túa cronoloxía. Énchea con persoas interesantes.",
-  "onboarding.steps.follow_people.title": "Segue a {count, plural, one {unha persoa} other {# persoas}}",
-  "onboarding.steps.publish_status.body": "Saúda a todo o mundo.",
+  "onboarding.steps.follow_people.body": "Mastodon consiste en seguir a persoas interesantes.",
+  "onboarding.steps.follow_people.title": "Personaliza a túa cronoloxía",
+  "onboarding.steps.publish_status.body": "Exprésate con texto, fotos, vídeos ou enquisas {emoji}",
  "onboarding.steps.publish_status.title": "Escribe a túa primeira publicación",
  "onboarding.steps.setup_profile.body": "Ao engadir información ao teu perfil é máis probable que teñas máis interaccións.",
  "onboarding.steps.setup_profile.title": "Personaliza o perfil",
  "onboarding.steps.share_profile.body": "Dille ás amizades como poden atoparte en Mastodon!",
-  "onboarding.steps.share_profile.title": "Comparte o teu perfil",
+  "onboarding.steps.share_profile.title": "Comparte o teu perfil en Mastodon",
  "onboarding.tips.2fa": "<strong>Sabes que?</strong> Podes protexer a túa conta configurando un segundo factor de autenticación nos axustes. Funciona con calquera app TOTP, non precisas un número de teléfono!",
  "onboarding.tips.accounts_from_other_servers": "<strong>Sabes que?</strong> Como Mastodon é descentralizado, algúns perfís que atopes estarán en servidores diferentes ao teu. Pero podes interactuar igualmente con eles! O seu servidor é o que ven despois da @ no seu identificador!",
  "onboarding.tips.migration": "<strong>Sabes que?</strong> Se cres que {domain} non é o servidor axeitado para ti, podes mover a conta a outro servidor Mastodon sen perder as túas seguidoras. Incluso podes hospedar o teu propio servidor!",
@ -573,7 +573,7 @@
  "report.reasons.dislike": "Non me gusta",
  "report.reasons.dislike_description": "Non é algo que queiras ver",
  "report.reasons.legal": "É ilegal",
-  "report.reasons.legal_description": "Cres que atenta contra as leis do país do teu servidor",
+  "report.reasons.legal_description": "Cres que atenta contra as leis do país do teu pais ou servidor",
  "report.reasons.other": "É outra cousa",
  "report.reasons.other_description": "O problema non cae dentro de outras categorías",
  "report.reasons.spam": "É spam",
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@ -9,14 +9,20 @@
  "account.block": "Blocar @{name}",
  "account.block_short": "Blocar",
  "account.blocked": "Blocate",
+  "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
  "account.copy": "Copiar ligamine a profilo",
+  "account.domain_blocked": "Dominio blocate",
  "account.edit_profile": "Modificar profilo",
+  "account.enable_notifications": "Notifica me quando @{name} publica",
  "account.endorse": "Evidentiar sur le profilo",
  "account.featured_tags.last_status_at": "Ultime message in {date}",
  "account.featured_tags.last_status_never": "Necun messages",
+  "account.featured_tags.title": "Hashtags eminente de {name}",
  "account.follow": "Sequer",
  "account.follow_back": "Sequer etiam",
  "account.followers": "Sequitores",
+  "account.followers.empty": "Iste usator ancora non ha sequitores.",
+  "account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
  "account.following": "Sequente",
  "account.go_to_profile": "Vader al profilo",
  "account.hide_reblogs": "Celar boosts de @{name}",
@ -30,6 +36,7 @@
  "account.mute_short": "Silentiar",
  "account.muted": "Silentiate",
  "account.no_bio": "Nulle description fornite.",
+  "account.open_original_page": "Aperir le pagina original",
  "account.posts": "Messages",
  "account.posts_with_replies": "Messages e responsas",
  "account.share": "Compartir profilo de @{name}",
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@ -9,7 +9,7 @@
  "about.domain_blocks.suspended.explanation": "Jokie duomenys iš šio serverio nebus apdorojami, saugomi ar keičiami, todėl bet kokia sąveika ar bendravimas su šio serverio naudotojais bus neįmanomas.",
  "about.domain_blocks.suspended.title": "Uždrausta",
  "about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
-  "about.powered_by": "Decentralizuota socialinė žiniasklaida, kurią valdo {mastodon}",
+  "about.powered_by": "Decentralizuota socialinė medija, kurią valdo {mastodon}",
  "about.rules": "Serverio taisyklės",
  "account.account_note_header": "Pastaba",
  "account.add_or_remove_from_list": "Pridėti arba ištrinti iš sąrašų",
@ -27,24 +27,24 @@
  "account.domain_blocked": "Užblokuotas domenas",
  "account.edit_profile": "Redaguoti profilį",
  "account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
-  "account.endorse": "Savybė profilyje",
+  "account.endorse": "Rekomenduoti profilyje",
  "account.featured_tags.last_status_at": "Paskutinį kartą paskelbta {date}",
  "account.featured_tags.last_status_never": "Nėra įrašų",
-  "account.featured_tags.title": "{name} rekomenduojamos grotažymės",
+  "account.featured_tags.title": "{name} rekomenduojami saitažodžiai",
  "account.follow": "Sekti",
  "account.follow_back": "Sekti atgal",
  "account.followers": "Sekėjai",
  "account.followers.empty": "Šio naudotojo dar niekas neseka.",
  "account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
-  "account.following": "Seka",
-  "account.following_counter": "{count, plural, one {{counter} Seka} few {{counter} Seka} many {{counter} Seka} other {{counter} Seka}}",
+  "account.following": "Sekama",
+  "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
  "account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
  "account.go_to_profile": "Eiti į profilį",
  "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
  "account.in_memoriam": "Atminimui.",
  "account.joined_short": "Prisijungė",
  "account.languages": "Keisti prenumeruojamas kalbas",
-  "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}",
+  "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}.",
  "account.locked_info": "Šios paskyros privatumo būsena nustatyta kaip užrakinta. Savininkas (-ė) rankiniu būdu peržiūri, kas gali sekti.",
  "account.media": "Medija",
  "account.mention": "Paminėti @{name}",
@ -58,8 +58,8 @@
  "account.open_original_page": "Atidaryti originalinį puslapį",
  "account.posts": "Įrašai",
  "account.posts_with_replies": "Įrašai ir atsakymai",
-  "account.report": "Pranešti @{name}",
-  "account.requested": "Laukiama patvirtinimo. Spausk, kad atšaukti sekimo užklausą",
+  "account.report": "Pranešti apie @{name}",
+  "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą.",
  "account.requested_follow": "{name} paprašė tave sekti",
  "account.share": "Bendrinti @{name} profilį",
  "account.show_reblogs": "Rodyti pakėlimus iš @{name}",
@ -69,28 +69,28 @@
  "account.unblock_short": "Atblokuoti",
  "account.unendorse": "Nerodyti profilyje",
  "account.unfollow": "Nebesekti",
-  "account.unmute": "Atitildyti @{name}",
-  "account.unmute_notifications_short": "Atitildyti pranešimus",
-  "account.unmute_short": "Atitildyti",
-  "account_note.placeholder": "Spausk norėdamas (-a) pridėti pastabą",
-  "admin.dashboard.daily_retention": "Vartotojų išbuvimo rodiklis pagal dieną po registracijos",
-  "admin.dashboard.monthly_retention": "Naudotojų išlaikymo rodiklis pagal mėnesį po registracijos",
+  "account.unmute": "Atšaukti nutildymą @{name}",
+  "account.unmute_notifications_short": "Atšaukti nutildymą pranešimams",
+  "account.unmute_short": "Atšaukti nutildymą",
+  "account_note.placeholder": "Spustelėk norėdamas (-a) pridėti pastabą",
+  "admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
+  "admin.dashboard.monthly_retention": "Naudotojų pasilikimo rodiklis pagal mėnesį po registracijos",
  "admin.dashboard.retention.average": "Vidurkis",
-  "admin.dashboard.retention.cohort": "Registravimo mėnuo",
+  "admin.dashboard.retention.cohort": "Registracijos mėnuo",
  "admin.dashboard.retention.cohort_size": "Nauji naudotojai",
  "admin.impact_report.instance_accounts": "Paskyrų profiliai, kuriuos tai ištrintų",
  "admin.impact_report.instance_followers": "Sekėjai, kuriuos prarastų mūsų naudotojai",
  "admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
  "admin.impact_report.title": "Poveikio apibendrinimas",
  "alert.rate_limited.message": "Pabandyk vėliau po {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Spartos ribojimas",
+  "alert.rate_limited.title": "Sparta ribota",
  "alert.unexpected.message": "Įvyko netikėta klaida.",
  "alert.unexpected.title": "Ups!",
  "announcement.announcement": "Skelbimas",
  "attachments_list.unprocessed": "(neapdorotas)",
  "audio.hide": "Slėpti garsą",
  "autosuggest_hashtag.per_week": "{count} per savaitę",
-  "boost_modal.combo": "Gali spausti {combo}, kad praleisti kitą kartą",
+  "boost_modal.combo": "Gali paspausti {combo}, kad praleisti kitą kartą",
  "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
  "bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
  "bundle_column_error.error.title": "O, ne!",
@ -104,10 +104,10 @@
  "bundle_modal_error.message": "Kraunant šį komponentą kažkas nepavyko.",
  "bundle_modal_error.retry": "Bandyti dar kartą",
  "closed_registrations.other_server_instructions": "Kadangi Mastodon yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
-  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą {domain}.",
+  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
  "closed_registrations_modal.find_another_server": "Rasti kitą serverį",
  "closed_registrations_modal.preamble": "Mastodon yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
-  "closed_registrations_modal.title": "Užsiregistravimas į Mastodon",
+  "closed_registrations_modal.title": "Užsiregistruoti Mastodon",
  "column.about": "Apie",
  "column.blocks": "Užblokuoti naudotojai",
  "column.bookmarks": "Žymės",
@ -116,15 +116,15 @@
  "column.directory": "Naršyti profilius",
  "column.domain_blocks": "Užblokuoti domenai",
  "column.favourites": "Mėgstamiausi",
-  "column.firehose": "Tiesioginiai padavimai",
-  "column.follow_requests": "Sekti prašymus",
+  "column.firehose": "Tiesioginiai srautai",
+  "column.follow_requests": "Sekimo prašymus",
  "column.home": "Pagrindinis",
  "column.lists": "Sąrašai",
  "column.mutes": "Nutildyti naudotojai",
  "column.notifications": "Pranešimai",
  "column.pins": "Prisegti įrašai",
  "column.public": "Federacinė laiko skalė",
-  "column_back_button.label": "Atgal",
+  "column_back_button.label": "Grįžti",
  "column_header.hide_settings": "Slėpti nustatymus",
  "column_header.moveLeft_settings": "Judinti stulpelį į kairę",
  "column_header.moveRight_settings": "Judinti stulpelį į dešinę",
--- a/app/javascript/mastodon/reducers/accounts.ts
+++ b/app/javascript/mastodon/reducers/accounts.ts
@ -59,24 +59,18 @@ export const accountsReducer: Reducer<typeof initialState> = (
    return normalizeAccounts(state, action.payload.accounts);
  else if (followAccountSuccess.match(action)) {
    return state
-      .update(
-        action.payload.relationship.id,
-        (account) => account?.update('followers_count', (n) => n + 1),
+      .update(action.payload.relationship.id, (account) =>
+        account?.update('followers_count', (n) => n + 1),
      )
-      .update(
-        getCurrentUser(),
-        (account) => account?.update('following_count', (n) => n + 1),
+      .update(getCurrentUser(), (account) =>
+        account?.update('following_count', (n) => n + 1),
      );
  } else if (unfollowAccountSuccess.match(action))
    return state
-      .update(
-        action.payload.relationship.id,
-        (account) =>
+      .update(action.payload.relationship.id, (account) =>
        account?.update('followers_count', (n) => Math.max(0, n - 1)),
      )
-      .update(
-        getCurrentUser(),
-        (account) =>
+      .update(getCurrentUser(), (account) =>
        account?.update('following_count', (n) => Math.max(0, n - 1)),
      );
  else return state;
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@ -88,6 +88,85 @@ table + p {
  padding: 24px;
 }

+// Account
+.email-account-banner-table {
+  background-color: #f3f2f5;
+  border-top-left-radius: 12px;
+  border-top-right-radius: 12px;
+}
+
+.email-account-banner-td {
+  border-top-left-radius: 12px;
+  border-top-right-radius: 12px;
+  height: 140px;
+  vertical-align: bottom;
+  background-color: #f3f2f5;
+  background-position: center;
+  background-size: cover;
+}
+
+.email-account-banner-inner-td {
+  padding: 24px 24px 0;
+  mso-padding-alt: 24px;
+}
+
+.email-account-banner-overlap-div {
+  max-height: 42px;
+}
+
+.email-account-banner-icon-table {
+  width: auto;
+  margin: 0;
+  overflow: hidden;
+  border-radius: 8px;
+  border-collapse: separate;
+  background-color: #fff;
+  border: 2px solid #fff;
+
+  img {
+    display: block;
+    max-width: 100%;
+    border: none;
+    border-radius: 6px;
+  }
+}
+
+.email-account-body-td {
+  padding: 56px 24px 24px;
+  mso-padding-alt: 24px;
+}
+
+.email-account-name {
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 24px;
+  color: #17063b;
+}
+
+.email-account-handle {
+  font-size: 14px;
+  line-height: 20px;
+  color: #746a89;
+}
+
+.email-account-stats-table {
+  td {
+    padding-right: 16px;
+    font-size: 14px;
+    line-height: 20px;
+    color: #746a89;
+  }
+
+  b {
+    font-weight: 600;
+    color: #17063b;
+  }
+
+  span {
+    white-space: nowrap;
+  }
+}
+
 // Utility classes
 .email-w-full {
  width: 100%;
@ -122,6 +201,14 @@ table + p {
  padding-top: 24px;
 }

+.email-padding-top-16 {
+  padding-top: 16px;
+}
+
+.email-padding-top-0 {
+  padding-top: 0;
+}
+
 .email-border-top {
  border-top: 1px solid #dfdee3;
 }
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1398,8 +1398,7 @@ body > [data-popper-placement] {
  .icon {
    width: 15px;
    height: 15px;
-    position: relative;
-    top: 0.145em;
+    vertical-align: middle;
  }
 }

@ -5544,6 +5543,10 @@ a.status-card {
    padding-inline-end: 10px;
  }

+  .icon {
+    vertical-align: middle;
+  }
+
  .button {
    flex: 0 0 auto;
  }
@ -6094,6 +6097,7 @@ a.status-card {
  gap: 2px;
 }

+.media-gallery__alt__label,
 .media-gallery__gifv__label {
  display: flex;
  align-items: center;
@ -6170,6 +6174,7 @@ a.status-card {

    .icon {
      color: $dark-text-color;
+      vertical-align: middle;
    }
  }
 }
@ -7415,6 +7420,13 @@ noscript {
          span {
            user-select: all;
          }
+
+          .icon-lock {
+            height: 16px;
+            width: 16px;
+            position: relative;
+            top: 3px;
+          }
        }
      }
    }
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@ -75,22 +75,41 @@ class Announcement < ApplicationRecord
  end

  def reactions(account = nil)
-    records = begin
-      scope = announcement_reactions.group(:announcement_id, :name, :custom_emoji_id).order(Arel.sql('MIN(created_at) ASC'))
-
-      if account.nil?
-        scope.select('name, custom_emoji_id, count(*) as count, false as me')
-      else
-        scope.select("name, custom_emoji_id, count(*) as count, exists(select 1 from announcement_reactions r where r.account_id = #{account.id} and r.announcement_id = announcement_reactions.announcement_id and r.name = announcement_reactions.name) as me")
+    grouped_ordered_announcement_reactions.select(
+      [:name, :custom_emoji_id, 'COUNT(*) as count'].tap do |values|
+        values << value_for_reaction_me_column(account)
      end
-    end.to_a
-
+    ).to_a.tap do |records|
      ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji).call
-    records
+    end
  end

  private

+  def grouped_ordered_announcement_reactions
+    announcement_reactions
+      .group(:announcement_id, :name, :custom_emoji_id)
+      .order(
+        Arel.sql('MIN(created_at)').asc
+      )
+  end
+
+  def value_for_reaction_me_column(account)
+    if account.nil?
+      'FALSE AS me'
+    else
+      <<~SQL.squish
+        EXISTS(
+          SELECT 1
+          FROM announcement_reactions inner_reactions
+          WHERE inner_reactions.account_id = #{account.id}
+            AND inner_reactions.announcement_id = announcement_reactions.announcement_id
+            AND inner_reactions.name = announcement_reactions.name
+        ) AS me
+      SQL
+    end
+  end
+
  def set_published
    return unless scheduled_at.blank? || scheduled_at.past?

--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@ -39,7 +39,7 @@ class ManifestSerializer < ActiveModel::Serializer
  def icons
    ICON_SIZES.map do |size|
      {
-        src: full_pack_url("media/icons/android-chrome-#{size}x#{size}.png"),
+        src: frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
        sizes: "#{size}x#{size}",
        type: 'image/png',
        purpose: 'any maskable',
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@ -28,7 +28,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
      }
    else
      {
-        url: full_pack_url('media/images/preview.png'),
+        url: frontend_asset_url('images/preview.png'),
      }
    end
  end
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@ -33,7 +33,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
  end

  def thumbnail
-    instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : full_pack_url('media/images/preview.png')
+    instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : frontend_asset_url('images/preview.png')
  end

  def max_toot_chars
--- a/app/views/application/mailer/_account.html.haml
+++ b/app/views/application/mailer/_account.html.haml
@ -0,0 +1,30 @@
+%table.email-w-full.email-account-banner-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-account-banner-td{ height: 140, background: full_asset_url(account.header.url) }
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-account-banner-inner-td
+            .email-account-banner-overlap-div
+              %table.email-account-banner-icon-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td
+                    %img{ src: full_asset_url(account.avatar.url), width: 80, height: 80, alt: '' }
+%table.email-w-full.email-account-body-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-account-body-td
+      %p.email-account-name= display_name(account)
+      %p.email-account-handle= acct(account)
+      %table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-padding-top-16
+            %table.email-w-full.email-account-stats-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td
+                  %b= account_formatted_stat(account.statuses_count)
+                  %span= t('accounts.posts', count: account.statuses_count)
+                %td
+                  %b= account_formatted_stat(account.following_count)
+                  %span= t('accounts.following')
+                %td
+                  %b= hide_followers_count?(account) ? '-' : account_formatted_stat(account.followers_count)
+                  %span= t('accounts.followers', count: account.followers_count)
--- a/app/views/application/mailer/_checklist.html.haml
+++ b/app/views/application/mailer/_checklist.html.haml
@ -11,9 +11,9 @@
                    %tr
                      %td.email-checklist-icons-checkbox-td
                        - if defined?(checked) && checked
-                          = image_tag full_pack_url('media/images/mailer-new/welcome/checkbox-on.png'), alt: '', width: 20, height: 20
+                          = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-on.png'), alt: '', width: 20, height: 20
                        - else
-                          = image_tag full_pack_url('media/images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
+                          = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
                      %td.email-checklist-icons-step-td
                        - if defined?(step_image_url)
                          = image_tag step_image_url, alt: '', width: 40, height: 40
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -14,12 +14,12 @@
    %link{ rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' }/

    - %w(16 32 48).each do |size|
-      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
+      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/

    - %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
-      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/apple-touch-icon-#{size}x#{size}.png") }/
+      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/

-    %link{ rel: 'mask-icon', href: asset_pack_path('media/images/logo-symbol-icon.svg'), color: '#6364FF' }/
+    %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
    %link{ rel: 'manifest', href: manifest_path(format: :json) }/
    %meta{ name: 'theme-color', content: '#191b22' }/
    %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@ -50,7 +50,7 @@
                                /[if mso]
                                  </v:textbox></v:rect>
                                = link_to root_url, class: 'email-header-logo-a' do
-                                  = image_tag full_pack_url('media/images/mailer-new/common/logo-header.png'), alt: 'Mastodon', width: 157, height: 40
+                                  = image_tag frontend_asset_url('images/mailer-new/common/logo-header.png'), alt: 'Mastodon', width: 157, height: 40

                          -# Heading
                          = yield :heading
@ -75,7 +75,7 @@
                  %td.email-footer-td
                    %p.email-footer-p
                      = link_to root_url, class: 'email-footer-logo-a' do
-                        = image_tag full_pack_url('media/images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', width: 44, height: 44
+                        = image_tag frontend_asset_url('images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', width: 44, height: 44
                    %p.email-footer-p
                      = t 'about.hosted_on', domain: site_hostname
                    %p.email-footer-p
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.favourite.title'), heading_subtitle: t('notification_mailer.favourite.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/favorite.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.favourite.title'), heading_subtitle: t('notification_mailer.favourite.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/favorite.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@ -1,9 +1,13 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow.title'), heading_subtitle: t('notification_mailer.follow.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/user.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow.title'), heading_subtitle: t('notification_mailer.follow.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/user.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
        %tr
-          %td.email-inner-card-td
+          %td.email-inner-card-td-without-padding
+            = render 'application/mailer/account', account: @account
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-padding-24.email-padding-top-0
                  = render 'application/mailer/button', text: t('application_mailer.view_profile'), url: web_url("@#{@account.pretty_acct}")
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@ -1,9 +1,13 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow_request.title'), heading_subtitle: t('notification_mailer.follow_request.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/follow.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow_request.title'), heading_subtitle: t('notification_mailer.follow_request.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/follow.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
        %tr
-          %td.email-inner-card-td
+          %td.email-inner-card-td-without-padding
+            = render 'application/mailer/account', account: @account
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-padding-24.email-padding-top-0
                  = render 'application/mailer/button', text: t('notification_mailer.follow_request.action'), url: web_url('follow_requests')
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.mention.title'), heading_subtitle: t('notification_mailer.mention.body', name: @status.account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/mention.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.mention.title'), heading_subtitle: t('notification_mailer.mention.body', name: @status.account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/mention.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.reblog.title'), heading_subtitle: t('notification_mailer.reblog.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/boost.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.reblog.title'), heading_subtitle: t('notification_mailer.reblog.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/boost.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/settings/flavours/show.html.haml
+++ b/app/views/settings/flavours/show.html.haml
@ -4,8 +4,8 @@
 = simple_form_for current_user, url: settings_flavour_path(@selected), html: { method: :put } do |f|
  = render 'shared/error_messages', object: current_user

-  - Themes.instance.flavour(@selected)['screenshot'].each do |screen|
-    %img.flavour-screen{ src: full_pack_url("media/#{screen}"), alt: '' }
+  - Themes.instance.flavour(@selected)['screenshot'].each do |screenshot|
+    %img.flavour-screen{ src: frontend_asset_url(screenshot), alt: '' }

  .flavour-description
    = t "flavours.#{@selected}.description", default: ''
--- a/app/views/shared/_og.html.haml
+++ b/app/views/shared/_og.html.haml
@ -8,7 +8,7 @@
 = opengraph 'og:type', 'website'
 = opengraph 'og:title', instance_presenter.title
 = opengraph 'og:description', description
-= opengraph 'og:image', full_asset_url(thumbnail&.file&.url(:'@1x') || asset_pack_path('media/images/preview.png', protocol: :request))
+= opengraph 'og:image', full_asset_url(thumbnail&.file&.url(:'@1x') || frontend_asset_path('images/preview.png'))
 = opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200'
 = opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630'
 = opengraph 'twitter:card', 'summary_large_image'
--- a/app/views/user_mailer/appeal_approved.html.haml
+++ b/app/views/user_mailer/appeal_approved.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_approved.title'), heading_subtitle: t('user_mailer.appeal_approved.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/appeal-approved.png')
+  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_approved.title'), heading_subtitle: t('user_mailer.appeal_approved.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/appeal-approved.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/appeal_rejected.html.haml
+++ b/app/views/user_mailer/appeal_rejected.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_rejected.title'), heading_subtitle: t('user_mailer.appeal_rejected.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/appeal-rejected.png')
+  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_rejected.title'), heading_subtitle: t('user_mailer.appeal_rejected.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/appeal-rejected.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/backup_ready.html.haml
+++ b/app/views/user_mailer/backup_ready.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('user_mailer.backup_ready.title'), heading_subtitle: t('user_mailer.backup_ready.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/archive.png')
+  = render 'application/mailer/heading', heading_title: t('user_mailer.backup_ready.title'), heading_subtitle: t('user_mailer.backup_ready.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/archive.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.confirmation_instructions.title'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.confirmation_instructions.title'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/email_changed.html.haml
+++ b/app/views/user_mailer/email_changed.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.email_changed.title'), heading_subtitle: t('devise.mailer.email_changed.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.email_changed.title'), heading_subtitle: t('devise.mailer.email_changed.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/password_change.html.haml
+++ b/app/views/user_mailer/password_change.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.password_change.title'), heading_subtitle: t('devise.mailer.password_change.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/password.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.password_change.title'), heading_subtitle: t('devise.mailer.password_change.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/password.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/reconfirmation_instructions.html.haml
+++ b/app/views/user_mailer/reconfirmation_instructions.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.reconfirmation_instructions.title'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.reconfirmation_instructions.title'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/reset_password_instructions.html.haml
+++ b/app/views/user_mailer/reset_password_instructions.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.reset_password_instructions.title'), heading_subtitle: t('devise.mailer.reset_password_instructions.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/password.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.reset_password_instructions.title'), heading_subtitle: t('devise.mailer.reset_password_instructions.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/password.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/suspicious_sign_in.html.haml
+++ b/app/views/user_mailer/suspicious_sign_in.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('user_mailer.suspicious_sign_in.title'), heading_subtitle: t('user_mailer.suspicious_sign_in.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/login.png')
+  = render 'application/mailer/heading', heading_title: t('user_mailer.suspicious_sign_in.title'), heading_subtitle: t('user_mailer.suspicious_sign_in.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/login.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/two_factor_disabled.html.haml
+++ b/app/views/user_mailer/two_factor_disabled.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_disabled.title'), heading_subtitle: t('devise.mailer.two_factor_disabled.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-disabled.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_disabled.title'), heading_subtitle: t('devise.mailer.two_factor_disabled.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-disabled.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/two_factor_enabled.html.haml
+++ b/app/views/user_mailer/two_factor_enabled.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_enabled.title'), heading_subtitle: t('devise.mailer.two_factor_enabled.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-enabled.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_enabled.title'), heading_subtitle: t('devise.mailer.two_factor_enabled.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-enabled.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
+++ b/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_recovery_codes_changed.title'), heading_subtitle: t('devise.mailer.two_factor_recovery_codes_changed.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-recovery.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_recovery_codes_changed.title'), heading_subtitle: t('devise.mailer.two_factor_recovery_codes_changed.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-recovery.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t("user_mailer.warning.title.#{@warning.action}"), heading_image_url: full_pack_url('media/images/mailer-new/heading/warning.png')
+  = render 'application/mailer/heading', heading_title: t("user_mailer.warning.title.#{@warning.action}"), heading_image_url: frontend_asset_url('images/mailer-new/heading/warning.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/webauthn_credential_added.html.haml
+++ b/app/views/user_mailer/webauthn_credential_added.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.added.title'), heading_subtitle: t('devise.mailer.webauthn_credential.added.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-added.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.added.title'), heading_subtitle: t('devise.mailer.webauthn_credential.added.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-added.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/webauthn_credential_deleted.html.haml
+++ b/app/views/user_mailer/webauthn_credential_deleted.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.deleted.title'), heading_subtitle: t('devise.mailer.webauthn_credential.deleted.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-deleted.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.deleted.title'), heading_subtitle: t('devise.mailer.webauthn_credential.deleted.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-deleted.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/webauthn_disabled.html.haml
+++ b/app/views/user_mailer/webauthn_disabled.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_disabled.title'), heading_subtitle: t('devise.mailer.webauthn_disabled.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-disabled.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_disabled.title'), heading_subtitle: t('devise.mailer.webauthn_disabled.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-disabled.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/app/views/user_mailer/webauthn_enabled.html.haml
+++ b/app/views/user_mailer/webauthn_enabled.html.haml
@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_enabled.title'), heading_subtitle: t('devise.mailer.webauthn_enabled.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-enabled.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_enabled.title'), heading_subtitle: t('devise.mailer.webauthn_enabled.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-enabled.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-body-padding-td
--- a/bin/bundle
+++ b/bin/bundle
@ -1,3 +1,109 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-load Gem.bin_path('bundler', 'bundle')
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../Gemfile", __dir__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_requirement
+    @bundler_requirement ||=
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
+  end
+
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
+
+    bundler_gem_version = Gem::Version.new(version)
+
+    bundler_gem_version.approximate_recommendation
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@ -52,9 +52,9 @@ Rails.application.config.content_security_policy do |p|

  if Rails.env.development?
    webpacker_public_host = ENV.fetch('WEBPACKER_DEV_SERVER_PUBLIC', Webpacker.config.dev_server[:public])
-    webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" }
+    front_end_build_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" }

-    p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
+    p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *front_end_build_urls
    p.script_src  :self, :unsafe_inline, :unsafe_eval, assets_host
  else
    p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@ -2,15 +2,6 @@

 require 'devise/strategies/authenticatable'

-# TODO: Remove this patch when this PR or similar is merged into Devise:
-# https://github.com/heartcombo/devise/pull/5645
-# We rely on ENV vars and not secrets/credentials, so the deprecation is just noise.
-class Devise::SecretKeyFinder
-  def find
-    @application.secret_key_base
-  end
-end
-
 Warden::Manager.after_set_user except: :fetch do |user, warden|
  session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
  session_id = user.activate_session(warden.request) unless user.session_activations.active?(session_id)
@ -133,9 +124,11 @@ Devise.setup do |config|
  # The secret key used by Devise. Devise uses this key to generate
  # random tokens. Changing this key will render invalid all existing
  # confirmation, reset password and unlock tokens in the database.
-  # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
-  # by default. You can change it below and use your own secret key.
-  # config.secret_key = '2f86974c4dd7735170fd70fbf399f7a477ffd635ef240d07a22cf4bd7cd13dbae17c4383a2996d0c1e79a991ec18a91a17424c53e4771adb75a8b21904bd1403'
+  #
+  # Set explicitly to Rails default to avoid deprecation warnings.
+  # https://github.com/heartcombo/devise/pull/5645#issuecomment-1871849856
+  # Remove when Devise changes `SecretKeyFinder` to not emit deprecations.
+  config.secret_key = Rails.application.secret_key_base

  # ==> Mailer Configuration
  # Configure the e-mail address which will be shown in Devise::Mailer,
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@ -1548,7 +1548,6 @@ an:
    webauthn: Claus de seguranza
  user_mailer:
    appeal_approved:
-      action: Ir ta la tuya cuenta
      explanation: L'apelación de l'amonestación contra la tuya cuenta d'o %{strike_date} que ninviés lo %{appeal_date} estió aprebada. La tuya cuenta se troba de nuevo en buen estau.
      subject: La tuya apelación d'o %{date} ha estau aprebada
      title: Apelación aprebada
@ -1557,7 +1556,6 @@ an:
      subject: La tuya apelación d'o %{date} ha estau refusada
      title: Apelación refusada
    backup_ready:
-      explanation: Has solicitau una copia completa d'a tuya cuenta de Mastodon. Ya ye preparada pa descargar!
      subject: Lo tuyo fichero ye preparau pa descargar
      title: Descargar fichero
    suspicious_sign_in:
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@ -1871,7 +1871,6 @@ ar:
    webauthn: مفاتيح الأمان
  user_mailer:
    appeal_approved:
-      action: انتقل إلى حسابك
      explanation: تمت الموافقة على استئناف السجل ضد حسابك في %{strike_date} الذي قدمته في %{appeal_date}. حسابك مرة أخرى في حالة جيدة.
      subject: تم قبول طعنك الذي قدمته بتاريخ %{date}
      title: تم قبول طعنك
@ -1880,7 +1879,6 @@ ar:
      subject: تم رفض طعنك الذي قدمته بتاريخ %{date}
      title: رُفض الاستئناف
    backup_ready:
-      explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون. إنها متوفرة الآن للتنزيل!
      subject: نسخة بيانات حسابك جاهزة للتنزيل
      title: المغادرة بأرشيف الحساب
    suspicious_sign_in:
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@ -1838,7 +1838,6 @@ be:
    webauthn: Ключы бяспекі
  user_mailer:
    appeal_approved:
-      action: Перайсці ў свой уліковы запіс
      explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была ўхвалена. Ваш уліковы запіс зноў на добрым рахунку.
      subject: Вашая апеляцыя ад %{date} была ўхваленая
      title: Абскарджанне ўхвалена
@ -1847,7 +1846,6 @@ be:
      subject: Вашая апеляцыя ад %{date} была адхіленая
      title: Абскарджанне адхілена
    backup_ready:
-      explanation: Вы запатрабавалі поўнае рэзервовае капіраванне вашага ўліковага запісу Mastodon. Цяпер яго можна спампаваць!
      subject: Ваш архіў гатовы да спампавання
      title: Ваш архіў можна спампаваць
    suspicious_sign_in:
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@ -1608,6 +1608,7 @@ bg:
      unknown_browser: Неизвестен браузър
      weibo: Weibo
    current_session: Текуща сесия
+    date: Дата
    description: "%{browser} на %{platform}"
    explanation: Това са уеб браузърите, от които в момента сте влезли с вашия Mastodon акаунт.
    ip: IP адрес
@ -1774,16 +1775,19 @@ bg:
    webauthn: Ключове за сигурност
  user_mailer:
    appeal_approved:
-      action: Към акаунта ви
+      action: Настройки на акаунта
      explanation: Жалбата, която изпратихте на %{appeal_date}, срещу нарушението за вашия акаунт, направено на %{strike_date}, е приета. Вашият акаунт е отново с добра репутация.
      subject: Вашето обжалване от %{date} е било одобрено
+      subtitle: Вашият акаунт още веднъж е в добра репутация.
      title: Одобрено обжалване
    appeal_rejected:
      explanation: Жалбата, която изпратихте на %{appeal_date}, срещу нарушението за вашия акаунт, направено на %{strike_date}, е отхвърлена.
      subject: Вашето обжалване от %{date} е било отхвърлено
+      subtitle: Обжалването ви е отхвърлено.
      title: Отхвърлено обжалване
    backup_ready:
-      explanation: Изискахте пълно резервно копиране на акаунта си в Mastodon. Вече е готово за изтегляне!
+      explanation: Изисквахте пълно резервно копие на акаунта си в Mastodon.
+      extra: Вече е готово за теглене!
      subject: Вашият архив е готов за изтегляне
      title: Сваляне на архива
    suspicious_sign_in:
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@ -471,6 +471,7 @@ br:
      safari: Safari
      uc_browser: UC Browser
      weibo: Weibo
+    date: Deiziad
    description: "%{browser} war %{platform}"
    ip: IP
    platforms:
@ -529,6 +530,10 @@ br:
    disable: Diweredekaat
    edit: Kemmañ
  user_mailer:
+    appeal_approved:
+      action: Arventennoù ar gont
+    backup_ready:
+      extra: Prest eo da vezañ pellgarget!
    warning:
      categories:
        spam: Spam
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -1605,6 +1605,7 @@ ca:
      unknown_browser: Navegador Desconegut
      weibo: Weibo
    current_session: Sessió actual
+    date: Data
    description: "%{browser} de %{platform}"
    explanation: Aquests són els navegadors web que actualment han iniciat la sessió amb el teu compte de Mastodon.
    ip: IP
@ -1771,16 +1772,19 @@ ca:
    webauthn: Claus de seguretat
  user_mailer:
    appeal_approved:
-      action: Ves al teu compte
+      action: Configuració del compte
      explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat aprovada. El teu compte torna a estar en bon estat.
      subject: La teva apel·lació del %{date} ha estat aprovada
+      subtitle: El vostre compte torna a estar correcte.
      title: Apel·lació aprovada
    appeal_rejected:
      explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat rebutjada.
      subject: La teva apel·lació del %{date} ha estat rebutjada
+      subtitle: S'ha rebutjat la vostra apel·lació.
      title: Apel·lació rebutjada
    backup_ready:
-      explanation: Has sol·licitat una copia completa del teu compte Mastodon. Ara ja està a punt per a descàrrega!
+      explanation: Heu demanat una còpia completa de les dades del vostre compte de Mastodon.
+      extra: Ja us ho podeu baixar
      subject: L'arxiu està preparat per a descàrrega
      title: Recollida de l'arxiu
    suspicious_sign_in:
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@ -1015,7 +1015,6 @@ ckb:
    webauthn: کلیلەکانی پاراستن
  user_mailer:
    backup_ready:
-      explanation: ئێوە وشانێکی پاڵپشتی تەواوت لە هەژمارەکەی خۆت داوا کردووە، ئەم پاڵپشتییە ئێستا ئامادەی بارکردنە!
      subject: ئارشیڤی ئێوە ئامادەی داگرتنە
      title: وەرگرتنی ئارشیڤ
    warning:
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@ -1034,7 +1034,6 @@ co:
    webauthn: Chjave di sicurità
  user_mailer:
    backup_ready:
-      explanation: Avete dumandatu un’archiviu cumpletu di u vostru contu Mastodon. Avà hè prontu per scaricà!
      subject: U vostru archiviu hè prontu à scaricà
      title: Archiviu prontu
    warning:
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@ -1792,7 +1792,6 @@ cs:
    webauthn: Bezpečnostní klíče
  user_mailer:
    appeal_approved:
-      action: Přejít do vašeho účtu
      explanation: Odvolání proti prohřešku vašeho účtu ze dne %{strike_date}, které jste podali %{appeal_date}, bylo schváleno. Váš účet je opět v pořádku.
      subject: Vaše odvolání ze dne %{date} bylo schváleno
      title: Odvolání schváleno
@ -1801,7 +1800,6 @@ cs:
      subject: Vaše odvolání z %{date} bylo zamítnuto
      title: Odvolání zamítnuto
    backup_ready:
-      explanation: Vyžádali jste si úplnou zálohu svého účtu Mastodon. Nyní je připravena ke stažení!
      subject: Váš archiv je připraven ke stažení
      title: Stažení archivu
    suspicious_sign_in:
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@ -21,7 +21,7 @@ cy:
    link_verified_on: Gwiriwyd perchnogaeth y ddolen yma ar %{date}
    nothing_here: Does dim byd yma!
    pin_errors:
-      following: Rhaid i chi fod yn dilyn y person yr ydych am ei gymeradwyo yn barod
+      following: Rhaid i chi fod yn dilyn yn barod y person rydych am ei gymeradwyo
    posts:
      few: Postiadau
      many: Postiadau
@ -85,7 +85,7 @@ cy:
      invite_request_text: Rhesymau dros ymuno
      invited_by: Gwahoddwyd gan
      ip: IP
-      joined: Ymunwyd
+      joined: Wedi ymuno
      location:
        all: Popeth
        local: Lleol
@ -1712,6 +1712,7 @@ cy:
      unknown_browser: Porwr Anhysbys
      weibo: Weibo
    current_session: Sesiwn gyfredol
+    date: Dyddiad
    description: "%{browser} ar %{platform}"
    explanation: Dyma'r porwyr gwe sydd wedi mewngofnodi i'ch cyfrif Mastodon ar hyn o bryd.
    ip: IP
@ -1902,16 +1903,19 @@ cy:
    webauthn: Allweddi diogelwch
  user_mailer:
    appeal_approved:
-      action: Ewch i'ch cyfrif
+      action: Gosodiadau Cyfrif
      explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i chymeradwyo. Mae eich cyfrif unwaith eto yn gadarnhaol.
      subject: Mae eich apêl gan %{date} wedi'i chymeradwyo
+      subtitle: Mae eich cyfrif unwaith eto mewn sefyllfa dda.
      title: Cymeradwywyd yr apêl
    appeal_rejected:
      explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i gwrthod.
      subject: Mae eich apêl ar %{date} wedi'i gwrthod
+      subtitle: Mae eich apêl wedi'i gwrthod
      title: Mae'r apêl wedi'i gwrthod
    backup_ready:
-      explanation: Fe wnaethoch chi gais am gopi wrth gefn llawn o'ch cyfrif Mastodon. Mae nawr yn barod i'w lawrlwytho!
+      explanation: Rydych wedi gofyn am gopi wrth gefn llawn o'ch cyfrif Mastodon.
+      extra: Mae nawr yn barod i'w lwytho i lawr!
      subject: Mae eich archif yn barod i'w lawrlwytho
      title: Allfudo archif
    suspicious_sign_in:
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@ -1608,6 +1608,7 @@ da:
      unknown_browser: Ukendt browser
      weibo: Weibo
    current_session: Aktuelle session
+    date: Dato
    description: "%{browser} på %{platform}"
    explanation: Disse webbrowsere er pt. logget ind på din Mastodon-konto.
    ip: IP
@ -1774,16 +1775,19 @@ da:
    webauthn: Sikkerhedsnøgler
  user_mailer:
    appeal_approved:
-      action: Gå til din konto
+      action: Kontoindstillinger
      explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet godkendt. Din kontostatus er igen god.
      subject: Din appel pr. %{date} er godkendt
+      subtitle: Dit kontoomdømme er nu igen godt.
      title: Appel godkendt
    appeal_rejected:
      explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet afvist.
      subject: Din appel pr. %{date} er afvist
+      subtitle: Din appel er afvist.
      title: Appel afvist
    backup_ready:
-      explanation: Den anmodede fulde sikkerhedskopi af din Mastodon-konto er nu klar til download!
+      explanation: Der er anmodet om en fuld sikkerhedskopi af din Mastodon-konto.
+      extra: Sikkerhedskopien kan nu downloades!
      subject: Dit arkiv er klar til download
      title: Arkiv download
    suspicious_sign_in:
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -1608,6 +1608,7 @@ de:
      unknown_browser: Unbekannter Browser
      weibo: Weibo
    current_session: Aktuelle Sitzung
+    date: Datum
    description: "%{browser} auf %{platform}"
    explanation: Dies sind die Webbrowser, die derzeit mit deinem Mastodon-Konto verbunden sind.
    ip: IP-Adresse
@ -1774,16 +1775,19 @@ de:
    webauthn: Sicherheitsschlüssel
  user_mailer:
    appeal_approved:
-      action: Dein Konto aufrufen
-      explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde genehmigt. Dein Konto ist wieder in gutem Zustand.
+      action: Kontoeinstellungen
+      explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde genehmigt. Dein Konto ist wieder in Ordnung.
      subject: Dein Einspruch vom %{date} wurde angenommen
+      subtitle: Dein Konto ist wieder in Ordnung.
      title: Einspruch angenommen
    appeal_rejected:
      explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde abgelehnt.
      subject: Dein Einspruch vom %{date} wurde abgelehnt
+      subtitle: Dein Einspruch wurde abgelehnt.
      title: Einspruch abgelehnt
    backup_ready:
-      explanation: Du hast eine vollständige Sicherung deines Mastodon-Kontos angefordert. Die Sicherung kann jetzt heruntergeladen werden!
+      explanation: Du hast eine vollständige Datensicherung deines Mastodon-Kontos angefordert.
+      extra: Sie ist jetzt zum Herunterladen bereit!
      subject: Dein persönliches Archiv kann heruntergeladen werden
      title: Archiv-Download
    suspicious_sign_in:
--- a/config/locales/devise.an.yml
+++ b/config/locales/devise.an.yml
@ -47,11 +47,9 @@ an:
        subject: 'Mastodon: Instruccions pa reiniciar clau'
        title: Reiniciar clau
      two_factor_disabled:
-        explanation: L'autenticación de dos factors pa la tuya cuenta ha estau deshabilitada. Agora puetz connectar-te nomás usando l'adreza de correu electronico y la clau.
        subject: 'Mastodon: L''autenticación de dos factors ye deshabilitada'
        title: 2FA desactivada
      two_factor_enabled:
-        explanation: L'autenticación de dos factors pa la tuya cuenta ha estau habilitada. Se requiere un token chenerau per l'aplicación TOTP emparellada pa ingresar.
        subject: 'Mastodon: L''autenticación de dos factors ye habilitada'
        title: 2FA activada
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ an:
          subject: 'Mastodon: Clau de seguranza eliminada'
          title: Una d'as tuyas claus de seguranza ha estau eliminada
      webauthn_disabled:
-        explanation: L'autenticación con claus de seguranza ha estau deshabilitada pa la tuya cuenta. Agora l'inicio de sesión nomás ye posible utilizando lo token chenerau per l'aplicación TOTP emparellada.
        subject: 'Mastodon: Autenticación con claus de seguranza deshabilitada'
        title: Claus de seguranza deshabilitadas
      webauthn_enabled:
-        explanation: L'autenticación con clau de seguranza ha estau habilitada pa la tuya cuenta. Agora la tuya clau de seguranza puede estar utilizada pa iniciar sesión.
        subject: 'Mastodon: Autenticación de clau de seguranza habilitada'
        title: Claus de seguranza habilitadas
    omniauth_callbacks:
--- a/config/locales/devise.ar.yml
+++ b/config/locales/devise.ar.yml
@ -47,11 +47,9 @@ ar:
        subject: 'ماستدون: تعليمات استعادة كلمة المرور'
        title: إعادة تعيين كلمة السر
      two_factor_disabled:
-        explanation: تم تعطيل المصادقة بخطوتين لحسابك الخاص. إنّ الولوج ممكن الآن باستخدام عنوان البريد الإلكتروني وكلمة المرور فقط.
        subject: 'ماستدون: نظام المصادقة بخطوتين مُعطّل'
        title: إنّ 2FA معطّل
      two_factor_enabled:
-        explanation: تم تفعيل المصادقة بخطوتين على حسابك. سيُطلب منك رمز تم توليده بواسطة تطبيق TOTP المقترن للولوج.
        subject: 'ماستدون: تم تفعيل نظام المصادقة بخطوتين'
        title: إنّ 2FA نشِط
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ ar:
          subject: 'ماستدون: تم حذف مفتاح الأمان'
          title: تم حذف أحد مفاتيح الأمان الخاصة بك
      webauthn_disabled:
-        explanation: تم تعطيل الاستيثاق مع مفاتيح الأمان لحسابك. تسجيل الدخول الآن ممكن باستخدام الرمز (token) الذي تم إنشاؤه بواسطة تطبيق TOTP المقترن.
        subject: 'ماستدون: الاستيثاق مع مفاتيح الأمان معطلة'
        title: مفاتيح الأمان معطلة
      webauthn_enabled:
-        explanation: تم تفعيل استيثاق مفتاح الأمان للحساب الخاص بك. يمكن الآن استخدام مفتاح الأمان الخاص بك لتسجيل الدخول.
        subject: 'ماستدون: تم تفعيل نظام استيثاق مفتاح الأمان'
        title: مفاتيح الأمان مفعلة
    omniauth_callbacks:
--- a/config/locales/devise.ast.yml
+++ b/config/locales/devise.ast.yml
@ -42,11 +42,9 @@ ast:
        subject: 'Mastodon: instrucciones pa camudar la contraseña'
        title: Cambéu de la contaseña
      two_factor_disabled:
-        explanation: Desactivóse l'autenticación en dos pasos na cuenta. Agora ye posible aniciar la sesión cola direición de corréu electrónicu ya la contraseña.
        subject: 'Mastodon: desactivóse l''autenticación en dos pasos'
        title: Autenticación de dos pasos activada
      two_factor_enabled:
-        explanation: Activóse l'autenticación en dos pasos na cuenta. Agora los pases que xenere l'aplicación TOTP empareyada son obligatorios p'aniciar la sesión.
        subject: 'Mastodon: activóse l''autenticación en dos pasos'
        title: Autenticación de dos pasos desactivada
      two_factor_recovery_codes_changed:
@ -62,11 +60,9 @@ ast:
        deleted:
          title: Desanicióse una de les to llaves de seguranza
      webauthn_disabled:
-        explanation: Desactivóse l'autenticación con llaves de seguranza na cuenta. Agora namás ye posible aniciar la sesión col pase xeneráu pola aplicación TOTP empareyada.
        subject: 'Mastodon: desactivóse l''autenticación con llaves de seguranza'
        title: Llaves de seguranza desactivaes
      webauthn_enabled:
-        explanation: Activóse l'autenticación con llaves de seguranza na cuenta. Agora pues usar la llave p'aniciar la sesión.
        subject: 'Mastodon: activóse l''autenticación con llaves de seguranza'
        title: Llaves de seguranza activaes
    passwords:
--- a/config/locales/devise.be.yml
+++ b/config/locales/devise.be.yml
@ -47,11 +47,9 @@ be:
        subject: 'Mastodon: Інструкцыі па скіданню пароля'
        title: Скіданне пароля
      two_factor_disabled:
-        explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была адключана. Цяпер для ўваходу патрэбны толькі электронная пошта і пароль.
        subject: 'Mastodon: двухфактарная аўтэнтыфікацыя адключана'
        title: двухэтапнае спраўджанне адключана
      two_factor_enabled:
-        explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была ўключана. Цяпер для ўваходу ў сістэму патрэбны токен, згенераваны даданай TOTP праграмай.
        subject: 'Mastodon: двухфактарная аўтэнтыфікацыя ўключана'
        title: двухэтапнае спраўджанне уключана
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ be:
          subject: 'Mastodon: ключ бяспекі выдалены'
          title: Адзін з вашых ключоў бяспекі быў выдалены
      webauthn_disabled:
-        explanation: Аўтэнтыфікацыя з дапамогай ключоў бяспекі была адключана для вашага ўліковага запісу. Уваход цяпер магчымы толькі з токенам, згенераваным спалучаным TOTP прыкладаннем.
        subject: 'Mastodon: Аўтэнтыфікацыя з дапамогай ключоў бяспекі адключана'
        title: Ключы бяспекі адключаны
      webauthn_enabled:
-        explanation: Аўтэнтыфікацыя праз ключ бяспекі была ўключана для вашага ўліковага запісу. Цяпер вы можаце выкарыстоўваць ваш ключ бяспекі для ўваходу.
        subject: 'Mastodon: Аўтэнтыфікацыя праз ключ бяспекі была ўключана'
        title: Ключы бяспекі ўключаны
    omniauth_callbacks:
--- a/config/locales/devise.bg.yml
+++ b/config/locales/devise.bg.yml
@ -18,7 +18,7 @@ bg:
      unconfirmed: Преди да продължите, трябва да потвърдите адреса на имейла си.
    mailer:
      confirmation_instructions:
-        action: Потвърдете адреса на имейла
+        action: Потвърждаване на адреса на имейла
        action_with_app: Потвърдете и се върнете към %{app}
        explanation: Създали сте акаунт на %{host} с този имейл адрес. Само на едно щракване разстояние сте от активирането му. Ако това не сте били вие, моля, игнорирайте този имейл.
        explanation_when_pending: Кандидатствахте за покана до %{host} с този имейл адрес. След като потвърдите своя имейл адрес, ние ще разгледаме вашето заявление. Можете да влезете, за да промените данните си или да изтриете акаунта си, но нямате достъп до повечето функции, докато акаунтът ви не бъде одобрен. Ако вашето заявление бъде отхвърлено, вашите данни ще бъдат премахнати, така че няма да се изискват допълнителни действия от вас. Ако това не сте били вие, моля, игнорирайте този имейл.
@ -39,7 +39,7 @@ bg:
        explanation: Потвърдете новия адрес, за да промените имейла си.
        extra: Ако тази промяна не е започната от вас, то пренебрегнете този имейл. Адресът на имейла за акаунта в Mastodon няма да се промени, докато не влезете в горната връзка.
        subject: 'Mastodon: Потвърдете имейла за %{instance}'
-        title: Потвърдете своя имейл адрес
+        title: Потвърждаване на адреса на имейла
      reset_password_instructions:
        action: Промяна на паролата
        explanation: Поискахте нова парола за акаунта си.
@ -47,16 +47,19 @@ bg:
        subject: 'Mastodon: Указания за задаване на нова парола'
        title: Нулиране на парола
      two_factor_disabled:
-        explanation: Двуфакторното удостоверяване за вашия акаунт е деактивирано. Влизането вече е възможно, като се използват само имейл адрес и парола.
+        explanation: Влизането вече е възможно, употребявайки само адрес на имейла и парола.
        subject: 'Mastodon: Двуфакторното удостоверяване е деактивирано'
+        subtitle: Двуфакторното удостоверяване за акаунта ви е изключено.
        title: Двуфакторното изключено
      two_factor_enabled:
-        explanation: За акаунта ви е включено двуфакторно удостоверяване. Отсега нататък ще ви трябва и временен код от сдвоеното приложение за удостоверяване TOTP, за да влезете.
+        explanation: Породени токени от сдвоено приложение TOTP ще се изискват за вход.
        subject: 'Mastodon: Включено двуфакторно удостоверяване'
+        subtitle: Двуфакторното удостоверяване е включено за акаунта ви.
        title: 2FA активирано
      two_factor_recovery_codes_changed:
        explanation: Предишните кодове за възстановяване са анулирани и се пораждат нови.
        subject: 'Mastodon: Породени пак са двуфакторни кодове за възстановяване'
+        subtitle: Предишните кодове за възстановяване са обезсилени и се пораждат нови.
        title: Кодове за 2 факт. удост. за възстановяване са променени
      unlock_instructions:
        subject: 'Mastodon: указания за отключване'
@ -70,11 +73,13 @@ bg:
          subject: 'Mastodon: Ключът за сигурност е изтрит'
          title: Един от ключовете ви за сигурност е изтрит
      webauthn_disabled:
-        explanation: Удостоверяването с ключове за сигурност е изключено за акаунта ви. Влизането вече е възможно, използвайки само ключа, породен от сдвоеното приложение TOTP.
+        explanation: Удостоверяването на ключовете за сигурност е изключено за акаунта ви.
+        extra: Влизането вече е възможно, употребявайки само породени токени от сдвоено приложение TOTP.
        subject: 'Mastodon: Изключено удостоверяване с ключове за сигурност'
        title: Изключени ключове за сигурност
      webauthn_enabled:
-        explanation: Удостоверяването с ключ за сигурност е активирано за вашия акаунт. Вашият ключ за сигурност вече може да се използва за вход.
+        explanation: Удостоверяването на ключа за сигурност е включено за акаунта ви.
+        extra: Вашият ключ за сигурност вече може да се употребява за вход.
        subject: 'Mastodon: Включено удостоверяване с ключ за сигурност'
        title: Включени ключове за сигурност
    omniauth_callbacks:
@ -82,8 +87,8 @@ bg:
      success: Успешно упълномощаване от акаунт на %{kind}.
    passwords:
      no_token: Не можете да осъществите достъп до тази страница, ако не сте я отворили чрез линк от получен имейл за възстановяване на паролата. Ако сте отворили линка за възстановяване на паролата от имейл, моля, уверете се, че сте използвали целия предоставен URL адрес.
-      send_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
-      send_paranoid_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
+      send_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на имейла си до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
+      send_paranoid_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на имейла си до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
      updated: Паролата ви беше променена успешно. Сега сте влезли.
      updated_not_active: Паролата ви беше променена успешно.
    registrations:
@ -101,7 +106,7 @@ bg:
      signed_out: Успешно излизане.
    unlocks:
      send_instructions: Ще получите имейл с указания как да отключите акаунта си до няколко минути. Проверете папката си за спам, ако не сте получили такъв имейл.
-      send_paranoid_instructions: Ако вашият акаунт съществува, ще получите имейл с указания за отключването му до няколко минути. Проверете спам папката си, ако не сте получили такъв имейл.
+      send_paranoid_instructions: Ако акаунта ви съществува, то ще получите е-писмо с указания за отключването му до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
      unlocked: Акаунтът ви е успешно отключен. Влезте, за да продължите.
  errors:
    messages:
--- a/config/locales/devise.bn.yml
+++ b/config/locales/devise.bn.yml
@ -47,11 +47,9 @@ bn:
        subject: 'মাস্টাডন: পাসওয়ার্ড বদলানোর নির্দেশনা'
        title: পাসওয়ার্ড বদলানো
      two_factor_disabled:
-        explanation: আপনার অ্যাকাউন্টের জন্য দ্বি-ফ্যাক্টর প্রমাণীকরণ অক্ষম করা হয়েছে। লগইন এখন কেবলমাত্র ইমেল ঠিকানা এবং পাসওয়ার্ড ব্যবহার করে সম্ভব।
        subject: 'মস্তোডন: দ্বি-গুণক প্রমাণীকরণ অক্ষম'
        title: 2FA অক্ষম
      two_factor_enabled:
-        explanation: আপনার অ্যাকাউন্টের জন্য দ্বি-ফ্যাক্টর প্রমাণীকরণ সক্ষম করা হয়েছে। জোড়যুক্ত TOTP অ্যাপ্লিকেশন দ্বারা উত্পাদিত একটি টোকেন লগইনের জন্য প্রয়োজন হবে।
        subject: 'মস্তোডন: দ্বি-গুণক প্রমাণীকরণ সক্ষম হয়েছে'
        title: 2FA সক্ষম
      two_factor_recovery_codes_changed:
--- a/config/locales/devise.br.yml
+++ b/config/locales/devise.br.yml
@ -47,11 +47,9 @@ br:
        subject: 'Mastodon: Adkorañ kemennoù ar ger-tremen'
        title: Adderaouekaat ar ger-tremen
      two_factor_disabled:
-        explanation: Dilesadur dre eil-elfenn a zo bet nac'het. Gallout a reer mont-tre en ur implijout nemet ur chomlec'h-postel hag ur ger-tremen.
        subject: 'Mastodon: dilesadur dre eil-elfenn nac''het'
        title: 2FA diweredekaet
      two_factor_enabled:
-        explanation: Dilesadur dre eil-elfenn a zo aotreet evit ho kont. Ret a vo implij ur jedouer krouet gant an app TOTP koublet evit mont-tre.
        subject: 'Mastodon: dilesadur dre eil-elfenn aotreet'
        title: 2FA gweredekaet
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ br:
          subject: 'Mastodon: alc''hwezioù surentez dilamet'
          title: Unan eus hoc'h alc'hwezioù surentez a zo bet dilamet
      webauthn_disabled:
-        explanation: Dilezadur dre alc'hwezioù surentel a zo bet nac'het evit ho kont. Gallout a reer mont-tre en ur implijout ar jedouer krouet gant app TOTP koublet.
        subject: 'Mastodon: dilesadur dre alc''hwezioù surentez nac''het'
        title: Alc'hwezioù surentez nac'het
      webauthn_enabled:
-        explanation: Dilesadur dre alc'hwez surentez a zo bet aotreet evit ho kont. Hoc'h alc'hwez surentez a c'hell bezañ implijet evit mont-tre.
        subject: 'Mastodon: dilesadur dre alc''hwezioù surentez aotreet'
        title: Alc'hwezioù surentez aotreet
    omniauth_callbacks:
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@ -49,16 +49,19 @@ ca:
        subject: 'Mastodon: Instruccions per a reiniciar contrasenya'
        title: Contrasenya restablerta
      two_factor_disabled:
-        explanation: L'autenticació de doble factor per al teu compte s'ha desactivat. Ara només pots iniciar la sessió fent servir la teva adreça de correu-e i la contrasenya.
+        explanation: Només es pot accedir amb compte de correu i contrasenya.
        subject: 'Mastodon: Autenticació de doble factor desactivada'
+        subtitle: S'ha deshabilitat l'autenticació de doble factor al vostre compte.
        title: A2F desactivada
      two_factor_enabled:
-        explanation: L'autenticació de doble factor s'ha habilitat per al teu compte. Per a iniciar la sessió es requerirà un token generat per l'aplicació TOTP que hi hagis emparellat.
+        explanation: Per accedir fa falta un token generat per l'aplicació TOTP aparellada.
        subject: 'Mastodon: Autenticació de doble factor activada'
+        subtitle: S'ha habilitat l'autenticació de doble factor al vostre compte.
        title: A2F activada
      two_factor_recovery_codes_changed:
        explanation: Els codis de recuperació anteriors ja no són vàlids i se n'han generat de nous.
        subject: 'Mastodon: codis de recuperació de doble factor regenerats'
+        subtitle: S'han invalidat els codis de recuperació anteriors i se n'ha generat de nous.
        title: Codis de recuperació A2F canviats
      unlock_instructions:
        subject: 'Mastodon: Instruccions per a desblocar'
@ -72,11 +75,13 @@ ca:
          subject: 'Mastodon: Clau de seguretat esborrada'
          title: Una de les teves claus de seguretat ha estat esborrada
      webauthn_disabled:
-        explanation: S'ha desactivat l'autenticació amb claus de seguretat per al teu compte. Ara només pots iniciar la sessió usant el token generat per l'aplicació TOTP.
+        explanation: S'ha deshabilitat l'autenticació amb claus de seguretat al vostre compte.
+        extra: Ara només podeu accedir amb el token generat amb l'aplicació TOTP aparellada.
        subject: 'Mastodon: S''ha desactivat l''autenticació amb claus de seguretat'
        title: Claus de seguretat desactivades
      webauthn_enabled:
-        explanation: S'ha activat l'autenticació amb claus de seguretat. Ja pots usar la teva clau de seguretat per a iniciar sessió.
+        explanation: S'ha habilitat l'accés amb clau de seguretat al vostre compte.
+        extra: Ara podeu accedir amb la vostra clau de seguretat.
        subject: 'Mastodon: Autenticació amb clau de seguretat activada'
        title: Claus de seguretat activades
    omniauth_callbacks:
--- a/config/locales/devise.ckb.yml
+++ b/config/locales/devise.ckb.yml
@ -47,11 +47,9 @@ ckb:
        subject: 'ماستۆدۆن: رێکردنەوەی رێنماییەکانی تێپەڕوشە'
        title: گەڕانەوەی تێپەڕوشە
      two_factor_disabled:
-        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت کە لە کارخراوە. چوونەژوورەوە ئێستا دەکرێت تەنها ناونیشانی ئیمەیڵ و تێپەڕوشەکەت بەکاربهێنی.
        subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری ناچالاک کراوە'
        title: 2FA ناچالاک کرا
      two_factor_enabled:
-        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت چالاک کراوە. ئاماژەیەک کە لەلایەن نەرمەکالایTOTP جووتکراو دروست کراوە پێویستە بە چوونە ژوورەوە.
        subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری چالاک کراوە'
        title: 2FA چالاک کرا
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ ckb:
          subject: 'ماستۆدۆن: کلیلی پاراستن سڕایەوە'
          title: کلیلە کانی پاراستنی یەکێک لە ئێوە سڕایەوە
      webauthn_disabled:
-        explanation: سەلماندن بە کلیلەپارێزراوەکان لە کارخراوە بۆ هەژمارەکەت. چوونەژوورەوە ئێستا دەکرێت تەنها ئەو نیشانەیە بەکاربێنیت کە لەلایەن نەرمەکالایTOTP دروست کراوە.
        subject: 'ماستۆدۆن: سەلماندن لەگەڵ کلیلە پاسایشی ناچالاک کراوە'
        title: کلیلە پارستنەکان ناچالاک کراون
      webauthn_enabled:
-        explanation: سەلماندنی کلیلی ئاسایش چالاک کراوە بۆ هەژمارەکەت. ئێستا کلیلی پاراستن دەتوانرێت بۆ چوونە ژوورەوە بەکار بێت.
        subject: 'ماستۆدۆن: سەلماندنی کلیلی پاراستن چالاک کراوە'
        title: کلیلە کانی پاراستن چالاک کرا
    omniauth_callbacks:
--- a/config/locales/devise.co.yml
+++ b/config/locales/devise.co.yml
@ -47,11 +47,9 @@ co:
        subject: 'Mastodon: Cambià a chjave d’accessu'
        title: Cambià a chjave
      two_factor_disabled:
-        explanation: L'autentificazione à dui fattori per u vostru contu hè stata disattivata. A cunnessione hè avà pussibule cù l'usu solu di u vostru e-mail è di a chjave d'accessu.
        subject: 'Mastodon: Autentificazione à dui fattori disattivata'
        title: A2F disattivata
      two_factor_enabled:
-        explanation: L'autentificazione à dui fattori hè stata attivata per u vostru contu. Un codice, o fiscia, generata da l'applicazione TOTP assuciata sarà dumandata per cunnettavvi.
        subject: 'Mastodon: Autentificazione à dui fattori attivata'
        title: A2F attivata
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ co:
          subject: 'Mastodon: Chjave di sicurità sguassata'
          title: Una di e vostre chjave di sicurità hè stata sguassata
      webauthn_disabled:
-        explanation: L'autentificazione cù una chjave di sicurità hè stata disattivata per u vostru contu. Avà pudete solu cunnettavi cù u codice di cunnessione generatu da l'applicazione TOTP appaghjata.
        subject: 'Mastodon: Autentificazione cù chjave di sicurità disattivata'
        title: Chjave di sicurità disattivate
      webauthn_enabled:
-        explanation: L'autentificazione cù una chjave di sicurità hè stata attivata per u vostru contu. Avà a vostra chjave pò esse utilizata per cunnettavi.
        subject: 'Mastodon: Identificazione cù chjave di sicurità attivata'
        title: Chjave di sicurità attivate
    omniauth_callbacks:
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@ -47,11 +47,9 @@ cs:
        subject: 'Mastodon: Instrukce pro obnovení hesla'
        title: Obnovení hesla
      two_factor_disabled:
-        explanation: Dvoufázové ověřování bylo pro váš účet vypnuto. Pro přihlášení vám nyní stačí pouze e-mailová adresa a heslo.
        subject: 'Mastodon: Dvoufázové ověření bylo vypnuto'
        title: 2FA bylo vypnuto
      two_factor_enabled:
-        explanation: Dvoufázové ověřování bylo pro váš účet zapnuto. Pro přihlášení bude vyžadován token vygenerovaný spárovanou TOTP aplikací.
        subject: 'Mastodon: Dvoufázové ověření bylo zapnuto'
        title: 2FA bylo zapnuto
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ cs:
          subject: 'Mastodon: Bezpečnostní klíč byl smazán'
          title: Jeden z vašich bezpečnostních klíčů byl smazán
      webauthn_disabled:
-        explanation: Pro váš účet bylo vypnuto ověření bezpečnostními klíči. Přihlášení je nyní možné pouze s tokenem vygenerovaným spárovanou TOTP aplikací.
        subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo vypnuto'
        title: Bezpečnostní klíče byly zakázány
      webauthn_enabled:
-        explanation: Pro váš účet bylo povoleno ověření bezpečnostními klíči. Nyní můžete svůj bezpečnostní klíč použít pro přihlášení.
        subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo povoleno'
        title: Bezpečnostní klíče byly povoleny
    omniauth_callbacks:
--- a/config/locales/devise.cy.yml
+++ b/config/locales/devise.cy.yml
@ -47,16 +47,19 @@ cy:
        subject: 'Mastodon: Ailosod cyfarwyddiadau cyfrinair'
        title: Ailosod cyfrinair
      two_factor_disabled:
-        explanation: Mae dilysiad dau ffactor ar gyfer eich cyfrif wedi'i analluogi. Mae modd mewngofnodi nawr gan ddefnyddio cyfeiriad e-bost a chyfrinair yn unig.
+        explanation: Mae modd mewngofnodi nawr gan ddefnyddio dim ond cyfeiriad e-bost a chyfrinair.
        subject: 'Mastodon: mae dilysu dau ffactor wedi''i alluogi'
+        subtitle: Mae dilysiad dau ffactor ar gyfer eich cyfrif wedi'i analluogi.
        title: Dilysu dau ffactor yn anabl
      two_factor_enabled:
-        explanation: Mae dilysu dau ffactor wedi'i alluogi ar gyfer eich cyfrif. Bydd angen tocyn a gynhyrchir gan yr ap TOTP pâr i fewngofnodi.
+        explanation: Bydd angen tocyn wedi'i gynhyrchu gan yr ap TOTP pâr i fewngofnodi.
        subject: 'Mastodon: mae dilysu dau ffactor wedi''i alluogi'
+        subtitle: Mae dilysiad dau ffactor wedi'i alluogi ar gyfer eich cyfrif.
        title: Mae dilysu dau ffactor wedi'i alluogi
      two_factor_recovery_codes_changed:
        explanation: Mae'r codau adfer blaenorol wedi'u hannilysu a chynhyrchwyd rhai newydd.
        subject: 'Mastodon: Mae codau adfer dau ffactor wedi''u hadfywio'
+        subtitle: Mae'r codau adfer blaenorol wedi'u hannilysu a rhai newydd wedi'u cynhyrchu.
        title: Newidiodd codau adfer 2FA
      unlock_instructions:
        subject: 'Mastodon: Cyfarwyddiadau datgloi'
@ -70,11 +73,13 @@ cy:
          subject: 'Mastodon: Allwedd ddiogelwch wedi''i dileu'
          title: Mae un o'ch allweddi diogelwch wedi'i ddileu
      webauthn_disabled:
-        explanation: Mae dilysu gydag allweddi diogelwch wedi'i analluogi ar gyfer eich cyfrif. Mae mewngofnodi bellach yn bosibl gan ddefnyddio'r tocyn a gynhyrchir gan yr ap TOTP pâr yn unig.
+        explanation: Mae dilysu gydag allweddi diogelwch wedi'i analluogi ar gyfer eich cyfrif.
+        extra: Mae mewngofnodi bellach yn bosibl gan ddefnyddio'r tocyn wedi'i gynhyrchu gan yr ap TOTP pâr yn unig.
        subject: 'Mastodon: Dilysiad gydag allweddi diogelwch wedi''i analluogi'
        title: Allweddi diogelwch wedi'u hanalluogi
      webauthn_enabled:
-        explanation: Mae dilysiad allwedd diogelwch wedi'i alluogi ar gyfer eich cyfrif. Gellir defnyddio'ch allwedd ddiogelwch nawr ar gyfer mewngofnodi.
+        explanation: Mae dilysiad allwedd diogelwch wedi'i alluogi ar gyfer eich cyfrif.
+        extra: Mae modd defnyddio'ch allwedd ddiogelwch nawr i fewngofnodi.
        subject: 'Mastodon: Dilysiad allwedd diogelwch wedi''i alluogi'
        title: Allweddi diogelwch wedi'u galluogi
    omniauth_callbacks:
--- a/config/locales/devise.da.yml
+++ b/config/locales/devise.da.yml
@ -47,16 +47,19 @@ da:
        subject: 'Mastodon: Instruktioner til adgangskodenulstilling'
        title: Adgangskodenulstilling
      two_factor_disabled:
-        explanation: Tofaktorgodkendelse for kontoen er blevet deaktiveret. Indlogning er nu kun mulig via email og adgangskode.
+        explanation: Indlogning er nu mulig via kun e-mailadresse og adgangskode.
        subject: 'Mastodon: Tofaktorgodkendelse deaktiveret'
+        subtitle: Tofaktorgodkendelse for kontoen er blevet deaktiveret.
        title: 2FA deaktiveret
      two_factor_enabled:
-        explanation: Tofaktorgodkendelse er blevet aktiveret for kontoen. Indlogning vil kærve et token genereret af den parrede TOTP-app.
+        explanation: Token genereret af parret TOTP-app vil være nødvendig for indlogning.
        subject: 'Mastodon: Tofaktorgodkendelse aktiveret'
+        subtitle: Tofaktorgodkendelse er blevet aktiveret for kontoen.
        title: 2FA aktiveret
      two_factor_recovery_codes_changed:
        explanation: De tidligere gendannelseskoder er ugyldiggjorte og nye er genereret.
        subject: 'Mastodan: Tofaktorgendannelseskoder genereret igen'
+        subtitle: Tidligere gendannelseskoder er ugyldiggjorte og nye er genereret.
        title: 2FA gendannelseskoder skiftet
      unlock_instructions:
        subject: 'Mastodon: Oplåsningsinstruktioner'
@ -70,11 +73,13 @@ da:
          subject: 'Mastodon: Sikkerhedsnøgle slettet'
          title: En af dine sikkerhedsnøgler er blevet slettet
      webauthn_disabled:
-        explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for kontoen. Indlogning er nu kun mulig via token genereret af den parrede TOTP-app.
+        explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for kontoen.
+        extra: Indlogning er nu mulig kun via tokenet genereret af parret TOTP-app.
        subject: 'Mastodon: Godkendelse med sikkerhedsnøgler deaktiveret'
        title: Sikkerhedsnøgler deaktiveret
      webauthn_enabled:
-        explanation: Sikkerhedsnøglegodkendelse er aktiveret for kontoen. Din sikkerhedsnøgle kan nu bruges til indlogning.
+        explanation: Sikkerhedsnøglegodkendelse er blevet aktiveret for kontoen.
+        extra: Sikkerhedsnøglen kan nu bruges til indlogning.
        subject: 'Mastodon: Sikkerhedsnøglegodkendelse aktiveret'
        title: Sikkerhedsnøgler aktiveret
    omniauth_callbacks:
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@ -47,16 +47,19 @@ de:
        subject: 'Mastodon: Anleitung zum Zurücksetzen deines Passworts'
        title: Passwort zurücksetzen
      two_factor_disabled:
-        explanation: Zwei-Faktor-Authentisierung (2FA) für dein Konto wurde deaktiviert. Eine Anmeldung ist jetzt nur noch mit E-Mail-Adresse und Passwort möglich.
+        explanation: Das Anmelden ist jetzt nur noch mit einer E-Mail-Adresse und einem Passwort möglich.
        subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) deaktiviert'
+        subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto deaktiviert.
        title: 2FA deaktiviert
      two_factor_enabled:
-        explanation: Die Zwei-Faktor-Authentisierung (2FA) wurde für dein Konto aktiviert. Das zeitbasierte Einmalpasswort, das von deiner TOTP-App generiert wird, muss bei jeder Anmeldung zusätzlich eingegeben werden.
+        explanation: Für das Anmelden wird ein Token benötigt, das von der hinterlegten TOTP-App generiert wird.
        subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) aktiviert'
+        subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto aktiviert.
        title: 2FA aktiviert
      two_factor_recovery_codes_changed:
        explanation: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue erstellt.
        subject: 'Mastodon: Zwei-Faktor-Wiederherstellungscodes neu erstellt'
+        subtitle: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue erstellt.
        title: 2FA-Wiederherstellungscodes geändert
      unlock_instructions:
        subject: 'Mastodon: Anleitung zum Entsperren deines Kontos'
@ -70,11 +73,13 @@ de:
          subject: 'Mastodon: Sicherheitsschlüssel entfernt'
          title: Einer deiner Sicherheitsschlüssel wurde entfernt
      webauthn_disabled:
-        explanation: Das Authentisieren mit Sicherheitsschlüsseln wurde für dein Konto deaktiviert. Die Anmeldung ist jetzt nur noch mit dem zeitbasierten Einmalpasswort möglich, das von deiner TOTP-App generiert wird.
+        explanation: Die Authentisierung mit Sicherheitsschlüsseln wurde für dein Konto deaktiviert.
+        extra: Das Anmelden ist jetzt nur noch mit Token aus der TOTP-App möglich, die im Konto hinterlegt wurde.
        subject: 'Mastodon: Authentisierung mit Sicherheitsschlüsseln deaktiviert'
        title: Sicherheitsschlüssel deaktiviert
      webauthn_enabled:
-        explanation: Die Authentisierung mit Sicherheitsschlüssel wurde für dein Konto aktiviert. Dein Sicherheitsschlüssel kann nun für die Anmeldung verwendet werden.
+        explanation: Die Authentisierung mit Sicherheitsschlüsseln wurde für dein Konto aktiviert.
+        extra: Dein Sicherheitsschlüssel kann jetzt zum Anmelden verwendet werden.
        subject: 'Mastodon: Authentisierung mit Sicherheitsschlüssel aktiviert'
        title: Sicherheitsschlüssel aktiviert
    omniauth_callbacks:
--- a/config/locales/devise.el.yml
+++ b/config/locales/devise.el.yml
@ -47,16 +47,19 @@ el:
        subject: 'Mastodon: Οδηγίες επαναφοράς συνθηματικού'
        title: Επαναφορά συνθηματικού
      two_factor_disabled:
-        explanation: Η επαλήθευση 2 βημάτων (2FA) έχει απενεργοποιηθεί για το λογαριασμό σου. Η σύνδεση γίνεται απλά με το email και το συνθηματικό.
+        explanation: Η σύνδεση είναι τώρα δυνατή χρησιμοποιώντας μόνο τη διεύθυνση ηλεκτρονικού ταχυδρομείου και τον κωδικό πρόσβασης.
        subject: 'Mastodon: Απενεργοποιήθηκε η επαλήθευση 2 βημάτων (2FA)'
+        subtitle: Ο έλεγχος ταυτότητας δύο παραγόντων για τον λογαριασμό σας έχει απενεργοποιηθεί.
        title: Επαλήθευση 2 βημάτων ανενεργή (2FA)
      two_factor_enabled:
-        explanation: Έχει ενεργοποιηθεί η πιστοποίηση 2 παραγόντων για το λογαριασμό σου (2FA). Για να συνδεθείς θα απαιτηθεί πιστοποιημένο τεκμήριο από κάποια ζευγαρωμένη εφαρμογή.
+        explanation: Ένα διακριτικό που δημιουργείται από τη συνδεδεμένη εφαρμογή TOTP θα απαιτείται για τη σύνδεση.
        subject: 'Mastodon: Ενεργοποιήθηκε η επαλήθευση 2 βημάτων (2FA)'
+        subtitle: Ο έλεγχος ταυτότητας δύο παραγόντων έχει ενεργοποιηθεί για τον λογαριασμό σας.
        title: Επαλήθευση 2 βημάτων ενεργή (2FA)
      two_factor_recovery_codes_changed:
        explanation: Οι προηγούμενοι κωδικοί ανάκτησης ακυρώθηκαν και δημιουργήθηκαν νέοι.
        subject: 'Mastodon: Δημιουργήθηκαν νέοι κωδικοί ανάκτησης'
+        subtitle: Οι προηγούμενοι κωδικοί ανάκτησης ακυρώθηκαν και δημιουργήθηκαν νέοι.
        title: Οι κωδικοί ανάκτησης επαλήθευσης 2 βημάτων (2FA) άλλαξαν
      unlock_instructions:
        subject: 'Mastodon: Οδηγίες ξεκλειδώματος'
@ -70,11 +73,13 @@ el:
          subject: 'Mastodon: Διαγράφηκε ένα κλειδί ασφαλείας'
          title: Ένα από τα κλειδιά ασφαλείας σου διαγράφηκε
      webauthn_disabled:
-        explanation: Η επαλήθευση με κλειδί ασφαλείας έχει απενεργοποιηθεί για τον λογαριασμό σας. Η σύνδεση είναι τώρα εφικτή μόνο με τη χρήση κλειδιού που δημιουργημένου με την συνδεδεμένη εφαρμογή TOTP.
+        explanation: Ο έλεγχος ταυτότητας με κλειδιά ασφαλείας έχει απενεργοποιηθεί για τον λογαριασμό σας.
+        extra: Η σύνδεση είναι πλέον δυνατή χρησιμοποιώντας μόνο το διακριτικό που δημιουργείται από την εφαρμογή TOTP.
        subject: 'Mastodon: Η αυθεντικοποίηση με χρήση κλειδιών ασφαλείας απενεργοποιήθηκε'
        title: Τα κλειδιά ασφαλείας απενεργοποιήθηκαν
      webauthn_enabled:
-        explanation: Η επαλήθευση με κλειδί ασφαλείας έχει ενεργοποιηθεί για τον λογαριασμό σας. Μπορείτε να το χρησιμοποιήσετε για να συνδεθείτε.
+        explanation: Ο έλεγχος ταυτότητας κλειδιού ασφαλείας έχει ενεργοποιηθεί για τον λογαριασμό σας.
+        extra: Το κλειδί ασφαλείας σας μπορεί τώρα να χρησιμοποιηθεί για τη σύνδεση.
        subject: 'Mastodon: Ενεργοποιήθηκε η επαλήθευση με κλειδί ασφαλείας'
        title: Τα κλειδιά ασφαλείας ενεργοποιήθηκαν
    omniauth_callbacks:
--- a/config/locales/devise.en-GB.yml
+++ b/config/locales/devise.en-GB.yml
@ -47,11 +47,9 @@ en-GB:
        subject: 'Mastodon: Reset password instructions'
        title: Password reset
      two_factor_disabled:
-        explanation: Two-factor authentication for your account has been disabled. Login is now possible using only e-mail address and password.
        subject: 'Mastodon: Two-factor authentication disabled'
        title: 2FA disabled
      two_factor_enabled:
-        explanation: Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.
        subject: 'Mastodon: Two-factor authentication enabled'
        title: 2FA enabled
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ en-GB:
          subject: 'Mastodon: Security key deleted'
          title: One of your security keys has been deleted
      webauthn_disabled:
-        explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
        subject: 'Mastodon: Authentication with security keys disabled'
        title: Security keys disabled
      webauthn_enabled:
-        explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
        subject: 'Mastodon: Security key authentication enabled'
        title: Security keys enabled
    omniauth_callbacks:
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@ -47,11 +47,9 @@ eo:
        subject: 'Mastodon: Instrukcioj por ŝanĝi pasvorton'
        title: Pasvorto restarigita
      two_factor_disabled:
-        explanation: Dufaktora aŭtentigo por via konto malebligis. Ensalutado nun eblas per nur retpoŝtadreso kaj pasvorto.
        subject: 'Mastodon: dufaktora aŭtentigo malebligita'
        title: 2FA estas malŝaltita
      two_factor_enabled:
-        explanation: Dufaktora aŭtentigo sukcese ebligita por via akonto. Vi bezonos ĵetonon kreitan per parigitan aplikaĵon por ensaluti.
        subject: 'Mastodon: Dufaktora aŭtentigo ebligita'
        title: 2FA aktivigita
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ eo:
          subject: 'Mastodon: sekureca ŝlosilo forigita'
          title: Unu el viaj sekurecaj ŝlosiloj estis forigita
      webauthn_disabled:
-        explanation: Aŭtentikigo per sekurecaj ŝlosiloj estis malebligita por via konto. Ensaluto nun eblas per nur la signo generita de la parigita TOTP-programo.
        subject: 'Mastodon: sekureca-ŝlosila aŭtentigo malebligita'
        title: Sekurecaj ŝlosiloj malaktivigitaj
      webauthn_enabled:
-        explanation: Sekureca ŝlosila aŭtentokontrolo estis ebligita por via konto. Via sekureca ŝlosilo nun uzeblas por ensaluti.
        subject: 'Mastodon: sekureca-ŝlosila aŭtentigo ebligita'
        title: Sekurecaj ŝlosiloj aktivigitaj
    omniauth_callbacks:
--- a/config/locales/devise.es-AR.yml
+++ b/config/locales/devise.es-AR.yml
@ -47,16 +47,19 @@ es-AR:
        subject: 'Mastodon: instrucciones para cambiar la contraseña'
        title: Cambiar contraseña
      two_factor_disabled:
-        explanation: La autenticación de dos factores para tu cuenta está deshabilitada. Ahora el inicio de sesión sólo es posible usando la dirección de correo electrónico y la contraseña.
+        explanation: Ahora es posible iniciar sesión utilizando sólo la dirección de correo electrónico y la contraseña.
        subject: 'Mastodon: autenticación de dos factores, deshabilitada'
+        subtitle: Se deshabilitó la autenticación de dos factores para tu cuenta.
        title: 2FA deshabilitada
      two_factor_enabled:
-        explanation: La autenticación de dos factores para tu cuenta está habilitada. Se requiere una clave generada por la aplicación TOTP asociada para iniciar sesión.
+        explanation: Para iniciar sesión, se requerirá una clave numérica ("token") generada por la aplicación TOTP emparejada.
        subject: 'Mastodon: autenticación de dos factores, habilitada'
+        subtitle: Se habilitó la autenticación de dos factores para tu cuenta.
        title: 2FA habilitada
      two_factor_recovery_codes_changed:
        explanation: Los códigos anteriores de recuperación fueron invalidados y se generaron unos nuevos.
        subject: 'Mastodon: códigos de recuperación de dos factores, regenerados'
+        subtitle: Los códigos de recuperación anteriores ya no son válidos y se generaron códigos nuevos.
        title: Códigos de recuperación 2FA cambiados
      unlock_instructions:
        subject: 'Mastodon: instrucciones de desbloqueo'
@ -70,11 +73,13 @@ es-AR:
          subject: 'Mastodon: llave de seguridad eliminada'
          title: Se eliminó una de tus llaves de seguridad
      webauthn_disabled:
-        explanation: Se deshabilitó la autenticación con llaves de seguridad en tu cuenta. El inicio de sesión ahora es posible usando sólo la clave generada por la aplicación TOTP asociada.
+        explanation: Se deshabilitó la autenticación con claves de seguridad para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando sólo la clave numérica ("token") generada por la aplicación TOTP emparejada.
        subject: 'Mastodon: autenticación con llaves de seguridad, deshabilitada'
        title: Llaves de seguridad deshabilitadas
      webauthn_enabled:
-        explanation: Se habilitó la autenticación de llave de seguridad en tu cuenta. Ahora tu llave de seguridad se puede usar para iniciar sesión.
+        explanation: Se habilitó la autenticación con llave de seguridad para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando tu llave de seguridad.
        subject: 'Mastodon: autenticación con llaves de seguridad, habilitada'
        title: Llaves de seguridad habilitadas
    omniauth_callbacks:
--- a/config/locales/devise.es-MX.yml
+++ b/config/locales/devise.es-MX.yml
@ -47,16 +47,19 @@ es-MX:
        subject: 'Mastodon: Instrucciones para reiniciar contraseña'
        title: Reiniciar contraseña
      two_factor_disabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido deshabilitada. Ahora puedes conectarte solamente usando la dirección de correo electrónico y la contraseña.
+        explanation: Ahora es posible iniciar sesión utilizando solamente la dirección de correo electrónico y la contraseña.
        subject: 'Mastodon: La autenticación de dos factores está deshabilitada'
+        subtitle: La autenticación de doble factor para tu cuenta ha sido deshabilitada.
        title: 2FA desactivada
      two_factor_enabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido habilitada. Se requiere un token generado por la aplicación TOTP emparejada para ingresar.
+        explanation: Se requerirá un token generado por la aplicación TOTP emparejada para iniciar sesión.
        subject: 'Mastodon: La autenticación de dos factores está habilitada'
+        subtitle: La autenticación de doble factor ha sido habilitada para tu cuenta.
        title: 2FA activada
      two_factor_recovery_codes_changed:
        explanation: Los códigos de recuperación previos han sido invalidados y se generaron códigos nuevos.
        subject: 'Mastodon: Los códigos de recuperación de dos factores fueron regenerados'
+        subtitle: Los códigos de recuperación anteriores han sido invalidados y se han generado códigos nuevos.
        title: Códigos de recuperación 2FA cambiados
      unlock_instructions:
        subject: 'Mastodon: Instrucciones para desbloquear'
@ -70,11 +73,13 @@ es-MX:
          subject: 'Mastodon: Clave de seguridad eliminada'
          title: Una de sus claves de seguridad ha sido eliminada
      webauthn_disabled:
-        explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta. El inicio de sesión es ahora posible únicamente utilizando el token generado por la aplicación emparejada TOTP.
+        explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando únicamente el token generado por la aplicación TOTP emparejada.
        subject: 'Mastodon: Autenticación con claves de seguridad desactivada'
        title: Claves de seguridad desactivadas
      webauthn_enabled:
-        explanation: La autenticación con clave de seguridad ha sido habilitada para su cuenta. Su clave de seguridad ahora puede ser usada para iniciar sesión.
+        explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta.
+        extra: Tu clave de seguridad ahora puede usarse para iniciar sesión.
        subject: 'Mastodon: Autenticación con clave de seguridad activada'
        title: Claves de seguridad activadas
    omniauth_callbacks:
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@ -47,16 +47,19 @@ es:
        subject: 'Mastodon: Instrucciones para reiniciar contraseña'
        title: Reiniciar contraseña
      two_factor_disabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido deshabilitada. Ahora puedes conectarte solamente usando la dirección de correo electrónico y la contraseña.
+        explanation: Ahora es posible iniciar sesión utilizando únicamente la dirección de correo electrónico y la contraseña.
        subject: 'Mastodon: La autenticación de dos factores está deshabilitada'
+        subtitle: La autenticación de doble factor para tu cuenta ha sido deshabilitada.
        title: 2FA desactivada
      two_factor_enabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido habilitada. Se requiere un token generado por la aplicación TOTP emparejada para ingresar.
+        explanation: Se requerirá un token generado por la aplicación TOTP emparejada para iniciar sesión.
        subject: 'Mastodon: La autenticación de dos factores está habilitada'
+        subtitle: La autenticación de doble factor ha sido habilitada para tu cuenta.
        title: 2FA activada
      two_factor_recovery_codes_changed:
        explanation: Los códigos de recuperación previos han sido invalidados y se generaron códigos nuevos.
        subject: 'Mastodon: Los códigos de recuperación de dos factores fueron regenerados'
+        subtitle: Los códigos de recuperación anteriores han sido invalidados y se han generado códigos nuevos.
        title: Códigos de recuperación 2FA cambiados
      unlock_instructions:
        subject: 'Mastodon: Instrucciones para desbloquear'
@ -70,11 +73,13 @@ es:
          subject: 'Mastodon: Clave de seguridad eliminada'
          title: Una de tus claves de seguridad ha sido eliminada
      webauthn_disabled:
-        explanation: La autenticación con claves de seguridad ha sido deshabilitada para tu cuenta. Ahora el inicio de sesión solo es posible utilizando el token generado por la aplicación TOTP emparejada.
+        explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando únicamente el token generado por la aplicación TOTP emparejada.
        subject: 'Mastodon: Autenticación con claves de seguridad deshabilitada'
        title: Claves de seguridad deshabilitadas
      webauthn_enabled:
-        explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta. Ahora tu clave de seguridad puede ser utilizada para iniciar sesión.
+        explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta.
+        extra: Tu clave de seguridad ahora puede usarse para iniciar sesión.
        subject: 'Mastodon: Autenticación de clave de seguridad habilitada'
        title: Claves de seguridad habilitadas
    omniauth_callbacks:
--- a/config/locales/devise.et.yml
+++ b/config/locales/devise.et.yml
@ -47,16 +47,19 @@ et:
        subject: 'Mastodon: salasõna lähtestamisjuhendid'
        title: Salasõna lähtestamine
      two_factor_disabled:
-        explanation: Kontol on kaheastmeline autentimine välja lülitatud. Sisenemine on võimalik ainult kasutades e-postiaadressi ja salasõna.
+        explanation: Sisselogimine on nüüd võimalik vaid e-postiaadressi ja salasõnaga.
        subject: 'Mastodon: Kaheastmeline autentimine välja lülitatud'
+        subtitle: Kaheastmeline autoriseerimine on sinu konto jaoks nüüd välja lülitatud.
        title: 2FA keelatud
      two_factor_enabled:
-        explanation: Kontol on sisse lülitatud kaheastmeline autentimine. Sisenemiseks on vajalik ühekordne aeguv võti TOTP-rakenduse poolt.
+        explanation: Sisenemiseks on vaja seotud kaheastmelise autoriseerimise äpi genereeritud võtit.
        subject: 'Mastodon: kaheastmeline autentimine sisse lülitatud'
+        subtitle: Sinu konto jaoks on kaheastmeline autoriseerimine sisse lülitatud.
        title: 2FA lubatud
      two_factor_recovery_codes_changed:
        explanation: Eelmised taastekoodid on nüüd kehtetud ning loodud uued.
        subject: 'Mastodon: Kaheastmelise autentimise taastuskoodid taasloodud'
+        subtitle: Eelmised taastekoodid on tühistatud ja uued genereeritud.
        title: 2FA taastekoodid muudetud
      unlock_instructions:
        subject: 'Mastodon: Lahti lukustamis juhendid'
@ -70,11 +73,13 @@ et:
          subject: 'Mastodon: turvavõti kustutatud'
          title: Üks sinu turvavõtmetest on kustutatud
      webauthn_disabled:
-        explanation: Autentimine turvavõtmetega on kontol välja lülitatud. Sisse logimine on nüüd võimalik ainult kasutades seotud TOTP rakenduse poolt genereeritud võtit.
+        explanation: Turvavõtmega autoriseerimine on sinu konto jaoks välja lülitatud.
+        extra: Sisenemine on nüüd võimalik vaid seotud kaheastmelise autoriseerimise äpi genereeritud võtmega.
        subject: 'Mastodon: autentimine turvavõtmega on välja lülitatud'
        title: Turvavõtmed on välja lülitatud
      webauthn_enabled:
-        explanation: Turvavõtmega autentimine on nüüd kontol sisse lülitatud. Nüüd saab kasutada sisse logimiseks sinu turvavõtit.
+        explanation: Turvavõtmega autoriseerimine on sinu konto jaoks nüüd sisse lülitatud.
+        extra: Nüüd saab sisselogimiseks kasutada sinu turvavõtit.
        subject: 'Mastodon: turvavõtme autentimine sisse lülitatud'
        title: Turvavõtmed on sisse lülitatud
    omniauth_callbacks:
--- a/config/locales/devise.eu.yml
+++ b/config/locales/devise.eu.yml
@ -47,16 +47,19 @@ eu:
        subject: 'Mastodon: Pasahitza berrezartzeko argibideak'
        title: Pasahitza berrezartzea
      two_factor_disabled:
-        explanation: Bi faktoreetako autentifikazioa desgaitu da zure kontuan. Orain saioa hasi daiteke e-mail helbidea eta pasahitza bakarrik erabilita.
+        explanation: Orain posible da helbide elektronikoa eta pasahitza erabiliz saioa hastea.
        subject: 'Mastodon: Bi faktoreetako autentifikazioa desgaituta'
+        subtitle: Kontuaren bi faktoreko autentifikazioa desgaitu da.
        title: 2FA desgaituta
      two_factor_enabled:
-        explanation: Bi faktoreetako autentifikazioa gaitu da zure kontuan. Token bat sortu du lotutako TOTP aplikazioak eta saioa hasteko eskatuko da.
+        explanation: Parekatutako TOTP aplikazioak sortutako tokena beharko da saioa hasteko.
        subject: 'Mastodon: Bi faktoreetako autentifikazioa gaituta'
+        subtitle: Kontuaren bi faktoreko autentifikazioa gaitu da.
        title: 2FA gaituta
      two_factor_recovery_codes_changed:
        explanation: Aurreko kodeak baliogabetu dira eta berriak sortu dira.
        subject: 'Mastodon: Bi faktoreetako berreskuratze kodeak birsortuta'
+        subtitle: Aurreko berreskuratze-kodeak baliogabetu eta berriak sortu dira.
        title: 2FA berreskuratze kodeak aldatuta
      unlock_instructions:
        subject: 'Mastodon: Desblokeatzeko argibideak'
@ -70,11 +73,13 @@ eu:
          subject: 'Mastodon: Segurtasun gakoa ezabatu da'
          title: Zure segurtasun gakoetako bat ezabatu da
      webauthn_disabled:
-        explanation: Segurtasun gako bidezko autentifikazioa desgaitu da zure kontuan. Saioa hasteko modu bakarra parekatutako TOTP aplikazioak sortutako tokena erabiltzea da orain.
+        explanation: Kontuaren segurtasun-gako bidezko autentifikazioa desgaitu da.
+        extra: Parekatutako TOTP aplikazioak sortutako tokena erabiliz bakarrik has daiteke saioa orain.
        subject: 'Mastodon: Segurtasun gakoekin autentifikatzea desgaituta'
        title: Segurtasun gakoak desgaituta
      webauthn_enabled:
-        explanation: Segurtasun gako bidezko autentifikazioa gaitu da zure kontuan. Orain zure segurtasun gakoa erabil dezakezu saioa hasteko.
+        explanation: Kontuaren segurtasun-gako bidezko autentifikazioa gaitu da.
+        extra: Orain, segurtasun-gakoa erabil daiteke saioa hasteko.
        subject: 'Mastodon: Segurtasun gako bidezko autentifikazioa gaituta'
        title: Segurtasun gakoak gaituta
    omniauth_callbacks:
--- a/config/locales/devise.fa.yml
+++ b/config/locales/devise.fa.yml
@ -47,11 +47,9 @@ fa:
        subject: 'ماستودون: راهنمایی برای بازنشانی گذرواژه'
        title: بازنشانی گذرواژه
      two_factor_disabled:
-        explanation: ورود دومرحله‌ای برای حساب شما غیرفعال شده است. از الان می‌توانید تنها با نشانی ایمیل و گذرواژه وارد حساب خود شوید.
        subject: 'ماستودون: تأیید هویت دو مرحله‌ای از کار افتاد'
        title: ورود دومرحله‌ای غیرفعال
      two_factor_enabled:
-        explanation: ورود دومرحله‌ای برای حساب شما فعال شده است. برای ورود به کدی نیاز خواهید داشت که نرم‌افزار TOTP از پیش تنظیم شده برایتان می‌سازد.
        subject: 'ماستودون: تأیید هویت دومرحله‌ای به کار افتاد'
        title: ورود دومرحله‌ای فعال
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ fa:
          subject: 'ماستودون: کلید امنیتی حذف شد'
          title: یکی از کلیدهای امنیتیتان حذف شد
      webauthn_disabled:
-        explanation: تأیید هویت با کلیدهای امنیتی برای حسابتان از کار افتاده است. ورود اکنون فقط با ژتون ایجاد شده با کارهٔ TOTP جفت‌شده امکان‌پذیر است.
        subject: 'ماستودون: تأیید هویت با کلیدهای امنیتی از کار افتاد'
        title: کلیدهای امنیتی از کار افتادند
      webauthn_enabled:
-        explanation: تأیید هویت با کلید امنیتی برای حسابتان به کار افتاده است. اکنون کلید امنیتیتان می‌تواند برای ورود استفاده شود.
        subject: 'ماستودون: تأیید هویت با کلید امنیتی به کار افتاد'
        title: کلیدهای امنیتی به کار افتادند
    omniauth_callbacks:
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@ -47,11 +47,9 @@ fi:
        subject: 'Mastodon: ohjeet salasanan vaihtoon'
        title: Salasanan vaihto
      two_factor_disabled:
-        explanation: Tilisi kaksivaiheinen todennus poistettiin käytöstä. Kirjautuminen onnistuu nyt pelkällä sähköpostiosoitella ja salasanalla.
        subject: 'Mastodon: kaksivaiheinen todennus poistettu käytöstä'
        title: 2-vaiheinen todennus pois käytöstä
      two_factor_enabled:
-        explanation: Kaksivaiheinen todennus on otettu käyttöön tilillesi. Kirjautumiseen tarvitaan kaksivaiheisen todennuksen sovelluksesta saatu koodi.
        subject: 'Mastodon: kaksivaiheinen todennus otettu käyttöön'
        title: 2-vaiheinen todennus käytössä
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ fi:
          subject: 'Mastodon: suojausavain poistettu'
          title: Yksi suojausavaimistasi on poistettu
      webauthn_disabled:
-        explanation: Suojausavaimilla todennus on poistettu käytöstä tililtäsi. Kirjautuminen on nyt mahdollista vain paritetun TOTP-sovelluksen luomaa koodia käyttämällä.
        subject: 'Mastodon: Todennus suojausavaimilla poistettu käytöstä'
        title: Suojausavaimet poistettu käytöstä
      webauthn_enabled:
-        explanation: Todennus suojausavaimella on otettu käyttöön tilillesi. Suojausavaintasi voidaan nyt käyttää kirjautumiseen.
        subject: 'Mastodon: Todennus suojausavaimella on otettu käyttöön'
        title: Suojausavaimet käytössä
    omniauth_callbacks:
--- a/config/locales/devise.fo.yml
+++ b/config/locales/devise.fo.yml
@ -47,16 +47,19 @@ fo:
        subject: 'Mastodon: Vegleiðing at skifta loyniorð'
        title: Skift loyniorð
      two_factor_disabled:
-        explanation: Tvey-faktor samgildi (2FA) fyri tína kontu er gjørt óvirkið. Nú er møguligt at rita inn við einans at nýta teldupost og loyniorð.
+        explanation: Innritan er nú møgulig við einans at brúka teldupost og loyniorð.
        subject: 'Mastodon: Váttan í tveimum stigum er gjørd óvirkin'
+        subtitle: Váttan í tveimum stigum (2FA) er gjørd óvirkin fyri tína kontu.
        title: 2FA óvirkið
      two_factor_enabled:
-        explanation: Váttan í tveimum stigum er gjørd virkin fyri tína kontu. Eitt merki framleitt av paraðu TOTP appini verður framyvir kravt fyri at rita inn.
+        explanation: Eitt tekin, sum er gjørt við eini paraðari TOTP app, verður kravt fyri at rita inn.
        subject: 'Mastodon: Váttan í tveimum stigum er virkin'
+        subtitle: Váttan í tveimum stigum (2FA) er gjørd virkin fyri tína kontu.
        title: 2FA virkið
      two_factor_recovery_codes_changed:
        explanation: Undanfarnu endurskapanarkodurnar eru ógildaðar og nýggjar eru framleiddar.
        subject: 'Mastodon: Endurskapanarkodurnar til váttan í tveimum stigum eru framleiddar umaftur'
+        subtitle: Undanfarnu kodur til endurgerð eru nú óvirknar og nýggjar eru gjørdar.
        title: 2FA endurskapanarkodur eru broyttar
      unlock_instructions:
        subject: 'Mastodon: Vegleiðing í at læsa upp'
@ -70,11 +73,13 @@ fo:
          subject: 'Mastodon: Trygdarlykilin strikaður'
          title: Ein av trygdarlyklunum hjá tær er strikaður
      webauthn_disabled:
-        explanation: Váttan við trygdarlyklum er gjørd óvirkin fyri tína kontu. Nú ber til at rita inn einans við teknum, sum eru framleidd av paraðu TOTP appini.
+        explanation: Samgildi við trygdarlyklum er gjørt óvirkið fyri tína kontu.
+        extra: Innritan er nú møgulig við einans at brúka teknið, sum er gjørt við paraðu TOTP appini.
        subject: 'Mastodon: Váttan við trygdarlyklum er gjørd óvirkin'
        title: Trygdarlyklar óvirknir
      webauthn_enabled:
-        explanation: Váttan við trygdarlyklum er gjørd virkin á tínari kontu. Nú kann tín trygdarlykil nýtast at rita inn við.
+        explanation: Trygdarlyklasamgildi er gjørt virkið fyri tína kontu.
+        extra: Trygdarlyklarnir hjá tær kunnu nú brúkast til innritan.
        subject: 'Mastodon: Váttan við trygdarlykli gjørd virkin'
        title: Trygdarlyklar gjørdir virknir
    omniauth_callbacks:
--- a/config/locales/devise.fr-CA.yml
+++ b/config/locales/devise.fr-CA.yml
@ -47,16 +47,19 @@ fr-CA:
        subject: 'Mastodon: Instructions pour changer votre mot de passe'
        title: Réinitialisation du mot de passe
      two_factor_disabled:
-        explanation: L'authentification à deux facteurs pour votre compte a été désactivée. La connexion est maintenant possible en utilisant uniquement l'adresse courriel et le mot de passe.
+        explanation: La connexion est maintenant possible en n'utilisant uniquement l'adresse e-mail et le mot de passe.
        subject: 'Mastodon: authentification à deux facteurs désactivée'
+        subtitle: L'authentification à deux facteurs pour votre compte a été désactivée.
        title: A2F désactivée
      two_factor_enabled:
-        explanation: L'authentification à deux facteurs a été activée pour votre compte. Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
+        explanation: Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
        subject: 'Mastodon: authentification à deux facteurs activée'
+        subtitle: L'authentification à deux facteurs est maintenant activée pour votre compte.
        title: A2F activée
      two_factor_recovery_codes_changed:
        explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
        subject: 'Mastodon: codes de récupération à deux facteurs régénérés'
+        subtitle: Les codes de récupération précédents ont été invalidés et de nouveaux codes ont été générés.
        title: Codes de récupération A2F modifiés
      unlock_instructions:
        subject: 'Mastodon: Instructions pour déverrouiller votre compte'
@ -70,11 +73,9 @@ fr-CA:
          subject: 'Mastodon: Clé de sécurité supprimée'
          title: Une de vos clés de sécurité a été supprimée
      webauthn_disabled:
-        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP appairée.
        subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
        title: Clés de sécurité désactivées
      webauthn_enabled:
-        explanation: L'authentification par clé de sécurité a été activée pour votre compte. Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
        subject: 'Mastodon: Authentification de la clé de sécurité activée'
        title: Clés de sécurité activées
    omniauth_callbacks:
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@ -47,16 +47,19 @@ fr:
        subject: 'Mastodon : Instructions pour changer votre mot de passe'
        title: Réinitialisation du mot de passe
      two_factor_disabled:
-        explanation: L'authentification à deux facteurs pour votre compte a été désactivée. La connexion est maintenant possible en utilisant uniquement l'adresse courriel et le mot de passe.
+        explanation: La connexion est maintenant possible en n'utilisant uniquement l'adresse e-mail et le mot de passe.
        subject: 'Mastodon : authentification à deux facteurs désactivée'
+        subtitle: L'authentification à deux facteurs pour votre compte a été désactivée.
        title: 2FA désactivée
      two_factor_enabled:
-        explanation: L'authentification à deux facteurs a été activée pour votre compte. Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
+        explanation: Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
        subject: 'Mastodon : authentification à deux facteurs activée'
+        subtitle: L'authentification à deux facteurs est maintenant activée pour votre compte.
        title: A2F activée
      two_factor_recovery_codes_changed:
        explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
        subject: 'Mastodon : codes de récupération à deux facteurs régénérés'
+        subtitle: Les codes de récupération précédents ont été invalidés et de nouveaux codes ont été générés.
        title: Codes de récupération A2F modifiés
      unlock_instructions:
        subject: 'Mastodon : Instructions pour déverrouiller votre compte'
@ -70,11 +73,9 @@ fr:
          subject: 'Mastodon: Clé de sécurité supprimée'
          title: Une de vos clés de sécurité a été supprimée
      webauthn_disabled:
-        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP appairée.
        subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
        title: Clés de sécurité désactivées
      webauthn_enabled:
-        explanation: L'authentification par clé de sécurité a été activée pour votre compte. Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
        subject: 'Mastodon: Authentification de la clé de sécurité activée'
        title: Clés de sécurité activées
    omniauth_callbacks:
--- a/config/locales/devise.fy.yml
+++ b/config/locales/devise.fy.yml
@ -49,16 +49,19 @@ fy:
        subject: 'Mastodon: Wachtwurd opnij ynstelle'
        title: Wachtwurd opnij ynstelle
      two_factor_disabled:
-        explanation: Twa-stapsferifikaasje foar jo account is útskeakele. Jo kinne no allinnich oanmelde mei in e-mailadres en wachtwurd.
+        explanation: Jo kinne no oanmelde mei allinnich in e-mailadres en wachtwurd.
        subject: 'Mastodon: Twa-stapsferifikaasje útskeakele'
+        subtitle: Twastapsferifikaasje foar jo account is útskeakele.
        title: Twa-stapsferifikaasje útskeakele
      two_factor_enabled:
-        explanation: Twa-stapsferifikaasje foar jo account is ynskeakele. Om oanmelde te kinnen is in troch in twa-stapsferifikaasje-app generearre tagongskoade nedich.
+        explanation: Jo hawwe in troch de autentikaasje-app genearre tagongskoade nedich om oan te melden.
        subject: 'Mastodon: Twa-stapsferifikaasje ynskeakele'
+        subtitle: Twastapsferifikaasje is foar jo account ynskeakele.
        title: Twa-stapsferifikaasje ynskeakele
      two_factor_recovery_codes_changed:
        explanation: De foarige werstelkoaden binne ûnjildich makke en nije binne oanmakke.
        subject: 'Mastodon: Twa-staps-werstelkoaden binne opnij oanmakke'
+        subtitle: De foarige werstelkoaden binne ûnjildich makke en nije binne oanmakke.
        title: Werstelkoaden twa-stapsferifikaasje wizige
      unlock_instructions:
        subject: 'Mastodon: Ynstruksjes foar ûntskoatteljen'
@ -72,11 +75,13 @@ fy:
          subject: 'Mastodon: Befeiligingskaai fuortsmiten'
          title: Ien fan jo befeiligingskaaien is fuortsmiten
      webauthn_disabled:
-        explanation: Ferifikaasje mei befeiligingskaaien is útskeakele foar jo account. Oanmelden is no allinnich mooglik mei it gebrûk fan in troch in keppele TOTP-app generearre kaai.
+        explanation: Ferifikaasje mei befeiligingskaaien is foar jo account útskeakele.
+        extra: It is no allinnich mooglik om oan te melden mei in troch de autentikaasje-app genearre tagongskoade.
        subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is útskeakele'
        title: Befeiligingskaaien útskeakele
      webauthn_enabled:
-        explanation: Ferifikaasje mei befeiligingskaaien is ynskeakele foar jo account. Jo befeiligingskaai kin no brûkt wurde om oan te melden.
+        explanation: Ferifikaasje mei befeiligingskaaien is foar jo account ynskeakele.
+        extra: Jo befeiligingskaai kin no brûkt wurde om oan te melden.
        subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is ynskeakele'
        title: Befeiligingskaaien ynskeakele
    omniauth_callbacks:
--- a/config/locales/devise.gd.yml
+++ b/config/locales/devise.gd.yml
@ -47,11 +47,9 @@ gd:
        subject: 'Mastodon: Stiùireadh air ath-shuidheachadh an fhacail-fhaire'
        title: Ath-shuidheachadh an fhacail-fhaire
      two_factor_disabled:
-        explanation: Chaidh an dearbhadh dà-cheumnach a chur à comas dhan chunntas agad. ’S urrainn dhut clàradh a-steach le seòladh puist-d is facal-faire a-mhàin a-nis.
        subject: 'Mastodon: Tha an dearbhadh dà-cheumnach à comas'
        title: Dearbhadh dà-cheumnach à comas
      two_factor_enabled:
-        explanation: Chaidh an dearbhadh dà-cheumnach a chur an comas dhan chunntas agad. Bidh feum air tòcan a ghineas an aplacaid TOTP a chaidh a phaidhreachadh airson clàradh a-steach.
        subject: 'Mastodon: Tha an dearbhadh dà-cheumnach an comas'
        title: Dearbhadh dà-cheumnach an comas
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ gd:
          subject: 'Mastodon: Chaidh iuchair tèarainteachd a sguabadh às'
          title: Chaidh tè dhe na h-iuchraichean tèarainteachd agad a sguabadh às
      webauthn_disabled:
-        explanation: Chaidh an dearbhadh le iuchraichean tèarainteachd a chur à comas dhan chunntas agad. ’S urrainn dhut clàradh a-steach leis an tòcan a ghineas an aplacaid TOTP paidhrichte a-mhàin a-nis.
        subject: 'Mastodon: Tha dearbhadh le iuchraichean tèarainteachd à comas'
        title: Chaidh na h-iuchraichean tèarainteachd a chur à comas
      webauthn_enabled:
-        explanation: Chaidh an dearbhadh le iuchair tèarainteachd a chur an comas dhan chunntas agad. ’S urrainn dhut an iuchair tèarainteachd agad a chleachdadh airson clàradh a-steach a-nis.
        subject: 'Mastodon: Tha dearbhadh le iuchair tèarainteachd an comas'
        title: Chaidh na h-iuchraichean tèarainteachd a chur an comas
    omniauth_callbacks:
--- a/config/locales/devise.gl.yml
+++ b/config/locales/devise.gl.yml
@ -47,16 +47,19 @@ gl:
        subject: 'Mastodon: Instrucións para restabelecer o contrasinal'
        title: Restabelecer contrasinal
      two_factor_disabled:
-        explanation: A autenticación de dobre factor para a túa conta foi desactivada. É agora posíbel acceder só co teu enderezo de email e contrasinal.
+        explanation: Agora xa podes acceder usando simplemente o correo e contrasinal.
        subject: 'Mastodon: Autenticación de dobre factor desactivada'
+        subtitle: Desactivouse o segundo factor de autenticación.
        title: 2FA desactivado
      two_factor_enabled:
-        explanation: A autenticación de dobre factor foi activada para a túa conta. Un token, xerado pola aplicación TOTP emparellada, será necesario para acceder.
+        explanation: Vai ser preciso usar un código creado pola app TOTP emparellada.
        subject: 'Mastodon: Activouse a autenticación de dobre factor'
+        subtitle: Activouse o segundo factor de autenticación para a conta.
        title: 2FA activado
      two_factor_recovery_codes_changed:
        explanation: Os códigos de recuperación anteriores fican anulados e os novos foron xerados.
        subject: 'Mastodon: Xerados novos códigos de recuperación de dobre factor'
+        subtitle: Os anteriores códigos de recuperación quedaron desactivados e crearonse uns novos.
        title: Códigos de recuperación 2FA mudados
      unlock_instructions:
        subject: 'Mastodon: Instrucións para desbloquear'
@ -70,11 +73,13 @@ gl:
          subject: 'Mastodon: Chave de seguridade eliminada'
          title: Eliminouse unha das túas chaves de seguridade
      webauthn_disabled:
-        explanation: Desactivouse para a túa conta a autenticación con chaves de seguridade. Agora a conexión é posible usando só o token creado pola app TOTP emparellada.
+        explanation: Desactivouse para a conta a autenticación con chaves de seguridade.
+        extra: Agora só se pode acceder usando o código creado pola app TOTP emparellada.
        subject: 'Mastodon: Desactivouse a autenticación con chave de seguridade'
        title: Chaves de seguridade desactivadas
      webauthn_enabled:
-        explanation: Activouse para a conta a autenticación con chave de seguridade. Xa podes usar a chave de seguridade para contectar.
+        explanation: Activouse para a conta a autenticación con chave de seguridade.
+        extra: Xa podes usar a chave de seguridade para acceder.
        subject: 'Mastodon: Autenticación con chave de seguridade activada'
        title: Chaves de seguridade activas
    omniauth_callbacks:
--- a/config/locales/devise.he.yml
+++ b/config/locales/devise.he.yml
@ -47,16 +47,19 @@ he:
        subject: 'מסטודון: הוראות לאיפוס סיסמה'
        title: איפוס סיסמה
      two_factor_disabled:
-        explanation: האימות הדו-גורמי לחשבונך בוטל. ניתן עתה להכנס לחשבון עם כתובת דוא"ל וסיסמא בלבד.
+        explanation: החיבור כרגע אפשרי בעזרת שם משתמש וסיסמא ותו לא.
        subject: 'מסטודון: אימות דו גורמי מושבת'
+        subtitle: אימות דו-שלבי כובה לחשבון זה.
        title: אימות דו-גורמי הושעה
      two_factor_enabled:
-        explanation: אימות דו-גורמי הופעל בחשבונך. עתה על מנת להכנס לחשבון נדרש אסימון המיוצר על אפליקציית ה-TOTP המצומדת.
+        explanation: כדי להתחבר דרוש קוד חד פעמי מיישומון TOTP ששידכת לחשבון זה.
        subject: 'מסטודון: אימות דו גורמי הופעל'
+        subtitle: אימות דו־שלבי הופעל לחשבונך.
        title: אימות דו־גורמי הופעל
      two_factor_recovery_codes_changed:
        explanation: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
        subject: 'מסטודון: צפני אחזור דו-גורמי יוצרו מחדש'
+        subtitle: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
        title: צפני אחזור דו-גורמי השתנו
      unlock_instructions:
        subject: 'מסטודון: הוראות לביטול נעילה'
@ -70,11 +73,13 @@ he:
          subject: 'מסטודון: מפתח האבטחה נמחק'
          title: אחד ממפתחות האבטחה שלך נמחק
      webauthn_disabled:
-        explanation: בוטלה האפשרות לאמת את חשבונך בעזרת מפתחות אבטחה. כניסה לחשבון אפשרית עכשיו רק בעזרת אסימון שיוצר באפליקציית ה-TOTP המצומדת.
+        explanation: אימות במפתחות אבטחה כובה לחשבונך.
+        extra: חיבור כעת ניתן רק על ידי הקוד שיוצר על ידי יישומון TOTP ששודך.
        subject: 'מסטודון: אימות בעזרת מפתחות אבטחה הושעה'
        title: מפתחות אבטחה הושעו
      webauthn_enabled:
-        explanation: אימות בעזרת מפתחות אבטחה הופעלו עבור חשבונך. ניתן עתה להשתמש במפתח האבטחה שלך על מנת להכנס לחשבון.
+        explanation: אימות מפתח בטחון הופעל בחשבונך.
+        extra: ניתן להשתמש כעת במפתח האבטחה שלך כדי להתחבר.
        subject: 'מסטודון: אימות בעזרת מפתח אבטחה אופשר'
        title: מפתחות אבטחה אופשרו
    omniauth_callbacks:
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@ -47,11 +47,9 @@ hu:
        subject: 'Mastodon: Jelszóvisszaállítási utasítások'
        title: Jelszó visszaállítása
      two_factor_disabled:
-        explanation: A fiókod kétlépcsős hitelesítését kikapcsoltuk. A bejelentkezés mostantól csak az e-mail cím és a jelszó használatával lesz lehetséges.
        subject: Kétlépcsős azonosítás kikapcsolva
        title: Kétlépcsős hitelesítés kikapcsolva
      two_factor_enabled:
-        explanation: A kétlépcsős hitelesítést engedélyeztük a fiókodban. A bejelentkezéshez a párosított TOTP alkalmazás által generált tokenre lesz szükség.
        subject: 'Mastodon: Kétlépcsős azonosítás engedélyezve'
        title: Kétlépcsős hitelesítés engedélyezve
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ hu:
          subject: 'Mastodon: A biztonsági kulcs törlésre került'
          title: Az egyik biztonsági kulcsodat törölték
      webauthn_disabled:
-        explanation: A biztonsági kulccsal történő hitelesítést letiltottuk a fiókodon. Bejelentkezni csak a párosított TOTP app által generált tokennel lehet.
        subject: 'Mastodon: A biztonsági kulccsal történő hitelesítés letiltásra került'
        title: A biztonsági kulcsok letiltásra kerültek
      webauthn_enabled:
-        explanation: A biztonsági kulccsal történő hitelesítést engedélyeztük a fiókodon. A biztonsági kulcsodat mostantól használhatod bejelentkezésre.
        subject: 'Mastodon: A biztonsági kulcsos hitelesítés engedélyezésre került'
        title: A biztonsági kulcsok engedélyezésre kerültek
    omniauth_callbacks:
--- a/config/locales/devise.hy.yml
+++ b/config/locales/devise.hy.yml
@ -47,11 +47,9 @@ hy:
        subject: Մաստոդոն․ Գաղտնաբառի վերականգնման նկարագրութիւններ
        title: Վերականգնել գաղտնաբառը
      two_factor_disabled:
-        explanation: 2FA֊ն քո հաշուի համար անջատուեց։ Մուտքն այժմ հնարաւոր է միայն էլ․ փոտի եւ գաղտնաբառի միջոցով։
        subject: Մաստոդոն․ 2FA֊ն անջատուեց
        title: 2FA անջատուած է
      two_factor_enabled:
-        explanation: 2FA֊ն քո հաշուի համար միացուած է։ TOTP ծրագրի միջոցով գեներացուած token֊ը պէտք է օգտագործես մուտք գործելու համար։
        subject: Մաստոդոն․ 2FA-ն միացուեց
        title: 2FA միացուած է
      two_factor_recovery_codes_changed:
@ -70,11 +68,9 @@ hy:
          subject: Մաստոդոն․ Անվտանգութեան բանալին ջնջուել է
          title: Անվտանգութեան բանալիներիցդ մեկը ջնջուել է
      webauthn_disabled:
-        explanation: Անվտանգութեան բանալիներով նոյնականացումը քո հաշուից կասեցուել է։ Մուտք գործելն այժմ հնարաւոր է՝ օգտագործելով միայն զուգաւորուած TOTP յաւելուածից գեներացուած կտրօնը։
        subject: Մաստոդոն․ Նոյնականացումն անվտանգութեան բանալիներով կասեցուած է
        title: Անվտանգութեան բանալիները կասեցուել են
      webauthn_enabled:
-        explanation: Անվտանգութեան բանալիով նոյնականացումը քո հաշուի համար միացուած է։ Քո անվտանգութեան բանալին այժմ կարող է օգտագործուել մուտք գործելու համար։
        subject: Մաստոդոն․ Անվտանգութեան բանալիով նոյնականացումը միացուած է
        title: Անվտանգութեան բանալիները միացուել են
    omniauth_callbacks:
--- a/Show More
+++ b/Show More